Base类封装优化

Author: fmtjava

app/src/main/java/com/fmt/github/App.kt

@@ -2,7 +2,6 @@ package com.fmt.github
 
 import android.app.Application
 import android.content.ContextWrapper
-import android.os.Debug
 import com.fmt.github.tasks.*
 import com.rousetime.android_startup.StartupManager
 

app/src/main/java/com/fmt/github/base/activity/BaseVMActivity.kt

@@ -2,6 +2,7 @@ package com.fmt.github.base.activity
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.LiveData
 import com.fmt.github.base.viewmodel.BaseViewModel
 import com.fmt.github.base.viewmodel.ErrorState
 import com.fmt.github.base.viewmodel.LoadState
@@ -61,4 +62,10 @@ abstract class BaseVMActivity : AppCompatActivity() {
     open fun handleError() {
 
     }
+
+    protected fun <T : Any> LiveData<T>.observeKt(block: (T) -> Unit) {
+        this.observe(this@BaseVMActivity) {
+            block(it)
+        }
+    }
 }

app/src/main/java/com/fmt/github/base/viewmodel/BaseViewModel.kt

@@ -16,7 +16,7 @@ open class BaseViewModel : ViewModel() {
 
     fun launch(cancel: Cancel? = null, block: LaunchBlock) {//使用协程封装统一的网络请求处理
         viewModelScope.launch {
-            //ViewModel自带的viewModelScope.launch,会在页面销毁的时候自动取消请求,有效封装内存泄露
+            //ViewModel自带的viewModelScope.launch,会在页面销毁的时候自动取消请求,有效防止了内存泄露(具体可参考)
             try {
                 mStateLiveData.value = LoadState
                 block()

app/src/main/java/com/fmt/github/home/activity/HomeActivity.kt

@@ -23,7 +23,6 @@ import com.fmt.github.user.activity.AboutActivity
 import com.fmt.github.user.activity.LoginActivity
 import com.fmt.github.user.activity.UserInfoActivity
 import com.fmt.github.user.dao.UserDao
-import com.fmt.github.user.model.UserModel
 import com.fmt.github.user.model.db.User
 import com.fmt.github.utils.NavigationUtil
 import com.fmt.github.utils.TREND_PAGE
@@ -134,11 +133,11 @@ class HomeActivity : BaseVMActivity(), NavigationView.OnNavigationItemSelectedLi
     }
 
     private fun checkVersionUpdate() {
-        mViewModel.getReleases().observe(this, {
+        mViewModel.getReleases().observeKt {
             (it.tag_name != getVersionName()).yes {
                 showVersionUpdatePopup(it.assets[0].browser_download_url)
             }
-        })
+        }
     }
 
     private fun showVersionUpdatePopup(downLoadUrl: String) {

app/src/main/java/com/fmt/github/repos/activity/ReposDetailActivity.kt

@@ -94,28 +94,28 @@ class ReposDetailActivity : BaseVMActivity() {
 
     private fun checkRepoStarred() {
         mViewModel.checkRepoStarred(mOwner, mRepos)
-            .observe(this, {
+            .observeKt {
                 fl_favor.visibility = View.VISIBLE
                 mFavorIb.isLiked = it
-            })
+            }
     }
 
     private fun starRepo() {
         mViewModel.starRepo(mOwner, mRepos)
-            .observe(this@ReposDetailActivity, {
+            .observeKt {
                 successToast(getString(R.string.stared))
                 LiveDataBus.with<ReposStarEvent>(Constant.STAR_EVENT_KEY)
                     .setData(ReposStarEvent(mIsFromFavor))
-            })
+            }
     }
 
     private fun unStarRepo() {
         mViewModel.unStarRepo(mOwner, mRepos)
-            .observe(this@ReposDetailActivity, {
+            .observeKt{
                 successToast(getString(R.string.un_stared))
                 LiveDataBus.with<ReposStarEvent>(Constant.STAR_EVENT_KEY)
                     .setData(ReposStarEvent(mIsFromFavor))
-            })
+            }
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean =

app/src/main/java/com/fmt/github/user/activity/LoginActivity.kt

@@ -2,7 +2,6 @@ package com.fmt.github.user.activity
 
 import android.content.Intent
 import android.view.View
-import androidx.lifecycle.Observer
 import com.fmt.github.R
 import com.fmt.github.base.activity.BaseDataBindVMActivity
 import com.fmt.github.base.viewmodel.BaseViewModel
@@ -13,7 +12,6 @@ import com.fmt.github.ext.otherwise
 import com.fmt.github.ext.startActivity
 import com.fmt.github.ext.yes
 import com.fmt.github.home.activity.HomeActivity
-import com.fmt.github.user.model.AuthorizationRespModel
 import com.fmt.github.user.model.UserLoginModel
 import com.fmt.github.user.model.UserModel
 import com.fmt.github.user.model.db.User
@@ -90,29 +88,29 @@ class LoginActivity : BaseDataBindVMActivity<ActivityLoginBinding>() {
     }
 
     private fun createOrGetAuthorization() {
-        mViewModel.createOrGetAuthorization().observe(this, Observer<AuthorizationRespModel> {
+        mViewModel.createOrGetAuthorization().observeKt {
             //保存授权后的Token和ID
             Settings.Account.token = it.token
             //获取用户信息
             getUserInfo()
-        })
+        }
     }
 
     private fun getToken(code: String?, state: String?) {
         if (code != null && state != null) {
             mDataBind.mOAuthProgress.visibility = View.VISIBLE
             mDataBind.mOAuthLoginIv.visibility = View.GONE
-            mViewModel.getAccessToken(code, state).observe(this, Observer {
+            mViewModel.getAccessToken(code, state).observeKt {
                 Settings.Account.token = it.access_token
                 getUserInfo()
-            })
+            }
         }
     }
 
     private fun getUserInfo() {
-        mViewModel.getUser().observe(this, Observer<UserModel> {
+        mViewModel.getUser().observeKt {
             saveUserInfo(it)
-        })
+        }
     }
 
     private fun saveUserInfo(userModel: UserModel) {