更改回调名

Reginer · Apr 24, 2022 · 51cb1c6 · 51cb1c6
1 parent 3e38dd5
commit 51cb1c6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ maven { url 'https://jitpack.io' }
 ```
 
 ```
-implementation 'com.github.Reginer:MVVMHub:2.1.3'
+implementation 'com.github.Reginer:MVVMHub:2.1.4'
 ```
 
 登录：
@@ -29,14 +29,14 @@ class LoginActivity : BaseVmActivity() {
     override fun createObserver() {
 
         mViewModel.loginResult.vmObserver(this) {
-            onAppLoading { showProgress() }
-            onAppSuccess { mViewModel.saveUser(it);finish() }
-            onAppError { Logger.e(it.errorMsg);Logger.e("  error code is:::" + it.errorCode) }
-            onAppComplete { dismissProgress() }
+            onLoading { showProgress() }
+            onSuccess { mViewModel.saveUser(it);finish() }
+            onError { Logger.e(it.errorMsg);Logger.e("  error code is:::" + it.errorCode) }
+            onComplete { dismissProgress() }
         }
         //不管那一套，直接取成功就完事了
 //        mViewModel.loginResult.vmObserver(this) {
-//            onAppSuccess { mViewModel.saveUser(it);finish() }
+//            onSuccess { mViewModel.saveUser(it);finish() }
 //        }
     }
 }

diff --git a/app/build.gradle b/app/build.gradle
@@ -59,5 +59,5 @@ dependencies {
     androidTestImplementation(MvvmExt.espresso)
     implementation project(path: ':base')
     implementation(MvvmExt.viewBinding)
-//    releaseImplementation  'com.github.Reginer:MVVMHub:2.1.3'
+//    releaseImplementation  'com.github.Reginer:MVVMHub:2.1.4'
 }
diff --git a/app/src/main/java/win/regin/mvvm/ui/LoginActivity.kt b/app/src/main/java/win/regin/mvvm/ui/LoginActivity.kt
@@ -63,10 +63,10 @@ class LoginActivity : BaseVmActivity() {
     override fun createObserver() {
 
         mViewModel.loginResult.vmObserver(this) {
-            onAppLoading { showProgress() }
-            onAppSuccess { mViewModel.saveUser(it);finish() }
-            onAppError { Logger.e(it.errorMsg);Logger.e("  error code is:::" + it.errorCode) }
-            onAppComplete { dismissProgress() }
+            onLoading { showProgress() }
+            onSuccess { mViewModel.saveUser(it);finish() }
+            onError { Logger.e(it.errorMsg);Logger.e("  error code is:::" + it.errorCode) }
+            onComplete { dismissProgress() }
         }
         //不管那一套，直接取成功就完事了
 //        mViewModel.loginResult.vmObserver(this) {

diff --git a/app/src/main/java/win/regin/mvvm/ui/MainActivity.kt b/app/src/main/java/win/regin/mvvm/ui/MainActivity.kt
@@ -76,7 +76,7 @@ class MainActivity : BaseVmActivity() {
             it?.let { mViewModel.getArticle(0) }
         }
         mViewModel.articleResult.vmObserver(this) {
-            onAppSuccess { mViewModel.parseArticleData(it) }
+            onSuccess { mViewModel.parseArticleData(it) }
         }
         mViewModel.articleLiveData.observe(this) {
             mViewBinding.content.text = it.toJsonString()

diff --git a/base/src/main/java/win/regin/base/ext/MvvmExt.kt b/base/src/main/java/win/regin/base/ext/MvvmExt.kt
@@ -66,13 +66,13 @@ inline fun <T> VmLiveData<T>.vmObserver(owner: LifecycleOwner, vmResult: VmResul
     val result = VmResult<T>();result.vmResult();observe(owner = owner) {
         when (it) {
             is VmState.Loading -> {
-                result.onAppLoading()
+                result.onLoading()
             }
             is VmState.Success -> {
-                result.onAppSuccess(it.data);result.onAppComplete()
+                result.onSuccess(it.data);result.onComplete()
             }
             is VmState.Error -> {
-                result.onAppError(it.error);result.onAppComplete()
+                result.onError(it.error);result.onComplete()
             }
         }
     }

diff --git a/base/src/main/java/win/regin/base/ext/ViewState.kt b/base/src/main/java/win/regin/base/ext/ViewState.kt
@@ -40,25 +40,25 @@ import win.regin.base.exception.AppException
  */
 
 class VmResult<T> {
-    var onAppSuccess: (data: T) -> Unit = {}
-    var onAppError: (AppException) -> Unit = {}
-    var onAppLoading: () -> Unit = {}
-    var onAppComplete: () -> Unit = {}
+    var onSuccess: (data: T) -> Unit = {}
+    var onError: (AppException) -> Unit = {}
+    var onLoading: () -> Unit = {}
+    var onComplete: () -> Unit = {}
 
-    fun onAppSuccess(success: (T) -> Unit) {
-        onAppSuccess = success
+    fun onSuccess(success: (T) -> Unit) {
+        onSuccess = success
     }
 
-    fun onAppError(error: (AppException) -> Unit) {
-        onAppError = error
+    fun onError(error: (AppException) -> Unit) {
+        onError = error
     }
 
-    fun onAppLoading(loading: () -> Unit) {
-        onAppLoading = loading
+    fun onLoading(loading: () -> Unit) {
+        onLoading = loading
     }
 
-    fun onAppComplete(complete: () -> Unit) {
-        onAppComplete = complete
+    fun onComplete(complete: () -> Unit) {
+        onComplete = complete
     }
 }