Merge branch 'v_1.7'

Author: fmtcias

app/build.gradle

@@ -69,9 +69,9 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
 
     //协程 + room
-    implementation "androidx.room:room-runtime:2.2.3"
-    kapt "androidx.room:room-compiler:2.2.3"
-    implementation "androidx.room:room-ktx:2.2.3"
+    implementation "androidx.room:room-runtime:2.2.4"
+    kapt "androidx.room:room-compiler:2.2.4"
+    implementation "androidx.room:room-ktx:2.2.4"
 
     //koin(依赖注入)
     implementation "org.koin:koin-androidx-scope:2.0.1"

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

@@ -1,8 +1,6 @@
 package com.fmt.github.base.viewmodel
 
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
@@ -11,7 +9,6 @@ open class BaseViewModel : ViewModel() {
     val mStateLiveData = MutableLiveData<StateActionEvent>()//通用事件模型驱动(如：显示对话框、取消对话框、错误提示)
 
     fun launch(block: suspend CoroutineScope.() -> Unit) {//使用协程封装统一的网络请求处理
-
         viewModelScope.launch {
             //ViewModel自带的viewModelScope.launch,会在页面销毁的时候自动取消请求,有效封装内存泄露
             try {
@@ -22,7 +19,17 @@ open class BaseViewModel : ViewModel() {
                 mStateLiveData.value = ErrorState(e.message)
             }
         }
-
     }
 
+    fun <T> emit(block: suspend LiveDataScope<T>.() -> T): LiveData<T> {
+        return liveData {
+            try {
+                mStateLiveData.value = LoadState
+                emit(block())
+                mStateLiveData.value = SuccessState
+            } catch (e: Exception) {
+                mStateLiveData.value = ErrorState(e.message)
+            }
+        }
+    }
 }

app/src/main/java/com/fmt/github/home/viewmodel/HomeViewModel.kt

@@ -8,11 +8,9 @@ import com.fmt.github.user.repository.UserRepository
 
 class HomeViewModel(private val mUserRepository: UserRepository) : BaseViewModel() {
 
-    fun deleteAuthorization(id: Int): LiveData<Boolean> = liveData {
+    fun deleteAuthorization(id: Int): LiveData<Boolean> = emit {
         val response = mUserRepository.deleteAuthorization(id)
-        (response.code() == 204).yes {
-            emit(true)
-        }
+        response.code() == 204
     }
 
     fun deleteUser() {

app/src/main/java/com/fmt/github/repos/viewmodel/ReposViewModel.kt

@@ -14,31 +14,19 @@ class ReposViewModel(private val mReposRepository: ReposRepository) : BaseViewMo
         sort: String,
         order: String,
         page: Int
-    ): LiveData<List<ReposItemModel>> = liveData {
-        emit(mReposRepository.searchRepos(query, sort, order, page).items)//挂起函数
+    ): LiveData<List<ReposItemModel>> = emit {
+        mReposRepository.searchRepos(query, sort, order, page).items
     }
 
-    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)
-        }
+    fun checkRepoStarred(owner: String, repo: String): LiveData<Boolean> = emit {
+        mReposRepository.starRepo(owner, repo).code() == 204
     }
 
-    fun starRepo(owner: String, repo: String): LiveData<Boolean> = liveData {
-        val response = mReposRepository.starRepo(owner, repo)
-        (response.code() == 204).yes {
-            emit(true)
-        }
+    fun starRepo(owner: String, repo: String): LiveData<Boolean> = emit {
+        mReposRepository.starRepo(owner, repo).code() == 204
     }
 
-    fun unStarRepo(owner: String, repo: String): LiveData<Boolean> = liveData {
-        val response = mReposRepository.unStarRepo(owner, repo)
-        (response.code() == 204).yes {
-            emit(true)
-        }
+    fun unStarRepo(owner: String, repo: String): LiveData<Boolean> = emit {
+        mReposRepository.unStarRepo(owner, repo).code() == 204
     }
-
 }

app/src/main/java/com/fmt/github/user/viewmodel/UserViewModel.kt

@@ -2,7 +2,6 @@ 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
@@ -20,19 +19,17 @@ class UserViewModel(private val mUserRepository: UserRepository) : BaseViewModel
             Configs.SCOPE,
             Configs.NOTE, Configs.NOTE_URL
         )
-        return liveData {
-            emit(
-                mUserRepository.createOrGetAuthorization(
-                    authorizationReqModel,
-                    Configs.CLIENT_ID,
-                    Configs.FINGERPRINT
-                )
+        return emit {
+            mUserRepository.createOrGetAuthorization(
+                authorizationReqModel,
+                Configs.CLIENT_ID,
+                Configs.FINGERPRINT
             )
         }
     }
 
-    fun getUser(): LiveData<UserModel> = liveData {
-        emit(mUserRepository.getUser())
+    fun getUser(): LiveData<UserModel> = emit {
+        mUserRepository.getUser()
     }
 
     fun saveLocalUser(user: User) {
@@ -46,22 +43,22 @@ class UserViewModel(private val mUserRepository: UserRepository) : BaseViewModel
         sort: String,
         order: String,
         page: Int
-    ): LiveData<List<UserModel>> = liveData {
-        emit(mUserRepository.searchUsers(query, sort, order, page).items)
+    ): LiveData<List<UserModel>> = emit {
+        mUserRepository.searchUsers(query, sort, order, page).items
     }
 
-    fun getUserInfo(user: String): MutableLiveData<UserInfoModel> {
+    fun getUserInfo(user: String): LiveData<UserInfoModel> {
         launch {
             mUserInfoModel.value = mUserRepository.getUserInfo(user)
         }
         return mUserInfoModel
     }
 
-    fun getUserPublicRepos(user: String, page: Int): LiveData<List<ReposItemModel>> = liveData {
-        emit(mUserRepository.getUserPublicRepos(user, page))
+    fun getUserPublicRepos(user: String, page: Int):LiveData<List<ReposItemModel>> = emit {
+        mUserRepository.getUserPublicRepos(user, page)
     }
 
-    fun getStarredRepos(user: String, page: Int): LiveData<List<ReposItemModel>> = liveData {
-        emit(mUserRepository.getStarredRepos(user, page))
+    fun getStarredRepos(user: String, page: Int): LiveData<List<ReposItemModel>> = emit {
+        mUserRepository.getStarredRepos(user, page)
     }
 }