|
@@ -103,6 +103,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
|
103
|
103
|
|
104
|
104
|
//标记是否请求了应用策略,都为真则提示
|
105
|
105
|
private var updateStrategyFlag = false
|
|
106
|
+ //标记当前是否锁定
|
|
107
|
+ private var mainLockFlag=false
|
106
|
108
|
override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
|
107
|
109
|
|
108
|
110
|
@SuppressLint("CheckResult")
|
|
@@ -421,7 +423,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
|
421
|
423
|
}
|
422
|
424
|
|
423
|
425
|
mBinding.lockLlayout.setOnClickListener {
|
424
|
|
- if (lastTimeLong+2*60*1000<System.currentTimeMillis()){
|
|
426
|
+ //限制最多1分钟请求一次策略,
|
|
427
|
+ if (lastTimeLong+1*60*1000<System.currentTimeMillis()){
|
425
|
428
|
lastTimeLong=System.currentTimeMillis()
|
426
|
429
|
updateAllStrategy()
|
427
|
430
|
}
|
|
@@ -550,7 +553,13 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
|
550
|
553
|
|
551
|
554
|
override fun onResume() {
|
552
|
555
|
super.onResume()
|
553
|
|
- useTimeStrategy()
|
|
556
|
+ if (mainLockFlag&&lastTimeLong+10*60*1000<System.currentTimeMillis()){
|
|
557
|
+ //如果时锁定状态进入这个页面则请求一次策略,限制为10分钟
|
|
558
|
+ lastTimeLong=System.currentTimeMillis()
|
|
559
|
+ updateAllStrategy()
|
|
560
|
+ }else{
|
|
561
|
+ useTimeStrategy()
|
|
562
|
+ }
|
554
|
563
|
updatePadInfo()
|
555
|
564
|
updateMcApp()
|
556
|
565
|
getLocation()
|
|
@@ -743,14 +752,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
|
743
|
752
|
}
|
744
|
753
|
mBinding.lockEt.setText("")
|
745
|
754
|
} catch (e: Exception) {
|
746
|
|
- val param = spUtils.getParam(Const.DISABLEPAD, false) as Boolean
|
747
|
|
- if (param) {
|
748
|
|
- mBinding.mainLlayout.visibility = View.GONE
|
749
|
|
- mBinding.lockLlayout.visibility = View.VISIBLE
|
750
|
|
- } else {
|
751
|
|
- mBinding.mainLlayout.visibility = View.VISIBLE
|
752
|
|
- mBinding.lockLlayout.visibility = View.GONE
|
753
|
|
- }
|
|
755
|
+ //默认不锁定
|
|
756
|
+ mBinding.mainLlayout.visibility = View.GONE
|
|
757
|
+ mBinding.lockLlayout.visibility = View.VISIBLE
|
754
|
758
|
}
|
755
|
759
|
}
|
756
|
760
|
|