Skip to content

Commit aa1d4c5

Browse files
author
jhonjson
committed
支持AndroidX
替换Mvp
1 parent 23bacd4 commit aa1d4c5

64 files changed

Lines changed: 1359 additions & 1876 deletions

File tree

Some content is hidden

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

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
repositories {
55
google()
66
jcenter()
7-
7+
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:3.3.1'

config.gradle

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,33 @@ ext {
2929
//依赖第三方配置
3030
dependencies = [
3131
//rxjava
32-
"rxjava" : "io.reactivex.rxjava2:rxjava:2.2.3",
33-
"rxandroid" : "io.reactivex.rxjava2:rxandroid:2.1.0",
32+
"rxjava" : "io.reactivex.rxjava2:rxjava:2.2.3",
33+
"rxandroid" : "io.reactivex.rxjava2:rxandroid:2.1.0",
3434
//rx系列与View生命周期同步
35-
"rxlifecycle" : "com.trello.rxlifecycle2:rxlifecycle:2.2.2",
36-
"rxlifecycle-components" : "com.trello.rxlifecycle2:rxlifecycle-components:2.2.2",
35+
"rxlifecycle" : "com.trello.rxlifecycle2:rxlifecycle:2.2.2",
36+
"rxlifecycle-components": "com.trello.rxlifecycle2:rxlifecycle-components:2.2.2",
3737
//rxbinding
38-
"rxbinding" : "com.jakewharton.rxbinding2:rxbinding:2.1.1",
38+
"rxbinding" : "com.jakewharton.rxbinding2:rxbinding:2.1.1",
3939
//rx 6.0权限请求
40-
"rxpermissions" : "com.github.tbruyelle:rxpermissions:0.10.2",
40+
"rxpermissions" : "com.github.tbruyelle:rxpermissions:0.10.2",
4141
//network
42-
"okhttp" : "com.squareup.okhttp3:okhttp:3.10.0",
43-
"retrofit" : "com.squareup.retrofit2:retrofit:2.4.0",
44-
"converter-gson" : "com.squareup.retrofit2:converter-gson:2.4.0",
45-
"adapter-rxjava" : "com.squareup.retrofit2:adapter-rxjava2:2.4.0",
42+
"okhttp" : "com.squareup.okhttp3:okhttp:3.10.0",
43+
"retrofit" : "com.squareup.retrofit2:retrofit:2.4.0",
44+
"converter-gson" : "com.squareup.retrofit2:converter-gson:2.4.0",
45+
"adapter-rxjava" : "com.squareup.retrofit2:adapter-rxjava2:2.4.0",
46+
"retrofit-cookie" : "com.github.franmontiel:PersistentCookieJar:v1.0.1",
47+
"logging-interceptor" : "com.squareup.okhttp3:logging-interceptor:3.11.0",
48+
"converter-gson" : "com.squareup.retrofit2:converter-gson:2.4.0",
4649
//glide图片加载
47-
"glide" : "com.github.bumptech.glide:glide:4.8.0",
48-
"glide-compiler" : "com.github.bumptech.glide:compiler:4.8.0",
50+
"glide" : "com.github.bumptech.glide:glide:4.8.0",
51+
"glide-compiler" : "com.github.bumptech.glide:compiler:4.8.0",
4952
//json解析
50-
"gson" : "com.google.code.gson:gson:2.8.5",
53+
"gson" : "com.google.code.gson:gson:2.8.5",
54+
//阿里
55+
"fastjson" : "com.alibaba:fastjson:1.1.70.android",
5156
//阿里路由框架
52-
"arouter-api" : "com.alibaba:arouter-api:1.4.1",
53-
"arouter-compiler" : "com.alibaba:arouter-compiler:1.2.2",
57+
"arouter-api" : "com.alibaba:arouter-api:1.4.1",
58+
"arouter-compiler" : "com.alibaba:arouter-compiler:1.2.2",
5459
]
5560
}
5661

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@ org.gradle.jvmargs=-Xmx1536m
1313
# org.gradle.parallel=true
1414
isBuildModule=false
1515

16+
android.useAndroidX=true
17+
android.enableJetifier=true
18+
1619

library_base/src/main/java/com/play/library_base/base/BaseAppManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package com.play.library_base.base;
22

33
import android.app.Activity;
4-
import android.support.v4.app.Fragment;
4+
5+
import androidx.fragment.app.Fragment;
56

67
import java.util.Stack;
78

library_base/src/main/java/com/play/library_base/base/BaseApplication.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,27 @@
22

33
import android.app.Activity;
44
import android.app.Application;
5-
import android.support.annotation.NonNull;
5+
import android.content.Context;
66
import android.os.Bundle;
77

88
import com.play.library_base.utils.Utils;
99

1010
public class BaseApplication extends Application {
1111
private static Application sInstance;
12-
12+
private Context context;
1313
@Override
1414
public void onCreate() {
1515
super.onCreate();
1616
setApplication(this);
17+
context = this;
1718
}
1819

1920
/**
2021
* 当主工程没有继承BaseApplication时,可以使用setApplication方法初始化BaseApplication
2122
*
2223
* @param application
2324
*/
24-
public static synchronized void setApplication(@NonNull Application application) {
25+
public static synchronized void setApplication(Application application) {
2526
sInstance = application;
2627
//初始化工具类
2728
Utils.init(application);
@@ -69,4 +70,8 @@ public static Application getInstance() {
6970
}
7071
return sInstance;
7172
}
73+
74+
public Context getContext() {
75+
return context;
76+
}
7277
}

library_base/src/main/java/com/play/library_base/base/BaseContainerActivity.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

library_base/src/main/java/com/play/library_base/config/ModuleLifecycleConfig.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.play.library_base.config;
22

33
import android.app.Application;
4-
import android.support.annotation.Nullable;
54

65
import com.play.library_base.base.IModuleInit;
76

@@ -24,7 +23,7 @@ public static ModuleLifecycleConfig getInstance() {
2423
private ModuleLifecycleConfig() {}
2524

2625
//初始化组件-靠前
27-
public void initModuleAhead(@Nullable Application application) {
26+
public void initModuleAhead(Application application) {
2827
for (String moduleInitName : ModuleLifecycleReflexs.initModuleNames) {
2928
try {
3029
Class<?> clazz = Class.forName(moduleInitName);
@@ -42,7 +41,7 @@ public void initModuleAhead(@Nullable Application application) {
4241
}
4342

4443
//初始化组件-靠后
45-
public void initModuleLow(@Nullable Application application) {
44+
public void initModuleLow(Application application) {
4645
for (String moduleInitName : ModuleLifecycleReflexs.initModuleNames) {
4746
try {
4847
Class<?> clazz = Class.forName(moduleInitName);

library_base/src/main/java/com/play/library_base/router/RouterFragmentPath.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public static class News {
3434
*/
3535
public static class User {
3636
/*用户界面*/
37-
public static final String USER = "/user";
37+
public static final String USER = "/myuser";
3838
/*用户详情*/
39-
public static final String PAGER_USERDETAIL = USER + "/user";
39+
public static final String PAGER_USERDETAIL = USER + "/myuser";
4040
}
4141
}
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
package com.play.library_base.user;
2+
3+
import android.os.Parcel;
4+
import android.os.Parcelable;
5+
6+
public class UserInfoBean implements Parcelable {
7+
8+
private String name;
9+
private String userId;
10+
private String password;
11+
private String sex;
12+
13+
protected UserInfoBean(Parcel in) {
14+
name = in.readString();
15+
password = in.readString();
16+
sex = in.readString();
17+
}
18+
19+
@Override
20+
public void writeToParcel(Parcel dest, int flags) {
21+
dest.writeString(name);
22+
dest.writeString(password);
23+
dest.writeString(sex);
24+
}
25+
26+
@Override
27+
public int describeContents() {
28+
return 0;
29+
}
30+
31+
public static final Creator<UserInfoBean> CREATOR = new Creator<UserInfoBean>() {
32+
@Override
33+
public UserInfoBean createFromParcel(Parcel in) {
34+
return new UserInfoBean(in);
35+
}
36+
37+
@Override
38+
public UserInfoBean[] newArray(int size) {
39+
return new UserInfoBean[size];
40+
}
41+
};
42+
43+
public String getName() {
44+
return name;
45+
}
46+
47+
public void setName(String name) {
48+
this.name = name;
49+
}
50+
51+
public String getUserId() {
52+
return userId;
53+
}
54+
55+
public void setUserId(String userId) {
56+
this.userId = userId;
57+
}
58+
59+
public String getPassword() {
60+
return password;
61+
}
62+
63+
public void setPassword(String password) {
64+
this.password = password;
65+
}
66+
67+
public String getSex() {
68+
return sex;
69+
}
70+
71+
public void setSex(String sex) {
72+
this.sex = sex;
73+
}
74+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.play.library_base.user;
2+
3+
import com.play.library_base.utils.SharePreUtils;
4+
5+
public class UserState {
6+
7+
public static String getUserId() {
8+
9+
return SharePreUtils.getString("userid");
10+
}
11+
12+
}

0 commit comments

Comments
 (0)