From 883296e9d1da083905ef3be00db1a6c028330a9f Mon Sep 17 00:00:00 2001 From: sohnyi Date: Mon, 5 Aug 2019 19:59:53 +0800 Subject: [PATCH 1/2] update dependency --- config.gradle | 21 +++++---------------- lib/build.gradle | 8 ++++++-- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/config.gradle b/config.gradle index 6b27be7..d0d5435 100644 --- a/config.gradle +++ b/config.gradle @@ -1,8 +1,8 @@ ext { version = [ androidSupportSdkVersion: "28.0.0", - retrofitSdkVersion : "2.5.0", - dagger2SdkVersion : "2.21", + retrofitSdkVersion : "2.6.1", + dagger2SdkVersion : "2.24", butterknifeSdkVersion : "8.8.1", rxlifecycleSdkVersion : "1.0", rxlifecycle2SdkVersion : "2.2.1", @@ -38,17 +38,6 @@ ext { "butterknife" : "com.jakewharton:butterknife:${version["butterknifeSdkVersion"]}", "butterknife-compiler" : "com.jakewharton:butterknife-compiler:${version["butterknifeSdkVersion"]}", - //rx1 - "rxandroid" : "io.reactivex:rxandroid:1.2.1", - "rxjava" : "io.reactivex:rxjava:1.3.0", - "rxlifecycle" : "com.trello:rxlifecycle:${version["rxlifecycleSdkVersion"]}", - "rxlifecycle-components" : "com.trello:rxlifecycle-components:${version["rxlifecycleSdkVersion"]}", - "rxcache" : "com.github.VictorAlbertos.RxCache:runtime:1.7.0-1.x", - "rxcache-jolyglot-gson" : "com.github.VictorAlbertos.Jolyglot:gson:0.0.4", - "rxbinding-recyclerview-v7" : "com.jakewharton.rxbinding:rxbinding-recyclerview-v7:1.0.1", - "rxpermissions" : "com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar", - "rxerrorhandler" : "me.jessyan:rxerrorhandler:1.0.1", - //rx2 "rxandroid2" : "io.reactivex.rxjava2:rxandroid:2.0.2", "rxjava2" : "io.reactivex.rxjava2:rxjava:2.1.12", @@ -67,9 +56,9 @@ ext { "dagger2-android-processor" : "com.google.dagger:dagger-android-processor:${version["dagger2SdkVersion"]}", "eventbus" : "org.greenrobot:eventbus:3.1.1", "gson" : "com.google.code.gson:gson:2.8.2", - "multidex" : "com.android.support:multidex:1.0.1", - "arouter" : "com.alibaba:arouter-api:1.3.1", - "arouter-compiler" : "com.alibaba:arouter-compiler:1.1.4", + "multidex" : "com.android.support:multidex:1.0.3", + "arouter" : "com.alibaba:arouter-api:1.5.0", + "arouter-compiler" : "com.alibaba:arouter-compiler:1.2.2", //zoo park "banana-utils" : "com.github.nasduck:BananaUtils:0.2", diff --git a/lib/build.gradle b/lib/build.gradle index b84f698..72bac7a 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -48,8 +48,10 @@ dependencies { api rootProject.ext.dependencies["rxpermissions2"] api rootProject.ext.dependencies["rxjava2"] api rootProject.ext.dependencies["rxandroid2"] - api rootProject.ext.dependencies['rxcache'] - api rootProject.ext.dependencies['rxcache-jolyglot-gson'] + api rootProject.ext.dependencies["rxlifecycle2"] + api rootProject.ext.dependencies["rxlifecycle2-android"] + api rootProject.ext.dependencies["rxlifecycle2-components"] + api rootProject.ext.dependencies["rxcache2"] // Dagger api rootProject.ext.dependencies['dagger2'] @@ -66,5 +68,7 @@ dependencies { api rootProject.ext.dependencies['retrofit-adapter-rxjava2'] // OkHttp3 + api rootProject.ext.dependencies["okhttp3"] api rootProject.ext.dependencies['okhttp3-logging-interceptor'] + api rootProject.ext.dependencies["okhttp-urlconnection"] } From ca47bebb1f3e4c9291647472358ac2663224e447 Mon Sep 17 00:00:00 2001 From: sohnyi Date: Mon, 5 Aug 2019 20:00:03 +0800 Subject: [PATCH 2/2] fix demo --- app/build.gradle | 2 +- .../com/zoopark/zooparkmvp/AnalyseActivity.java | 15 +++++++++------ app/src/main/res/layout/activity_main.xml | 11 ++++++++++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e51036a..7d961e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { javaCompileOptions { annotationProcessorOptions { - arguments = [moduleName: project.getName()] + arguments = [AROUTER_MODULE_NAME: project.getName()] } } } diff --git a/app/src/main/java/com/zoopark/zooparkmvp/AnalyseActivity.java b/app/src/main/java/com/zoopark/zooparkmvp/AnalyseActivity.java index f04cac6..a76a084 100644 --- a/app/src/main/java/com/zoopark/zooparkmvp/AnalyseActivity.java +++ b/app/src/main/java/com/zoopark/zooparkmvp/AnalyseActivity.java @@ -11,6 +11,15 @@ public class AnalyseActivity extends BaseActivity implements AnalyseContract.View { + @Override + public void initComponent() { + DaggerAnalyseComponent //如找不到该类,请编译一下项目 + .builder() + .appComponent(((BaseApplication) this.getApplicationContext()).getAppComponent()) + .analyseModule(new AnalyseModule(this)) + .build() + .inject(this); + } @Override public int initView(@Nullable Bundle savedInstanceState) { @@ -20,12 +29,6 @@ public int initView(@Nullable Bundle savedInstanceState) { @Override public void initData(@Nullable Bundle savedInstanceState) { - DaggerAnalyseComponent //如找不到该类,请编译一下项目 - .builder() - .appComponent(((BaseApplication) this.getApplicationContext()).getAppComponent()) - .analyseModule(new AnalyseModule(this)) - .build() - .inject(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e21ca08..6d7eb97 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,6 +5,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".AnalyseActivity" - android:background="@android:color/black"> + android:background="@android:color/white"> + + \ No newline at end of file