RxJava2升级为RxJava3

catchpig · Nov 22, 2020 · 78853b4 · 78853b4
1 parent 126b8c9
commit 78853b4
Show file tree

Hide file tree

Showing 22 changed files with 90 additions and 89 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 
 ### 5. 将在Application中初始化移至到ContentProvider中,从而不用封装BaseApplication
 
-### 6. AOP(面向切面)封装注解:TimeLog、ClickGap
+### 6. AOP(面向切面)封装注解:TimeLog、ClickGap、MethodLog
 
 ### 7. APT(编译时注解)封装注解：OnClickFirstDrawable、OnClickFirstText、OnClickSecondDrawable、OnClickSecondText、Prefs、PrefsField、StatusBar
 
@@ -220,7 +220,7 @@ kapt "com.github.catch-pig.kotlin-mvp:compiler:last_version"
 
 ### [Koin](https://github.com/InsertKoinIO/koin)
 
-### [RxJava](https://github.com/ReactiveX/RxJava)
+### [RxJava3](https://github.com/ReactiveX/RxJava)
 
 ### [RxAndroid](https://github.com/ReactiveX/RxAndroid)
 

diff --git a/app/src/main/java/com/catchpig/kotlin_mvp/di/NetWorkModule.kt b/app/src/main/java/com/catchpig/kotlin_mvp/di/NetWorkModule.kt
@@ -2,12 +2,9 @@ package com.catchpig.kotlin_mvp.di
 
 import com.catchpig.kotlin_mvp.Config
 import com.catchpig.kotlin_mvp.network.api.WanAndroidService
