ソースを参照

1.每次更新策略时都刷新时间。

2025_1_7x505f
wangwanlei 3ヶ月前
コミット
6368d70658

+ 24
- 9
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt ファイルの表示

359
                         LogShow("冻结失败" + e.toString())
359
                         LogShow("冻结失败" + e.toString())
360
                     }
360
                     }
361
                     unInstallAppList.clear()
361
                     unInstallAppList.clear()
362
+                    var hasapp = 1
363
+                    try {
364
+                        val strategyBean =
365
+                            spUtils.getFromJson(Const.STRATEGYBEANKEY, StrategyBean::class.java) as StrategyBean
366
+                        //获得平板策略是否使用app策略
367
+                        hasapp = strategyBean.hasapp
368
+                    }catch (e:Exception){
369
+
370
+                    }
362
                     if (modelList.size > 0) {
371
                     if (modelList.size > 0) {
363
                         ManageApplication.disableInstallation(true)
372
                         ManageApplication.disableInstallation(true)
364
                         //modelList为0表示未打开应用策略,不删除应用,并且打开应用安装权限,其余情况关闭
373
                         //modelList为0表示未打开应用策略,不删除应用,并且打开应用安装权限,其余情况关闭
373
                             }
382
                             }
374
                         }
383
                         }
375
                     } else {
384
                     } else {
376
-                        //modelList为0表示未打开应用策略,所以打开打开应用安装权限
377
-                        ManageApplication.disableInstallation(false)
385
+                        //hasapp==0表示未打开应用策略,所以打开打开应用安装权限,使用策略并未空则不允许安装应用
386
+                        if (hasapp==0){
387
+                            ManageApplication.disableInstallation(false)
388
+                        }else{
389
+                            ManageApplication.disableInstallation(true)
390
+                        }
378
                     }
391
                     }
379
                 }
392
                 }
380
             }
393
             }
618
 
631
 
