1.修改下载和安装方法

app/src/main/java/com/xhly/manageapp/ManageApplication.kt

@@ -74,11 +74,12 @@ class ManageApplication : MultiDexApplication() {
          */
 
         fun installPackage(string: String) {
+            enableAllUnkownsourcesV3(true)
             val installPackageWhiteList = getInstallPackageWhiteList()
             installPackageWhiteList.add(string)
             addInstallPackageWhiteList(installPackageWhiteList)
             if (ModelNameUtils.IS_LianxX505f()) {
-                LogShow("开始安装$string")
+                LogShow("开始安装$string"+File(string).exists())
                 csdkManager?.installPackage(string)
             } else {
                 instance?.let {

app/src/main/java/com/xhly/manageapp/broadcastreceiver/AppInstallReceiver.kt

@@ -8,6 +8,7 @@ import android.util.Log
 import android.widget.Toast
 import com.xhly.corelib.Const
 import com.xhly.corelib.eventbus.UIEvent
+import com.xhly.manageapp.utils.InstallUtils
 
 //(自定义广播类)  --自己命名的 XXXXReceiver
 class AppInstallReceiver : BroadcastReceiver() {
@@ -19,6 +20,7 @@ class AppInstallReceiver : BroadcastReceiver() {
             val packageName = intent.data!!.schemeSpecificPart
             Log.i(TAG, "--------安装成功$packageName")
             //Toast.makeText(context, "安装成功$packageName", Toast.LENGTH_LONG).show()
+            InstallUtils.installSuccess(packageName)
             UIEvent(Const.APPINSTALL).setMessage(packageName).post()
         } else if (TextUtils.equals(intent.action, Intent.ACTION_PACKAGE_REPLACED)) {
             val packageName = intent.data!!.schemeSpecificPart

app/src/main/java/com/xhly/manageapp/ui/ManageActivity.kt

@@ -160,7 +160,7 @@ class ManageActivity : BaseActivity<BaseViewModel, ActivityManageBinding>() {
         }
         mBinding.installBtn.setOnClickListener {
             var file = Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS)
-            var name = file.toString()
+            var name =  getExternalFilesDir(null).toString()
             var sb = StringBuffer()
             ManageApplication.getInstallPackageWhiteList().forEach {
                 sb.append("$it,")
@@ -179,7 +179,7 @@ class ManageActivity : BaseActivity<BaseViewModel, ActivityManageBinding>() {
             //ManageApplication.addInstallPackageWhiteList(arrayListOf("com.coolapk.market"))
 
            // ManageApplication.removeInstallPackageWhiteList(arrayListOf("com.coolapk.market"))
-            ManageApplication.installPackage(File(name, "test.apk").toString())
+            ManageApplication.installPackage(File(name, "英语词典.apk").toString())
             //ZJAPPUtils.installApk(this, File(name, "test.apk"))
         }
         var type10 = 0

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

@@ -73,6 +73,7 @@ import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
 import com.xhly.manageapp.utils.AppDownLoadUtils
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
 import com.xhly.manageapp.utils.CustomAppUtils
+import com.xhly.manageapp.utils.InstallUtils
 import com.xhly.manageapp.utils.PadInfoUtils
 import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.workmanager.TimingWorker
@@ -196,7 +197,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                             FileUtils.deleteCurrentFlie(it)
                         }
                         val file = getExternalFilesDir(null)
-                        viewModel.viewModelScope.launch {
+                    /*    viewModel.viewModelScope.launch {
                             modelList.forEach { app ->
                                 try {
                                     //获得已安装的应用判断版本，未安装的则直接静默安装。
@@ -209,18 +210,42 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                                         val currentApp = filter[0]
                                         if (app.versionNum > currentApp.versionNum) {
                                             //版本低则更新安装。
-                                            AppDownLoadUtils.addToDownloadQueue(apkPath, appName)
-                                           /* DownLoadUtils.addDownload(apkPath,appName,File(file.toString(), "$appName.apk").toString())*/
+                                            //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
+                                            DownLoadUtils.addDownload(apkPath,appName,File(file.toString(), "$appName.apk").toString(),app.appPackage)
                                         }
                                     } else {
                                         //不存在，直接下载安装。
-                                        AppDownLoadUtils.addToDownloadQueue(apkPath, appName)
-                                      /*  DownLoadUtils.addDownload(apkPath,appName,File(file.toString(), "$appName.apk").toString())*/
+                                        //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
+                                        DownLoadUtils.addDownload(apkPath,appName,File(file.toString(), "$appName.apk").toString(),app.appPackage)
                                     }
                                 } catch (e: Exception) {
                                     LogShow("问题" + e.toString())
                                 }
                             }
+                        }*/
+                        modelList.forEach { app ->
+                            try {
+                                //获得已安装的应用判断版本，未安装的则直接静默安装。
+                                val filter =
+                                    appList.filter { it.packageName.equals(app.appPackage) }
+                                //列表中不存在,或者版本较低则更新
+                                val apkPath = app.apkPath
+                                val appName = app.appName
+                                if (filter.isNotEmpty()) {
+                                    val currentApp = filter[0]
+                                    if (app.versionNum > currentApp.versionNum) {
+                                        //版本低则更新安装。
+                                        //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
+                                        DownLoadUtils.addDownload(apkPath,app.appPackage,File(file.toString(), "$appName.apk").toString(),app.appPackage)
+                                    }
+                                } else {
+                                    //不存在，直接下载安装。
+                                    //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
+                                    DownLoadUtils.addDownload(apkPath,app.appPackage,File(file.toString(), "$appName.apk").toString(),app.appPackage)
+                                }
+                            } catch (e: Exception) {
+                                LogShow("问题" + e.toString())
+                            }
                         }
                     } else {
                         // 用户拒绝了安装权限，处理相应逻辑
@@ -1203,7 +1228,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
 
     override fun onSuccess(downItem: DownloadItem) {
         LogShow("开始安装")
-        ManageApplication.installPackage(downItem.savepath)
+       /* ManageApplication.installPackage(downItem.savepath)*/
+        runOnUiThread {
+            InstallUtils.addInstall(downItem.savepath,downItem.pkgName)
+        }
     }
 
     override fun onFailure(downItem: DownloadItem, errMsg: String) {

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

@@ -13,13 +13,11 @@ import java.io.File
 import java.util.LinkedList
 
 object AppDownLoadUtils {
-    private val downloadQueue = LinkedList<Pair<String, String>>()
-    //添加安装集合
-    var installQuene= arrayListOf<Pair<String, String>>()
+    private val downloadQueue = LinkedList<Triple<String, String,String>>()
 
     private var isDownloading = false
-    suspend fun addToDownloadQueue(url: String, appName: String) {
-        downloadQueue.add(Pair(url, appName))
+    suspend fun addToDownloadQueue(url: String, appName: String,pkgName:String) {
+        downloadQueue.add(Triple(url, appName,pkgName))
         if (!isDownloading) {
             startNextDownload()
         }
@@ -27,14 +25,14 @@ object AppDownLoadUtils {
 
     private suspend fun startNextDownload() {
         if (downloadQueue.isNotEmpty()) {
-            val (url, appName) = downloadQueue.removeFirst()
-            downLoadFile(url, appName)
+            val (url, appName,pkgName) = downloadQueue.removeFirst()
+            downLoadFile(url, appName,pkgName)
         } else {
             isDownloading = false
         }
     }
 
-    private suspend fun downLoadFile(url: String, appName: String) {
+    private suspend fun downLoadFile(url: String, appName: String,pkgName:String) {
         withContext(Dispatchers.IO) {
             try {
                 //val file = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
@@ -55,11 +53,11 @@ object AppDownLoadUtils {
                         LogShow("下载结果" + successful)
                         if (successful) {
                            /* UIEvent(Const.INSTALL_FORCEAPP).setMessage(File(name, "$appName.apk").toString()).post()*/
-                            ManageApplication.installPackage(File(name, "$appName.apk").toString())
+                           /* ManageApplication.installPackage(File(name, "$appName.apk").toString())*/
+                            InstallUtils.addInstall(File(name, "$appName.apk").toString(),pkgName)
                         } else {
                             currentRetry++
                         }
-                        delay(1000*20)
                         LogShow("下载后，开始安装")
                     }
                 }

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

@@ -44,7 +44,7 @@ class CustomAppUtils {
         appList.add(getCusomAppBean(
             context.getString(R.string.netset),
             Const.WIFISEETTINGPKG,
-            AppCompatResources.getDrawable(context,R.drawable.icon_updatestrategy)!!
+            AppCompatResources.getDrawable(context,R.drawable.icon_netset)!!
         ))
         return appList
     }

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

@@ -37,7 +37,7 @@ object DownLoadUtils {
     /**
      * 下载文件
      */
-    fun addDownload(url: String, tag: String, savepath: String) {
+    fun addDownload(url: String, tag: String, savepath: String,pkgName: String) {
         var isHave = false
         for (element in queue) {
             if (element.tag === tag) {
@@ -45,10 +45,10 @@ object DownLoadUtils {
             }
         }
         if (!isHave) {
-            queue.add(DownloadItem(url, tag, savepath, 0))
+            queue.add(DownloadItem(url, tag, savepath, 0,pkgName))
         } else {
             for (downloadCallback in callbackList) {
-                downloadCallback.onFailure(DownloadItem(url, tag, savepath, 0), "已经在下载队列")
+                downloadCallback.onFailure(DownloadItem(url, tag, savepath, 0,pkgName), "已经在下载队列")
             }
         }
         downloadAction()
@@ -73,14 +73,14 @@ object DownLoadUtils {
                         val call = downloader.newCall(request)
                         call.execute(object : Download.Callback {
                             override fun onStart(call: Download.Call) {
-                                LogShow("开始下载")
+                                LogShow("开始下载"+downItem.savepath)
                                 for (downloadCallback in callbackList) {
                                     downloadCallback.onStart(downItem)
                                 }
                             }
 
                             override fun onSuccess(call: Download.Call, response: Download.Response) {
-                                LogShow("下载成功")
+                                LogShow("下载成功"+downItem.savepath)
                                 queue.poll()
                                 for (downloadCallback in callbackList) {
                                     downloadCallback.onSuccess(downItem)
@@ -97,7 +97,7 @@ object DownLoadUtils {
 
                             override fun onLoading(call: Download.Call, current: Long, total: Long) {
                                 val progress = (current * 100 / total).toInt()
-                                LogShow("下载进度"+progress)
+                               // LogShow("下载进度"+progress)
 //                                Log.i("详情", "$progress ${downItem.progress} ${callbackList.size}")
                                 if (progress != downItem.progress) {
                                     for (downloadCallback in callbackList) {
@@ -122,7 +122,7 @@ object DownLoadUtils {
     }
 }
 
-data class DownloadItem(val url: String, val tag: String, val savepath: String, var progress: Int)
+data class DownloadItem(val url: String, val tag: String, val savepath: String, var progress: Int,var pkgName:String)
 
 interface DownloadCallback {
     fun onStart(downItem: DownloadItem)

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

@@ -0,0 +1,83 @@
+package com.xhly.manageapp.utils
+
+import android.app.Activity
+import com.xhly.corelib.utils.LogShow
+import com.xhly.manageapp.ManageApplication
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.util.LinkedList
+import java.util.Queue
+
+object InstallUtils {
+    var isRunning: Boolean = false
+    var isInstalling: Boolean = false
+    val queue: Queue<InstallItem> = LinkedList()
+    var coroutineScope:CoroutineScope? = null
+    fun installSuccess(packageName: String) {
+        LogShow("执行任务"+packageName)
+        if (queue.size > 0) {
+            LogShow("111执行任务"+packageName)
+            val installItem = queue.peek()
+            if (installItem != null) {
+                LogShow("222执行任务"+packageName)
+                if(packageName == installItem.packageName){
+                    LogShow("333执行任务"+packageName)
+                    queue.poll()
+                    isInstalling = false
+                }
+            }
+        }
+    }
+
+    fun addInstall(savepath: String, packageName: String) {
+        var isHave = false
+        for (element in queue) {
+            if (element.packageName === packageName) {
+                isHave = true
+            }
+        }
+        if (!isHave) {
+            queue.add(InstallItem( savepath, packageName))
+        }
+        installAction()
+    }
+
+    private fun installAction() {
+        LogShow("开始安装"+ isRunning)
+        if (isRunning) {
+            return
+        }
+        /*if (coroutineScope==null){
+            coroutineScope=CoroutineScope(Dispatchers.IO)
+        }*/
+        coroutineScope=CoroutineScope(Dispatchers.IO)
+        coroutineScope?.launch {
+            while (queue.size > 0) {
+                isRunning = true
+                val installItem = queue.peek()
+                installItem?.let {
+                    isInstalling = true
+                    //installApp(installItem.activity, installItem.savepath, installItem.packageName)
+                    ManageApplication.installPackage(installItem.savepath)
+                    while (isInstalling) {
+                        delay(1000)
+                    }
+                }
+            }
+            isRunning = false
+        }
+
+    }
+
+    public fun destroyInstallUtils(){
+        queue.clear()
+        isRunning= false
+        isInstalling = false
+        coroutineScope?.cancel()
+    }
+}
+
+data class InstallItem(val savepath: String, val packageName: String)

app/src/main/res/layout/activity_main.xml

@@ -22,7 +22,7 @@
                 android:layout_width="100dp"
                 android:layout_height="100dp"
                 android:text="管理页面"
-                android:visibility="gone" />
+                android:visibility="visible" />
 
 
             <LinearLayout