1.应用列表app名字从接口获取。

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

@@ -121,8 +121,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     private var autoAppFlag=true
 
     private var accountDialog:CustomDialog?=null
-    //创建应用卸载集合，方便获得应用信息
-    private val unInstallAppList= arrayListOf<AppInfo>()
 
     //标记是否可以点击啊
     private var canClickFlag=false
@@ -134,6 +132,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     //判断是否从oncreat执行，防止时间策略多次执行
     private var isCreatFlag=false
 
+    private var appStroeList:ArrayList<AppModel> = arrayListOf()
 
 
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
@@ -246,6 +245,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             //在这里执行获得策略的操作，用来处理在后台时的数据处理。
             viewModel.listAppData.collect{ modelList ->
                 modelList?.let {
+                    appStroeList.clear()
+                    appStroeList.addAll(it)
                     //存储商店应用包名到本地,并且存储商店应用列表数据到本地集合
                     val appNameList = arrayListOf<String>()
                     val whiteList = arrayListOf<String>()
@@ -275,14 +276,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                         LogShow("冻结失败" + e.toString())
                     }
                     appList.forEach { app ->
-                        unInstallAppList.clear()
                         val filter = modelList.filter { it.appPackage.equals(app.packageName) }
                         val appInfos = firstAppList.filter { app.packageName.equals(it) }
                         //接口列表以及初始化列表中不存在则将应用冻结或者卸载,目前是卸载
                         LogShow("${app.name},被冻结" + (filter.isEmpty() && appInfos.isEmpty()))
                         if (filter.isEmpty() && appInfos.isEmpty()) {
                             //ManageApplication.setPackageEnabled(app.packageName, (filter.isNotEmpty()))
-                            unInstallAppList.add(app)
                             ManageApplication.uninstallPackage(app.packageName)
                         }
                     }
@@ -1156,11 +1155,27 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                     ManageApplication.getDeviceInfo()?.let {
                         data.sn = it
                     }
-                    val packageInfo =
-                        packageManager.getPackageInfo(message, PackageManager.GET_META_DATA)
-                    val label =
-                        packageManager.getApplicationLabel(packageInfo.applicationInfo)
-                    data.comm =label.toString()
+                    try {
+                        //优先从集合中取名字
+                        getAppStoreList()
+                        val filter = appStroeList.filter { it.appPackage == message }
+                        val label =if (filter.isNotEmpty()){
+                            filter[0].appName
+                        }else{
+                            ""
+                        }
+                        data.comm =label.toString()
+                    }catch (e:Exception){
+
+                    }finally {
+                     if (data.comm.isNullOrBlank()){
+                         val packageInfo =
+                             packageManager.getPackageInfo(message, PackageManager.GET_META_DATA)
+                         val label =
+                             packageManager.getApplicationLabel(packageInfo.applicationInfo)
+                         data.comm =label.toString()
+                     }
+                    }
                     data.appPackage = message
                     data.doEvent = EventLog.APPINSTALLEVENT
                     viewModel.eventLog(data)
@@ -1178,13 +1193,19 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 ManageApplication.getDeviceInfo()?.let {
                     data.sn = it
                 }
-                val filter = unInstallAppList.filter { it.packageName == message }
-                val label =if (filter.isNotEmpty()){
-                    filter[0].name
-                }else{
-                    ""
+                try {
+                    //从存储集合中获得名字
+                    getAppStoreList()
+                    val filter = appStroeList.filter { it.appPackage == message }
+                    val label =if (filter.isNotEmpty()){
+                        filter[0].appName
+                    }else{
+                        ""
+                    }
+                    data.comm =label.toString()
+                }catch (e:Exception){
+
                 }
-                data.comm =label.toString()
                 data.appPackage = message
                 data.doEvent = EventLog.APPUNINSTALLEVENT
                 viewModel.eventLog(data)
@@ -1299,6 +1320,22 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         }
     }
 
+    private fun getAppStoreList(){
+        try {
+            if (appStroeList.size==0){
+                val type = object : TypeToken<List<AppModel>>() {}.type
+                val appModelList = spUtils.getFromJsonType(
+                    Const.APPSTOREDATAKEY,
+                    ArrayList<AppModel>().javaClass,
+                    type
+                ) as ArrayList<AppModel>
+                appStroeList.addAll(appModelList)
+            }
+        }catch (e:Exception){
+
+        }
+    }
+
     private fun postLogPush(pushType: Int) {
         //执行这些操作优先跳回本页面，不然livedata会不刷新
         val pushBean = LogPushBean()
@@ -1320,6 +1357,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             schoolDeviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this)
             val storeList = arrayListOf<String>()
             val storeRemoveList= arrayListOf<String>()
+            //获得已安装app
+            var appList = AppUtils.GetAppList(this)
             try {
                 val type = object : TypeToken<List<AppModel>>() {}.type
                 val appModelList = spUtils.getFromJsonType(
@@ -1335,11 +1374,16 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                         storeRemoveList.add(it.appPackage)
                     }
                 }
+                appList.forEach {app->
+                    appModelList.filter { it.appPackage==app.packageName }.forEach {
+                        app.name=it.appName
+                    }
+                }
             } catch (e: Exception) {
                 LogShow("商店应用为空"+e.toString())
             }
             dataList.clear()
-            var appList = AppUtils.GetAppList(this)
+
             //获得预装应用直接隐藏
             val removeList = arrayListOf<AppInfo>()
             try {