619
         viewModel.viewModelScope.launch {
632
         viewModel.viewModelScope.launch {
620
             viewModel.autoAppData.collect {
633
             viewModel.autoAppData.collect {
634
+                lifecycleScope.launch {
635
+                    withContext(Dispatchers.IO){
636
+                        delay(10000)
637
+                    }
638
+                    mBinding.flayoutRoot.visibility = View.GONE
639
+                }
621
                 it?.let {
640
                 it?.let {
622
                     if (!netAutoAppFlag || isDestroyFlag) {
641
                     if (!netAutoAppFlag || isDestroyFlag) {
623
-                        mBinding.flayoutRoot.visibility = View.GONE
624
                         return@collect
642
                         return@collect
625
                     } else {
643
                     } else {
626
                         netAutoAppFlag = false
644
                         netAutoAppFlag = false
634
                         //如果地址为空并且请求为true则不跳转,否则跳转
652
                         //如果地址为空并且请求为true则不跳转,否则跳转
635
                         try {
653
                         try {
636
                             if ((it.authUrl.isNullOrEmpty() || it.appPackage.isNullOrEmpty()) && it.netSucessFlag) {
654
                             if ((it.authUrl.isNullOrEmpty() || it.appPackage.isNullOrEmpty()) && it.netSucessFlag) {
637
-                                mBinding.flayoutRoot.visibility = View.GONE
638
                                 //请求成功但地址为空,不跳转
655
                                 //请求成功但地址为空,不跳转
639
                                 canClickFlag = true
656
                                 canClickFlag = true
640
                                 autoAppFlag = false
657
                                 autoAppFlag = false
666
                                 } else {
683
                                 } else {
667
                                     //其余情况都允许触控
684
                                     //其余情况都允许触控
668
                                     canClickFlag = true
685
                                     canClickFlag = true
669
-                                    mBinding.flayoutRoot.visibility = View.GONE
670
                                 }
686
                                 }
671
                             } else {
687
                             } else {
672
-                                mBinding.flayoutRoot.visibility = View.GONE
673
                                 canClickFlag = true
688
                                 canClickFlag = true
674
                             }
689
                             }
675
                         } catch (e: Exception) {
690
                         } catch (e: Exception) {
676
                             canClickFlag = true
691
                             canClickFlag = true
677
-                            mBinding.flayoutRoot.visibility = View.GONE
678
                         }
692
                         }
679
                     } else {
693
                     } else {
680
-                        mBinding.flayoutRoot.visibility = View.GONE
681
                         canClickFlag = true
694
                         canClickFlag = true
682
                         autoAppFlag = false
695
                         autoAppFlag = false
683
                         startIntentActivity(MainActivity().javaClass)
696
                         startIntentActivity(MainActivity().javaClass)
810
             canClickFlag = true
823
             canClickFlag = true
811
             LogShow("跳转问题是$e")
824
             LogShow("跳转问题是$e")
812
         }
825
         }
813
-        mBinding.flayoutRoot.visibility = View.GONE
814
     }
826
     }
815
 
827
 
816
     private fun showSucessToast() {
828
     private fun showSucessToast() {
1119
         viewModel.postAppNetWhiteList()
1131
         viewModel.postAppNetWhiteList()
1120
         updatePadInfo()
1132
         updatePadInfo()
1121
         updateAppInstallInfo()
1133
         updateAppInstallInfo()
1134
+        //自动同时一次时间
1135
+        viewModel.postSyncTime()
1136
+        lastTimeLong = System.currentTimeMillis()
1122
     }
1137
     }
1123
 
1138
 
1124
     private fun updateAppInstallInfo() {
1139
     private fun updateAppInstallInfo() {

+ 2
- 1
app/src/main/java/com/xhly/manageapp/viewmodel/BaseViewModel.kt ファイルの表示

186
                 val obj = postSyncTime.obj
186
                 val obj = postSyncTime.obj
187
                 val l = obj + (endTime - startTime) / 2
187
                 val l = obj + (endTime - startTime) / 2
188
                 LogShow("设置的时间是"+SystemClock.getDateString(l))
188
                 LogShow("设置的时间是"+SystemClock.getDateString(l))
189
-                timeResult.value = l
189
+                /*timeResult.value = l*/
190
+                timeResult.value = obj
190
             } else {
191
             } else {
191
                 if (!postSyncTime.msg.isNullOrEmpty()) {
192
                 if (!postSyncTime.msg.isNullOrEmpty()) {
192
                     netMessage.value = postSyncTime.msg
193
                     netMessage.value = postSyncTime.msg

+ 8
- 8
app/src/main/res/layout/activity_main.xml ファイルの表示

84
                 android:layout_marginTop="24dp"
84
                 android:layout_marginTop="24dp"
85
                 android:overScrollMode="never" />
85
                 android:overScrollMode="never" />
86
         </LinearLayout>
86
         </LinearLayout>
87
-        <LinearLayout
88
-            android:id="@+id/flayout_root"
89
-            android:layout_width="match_parent"
90
-            android:layout_height="match_parent"
91
-            android:background="@drawable/main_bg"
92
-            android:gravity="center_horizontal"
93
-            android:orientation="vertical"
94
-            />
95
         <LinearLayout
87
         <LinearLayout
96
             android:id="@+id/lock_llayout"
88
             android:id="@+id/lock_llayout"
97
             android:layout_width="match_parent"
89
             android:layout_width="match_parent"
187
                 android:textColor="#253A70"
179
                 android:textColor="#253A70"
188
                 android:textSize="8sp" />
180
                 android:textSize="8sp" />
189
         </LinearLayout>
181
         </LinearLayout>
182
+        <LinearLayout
183
+            android:id="@+id/flayout_root"
184
+            android:layout_width="match_parent"
185
+            android:layout_height="match_parent"
186
+            android:background="@drawable/main_bg"
187
+            android:gravity="center_horizontal"
188
+            android:orientation="vertical"
189
+            />
190
     </FrameLayout>
190
     </FrameLayout>
191
 </LinearLayout>
191
 </LinearLayout>

読み込み中…
キャンセル
保存