1.时间设置改为flow。

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -698,7 +698,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                 }
             }
         }
-        viewModel.timeResultData.observe(this) {
+      /*  viewModel.timeResultData.observe(this) {
             if (SystemUtil.updateTimeFlag) {
                 SystemUtil.updateTimeFlag = false
                 ManageApplication.setSysTime(it)
@@ -709,6 +709,20 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
 
                 }
             }
+        }*/
+        viewModel.viewModelScope.launch {
+            viewModel.timeResultDataFlow.collect{
+                if (SystemUtil.updateTimeFlag&&it!=null) {
+                    SystemUtil.updateTimeFlag = false
+                    ManageApplication.setSysTime(it)
+                    LogShow("当前设置的时间是" + it + "|||" + SystemClock.getDateString(it))
+                    try {
+                        tipsDialog?.dismiss()
+                    } catch (e: Exception) {
+
+                    }
+                }
+            }
         }
         viewModel.viewModelScope.launch {
             viewModel.mainLoginData.collect { bean ->

app/src/main/java/com/xhly/manageapp/viewmodel/BaseViewModel.kt

@@ -32,6 +32,9 @@ open class BaseViewModel : CommonBaseViewModel() {
     val pwdResultData: LiveData<Boolean> = pwdResult
     private val timeResult = MutableLiveData<Long>()
     val timeResultData: LiveData<Long> = timeResult
+    private val timeResultFlow = MutableStateFlow<Long?>(null)
+    val timeResultDataFlow: Flow<Long?> = timeResultFlow
+
     private val controlResult = MutableLiveData<Boolean>()
     val controlResultData: LiveData<Boolean> = controlResult
     private val lockResult = MutableLiveData<Boolean>()
@@ -190,6 +193,7 @@ open class BaseViewModel : CommonBaseViewModel() {
                 LogShow("设置的时间是"+SystemClock.getDateString(l))
                 /*timeResult.value = l*/
                 timeResult.value = obj
+                timeResultFlow.value=obj
                 if (resetAppSocket){
                     UIEvent(Const.STARTSOCKET).post()
                 }