Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 95901ca

Browse files
author
chenyouwei
committed
feat:升级androidx 新增greendao demo
1 parent a4871b1 commit 95901ca

File tree

61 files changed

+189
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+189
-152
lines changed

‎app/build.gradle‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'com.tencent.tinker.patch'
33
apply from: 'tinker-support.gradle'
4+
apply plugin: 'org.greenrobot.greendao' // apply plugin
45

56
android {
67
compileSdkVersion 28
@@ -10,7 +11,7 @@ android {
1011
targetSdkVersion 28
1112
versionCode 1
1213
versionName "1.0"
13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1415
// multiDexEnabled true // 开启dex分包
1516
}
1617
buildTypes {
@@ -50,13 +51,13 @@ android {
5051

5152
dependencies {
5253
implementation fileTree(dir: 'libs', include: ['*.jar'])
53-
implementation 'com.android.support:appcompat-v7:28.0.0'
54-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
54+
implementation 'androidx.appcompat:appcompat:1.0.0'
55+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
5556
testImplementation 'junit:junit:4.12'
56-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
57-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
57+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
58+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
5859
implementation "com.squareup.okhttp3:okhttp:3.14.2"
59-
implementation "com.android.support:recyclerview-v7:28.0.0"
60+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
6061
implementation 'org.greenrobot:eventbus:3.1.1'
6162
implementation "com.squareup.retrofit2:retrofit:2.6.0"
6263
implementation "com.squareup.retrofit2:converter-gson:2.6.0"
@@ -76,7 +77,7 @@ dependencies {
7677

7778
// ExoPlayer as IMediaPlayer: optional, experimental
7879
compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.8'
79-
implementation 'com.android.support:cardview-v7:25.3.1'
80+
implementation 'androidx.cardview:cardview:1.0.0'
8081
// 滴滴调试工具
8182
debugImplementation 'com.didichuxing.doraemonkit:doraemonkit:1.2.1'
8283
releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-no-op:1.2.0'
@@ -95,4 +96,6 @@ dependencies {
9596

9697
implementation "io.reactivex.rxjava2:rxandroid:2.0.2"
9798
implementation "io.reactivex.rxjava2:rxjava:2.1.12"
99+
100+
implementation 'org.greenrobot:greendao:3.3.0' // add library
98101
}

‎app/src/main/java/com/hugh/basis/MainActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import android.content.pm.ApplicationInfo;
77
import android.content.res.Configuration;
88
import android.os.Environment;
9-
import android.support.v7.app.AppCompatActivity;
109
import android.os.Bundle;
1110
import android.util.Log;
1211
import android.view.MotionEvent;
@@ -60,6 +59,7 @@
6059
import java.util.List;
6160
import java.util.concurrent.TimeUnit;
6261

62+
import androidx.appcompat.app.AppCompatActivity;
6363
import okhttp3.Call;
6464
import okhttp3.Callback;
6565
import okhttp3.OkHttpClient;

‎app/src/main/java/com/hugh/basis/MediaPlay/MediaPlayActivity.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import android.media.MediaPlayer;
55
import android.net.Uri;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
8-
import android.support.v7.app.AppCompatActivity;
7+
98
import android.view.SurfaceHolder;
109
import android.view.SurfaceView;
1110
import android.view.View;
@@ -14,6 +13,9 @@
1413

1514
import com.hugh.basis.R;
1615

16+
import androidx.annotation.Nullable;
17+
import androidx.appcompat.app.AppCompatActivity;
18+
1719
/**
1820
* Created by chenyw on 2019年07月10日.
1921
*/

‎app/src/main/java/com/hugh/basis/ReceiveActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
package com.hugh.basis;import android.os.Bundle;import android.support.annotation.Nullable;import android.support.v7.app.AppCompatActivity;import android.util.Log;import android.widget.Toast;/** * Created by chenyw on 2019年5月23日. */public class ReceiveActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_receive); String str = getIntent().getStringExtra("send"); Toast.makeText(this, str, Toast.LENGTH_SHORT).show(); Log.e("aaa",MainActivity.markNum+""); }}
1+
package com.hugh.basis;import android.os.Bundle;import android.util.Log;import android.widget.Toast;import androidx.annotation.Nullable;import androidx.appcompat.app.AppCompatActivity;/** * Created by chenyw on 2019年5月23日. */public class ReceiveActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_receive); String str = getIntent().getStringExtra("send"); Toast.makeText(this, str, Toast.LENGTH_SHORT).show(); Log.e("aaa",MainActivity.markNum+""); }}

‎app/src/main/java/com/hugh/basis/SecondActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
import android.content.Intent;
55
import android.content.res.Configuration;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
87
import android.util.Log;
98
import android.view.View;
109
import android.widget.Button;
1110

1211
import com.hugh.basis.binder.UserManager;
1312

