1.修改App列表显示规则

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

@@ -58,6 +58,7 @@ import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
 import com.xhly.manageapp.service.ManageAccessibilityService
+import com.xhly.manageapp.service.websocket.AppSocket
 import com.xhly.manageapp.ui.ManageActivity
 import com.xhly.manageapp.ui.login.activity.LoginActivity
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
@@ -181,20 +182,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             spUtils.saveJson(Const.STRATEGYBEANKEY, it)
             StrategyUtils.setStrategy(it)
             useTimeStrategy()
-            updateStrategyFlag=true
-            if (updateTimeFlag){
-                showSucessToast()
-                updateStrategyFlag=false
-            }
         }
         viewModel.appStrategyData.observe(this) {
             //存储app时间策略
             spUtils.saveJson(Const.APPSTRATEGYBEANKEY, it)
-            updateTimeFlag=true
-            if (updateStrategyFlag){
-                showSucessToast()
-                updateTimeFlag=false
-            }
+            showSucessToast()
         }
         viewModel.padInfoData.observe(this) {
             //存储信息上传时间
@@ -873,11 +865,22 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
     private fun updateAppRv() {
         try {
+            //获得预装应用和商店应用，商店应用和预装重叠直接显示，其余预装直接隐藏
             var schoolDeviceSetBean: SchoolDeviceSetBean? = null
             schoolDeviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this)
+            val storeList= arrayListOf<String>()
+            try {
+                val fromJson = spUtils.getFromJson(Const.APPSTOREKEY, ArrayList<String>().javaClass)
+                if (fromJson!=null){
+                    storeList.addAll(fromJson as ArrayList<String>)
+                }
+            }catch (e:Exception){
+                LogShow("商店应用为空")
+            }
             dataList.clear()
             var appList = AppUtils.GetAppList(this)
             //获得预装应用直接隐藏
+            val removeList = arrayListOf<AppInfo>()
             try {
                 //获得预装应用的包名
                 val currentList =
@@ -885,24 +888,24 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                         Const.FIRSTAPPLIST,
                         ArrayList<String>().javaClass
                     ) as ArrayList<String>
-                val removeList = arrayListOf<AppInfo>()
                 currentList.forEach { pkg ->
-                    //学校控制之外的预装应用加入移除集合
-                    if (!Const.schoolSetAppList.contains(pkg)) {
+                    //学校控制之外的预装应用加入移除集合，应用商店列表包含的不需要加入移除集合
+                    if (!Const.schoolSetAppList.contains(pkg)&&!storeList.contains(pkg)) {
                         appList.filter { it.packageName == pkg }.forEach {
                             removeList.add(it)
                         }
                     }
                 }
-                //如果包含应用商店也移除，因为会在自定义app中添加
-                appList.filter { it.packageName == Const.STOREAPPPKG}.forEach {
-                    removeList.add(it)
-                }
-                //移除学校控制之外预装应用
-                appList.removeAll(removeList)
             } catch (e: Exception) {
 
             }
+            //如果包含应用商店也移除，因为会在自定义app中添加
+            appList.filter { it.packageName == Const.STOREAPPPKG}.forEach {
+                removeList.add(it)
+            }
+            //移除学校控制之外预装应用
+            appList.removeAll(removeList)
+
             appList.addAll(CustomAppUtils().getCustomAppList(this))
             //获得学校设置，设置应用显示（部分回合预装重合，由学校设置判断是否显示）
             if (schoolDeviceSetBean != null) {
@@ -1030,6 +1033,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
         Const.USERID = null
         Const.USERNAME = ""
+        AppSocket.onDestroy()
         startIntentActivity(LoginActivity().javaClass)
         finish()
     }