调整网络请求的error到Flow的catch中

catch-pig · catch-pig · commit 488ac5b7c2bd · 2021-10-29T21:52:00.000+08:00
diff --git a/app/src/main/java/com/catchpig/kmvvm/mvvm/child/ChildActivity.kt b/app/src/main/java/com/catchpig/kmvvm/mvvm/child/ChildActivity.kt
@@ -9,10 +9,6 @@ import com.catchpig.kmvvm.R
 import com.catchpig.kmvvm.databinding.ActivityChildBinding
 import com.catchpig.mvvm.base.activity.BaseVMActivity
 import com.catchpig.mvvm.manager.SnackbarManager
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.runBlocking
 
 @Title
 @StatusBar
@@ -45,11 +41,8 @@ class ChildActivity : BaseVMActivity<ActivityChildBinding, ChildViewModel>() {
      * dialog形式的loading
      */
     fun loadingDialog(v: View) {
-        launcherLoadingDialog(viewModel.loadingDialog().map {
-            delay(2000)
-            it
-        }) {
-            snackbar(this)
+        launcherLoadingDialog(viewModel.loadingDialog()) {
+            snackBar(this)
         }
 
     }
@@ -58,11 +51,8 @@ class ChildActivity : BaseVMActivity<ActivityChildBinding, ChildViewModel>() {
      * 标题栏以下的loading
      */
     fun loadingView(v: View) {
-        launcherLoadingView(viewModel.loadingView().map {
-            delay(2000)
-            it
-        }) {
-            snackbar(this)
+        launcherLoadingView(viewModel.loadingView()) {
+            snackBar(this)
         }
     }
 }
diff --git a/app/src/main/java/com/catchpig/kmvvm/mvvm/child/ChildViewModel.kt b/app/src/main/java/com/catchpig/kmvvm/mvvm/child/ChildViewModel.kt
@@ -1,16 +1,24 @@
 package com.catchpig.kmvvm.mvvm.child
 
 import com.catchpig.mvvm.base.viewmodel.BaseViewModel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
 
 class ChildViewModel : BaseViewModel() {
 
     fun loadingView(): Flow<String> {
-        return flowOf("loadingView")
+        return flowOf("loadingView").map {
+            delay(2000)
+            it
+        }
     }
 
     fun loadingDialog(): Flow<String> {
-        return flowOf("loadingDialog")
+        return flowOf("loadingDialog").map {
+            delay(2000)
+            it
+        }
     }
 }
diff --git a/app/src/main/java/com/catchpig/kmvvm/mvvm/recycle/RecycleActivity.kt b/app/src/main/java/com/catchpig/kmvvm/mvvm/recycle/RecycleActivity.kt
@@ -12,7 +12,6 @@ import com.catchpig.mvvm.base.activity.BaseActivity
 import com.gyf.immersionbar.ktx.immersionBar
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.collections.ArrayList
@@ -30,7 +29,7 @@ class RecycleActivity : BaseActivity<ActivityRecycleBinding>() {
     private fun initAdapter() {
         var userAdapter = UserAdapter(bodyBinding.refresh)
         userAdapter.setOnItemClickListener { _, m, _ ->
-            snackbar(m.name)
+            snackBar(m.name)
         }
         var linearLayoutManager = LinearLayoutManager(this)
         linearLayoutManager.orientation = LinearLayoutManager.VERTICAL
diff --git a/app/src/main/java/com/catchpig/kmvvm/mvvm/transparent/TransparentActivity.kt b/app/src/main/java/com/catchpig/kmvvm/mvvm/transparent/TransparentActivity.kt
@@ -20,12 +20,12 @@ class TransparentActivity : BaseVMActivity<ActivityTransparentBinding, Transpare
             viewModel.banner().flowOn(Dispatchers.IO).onStart {
                 loadingView()
             }.catch { t: Throwable ->
-                snackbar(t.message!!)
+                snackBar(t.message!!)
             }.onCompletion {
                 hideLoadingView()
             }.collect {
                 Glide.with(this@TransparentActivity).load(it.imagePath).into(bodyBinding.banner)
-                snackbar(it.title)
+                snackBar(it.title)
             }
         }
     }
diff --git a/app/src/main/java/com/catchpig/kmvvm/network/MessageObserverError.kt b/app/src/main/java/com/catchpig/kmvvm/network/MessageObserverError.kt
@@ -1,12 +1,24 @@
 package com.catchpig.kmvvm.network
 
 import com.catchpig.annotation.ObserverError
-import com.catchpig.mvvm.base.viewmodel.IBaseViewModel
+import com.catchpig.mvvm.base.activity.BaseActivity
+import com.catchpig.mvvm.base.fragment.BaseFragment
 import com.catchpig.mvvm.interfaces.IObserverError
 
 @ObserverError
 class MessageObserverError : IObserverError {
-    override fun onError(iBaseViewModel: IBaseViewModel, t: Throwable) {
-
+    override fun onError(any: Any, t: Throwable) {
+        t.message?.let {
+            when (any) {
+                is BaseActivity<*> -> {
+                    any.snackBar(it)
+                }
+                is BaseFragment<*> -> {
+                    any.snackBar(it)
+                }
+                else -> {
+                }
+            }
+        }
     }
 }
diff --git a/app/src/main/java/com/catchpig/kmvvm/network/TokenObserverError.kt b/app/src/main/java/com/catchpig/kmvvm/network/TokenObserverError.kt
@@ -1,11 +1,14 @@
 package com.catchpig.kmvvm.network
 
 import com.catchpig.annotation.ObserverError
-import com.catchpig.mvvm.base.viewmodel.IBaseViewModel
+import com.catchpig.mvvm.base.activity.BaseActivity
+import com.catchpig.mvvm.base.fragment.BaseFragment
 import com.catchpig.mvvm.interfaces.IObserverError
 
 @ObserverError
 class TokenObserverError : IObserverError {
-    override fun onError(iBaseViewModel: IBaseViewModel, t: Throwable) {
+    override fun onError(any: Any, t: Throwable) {
+
+
     }
 }
diff --git a/compiler/src/main/java/com/catchpig/compiler/KotlinMvvmProcessor.kt b/compiler/src/main/java/com/catchpig/compiler/KotlinMvvmProcessor.kt
@@ -30,8 +30,6 @@ class KotlinMvvmProcessor : BaseProcessor() {
         private val CLASS_NAME_LIST_OF_I_OBSERVER_ERROR =
             CLASS_NAME_LIST.parameterizedBy(CLASS_NAME_I_OBSERVER_ERROR)
         private val CLASS_NAME_MAP = ClassName("kotlin.collections", "HashMap")
-        private val CLASS_NAME_I_BASE_VIEW_MODEL =
-            ClassName("com.catchpig.mvvm.base.viewmodel", "IBaseViewModel")
         private val CLASS_NAME_SERVICE_PARAM =
             ClassName("com.catchpig.mvvm.entity", "ServiceParam")
         private val CLASS_NAME_INTERCEPTOR =
@@ -175,10 +173,10 @@ class KotlinMvvmProcessor : BaseProcessor() {
         var funSpecBuilder = FunSpec
             .builder("onError")
             .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
-            .addParameter("iBaseViewModel", CLASS_NAME_I_BASE_VIEW_MODEL)
+            .addParameter("any", ANY)
             .addParameter("t", Throwable::class)
             .addStatement("observerErrors.forEach {")
-            .addStatement("  it.onError(iBaseViewModel, t)")
+            .addStatement("  it.onError(any, t)")
             .addStatement("}")
         return funSpecBuilder.build()
     }
diff --git a/mvvm/src/main/java/com/catchpig/mvvm/apt/KotlinMvvmCompiler.kt b/mvvm/src/main/java/com/catchpig/mvvm/apt/KotlinMvvmCompiler.kt
@@ -5,8 +5,8 @@ import android.view.ViewGroup
 import com.catchpig.mvvm.apt.interfaces.ActivityCompiler
 import com.catchpig.mvvm.apt.interfaces.GlobalCompiler
 import com.catchpig.mvvm.apt.interfaces.RecyclerAdapterCompiler
+import com.catchpig.mvvm.base.activity.BaseActivity
 import com.catchpig.mvvm.base.adapter.RecyclerAdapter
-import com.catchpig.mvvm.base.viewmodel.BaseViewModel
 import com.catchpig.mvvm.entity.AdapterBinding
 import com.catchpig.mvvm.entity.ServiceParam
 import com.catchpig.mvvm.exception.AptAdapterException
@@ -23,6 +23,7 @@ object KotlinMvvmCompiler {
         var compilerClass = Class.forName("com.catchpig.mvvm.apt.interfaces.Global_Compiler")
         compilerClass.newInstance() as GlobalCompiler
     }
+
     fun inject(baseActivity: Activity) {
         val className = baseActivity.javaClass.name
         try {
@@ -36,8 +37,8 @@ object KotlinMvvmCompiler {
         }
     }
 
-    fun onError(baseViewModel: BaseViewModel, t: Throwable) {
-        globalCompiler.onError(baseViewModel, t)
+    fun onError(any: Any, t: Throwable) {
+        globalCompiler.onError(any, t)
     }
 
     fun viewBanding(recyclerAdapter: RecyclerAdapter<*, *>, parent: ViewGroup): AdapterBinding {
@@ -59,7 +60,7 @@ object KotlinMvvmCompiler {
         return globalCompiler.getGlobalConfig()
     }
 
-    fun getServiceParam(className:String):ServiceParam{
+    fun getServiceParam(className: String): ServiceParam {
         return globalCompiler.getServiceParam(className)
     }
 }
diff --git a/mvvm/src/main/java/com/catchpig/mvvm/apt/interfaces/GlobalCompiler.kt b/mvvm/src/main/java/com/catchpig/mvvm/apt/interfaces/GlobalCompiler.kt
@@ -1,6 +1,6 @@
 package com.catchpig.mvvm.apt.interfaces
 
-import com.catchpig.mvvm.base.viewmodel.IBaseViewModel
+import android.app.Activity
 import com.catchpig.mvvm.entity.ServiceParam
 import com.catchpig.mvvm.interfaces.IGlobalConfig
 
@@ -18,10 +18,10 @@ interface GlobalCompiler {
 
     /**
      * 发送Rxjava的异常到被注解ObserverError修饰的接口实现类
-     * @param iBaseViewModel IBaseViewModel
+     * @param any Any
      * @param t Throwable
      */
-    fun onError(iBaseViewModel: IBaseViewModel, t: Throwable)
+    fun onError(any: Any, t: Throwable)
 
     fun getServiceParam(className: String): ServiceParam
 }
diff --git a/mvvm/src/main/java/com/catchpig/mvvm/base/activity/BaseActivity.kt b/mvvm/src/main/java/com/catchpig/mvvm/base/activity/BaseActivity.kt
@@ -88,7 +88,6 @@ open class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
                     ViewGroup.LayoutParams.MATCH_PARENT
                 )
             )
-//            loadingViewController = LoadingViewController(this, rootBinding)
         }
     }
 
@@ -108,11 +107,11 @@ open class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         titleText.setText(title)
     }
 
-    protected fun snackbar(text: CharSequence) {
+    fun snackBar(text: CharSequence) {
         SnackbarManager.show(rootBinding.layoutBody, text)
     }
 
-    protected fun snackbar(@StringRes textRes: Int) {
+    fun snackBar(@StringRes textRes: Int) {
         SnackbarManager.show(rootBinding.layoutBody, textRes)
     }
 
diff --git a/mvvm/src/main/java/com/catchpig/mvvm/base/activity/BaseVMActivity.kt b/mvvm/src/main/java/com/catchpig/mvvm/base/activity/BaseVMActivity.kt
@@ -5,6 +5,7 @@ import androidx.annotation.CallSuper
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
+import com.catchpig.mvvm.apt.KotlinMvvmCompiler
 import com.catchpig.mvvm.base.viewmodel.BaseViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
@@ -43,9 +44,7 @@ abstract class BaseVMActivity<VB : ViewBinding, VM : BaseViewModel> : BaseActivi
             }.onCompletion {
                 hideLoadingView()
             }.catch { t: Throwable ->
-                t.message?.let {
-                    snackbar(it)
-                }
+                KotlinMvvmCompiler.onError(this@BaseVMActivity, t)
             }.collect {
                 callback(it)
             }
@@ -59,9 +58,7 @@ abstract class BaseVMActivity<VB : ViewBinding, VM : BaseViewModel> : BaseActivi
             }.onCompletion {
                 hideLoadingView()
             }.catch { t: Throwable ->
-                t.message?.let {
-                    snackbar(it)
-                }
+                KotlinMvvmCompiler.onError(this@BaseVMActivity, t)
             }.collect {
                 callback(it)
             }
diff --git a/mvvm/src/main/java/com/catchpig/mvvm/base/fragment/BaseFragment.kt b/mvvm/src/main/java/com/catchpig/mvvm/base/fragment/BaseFragment.kt
@@ -43,11 +43,11 @@ open class BaseFragment<VB : ViewBinding> : Fragment() {
         return bodyBinding.root
     }
 
-    protected fun snackbar(text: CharSequence) {
+    fun snackBar(text: CharSequence) {
         SnackbarManager.show(bodyBinding.root, text)
     }
 
-    protected fun snackbar(@StringRes textRes: Int) {
+    fun snackBar(@StringRes textRes: Int) {
         SnackbarManager.show(bodyBinding.root, textRes)
     }
 
diff --git a/mvvm/src/main/java/com/catchpig/mvvm/base/fragment/BaseVMFragment.kt b/mvvm/src/main/java/com/catchpig/mvvm/base/fragment/BaseVMFragment.kt
@@ -6,6 +6,7 @@ import androidx.annotation.CallSuper
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
+import com.catchpig.mvvm.apt.KotlinMvvmCompiler
 import com.catchpig.mvvm.base.viewmodel.BaseViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
@@ -45,11 +46,9 @@ abstract class BaseVMFragment<VB : ViewBinding, VM : BaseViewModel> : BaseFragme
             }.onCompletion {
                 hideLoadingView()
             }.catch { t: Throwable ->
-                t.message?.let {
-                    snackbar(it)
-                }
+                KotlinMvvmCompiler.onError(this@BaseVMFragment, t)
             }.collect {
-                callback
+                callback(it)
             }
         }
     }
@@ -61,11 +60,9 @@ abstract class BaseVMFragment<VB : ViewBinding, VM : BaseViewModel> : BaseFragme
             }.onCompletion {
                 hideLoadingView()
             }.catch { t: Throwable ->
-                t.message?.let {
-                    snackbar(it)
-                }
+                KotlinMvvmCompiler.onError(this@BaseVMFragment, t)
             }.collect {
-                callback
+                callback(it)
             }
         }
     }
