1.将应用安装逻辑抽取到独立的函数installAppList中

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

@@ -428,104 +428,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         }
         viewModel.viewModelScope.launch {
             viewModel.forceListAppData.collect { modelList ->
-                modelList?.let {
-                    //如果已经进入商店则不显示
-                    if (!Const.startAppStoreFlag) {
-                        DownLoadUtils.destroyDownLoad()
-                        InstallUtils.destroyInstallUtils()
-                        //获得必装应用，未安装或者版本较低则更新，先删除目录中的文件
-                        val rxPermissions = RxPermissions(this@MainActivity)
-                        rxPermissions.request(Manifest.permission.REQUEST_INSTALL_PACKAGES)
-                            .subscribe { granted ->
-                                if (granted || ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f() || ModelNameUtils.IS_LianxTB223FC()) {
-                                    // 权限已授予，执行安装操作
-                                    val appList = AppUtils.GetAppList(this@MainActivity)
-                                    //修改路径
-                                    /*     getExternalFilesDir(null)?.let {
-                                             FileUtils.deleteCurrentFlie(it)
-                                         }
-                                         val file = getExternalFilesDir(null)*/
-                                    var file: File? = null
-                                    if (ModelNameUtils.IS_LianxTB223FC()) {
-                                        var directory =
-                                            Environment.getExternalStoragePublicDirectory(
-                                                Environment.DIRECTORY_DOWNLOADS
-                                            )
-                                        file = File(directory, "appdownload")
-                                        if (!file.exists()) {
-                                            file.mkdirs()
-                                        } else {
-                                            FileUtils.deleteCurrentFlie(file)
-                                        }
-                                    } else {
-                                        getExternalFilesDir(null)?.let {
-                                            FileUtils.deleteCurrentFlie(it)
-                                        }
-                                        file = getExternalFilesDir(null)
-                                    }
-                                    modelList.forEach { app ->
-                                        try {
-                                            //获得已安装的应用判断版本，未安装的则直接静默安装。
-                                            val filter =
-                                                appList.filter { it.packageName.equals(app.appPackage) }
-                                            //列表中不存在,或者版本较低则更新
-                                            val apkPath = app.apkPath
-                                            val appName = app.appName
-                                            if (filter.isNotEmpty() || app.appPackage.equals(
-                                                    packageName
-                                                )
-                                            ) {
-                                                //不为空filter.isNotEmpty()表示列表存在应用则判断版本号，app.appPackage.equals(packageName)表示需要判断是否更新桌面应用，都不满足表示应用不存在
-                                                val appversion =
-                                                    if (app.appPackage.equals(packageName)) {
-                                                        SystemUtil.getAppVersionCode(
-                                                            this@MainActivity,
-                                                            packageName
-                                                        )
-                                                    } else {
-                                                        filter[0].versionNum
-                                                    }
-                                                if (app.versionNum > appversion) {
-                                                    //版本低则更新安装。
-                                                    //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
-                                                    DownLoadUtils.addDownload(
-                                                        apkPath,
-                                                        app.appPackage,
-                                                        File(
-                                                            file.toString(),
-                                                            "$appName.apk"
-                                                        ).toString(),
-                                                        app.appPackage,
-                                                        appName,
-                                                        app.versionNum.toLong()
-                                                    )
-                                                }
-                                            } else {
-                                                //不存在，直接下载安装。
-                                                //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
-                                                DownLoadUtils.addDownload(
-                                                    apkPath,
-                                                    app.appPackage,
-                                                    File(
-                                                        file.toString(),
-                                                        "$appName.apk"
-                                                    ).toString(),
-                                                    app.appPackage,
-                                                    appName,
-                                                    app.versionNum.toLong()
-                                                )
-                                            }
-                                        } catch (e: Exception) {
-                                            LogShow("问题" + e.toString())
-                                        }
-                                    }
-                                } else {
-                                    // 用户拒绝了安装权限，处理相应逻辑
-                                    viewModel.getAppList()
-                                }
-                            }
-                    }
-                }
+                installAppList(modelList)
             }
 
         }
