diff --git a/app/src/main/java/com/zj/play/main/login/LoginViewModel.kt b/app/src/main/java/com/zj/play/main/login/LoginViewModel.kt index 47d8a696..3d901590 100644 --- a/app/src/main/java/com/zj/play/main/login/LoginViewModel.kt +++ b/app/src/main/java/com/zj/play/main/login/LoginViewModel.kt @@ -14,6 +14,7 @@ import com.zj.play.article.ArticleBroadCast import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import javax.inject.Inject /** @@ -52,14 +53,18 @@ class LoginViewModel @Inject constructor( _state.postValue(LoginSuccess(login)) Play.setLogin(true) Play.setUserInfo(login.nickname, login.username) - getApplication().showToast( - if (account.isLogin) getApplication().getString(R.string.login_success) else getApplication().getString( - R.string.register_success + withContext(Dispatchers.Main) { + getApplication().showToast( + if (account.isLogin) getApplication().getString(R.string.login_success) else getApplication().getString( + R.string.register_success + ) ) - ) + } ArticleBroadCast.sendArticleChangesReceiver(context = getApplication()) } else { - getApplication().showToast(loginModel.errorMsg) + withContext(Dispatchers.Main) { + getApplication().showToast(loginModel.errorMsg) + } _state.postValue(LoginError) } } diff --git a/config.gradle b/config.gradle index 2b8936ec..0287a543 100644 --- a/config.gradle +++ b/config.gradle @@ -3,8 +3,8 @@ ext { compileSdkVersion : 32, minSdkVersion : 24, targetSdkVersion : 32, - versionCode : 31, - versionName : "4.5.3", + versionCode : 35, + versionName : "5.0.0", testInstrumentationRunner: "androidx.test.runner.AndroidJUnitRunner", consumerProguardFiles : 'consumer-rules.pro', ]