使用协程简化异步代码

fmtcias · fmtcias · commit e0e90758239f · 2020-02-06T17:31:27.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.fmt.github"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 6
-        versionName "1.6"
+        versionCode 7
+        versionName "1.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
@@ -50,15 +50,18 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
-
-    //Android KTX 是一组 Kotlin 扩展程序，属于 Android Jetpack 系列
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0'
 
     //协程
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
+
+    //Android KTX 是一组 Kotlin 扩展程序，属于 Android Jetpack 系列
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
+
 
     //okhttp + retrofit(2.6.0支持协程)
     implementation("com.squareup.okhttp3:logging-interceptor:4.0.0")
diff --git a/app/src/main/java/com/fmt/github/WelcomeActivity.kt b/app/src/main/java/com/fmt/github/WelcomeActivity.kt
@@ -1,6 +1,7 @@
 package com.fmt.github
 
 import android.content.Intent
+import androidx.lifecycle.lifecycleScope
 import com.afollestad.assent.*
 import com.fmt.github.base.activity.BaseDataBindActivity
 import com.fmt.github.databinding.ActivityWelcomeBinding
@@ -47,7 +48,7 @@ class WelcomeActivity : BaseDataBindActivity<ActivityWelcomeBinding>() {
     }
 
     private fun checkIsLogin() {
-        launch {
+        lifecycleScope.launch {
             delay(500)//挂起,但不会阻塞,后续通过resumeWith恢复执行
             val userList = mUserDao.getAll()
             (userList.isEmpty()).yes {
diff --git a/app/src/main/java/com/fmt/github/base/activity/BaseActivity.kt b/app/src/main/java/com/fmt/github/base/activity/BaseActivity.kt
@@ -2,11 +2,8 @@ package com.fmt.github.base.activity
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.cancel
 
-abstract class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope() {
+abstract class BaseActivity : AppCompatActivity(){
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -26,10 +23,4 @@ abstract class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope()
     open fun initData() {
 
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        cancel()
-    }
-
 }
diff --git a/app/src/main/java/com/fmt/github/base/activity/BaseVMActivity.kt b/app/src/main/java/com/fmt/github/base/activity/BaseVMActivity.kt
@@ -8,14 +8,8 @@ import com.fmt.github.base.viewmodel.ErrorState
 import com.fmt.github.base.viewmodel.LoadState
 import com.fmt.github.base.viewmodel.SuccessState
 import com.fmt.github.ext.errorToast
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.cancel
 
-/**
- * 封装带有协程基类,使用代理类完成
- */
-abstract class BaseVMActivity : AppCompatActivity(), CoroutineScope by MainScope() {
+abstract class BaseVMActivity : AppCompatActivity(){
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -68,9 +62,4 @@ abstract class BaseVMActivity : AppCompatActivity(), CoroutineScope by MainScope
     open fun handleError() {
 
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        cancel()//取消协程任务
-    }
 }
diff --git a/app/src/main/java/com/fmt/github/ext/InputManagerExt.kt b/app/src/main/java/com/fmt/github/ext/InputManagerExt.kt
@@ -6,7 +6,6 @@ import android.view.inputmethod.InputMethodManager
 
 fun hideKeyboard(view: View) {
     val manager = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    if (view == null) return
     view.windowToken?.let {
         manager.hideSoftInputFromWindow(it, 0)
     }
diff --git a/app/src/main/java/com/fmt/github/home/activity/HomeActivity.kt b/app/src/main/java/com/fmt/github/home/activity/HomeActivity.kt
@@ -10,6 +10,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
 import com.fmt.github.R
 import com.fmt.github.base.activity.BaseVMActivity
 import com.fmt.github.base.viewmodel.BaseViewModel
@@ -51,7 +52,7 @@ class HomeActivity : BaseVMActivity(), NavigationView.OnNavigationItemSelectedLi
     override fun getViewModel(): BaseViewModel = mViewModel
 
     private fun initUserInfo() {
-        launch {
+        lifecycleScope.launch {//Androidx的协程支持LifecycleScope、ViewModelScope
             mUser = mUserDao.getAll()[0]
             initHeaderLayout()
             initViewPager()
diff --git a/app/src/main/java/com/fmt/github/home/viewmodel/HomeViewModel.kt b/app/src/main/java/com/fmt/github/home/viewmodel/HomeViewModel.kt
@@ -1,22 +1,18 @@
 package com.fmt.github.home.viewmodel
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.liveData
 import com.fmt.github.base.viewmodel.BaseViewModel
 import com.fmt.github.ext.yes
 import com.fmt.github.user.repository.UserRepository
 
-class HomeViewModel(private val mUserRepository : UserRepository) : BaseViewModel() {
+class HomeViewModel(private val mUserRepository: UserRepository) : BaseViewModel() {
 
-    fun deleteAuthorization(id: Int): LiveData<Boolean> {
-        val mutableLiveData = MutableLiveData<Boolean>()
-        launch {
-            val response = mUserRepository.deleteAuthorization(id)
-            (response.code() == 204).yes {
-                mutableLiveData.value = true
-            }
+    fun deleteAuthorization(id: Int): LiveData<Boolean> = liveData {
+        val response = mUserRepository.deleteAuthorization(id)
+        (response.code() == 204).yes {
+            emit(true)
         }
-        return mutableLiveData
     }
 
     fun deleteUser() {
diff --git a/app/src/main/java/com/fmt/github/repos/model/ReposListModel.kt b/app/src/main/java/com/fmt/github/repos/model/ReposListModel.kt
@@ -1,3 +1,3 @@
 package com.fmt.github.repos.model
 
-data class ReposListModel(val items: MutableList<ReposItemModel>)
+data class ReposListModel(val items: List<ReposItemModel>)
diff --git a/app/src/main/java/com/fmt/github/repos/viewmodel/ReposViewModel.kt b/app/src/main/java/com/fmt/github/repos/viewmodel/ReposViewModel.kt
@@ -1,7 +1,7 @@
 package com.fmt.github.repos.viewmodel
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.liveData
 import com.fmt.github.base.viewmodel.BaseViewModel
 import com.fmt.github.ext.yes
 import com.fmt.github.repos.model.ReposItemModel
@@ -14,47 +14,31 @@ class ReposViewModel(private val mReposRepository: ReposRepository) : BaseViewMo
         sort: String,
         order: String,
         page: Int
-    ): LiveData<List<ReposItemModel>> {
-        val mutableLiveData = MutableLiveData<List<ReposItemModel>>()
-        launch {
-            mutableLiveData.value = mReposRepository.searchRepos(query, sort, order, page).items
-        }
-        return mutableLiveData
+    ): LiveData<List<ReposItemModel>> = liveData {
+        emit(mReposRepository.searchRepos(query, sort, order, page).items)//挂起函数
     }
 
-    fun checkRepoStarred(owner: String, repo: String): LiveData<Boolean> {
-        val mutableLiveData = MutableLiveData<Boolean>()
-        launch {
-            val response = mReposRepository.checkRepoStarred(owner, repo)
-            if (response.code() == 204) {
-                mutableLiveData.value = true
-            } else if (response.code() == 404) {
-                mutableLiveData.value = false
-            }
+    fun checkRepoStarred(owner: String, repo: String): LiveData<Boolean> = liveData {
+        val response = mReposRepository.checkRepoStarred(owner, repo)
+        if (response.code() == 204) {
+            emit(true)
+        } else if (response.code() == 404) {
+            emit(false)
         }
-        return mutableLiveData
     }
 
-    fun starRepo(owner: String, repo: String): LiveData<Boolean> {
-        val mutableLiveData = MutableLiveData<Boolean>()
-        launch {
-            val response = mReposRepository.starRepo(owner, repo)
-            (response.code() == 204).yes {
-                mutableLiveData.value = true
-            }
+    fun starRepo(owner: String, repo: String): LiveData<Boolean> = liveData {
+        val response = mReposRepository.starRepo(owner, repo)
+        (response.code() == 204).yes {
+            emit(true)
         }
-        return mutableLiveData
     }
 
-    fun unStarRepo(owner: String, repo: String): LiveData<Boolean> {
-        val mutableLiveData = MutableLiveData<Boolean>()
-        launch {
-            val response = mReposRepository.unStarRepo(owner, repo)
-            (response.code() == 204).yes {
-                mutableLiveData.value = true
-            }
+    fun unStarRepo(owner: String, repo: String): LiveData<Boolean> = liveData {
+        val response = mReposRepository.unStarRepo(owner, repo)
+        (response.code() == 204).yes {
+            emit(true)
         }
-        return mutableLiveData
     }
 
 }
diff --git a/app/src/main/java/com/fmt/github/user/model/UserListModel.kt b/app/src/main/java/com/fmt/github/user/model/UserListModel.kt
@@ -1,3 +1,3 @@
 package com.fmt.github.user.model
 
-data class UserListModel(val items:MutableList<UserModel>)
+data class UserListModel(val items:List<UserModel>)
diff --git a/app/src/main/java/com/fmt/github/user/viewmodel/UserViewModel.kt b/app/src/main/java/com/fmt/github/user/viewmodel/UserViewModel.kt
@@ -1,6 +1,8 @@
 package com.fmt.github.user.viewmodel
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.liveData
 import com.fmt.github.base.viewmodel.BaseViewModel
 import com.fmt.github.config.Configs
 import com.fmt.github.repos.model.ReposItemModel
@@ -12,30 +14,25 @@ class UserViewModel(private val mUserRepository: UserRepository) : BaseViewModel
 
     val mUserInfoModel = MutableLiveData<UserInfoModel>()
 
-    fun createOrGetAuthorization(): MutableLiveData<AuthorizationRespModel> {
+    fun createOrGetAuthorization(): LiveData<AuthorizationRespModel> {
         val authorizationReqModel = AuthorizationReqModel(
             Configs.CLIENT_SECRET,
             Configs.SCOPE,
             Configs.NOTE, Configs.NOTE_URL
         )
-        val mutableLiveData = MutableLiveData<AuthorizationRespModel>()
-        launch {
-            mutableLiveData.value =
+        return liveData {
+            emit(
                 mUserRepository.createOrGetAuthorization(
                     authorizationReqModel,
                     Configs.CLIENT_ID,
                     Configs.FINGERPRINT
                 )
+            )
         }
-        return mutableLiveData
     }
 
-    fun getUser(): MutableLiveData<UserModel> {
-        val mutableLiveData = MutableLiveData<UserModel>()
-        launch {
-            mutableLiveData.value = mUserRepository.getUser()
-        }
-        return mutableLiveData
+    fun getUser(): LiveData<UserModel> = liveData {
+        emit(mUserRepository.getUser())
     }
 
     fun saveLocalUser(user: User) {
@@ -49,12 +46,8 @@ class UserViewModel(private val mUserRepository: UserRepository) : BaseViewModel
         sort: String,
         order: String,
         page: Int
-    ): MutableLiveData<List<UserModel>> {
-        val mutableLiveData = MutableLiveData<List<UserModel>>()
-        launch {
-            mutableLiveData.value = mUserRepository.searchUsers(query, sort, order, page).items
-        }
-        return mutableLiveData
+    ): LiveData<List<UserModel>> = liveData {
+        emit(mUserRepository.searchUsers(query, sort, order, page).items)
     }
 
     fun getUserInfo(user: String): MutableLiveData<UserInfoModel> {
@@ -64,19 +57,11 @@ class UserViewModel(private val mUserRepository: UserRepository) : BaseViewModel
         return mUserInfoModel
     }
 
-    fun getUserPublicRepos(user: String, page: Int): MutableLiveData<List<ReposItemModel>> {
-        val mutableLiveData = MutableLiveData<List<ReposItemModel>>()
-        launch {
-            mutableLiveData.value = mUserRepository.getUserPublicRepos(user, page)
-        }
-        return mutableLiveData
+    fun getUserPublicRepos(user: String, page: Int): LiveData<List<ReposItemModel>> = liveData {
+        emit(mUserRepository.getUserPublicRepos(user, page))
     }
 
-    fun getStarredRepos(user: String, page: Int): MutableLiveData<List<ReposItemModel>> {
-        val mutableLiveData = MutableLiveData<List<ReposItemModel>>()
-        launch {
-            mutableLiveData.value = mUserRepository.getStarredRepos(user, page)
-        }
-        return mutableLiveData
+    fun getStarredRepos(user: String, page: Int): LiveData<List<ReposItemModel>> = liveData {
+        emit(mUserRepository.getStarredRepos(user, page))
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import android.view.inputmethod.InputMethodManager`
`6`	`6`
`7`	`7`	`fun hideKeyboard(view: View) {`
`8`	`8`	`val manager = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager`
`9`		`- if (view == null) return`
`10`	`9`	`view.windowToken?.let {`
`11`	`10`	`manager.hideSoftInputFromWindow(it, 0)`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`package com.fmt.github.repos.model`
`2`	`2`
`3`		`-data class ReposListModel(val items: MutableList<ReposItemModel>)`
	`3`	`+data class ReposListModel(val items: List<ReposItemModel>)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`package com.fmt.github.user.model`
`2`	`2`
`3`		`-data class UserListModel(val items:MutableList<UserModel>)`
	`3`	`+data class UserListModel(val items:List<UserModel>)`