Browse Source

1.时间设置改为flow。

2025_1_17_tb223fc
wangwanlei 1 month ago
parent
commit
718dfb385e

+ 15
- 1
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt View File

698
                 }
698
                 }
699
             }
699
             }
700
         }
700
         }
701
-        viewModel.timeResultData.observe(this) {
701
+      /*  viewModel.timeResultData.observe(this) {
702
             if (SystemUtil.updateTimeFlag) {
702
             if (SystemUtil.updateTimeFlag) {
703
                 SystemUtil.updateTimeFlag = false
703
                 SystemUtil.updateTimeFlag = false
704
                 ManageApplication.setSysTime(it)
704
                 ManageApplication.setSysTime(it)
709
 
709
 
710
                 }
710
                 }
711
             }
711
             }
712
+        }*/
713
+        viewModel.viewModelScope.launch {
714
+            viewModel.timeResultDataFlow.collect{
715
+                if (SystemUtil.updateTimeFlag&&it!=null) {
716
+                    SystemUtil.updateTimeFlag = false
717
+                    ManageApplication.setSysTime(it)
718
+                    LogShow("当前设置的时间是" + it + "|||" + SystemClock.getDateString(it))
719
+                    try {
720
+                        tipsDialog?.dismiss()
721
+                    } catch (e: Exception) {
722
+
723
+                    }
724
+                }
725
+            }
712
         }
726
         }
713
         viewModel.viewModelScope.launch {
727
         viewModel.viewModelScope.launch {
714
             viewModel.mainLoginData.collect { bean ->
728
             viewModel.mainLoginData.collect { bean ->

+ 4
- 0
app/src/main/java/com/xhly/manageapp/viewmodel/BaseViewModel.kt View File

32
     val pwdResultData: LiveData<Boolean> = pwdResult
32
     val pwdResultData: LiveData<Boolean> = pwdResult
33
     private val timeResult = MutableLiveData<Long>()
33
     private val timeResult = MutableLiveData<Long>()
34
     val timeResultData: LiveData<Long> = timeResult
34
     val timeResultData: LiveData<Long> = timeResult
35
+    private val timeResultFlow = MutableStateFlow<Long?>(null)
36
+    val timeResultDataFlow: Flow<Long?> = timeResultFlow
37
+
35
     private val controlResult = MutableLiveData<Boolean>()
38
     private val controlResult = MutableLiveData<Boolean>()
36
     val controlResultData: LiveData<Boolean> = controlResult
39
     val controlResultData: LiveData<Boolean> = controlResult
37
     private val lockResult = MutableLiveData<Boolean>()
40
     private val lockResult = MutableLiveData<Boolean>()
190
                 LogShow("设置的时间是"+SystemClock.getDateString(l))
193
                 LogShow("设置的时间是"+SystemClock.getDateString(l))
191
                 /*timeResult.value = l*/
194
                 /*timeResult.value = l*/
192
                 timeResult.value = obj
195
                 timeResult.value = obj
196
+                timeResultFlow.value=obj
193
                 if (resetAppSocket){
197
                 if (resetAppSocket){
194
                     UIEvent(Const.STARTSOCKET).post()
198
                     UIEvent(Const.STARTSOCKET).post()
195
                 }
199
                 }

Loading…
Cancel
Save