@@ -827,6 +730,108 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         }
     }
 
+    private fun installAppList(modelList:ArrayList<AppModel>?) {
+        modelList?.let {
+            //如果已经进入商店则不显示
+            if (!Const.startAppStoreFlag) {
+                DownLoadUtils.destroyDownLoad()
+                InstallUtils.destroyInstallUtils()
+                //获得必装应用，未安装或者版本较低则更新，先删除目录中的文件
+                val rxPermissions = RxPermissions(this@MainActivity)
+                rxPermissions.request(Manifest.permission.REQUEST_INSTALL_PACKAGES)
+                    .subscribe { granted ->
+                        if (granted || ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f() || ModelNameUtils.IS_LianxTB223FC()) {
+                            // 权限已授予，执行安装操作
+                            val appList = AppUtils.GetAppList(this@MainActivity)
+                            //修改路径
+                            /*     getExternalFilesDir(null)?.let {
+                                     FileUtils.deleteCurrentFlie(it)
+                                 }
+                                 val file = getExternalFilesDir(null)*/
+                            var file: File? = null
+                            if (ModelNameUtils.IS_LianxTB223FC()) {
+                                var directory =
+                                    Environment.getExternalStoragePublicDirectory(
+                                        Environment.DIRECTORY_DOWNLOADS
+                                    )
+                                file = File(directory, "appdownload")
+                                if (!file.exists()) {
+                                    file.mkdirs()
+                                } else {
+                                    FileUtils.deleteCurrentFlie(file)
+                                }
+                            } else {
+                                getExternalFilesDir(null)?.let {
+                                    FileUtils.deleteCurrentFlie(it)
+                                }
+                                file = getExternalFilesDir(null)
+                            }
+                            modelList.forEach { app ->
+                                try {
+                                    //获得已安装的应用判断版本，未安装的则直接静默安装。
+                                    val filter =
+                                        appList.filter { it.packageName.equals(app.appPackage) }
+                                    //列表中不存在,或者版本较低则更新
+                                    val apkPath = app.apkPath
+                                    val appName = app.appName
+                                    if (filter.isNotEmpty() || app.appPackage.equals(
+                                            packageName
+                                        )
+                                    ) {
+                                        //不为空filter.isNotEmpty()表示列表存在应用则判断版本号，app.appPackage.equals(packageName)表示需要判断是否更新桌面应用，都不满足表示应用不存在
+                                        val appversion =
+                                            if (app.appPackage.equals(packageName)) {
+                                                SystemUtil.getAppVersionCode(
+                                                    this@MainActivity,
+                                                    packageName
+                                                )
+                                            } else {
+                                                filter[0].versionNum
+                                            }
+                                        if (app.versionNum > appversion) {
+                                            //版本低则更新安装。
+                                            //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
+                                            DownLoadUtils.addDownload(
+                                                apkPath,
+                                                app.appPackage,
+                                                File(
+                                                    file.toString(),
+                                                    "$appName.apk"
+                                                ).toString(),
+                                                app.appPackage,
+                                                appName,
+                                                app.versionNum.toLong()
+                                            )
+                                        }
+                                    } else {
+                                        //不存在，直接下载安装。
+                                        //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
+                                        DownLoadUtils.addDownload(
+                                            apkPath,
+                                            app.appPackage,
+                                            File(
+                                                file.toString(),
+                                                "$appName.apk"
+                                            ).toString(),
+                                            app.appPackage,
+                                            appName,
+                                            app.versionNum.toLong()
+                                        )
+                                    }
+                                } catch (e: Exception) {
+                                    LogShow("问题" + e.toString())
+                                }
+                            }
+                        } else {
+                            // 用户拒绝了安装权限，处理相应逻辑
+                            viewModel.getAppList()
+                        }
+                    }
+            }
+        }
+
+    }
+
 
     private fun startAutoApp(autoAppBean: AutoAppBean) {
         try {