diff --git a/mvvm/src/main/java/com/catchpig/mvvm/interfaces/IObserverError.kt b/mvvm/src/main/java/com/catchpig/mvvm/interfaces/IObserverError.kt
@@ -1,7 +1,5 @@
 package com.catchpig.mvvm.interfaces
 
-import com.catchpig.mvvm.base.viewmodel.IBaseViewModel
-
 interface IObserverError {
-    fun onError(iBaseViewModel: IBaseViewModel, t: Throwable)
+    fun onError(any: Any, t: Throwable)
 }

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ class TransparentActivity : BaseVMActivity<ActivityTransparentBinding, Transpare`
`20`	`20`	`viewModel.banner().flowOn(Dispatchers.IO).onStart {`
`21`	`21`	`loadingView()`
`22`	`22`	`}.catch { t: Throwable ->`
`23`		`- snackbar(t.message!!)`
	`23`	`+ snackBar(t.message!!)`
`24`	`24`	`}.onCompletion {`
`25`	`25`	`hideLoadingView()`
`26`	`26`	`}.collect {`
`27`	`27`	`Glide.with(this@TransparentActivity).load(it.imagePath).into(bodyBinding.banner)`
`28`		`- snackbar(it.title)`
	`28`	`+ snackBar(it.title)`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import android.view.ViewGroup`
`5`	`5`	`import com.catchpig.mvvm.apt.interfaces.ActivityCompiler`
`6`	`6`	`import com.catchpig.mvvm.apt.interfaces.GlobalCompiler`
`7`	`7`	`import com.catchpig.mvvm.apt.interfaces.RecyclerAdapterCompiler`
	`8`	`+import com.catchpig.mvvm.base.activity.BaseActivity`
`8`	`9`	`import com.catchpig.mvvm.base.adapter.RecyclerAdapter`
`9`		`-import com.catchpig.mvvm.base.viewmodel.BaseViewModel`
`10`	`10`	`import com.catchpig.mvvm.entity.AdapterBinding`
`11`	`11`	`import com.catchpig.mvvm.entity.ServiceParam`
`12`	`12`	`import com.catchpig.mvvm.exception.AptAdapterException`
`@@ -23,6 +23,7 @@ object KotlinMvvmCompiler {`
`23`	`23`	`var compilerClass = Class.forName("com.catchpig.mvvm.apt.interfaces.Global_Compiler")`
`24`	`24`	`compilerClass.newInstance() as GlobalCompiler`
`25`	`25`	`}`
	`26`	`+`
`26`	`27`	`fun inject(baseActivity: Activity) {`
`27`	`28`	`val className = baseActivity.javaClass.name`
`28`	`29`	`try {`
`@@ -36,8 +37,8 @@ object KotlinMvvmCompiler {`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`
`39`		`- fun onError(baseViewModel: BaseViewModel, t: Throwable) {`
`40`		`- globalCompiler.onError(baseViewModel, t)`
	`40`	`+ fun onError(any: Any, t: Throwable) {`
	`41`	`+ globalCompiler.onError(any, t)`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`fun viewBanding(recyclerAdapter: RecyclerAdapter<, >, parent: ViewGroup): AdapterBinding {`
`@@ -59,7 +60,7 @@ object KotlinMvvmCompiler {`
`59`	`60`	`return globalCompiler.getGlobalConfig()`
`60`	`61`	`}`
`61`	`62`
`62`		`- fun getServiceParam(className:String):ServiceParam{`
	`63`	`+ fun getServiceParam(className: String): ServiceParam {`
`63`	`64`	`return globalCompiler.getServiceParam(className)`
`64`	`65`	`}`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ open class BaseActivity<VB : ViewBinding> : AppCompatActivity() {`
`88`	`88`	`ViewGroup.LayoutParams.MATCH_PARENT`
`89`	`89`	`)`
`90`	`90`	`)`
`91`		`-// loadingViewController = LoadingViewController(this, rootBinding)`
`92`	`91`	`}`
`93`	`92`	`}`
`94`	`93`
`@@ -108,11 +107,11 @@ open class BaseActivity<VB : ViewBinding> : AppCompatActivity() {`
`108`	`107`	`titleText.setText(title)`
`109`	`108`	`}`
`110`	`109`
`111`		`- protected fun snackbar(text: CharSequence) {`
	`110`	`+ fun snackBar(text: CharSequence) {`
`112`	`111`	`SnackbarManager.show(rootBinding.layoutBody, text)`
`113`	`112`	`}`
`114`	`113`
`115`		`- protected fun snackbar(@StringRes textRes: Int) {`
	`114`	`+ fun snackBar(@StringRes textRes: Int) {`
`116`	`115`	`SnackbarManager.show(rootBinding.layoutBody, textRes)`
`117`	`116`	`}`
`118`	`117`