-import okhttp3.OkHttpClient
 import org.koin.dsl.module
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
-import java.util.concurrent.TimeUnit
 
 val networkModule = module {
 

diff --git a/app/src/main/java/com/catchpig/kotlin_mvp/mvp/apk/view/InstallApkActivity.kt b/app/src/main/java/com/catchpig/kotlin_mvp/mvp/apk/view/InstallApkActivity.kt
@@ -5,7 +5,7 @@ import com.catchpig.annotation.Title
 import com.catchpig.kotlin_mvp.R
 import com.catchpig.kotlin_mvp.mvp.apk.InstallApkContract
 import com.catchpig.mvp.base.activity.BasePresenterActivity
-import com.tbruyelle.rxpermissions2.RxPermissions
+import com.tbruyelle.rxpermissions3.RxPermissions
 import kotlinx.android.synthetic.main.activity_install_apk.*
 import org.koin.core.parameter.parametersOf
 import org.koin.core.scope.inject

diff --git a/app/src/main/java/com/catchpig/kotlin_mvp/mvp/child/ChildActivity.kt b/app/src/main/java/com/catchpig/kotlin_mvp/mvp/child/ChildActivity.kt
@@ -4,8 +4,8 @@ import android.view.View
 import com.catchpig.annotation.*
 import com.catchpig.kotlin_mvp.R
 import com.catchpig.mvp.base.activity.BaseActivity
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Flowable
 import java.util.concurrent.TimeUnit
 
 @Title(R.string.child_title)

diff --git a/app/src/main/java/com/catchpig/kotlin_mvp/mvp/main/MainContract.kt b/app/src/main/java/com/catchpig/kotlin_mvp/mvp/main/MainContract.kt
@@ -2,9 +2,7 @@ package com.catchpig.kotlin_mvp.mvp.main
 
 import com.catchpig.kotlin_mvp.network.Result
 import com.catchpig.mvp.base.BaseContract
-import com.catchpig.mvp.bean.DownloadInfo
-import com.catchpig.mvp.network.listener.DownloadCallback
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 
 /**
  * @author catchpig

diff --git a/app/src/main/java/com/catchpig/kotlin_mvp/mvp/main/model/MainModel.kt b/app/src/main/java/com/catchpig/kotlin_mvp/mvp/main/model/MainModel.kt
@@ -3,10 +3,7 @@ package com.catchpig.kotlin_mvp.mvp.main.model
 import com.catchpig.kotlin_mvp.mvp.main.MainContract
 import com.catchpig.kotlin_mvp.network.Result
 import com.catchpig.kotlin_mvp.network.api.WanAndroidService
-import com.catchpig.mvp.bean.DownloadInfo
-import com.catchpig.mvp.network.listener.DownloadCallback
-import com.catchpig.mvp.network.download.DownloadManager
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 
 class MainModel(private val wanAndroidService: WanAndroidService):MainContract.Model {
     override fun banner(): Flowable<Result<Any>> {

diff --git a/app/src/main/java/com/catchpig/kotlin_mvp/mvp/recycle/RecycleActivity.kt b/app/src/main/java/com/catchpig/kotlin_mvp/mvp/recycle/RecycleActivity.kt
@@ -12,9 +12,9 @@ import com.catchpig.utils.ext.logd
 import com.google.android.material.appbar.AppBarLayout
 import com.gyf.immersionbar.ktx.immersionBar
 import com.scwang.smart.refresh.layout.api.RefreshLayout
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.subscribers.ResourceSubscriber
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subscribers.ResourceSubscriber
 import kotlinx.android.synthetic.main.activity_recycle.*
 import kotlinx.android.synthetic.main.layout_header.view.*
 import java.util.*

diff --git a/app/src/main/java/com/catchpig/kotlin_mvp/network/Callback.kt b/app/src/main/java/com/catchpig/kotlin_mvp/network/Callback.kt
@@ -1,7 +1,7 @@
 package com.catchpig.kotlin_mvp.network
 
 import com.catchpig.utils.ext.loge
-import io.reactivex.subscribers.ResourceSubscriber
+import io.reactivex.rxjava3.subscribers.ResourceSubscriber
 
 abstract class Callback<T>:ResourceSubscriber<T>() {
     override fun onError(t: Throwable?) {

diff --git a/app/src/main/java/com/catchpig/kotlin_mvp/network/api/WanAndroidService.kt b/app/src/main/java/com/catchpig/kotlin_mvp/network/api/WanAndroidService.kt
@@ -1,7 +1,7 @@
 package com.catchpig.kotlin_mvp.network.api
 
 import com.catchpig.kotlin_mvp.network.Result
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import retrofit2.http.GET
 
 

diff --git a/build.gradle b/build.gradle
@@ -19,9 +19,9 @@ buildscript {
         kotlin_mvp = '1.2.4'
         koin_version = '2.2.1'
         okhttp3_version = '3.14.0'
-        retrofit2_version = '2.6.0'
-        rxjava_version = '2.2.11'
-        rxandroid_version = '2.1.1'
+        retrofit2_version = '2.9.0'
+        rxjava_version = '3.0.0'
+        rxandroid_version = '3.0.0'
         gson_version = '2.8.5'
         glide_version = '4.9.0'
         immersionbar_version = '3.0.0-beta05'
@@ -30,9 +30,18 @@ buildscript {
         aspectj_version = '1.9.6'
         auto_service_version = '1.0-rc6'
         kotlinpoet_version = '1.4.0'
-        rxpermissions_version = "0.11"
+        rxpermissions_version = "0.12"
     }
     repositories {
+        maven{
+            url 'https://maven.aliyun.com/repository/public'
+        }
+        maven{
+            url 'https://maven.aliyun.com/repository/google'
+        }
+        maven{
+            url 'https://maven.aliyun.com/repository/gradle-plugin'
+        }
         google()
         jcenter()
         maven { url 'https://jitpack.io' }

diff --git a/mvp/build.gradle b/mvp/build.gradle
@@ -71,12 +71,12 @@ dependencies {
 
     //retrofit2
     api "com.squareup.retrofit2:retrofit:$retrofit2_version"
-    api "com.squareup.retrofit2:adapter-rxjava2:$retrofit2_version"
+    api "com.squareup.retrofit2:adapter-rxjava3:$retrofit2_version"
     api "com.squareup.retrofit2:converter-gson:$retrofit2_version"
 
-    //rxjava
-    api "io.reactivex.rxjava2:rxjava:$rxjava_version"
-    api "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
+    //rxjava3
+    api "io.reactivex.rxjava3:rxjava:$rxjava_version"
+    api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
 
 
 

diff --git a/mvp/src/androidTest/java/com/catchpig/mvp/ExampleInstrumentedTest.java b/mvp/src/androidTest/java/com/catchpig/mvp/ExampleInstrumentedTest.java
diff --git a/mvp/src/androidTest/java/com/catchpig/mvp/ExampleInstrumentedTest.kt b/mvp/src/androidTest/java/com/catchpig/mvp/ExampleInstrumentedTest.kt
@@ -0,0 +1,22 @@
+package com.catchpig.mvp
+
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see [Testing documentation](http://d.android.com/tools/testing)
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getTargetContext()
+        Assert.assertEquals("com.catchpig.mvp.test", appContext.packageName)
+    }
+}
diff --git a/mvp/src/main/java/com/catchpig/mvp/base/BaseContract.kt b/mvp/src/main/java/com/catchpig/mvp/base/BaseContract.kt
@@ -6,9 +6,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import com.catchpig.mvp.base.activity.BaseActivity
-import io.reactivex.Flowable
-import io.reactivex.disposables.Disposable
-import io.reactivex.subscribers.ResourceSubscriber
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.subscribers.ResourceSubscriber
 
 /**
  * @author catchpig

diff --git a/mvp/src/main/java/com/catchpig/mvp/base/BasePresenter.kt b/mvp/src/main/java/com/catchpig/mvp/base/BasePresenter.kt
@@ -3,10 +3,10 @@ package com.catchpig.mvp.base
 
 import androidx.annotation.CallSuper
 import com.catchpig.mvp.ext.io2main
-import io.reactivex.Flowable
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
-import io.reactivex.subscribers.ResourceSubscriber
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.subscribers.ResourceSubscriber
 
 
 /**

diff --git a/mvp/src/main/java/com/catchpig/mvp/di/AppModule.kt b/mvp/src/main/java/com/catchpig/mvp/di/AppModule.kt
@@ -16,7 +16,7 @@ import org.koin.core.qualifier.named
 import org.koin.dsl.bind
 import org.koin.dsl.module
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -55,7 +55,7 @@ val appModule = module {
     factory {
         Retrofit
                 .Builder()
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .client(get())
     }
 }
@@ -79,7 +79,7 @@ val downloadModule = module {
         Retrofit
                 .Builder()
                 .baseUrl(baseUrl)
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .client(get(named(DOWNLOAD_NAME)){ parametersOf(downloadProgressListener,timeout)})
                 .addConverterFactory(GsonConverterFactory.create())
                 .build()

diff --git a/mvp/src/main/java/com/catchpig/mvp/ext/RxJavaExt.kt b/mvp/src/main/java/com/catchpig/mvp/ext/RxJavaExt.kt
@@ -1,8 +1,9 @@
 package com.catchpig.mvp.ext
 
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.schedulers.Schedulers
+
 
 /**
  * 被观察者在io线程中执行,观察者在主线程中执行

diff --git a/mvp/src/main/java/com/catchpig/mvp/network/download/DownloadManager.kt b/mvp/src/main/java/com/catchpig/mvp/network/download/DownloadManager.kt
@@ -7,8 +7,8 @@ import com.catchpig.mvp.di.DOWNLOAD_NAME
 import com.catchpig.mvp.ext.io2main
 import com.catchpig.mvp.network.listener.DownloadCallback
 import com.catchpig.mvp.provider.KotlinMvpContentProvider
-import io.reactivex.Flowable
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.ResponseBody
 import org.koin.core.parameter.parametersOf
 import org.koin.core.qualifier.named
@@ -61,6 +61,11 @@ class DownloadManager {
         }.io2main().subscribeWith(downloadSubscriber)
     }
 
+    /**
+     * 生成文件的地址
+     * @param downloadUrl String
+     * @return String
+     */
     private fun localFileName(downloadUrl:String):String{
         val fileName = downloadUrl.replace("/","").replace("\\","")
         var cashDir = if (Environment.MEDIA_MOUNTED == Environment.getExternalStorageState()) {

diff --git a/mvp/src/main/java/com/catchpig/mvp/network/download/DownloadService.kt b/mvp/src/main/java/com/catchpig/mvp/network/download/DownloadService.kt
@@ -1,9 +1,8 @@
 package com.catchpig.mvp.network.download
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import okhttp3.ResponseBody
 import retrofit2.http.GET
-import retrofit2.http.Header
 import retrofit2.http.Streaming
 import retrofit2.http.Url
 /**

diff --git a/mvp/src/main/java/com/catchpig/mvp/network/download/DownloadSubscriber.kt b/mvp/src/main/java/com/catchpig/mvp/network/download/DownloadSubscriber.kt
@@ -3,7 +3,7 @@ package com.catchpig.mvp.network.download
 import com.catchpig.mvp.network.listener.DownloadCallback
 import com.catchpig.mvp.network.listener.DownloadProgressListener
 import com.catchpig.utils.ext.logd
-import io.reactivex.subscribers.ResourceSubscriber
+import io.reactivex.rxjava3.subscribers.ResourceSubscriber
 import java.lang.ref.WeakReference
 /**
  * 下载观察者

diff --git a/mvp/src/test/java/com/catchpig/mvp/ExampleUnitTest.java b/mvp/src/test/java/com/catchpig/mvp/ExampleUnitTest.java
diff --git a/mvp/src/test/java/com/catchpig/mvp/ExampleUnitTest.kt b/mvp/src/test/java/com/catchpig/mvp/ExampleUnitTest.kt
@@ -0,0 +1,16 @@
+package com.catchpig.mvp
+
+import org.junit.Assert
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see [Testing documentation](http://d.android.com/tools/testing)
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        Assert.assertEquals(4, 2 + 2.toLong())
+    }
+}