diff --git a/app/src/main/java/com/img/rabbit/MainActivity.kt b/app/src/main/java/com/img/rabbit/MainActivity.kt index 84c5630..af1a1b6 100644 --- a/app/src/main/java/com/img/rabbit/MainActivity.kt +++ b/app/src/main/java/com/img/rabbit/MainActivity.kt @@ -183,7 +183,7 @@ class MainActivity : ComponentActivity(), LoadingCallback { } LaunchedEffect(generalViewModel.agreementStatus.value) { - if (generalViewModel.agreementStatus.value == true){ + if (generalViewModel.agreementStatus.value){ //获取服务器时间 generalViewModel.getServerTime() } @@ -273,7 +273,7 @@ class MainActivity : ComponentActivity(), LoadingCallback { AppTheme { SplashScreenContent{ //未同意提示政策弹窗 - if (generalViewModel.agreementStatus.value == false){ + if (!generalViewModel.agreementStatus.value){ //同意继续 PrivacyPolicyScreen( viewModel = loginViewModel, diff --git a/app/src/main/java/com/img/rabbit/viewmodel/GeneralViewModel.kt b/app/src/main/java/com/img/rabbit/viewmodel/GeneralViewModel.kt index e678451..c1d0ec0 100644 --- a/app/src/main/java/com/img/rabbit/viewmodel/GeneralViewModel.kt +++ b/app/src/main/java/com/img/rabbit/viewmodel/GeneralViewModel.kt @@ -59,8 +59,8 @@ class GeneralViewModel: BaseViewModel(){ } } - private val _agreementStatus = MutableLiveData(PreferenceUtil.getAgreement()) - val agreementStatus: LiveData = _agreementStatus + private val _agreementStatus = mutableStateOf(PreferenceUtil.getAgreement()) + val agreementStatus: State = _agreementStatus fun setIsAgreement(agreement: Boolean){ PreferenceUtil.saveAgreement(agreement) _agreementStatus.value = agreement