1.不再默认生成应用商店

2.添加应用列表隐藏规则

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

@@ -28,6 +28,7 @@ import androidx.work.WorkManager
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomViewTarget
 import com.bumptech.glide.request.transition.Transition
+import com.google.gson.reflect.TypeToken
 import com.hjq.toast.Toaster
 import com.kongzue.dialogx.dialogs.CustomDialog
 import com.kongzue.dialogx.interfaces.OnBindView
@@ -51,6 +52,7 @@ import com.xhly.manageapp.ManageApplication
 import com.xhly.manageapp.bean.EventLog
 import com.xhly.manageapp.bean.SocketMsgBean
 import com.xhly.manageapp.bean.app.AppInstallBean
+import com.xhly.manageapp.bean.app.AppModel
 import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.log.UpdateBean
@@ -139,7 +141,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         // csdkManagerUtils.csdkManager.enableAccessibility("com.xhly.manageapp","com.xhly.manageapp.service.TestService",true)
 
         viewModel.listAppData.observe(this) { modelList ->
-            //存储商店应用包名到本地
+            //存储商店应用包名到本地,并且存储商店应用列表数据到本地集合
             val appNameList = arrayListOf<String>()
             val whiteList = arrayListOf<String>()
             modelList.forEach {
@@ -149,7 +151,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 }
             }
             ManageApplication.addAppWhiteRule(whiteList)
-            spUtils.saveJson(Const.APPSTOREKEY, appNameList)
+            spUtils.saveJson(Const.APPSTOREDATAKEY,modelList)
             //获得应用集合，必装应用和推荐应用，再加上预装应用(预装应用直接隐藏)，其余应用需要静默卸载,必装应用需要进行静默下载和安装。安装应用从forceapp接口获取
             val appList = AppUtils.GetAppList(this)
             val firstAppList = arrayListOf<String>()
@@ -936,14 +938,25 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
     private fun updateAppRv() {
         try {
-            //获得预装应用和商店应用，商店应用和预装重叠直接显示，其余预装直接隐藏
+            //获得预装应用和商店应用，商店应用(隐藏图标的不显示)和预装重叠直接显示，其余预装直接隐藏
             var schoolDeviceSetBean: SchoolDeviceSetBean? = null
             schoolDeviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this)
             val storeList = arrayListOf<String>()
+            val storeRemoveList= arrayListOf<String>()
             try {
-                val fromJson = spUtils.getFromJson(Const.APPSTOREKEY, ArrayList<String>().javaClass)
-                if (fromJson != null) {
-                    storeList.addAll(fromJson as ArrayList<String>)
+                val type = object : TypeToken<List<AppModel>>() {}.type
+                val appModelList = spUtils.getFromJsonType(
+                    Const.APPSTOREDATAKEY,
+                    ArrayList<AppModel>().javaClass,
+                    type
+                ) as ArrayList<AppModel>
+                if (appModelList != null) {
+                    appModelList.filter { it.showico==1}.forEach {
+                        storeList.add(it.appPackage)
+                    }
+                    appModelList.filter { it.showico==0}.forEach {
+                        storeRemoveList.add(it.appPackage)
+                    }
                 }
             } catch (e: Exception) {
                 LogShow("商店应用为空")
@@ -960,7 +973,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                         ArrayList<String>().javaClass
                     ) as ArrayList<String>
                 currentList.forEach { pkg ->
-                    //学校控制之外的预装应用加入移除集合，应用商店列表包含的不需要加入移除集合
+                    //获得预装，在学校控制和应用商店显示以外的app加入移除集合
                     if (!Const.schoolSetAppList.contains(pkg) && !storeList.contains(pkg)) {
                         appList.filter { it.packageName == pkg }.forEach {
                             removeList.add(it)
@@ -971,8 +984,13 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
             }
             //如果包含应用商店也移除，因为会在自定义app中添加
-            appList.filter { it.packageName == Const.STOREAPPPKG }.forEach {
+           /* appList.filter { it.packageName == Const.STOREAPPPKG }.forEach {
                 removeList.add(it)
+            }*/
+
+            //移除应用列表隐藏的应用
+            storeRemoveList.forEach {pkg->
+                appList.removeIf { it.packageName==pkg }
             }
             //移除学校控制之外预装应用
             appList.removeAll(removeList)

app/src/main/java/com/xhly/manageapp/utils/CustomAppUtils.kt

@@ -11,11 +11,11 @@ import com.xhly.corelib.bean.AppInfo
 class CustomAppUtils {
     public fun getCustomAppList(context: Context): ArrayList<AppInfo> {
         val appList= arrayListOf<AppInfo>()
-        appList.add(getCusomAppBean(
+     /*   appList.add(getCusomAppBean(
             context.getString(R.string.appstore),
             Const.STOREAPPPKG,
             AppCompatResources.getDrawable(context,R.drawable.icon_store)!!
-        ))
+        ))*/
         appList.add(getCusomAppBean(
             context.getString(R.string.speed),
             Const.CUSTOMSPEEDAPP,

app/src/main/java/com/xhly/manageapp/utils/StrategyUtils.kt

@@ -13,6 +13,7 @@ import com.xhly.corelib.utils.ModelNameUtils
 import com.xhly.corelib.utils.SharedPreferencesUtils
 import com.xhly.corelib.utils.hourToCurrentDateLong
 import com.xhly.manageapp.ManageApplication
+import com.xhly.manageapp.bean.app.AppModel
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
@@ -325,10 +326,19 @@ object StrategyUtils {
     public fun clearAppData(context: Context) {
         try {
             val spUtils by lazy { SharedPreferencesUtils.getInstance(context) }
-            val strings = spUtils.getFromJson(
-                Const.APPSTOREKEY,
-                ArrayList<String>().javaClass
-            ) as ArrayList<String>
+            val type = object : TypeToken<List<AppModel>>() {}.type
+            val appModelList = spUtils.getFromJsonType(
+                Const.APPSTOREDATAKEY,
+                ArrayList<AppModel>().javaClass,
+                type
+            ) as ArrayList<AppModel>
+
+            val strings= arrayListOf<String>()
+            appModelList.forEach {
+                if (it.cached==1){
+                    strings.add(it.appPackage)
+                }
+            }
             ManageApplication.clearAppData(strings)
         }catch (e:Exception){