13+
import androidx.annotation.Nullable;
14+
1415
/**
1516
* Created by {chenyouwei}
1617
* Date: {2019年4月8日}

‎app/src/main/java/com/hugh/basis/ThirdActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import android.app.Activity;
44
import android.content.res.Configuration;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
76
import android.util.Log;
87

8+
import androidx.annotation.Nullable;
9+
910
/**
1011
* Created by {chenyouwei}
1112
* Date: {2019年4月8日}

‎app/src/main/java/com/hugh/basis/View/CircleView.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
import android.graphics.Canvas;
66
import android.graphics.Color;
77
import android.graphics.Paint;
8-
import android.support.annotation.Nullable;
98
import android.util.AttributeSet;
109
import android.view.View;
1110

1211
import com.hugh.basis.R;
1312

13+
import androidx.annotation.Nullable;
14+
1415
/**
1516
* Created by {chenyouwei}
1617
* Date: {2019年4月12日}

‎app/src/main/java/com/hugh/basis/activities/BindServiceActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
import android.content.ServiceConnection;
66
import android.os.Bundle;
77
import android.os.IBinder;
8-
import android.support.annotation.Nullable;
9-
import android.support.v7.app.AppCompatActivity;
108
import android.util.Log;
119
import android.view.View;
1210
import android.widget.Button;
1311

1412
import com.hugh.basis.R;
1513
import com.hugh.basis.services.TestTwoService;
1614

15+
import androidx.annotation.Nullable;
16+
import androidx.appcompat.app.AppCompatActivity;
17+
1718
/**
1819
* Created by chenyw on 2019年06月13日.
1920
* client端要做的事情:

‎app/src/main/java/com/hugh/basis/activities/FragmentActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
package com.hugh.basis.activities;import android.app.Activity;import android.os.Bundle;import android.support.v4.app.Fragment;import android.support.v7.app.AppCompatActivity;import android.view.View;import android.view.Window;import com.hugh.basis.R;import com.hugh.basis.fragments.ContentFragment;import com.hugh.basis.fragments.NameContentFragment;import com.hugh.basis.fragments.NameFragment;/** * Created by chenyw on 2019年5月24日. */public class FragmentActivity extends AppCompatActivity implements NameFragment.showPro { private NameContentFragment cf; private NameFragment nf; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_fragment); cf = (NameContentFragment)getSupportFragmentManager().findFragmentById( R.id.content_fg); nf = (NameFragment) getSupportFragmentManager().findFragmentById(R.id.name_fg); } @Override public void showProByName(String name) { cf.showPro(name); } public void onClick(View v) { switch (v.getId()) { case R.id.clear_data: nf.clearData(); break; default: break; } }}
1+
package com.hugh.basis.activities;import android.os.Bundle;import android.view.View;import com.hugh.basis.R;import com.hugh.basis.fragments.NameContentFragment;import com.hugh.basis.fragments.NameFragment;import androidx.appcompat.app.AppCompatActivity;/** * Created by chenyw on 2019年5月24日. */public class FragmentActivity extends AppCompatActivity implements NameFragment.showPro { private NameContentFragment cf; private NameFragment nf; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_fragment); cf = (NameContentFragment)getSupportFragmentManager().findFragmentById( R.id.content_fg); nf = (NameFragment) getSupportFragmentManager().findFragmentById(R.id.name_fg); } @Override public void showProByName(String name) { cf.showPro(name); } public void onClick(View v) { switch (v.getId()) { case R.id.clear_data: nf.clearData(); break; default: break; } }}

‎app/src/main/java/com/hugh/basis/activities/ListActivity.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
package com.hugh.basis.activities;
22

33
import android.os.Bundle;
4-
importandroid.support.annotation.Nullable;
5-
import android.support.design.widget.CoordinatorLayout;
6-
import android.support.v4.widget.NestedScrollView;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.DividerItemDecoration;
9-
import android.support.v7.widget.GridLayoutManager;
10-
import android.support.v7.widget.LinearLayoutManager;
11-
import android.support.v7.widget.RecyclerView;
12-
importandroid.support.v7.widget.StaggeredGridLayoutManager;
4+
5+
import androidx.annotation.Nullable;
6+
import androidx.appcompat.app.AppCompatActivity;
7+
import androidx.core.widget.NestedScrollView;
8+
import androidx.recyclerview.widget.DividerItemDecoration;
9+
import androidx.recyclerview.widget.GridLayoutManager;
10+
import androidx.recyclerview.widget.LinearLayoutManager;
11+
import androidx.recyclerview.widget.RecyclerView;
12+
1313
import android.util.Log;
1414
import android.view.LayoutInflater;
1515
import android.view.View;
1616
import android.view.ViewGroup;
1717
import android.view.animation.LinearInterpolator;
18-
import android.widget.ScrollView;
1918
import android.widget.TextView;
2019

2120
import com.hugh.basis.R;
2221

2322
import java.util.ArrayList;
2423
import java.util.List;
2524

26-
import static android.support.v4.view.ViewCompat.TYPE_NON_TOUCH;
27-
2825
/**
2926
* Created by chenyw on 2019年06月30日.
3027
*

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /