|
@@ -121,6 +121,7 @@ import java.util.concurrent.TimeUnit
|
121
|
121
|
class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), DownloadCallback {
|
122
|
122
|
var adapter: AppAdapter? = null
|
123
|
123
|
private var debounceJob: Job? = null
|
|
124
|
+ private var lastUpdateResume=0L
|
124
|
125
|
private var useTimeStrategyDebounceJob: Job? = null
|
125
|
126
|
private var mMyInstallReceiver: AppInstallReceiver? = null
|
126
|
127
|
private var netConnectReceiver: NetConnectReceiver? = null
|
|
@@ -891,6 +892,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
|
891
|
892
|
canClickFlag = true
|
892
|
893
|
LogShow("跳转问题是$e")
|
893
|
894
|
}
|
|
895
|
+
|
894
|
896
|
}
|
895
|
897
|
|
896
|
898
|
//修改AutoApp启动逻辑,优先从本地中读取拉起,然后再从服务器中拉取
|
|
@@ -1612,11 +1614,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
|
1612
|
1614
|
viewModel.postAutoAppDetail(it.regionid)
|
1613
|
1615
|
}
|
1614
|
1616
|
}*/
|
1615
|
|
- //没有单点登录所以不再判断
|
1616
|
1617
|
LogShow("锁定了吧打开app拉起请求,type==$type"+(userBean==null))
|
1617
|
|
- useTimeStrategyDebounceJob?.cancel()
|
1618
|
|
- useTimeStrategyDebounceJob = lifecycleScope.launch {
|
1619
|
|
- delay(1000)
|
|
1618
|
+ //没有单点登录所以不再判断
|
|
1619
|
+ if (System.currentTimeMillis()-lastUpdateResume>10000){
|
|
1620
|
+ lastUpdateResume=System.currentTimeMillis()
|
1620
|
1621
|
userBean?.let {
|
1621
|
1622
|
netAutoAppFlag = true
|
1622
|
1623
|
viewModel.postAutoAppDetail(it.regionid)
|
|
@@ -2705,7 +2706,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
|
2705
|
2706
|
val firstOrNull = appList.firstOrNull { it.packageName.equals(downItem.pkgName) }
|
2706
|
2707
|
if (firstOrNull != null) {
|
2707
|
2708
|
if (downItem.appversion > firstOrNull.versionNum) {
|
2708
|
|
- /*try {
|
|
2709
|
+ try {
|
2709
|
2710
|
val autoAppBean = spUtils.getFromJson(
|
2710
|
2711
|
Const.AUTOAPPKEY,
|
2711
|
2712
|
AutoAppBean().javaClass
|
|
@@ -2715,7 +2716,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
|
2715
|
2716
|
}
|
2716
|
2717
|
}catch (e:Exception){
|
2717
|
2718
|
|
2718
|
|
- }*/
|
|
2719
|
+ }
|
2719
|
2720
|
InstallUtils.addInstall(downItem.savepath, downItem.pkgName, downItem.appName)
|
2720
|
2721
|
}
|
2721
|
2722
|
} else {
|