1.解除管控后登录再次管控。

2.增加下载后安装的延时操作。

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

@@ -4,6 +4,7 @@ package com.xhly.manageapp
 import android.Manifest
 import android.app.csdk.CSDKManager
 import android.content.ComponentName
+import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.core.content.ContextCompat
@@ -18,6 +19,7 @@ import com.xhly.corelib.utils.SharedPreferencesUtils
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.service.websocket.AppSocket
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
+import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.utils.ZJAPPUtils
 import java.io.File
 
@@ -76,6 +78,7 @@ class ManageApplication : MultiDexApplication() {
             installPackageWhiteList.add(string)
             addInstallPackageWhiteList(installPackageWhiteList)
             if (ModelNameUtils.IS_LianxX505f()) {
+                LogShow("开始安装$string")
                 csdkManager?.installPackage(string)
             } else {
                 instance?.let {
@@ -587,6 +590,18 @@ class ManageApplication : MultiDexApplication() {
                 csdkManager?.setSleepTimeout_V3(time)
             }
         }
+
+        /**
+         * 获得网址白名单
+         */
+        fun urlWhiteListRead():List<String>{
+            if (ModelNameUtils.IS_LianxX505f()){
+                csdkManager?.urlWhiteListRead()?.let {
+                    return it
+                }
+            }
+            return arrayListOf()
+        }
     }
 
     override fun onCreate() {
@@ -598,6 +613,7 @@ class ManageApplication : MultiDexApplication() {
         val exitControlFlag = currentSpUtils.getParam(Const.EXIT_CONTROL, false) as Boolean
         Toaster.init(this)
         DialogX.init(this)
+        csdkManager = CSDKManager(this)
         //如果解除管控为真，则不在执行以下代码
         try {
             val userBean = spUtils.getFromJson(
@@ -617,46 +633,7 @@ class ManageApplication : MultiDexApplication() {
         //允许运行时权限
         setRuntimePermissions(true)
         if (!exitControlFlag){
-            if (ModelNameUtils.IS_LianxX505f()) {
-                //是505f则执行
-                csdkManager = CSDKManager(this)
-                //启用白名单
-                setUrlWhiteListEnable(true)
-                addInstallPackageWhiteList(
-                    arrayListOf(
-                        Const.CURRENTAPPPKG,
-                        Const.STOREAPPPKG
-                    )
-                )
-                setSleepTimeoutV3()
-                //给自己加入网络白名单
-                addAppWhiteRule(arrayListOf(Const.CURRENTAPPPKG))
-                //禁止状态栏下拉，屏蔽底部虚拟键。
-                disableStatusBarPanel(false)
-                hideHomeSoftKey(true)
-                hideMenuSoftKey(true)
-                enableAccessibility()
-                setCustomLauncher(
-                    Const.CURRENTAPPPKG,
-                    Const.CURRENTAPPPKG+".ui.ManageActivity"
-                )
-                if (Const.isDebug){
-                    csdkManager?.setPackageEnabled("com.xhly.easystud", true)
-                    setUrlWhiteListEnable(false)
-                    disableStatusBarPanel(false)
-                    hideHomeSoftKey(false)
-                    hideMenuSoftKey(false)
-                    csdkManager?.wifiWhiteList.let {
-                        csdkManager?.removeWifiWhiteList(it)
-                    }
-                }
-                csdkManager?.urlWhiteListRead()?.forEach {
-                    LogShow("白名单有"+it.toString())
-                }
-                csdkManager?.wifiWhiteList?.forEach {
-                    LogShow("wifi白名单有"+it.toString())
-                }
-            }
+             StrategyUtils.initControlStrategy()
         }
     }
 

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

@@ -88,12 +88,12 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
                regioncode=""
            }
         }
-        val exitControlFlag = currentSpUtils.getParam(Const.EXIT_CONTROL, false) as Boolean
+      /*  val exitControlFlag = currentSpUtils.getParam(Const.EXIT_CONTROL, false) as Boolean
         //如果解除管控为真，则不在执行以下代码
         if (!exitControlFlag){
             //登陆页面不在执行定时任务
             //startWorkManager()
-        }
+        }*/
     }
 
     @SuppressLint("CheckResult")
@@ -193,6 +193,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     private fun login() {
         val account = mBinding.accountEt.text.toString()
         val code = mBinding.codeEt.text.toString()
+        LogShow("sn=="+ ManageApplication.getDeviceInfo())
         if (account.isNullOrBlank()) {
             Toast(getString(R.string.accountnoempty))
             return
@@ -220,6 +221,13 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     }
 
     private fun loginSucess(userBean: UserBean){
+        //登录成功则打开管控
+        val exitControlFlag = currentSpUtils.getParam(Const.EXIT_CONTROL, false) as Boolean
+        if (exitControlFlag){
+            //如果解除了管控，登录成功则重新添加管控
+            currentSpUtils.setParam(Const.EXIT_CONTROL,false)
+            StrategyUtils.initControlStrategy()
+        }
         //提交登录事件
         val data = LogdOperateBean()
         ManageApplication.getDeviceInfo()?.let {

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

@@ -1,6 +1,9 @@
 package com.xhly.manageapp.ui.main.activity
 
 import BaseActivity
+import DownLoadUtils
+import DownloadCallback
+import DownloadItem
 import android.Manifest
 import android.annotation.SuppressLint
 import android.app.ActivityManager
@@ -83,7 +86,7 @@ import java.util.TimerTask
 import java.util.concurrent.TimeUnit
 
 
-class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
+class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),DownloadCallback {
     var adapter: AppAdapter? = null
 
     private var mMyInstallReceiver: AppInstallReceiver? = null
@@ -129,6 +132,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 }
             }
         }
+        DownLoadUtils.addCallback(this)
         adapter = AppAdapter(this, dataList)
         mBinding.rv.layoutManager = GridLayoutManager(this, 6, GridLayoutManager.VERTICAL, false)
         adapter?.changePwdListener = getChangeCodeListener()
@@ -191,30 +195,31 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                         getExternalFilesDir(null)?.let {
                             FileUtils.deleteCurrentFlie(it)
                         }
-                        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) {
-                                        //版本低则更新安装。
-                                        viewModel.viewModelScope.launch {
+                        val file = getExternalFilesDir(null)
+                        viewModel.viewModelScope.launch {
+                            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)
+                                           /* DownLoadUtils.addDownload(apkPath,appName,File(file.toString(), "$appName.apk").toString())*/
                                         }
-                                    }
-                                } else {
-                                    //不存在，直接下载安装。
-                                    viewModel.viewModelScope.launch {
+                                    } else {
+                                        //不存在，直接下载安装。
                                         AppDownLoadUtils.addToDownloadQueue(apkPath, appName)
+                                      /*  DownLoadUtils.addDownload(apkPath,appName,File(file.toString(), "$appName.apk").toString())*/
                                     }
+                                } catch (e: Exception) {
+                                    LogShow("问题" + e.toString())
                                 }
-                            } catch (e: Exception) {
-                                LogShow("问题" + e.toString())
                             }
                         }
                     } else {
@@ -842,6 +847,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                     data.doEvent = EventLog.APPINSTALLEVENT
                     viewModel.eventLog(data)
                     updateAppInstallInfo()
+
                 } catch (e: Exception) {
 
                 }
@@ -1165,6 +1171,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             timer?.cancel()
             timer = null
         }
+        DownLoadUtils.removeCallback(this)
         mMyInstallReceiver?.let {
             unregisterReceiver(it)
         }
@@ -1188,4 +1195,21 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             WorkManager.getInstance(this).enqueue(request)
         }
     }
+
+    override fun onStart(downItem: DownloadItem) {
+
+    }
+
+    override fun onSuccess(downItem: DownloadItem) {
+        LogShow("开始安装")
+        ManageApplication.installPackage(downItem.savepath)
+    }
+
+    override fun onFailure(downItem: DownloadItem, errMsg: String) {
+
+    }
+
+    override fun onLoading(downItem: DownloadItem) {
+
+    }
 }

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

@@ -7,12 +7,16 @@ import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.utils.LogShow
 import com.xhly.manageapp.ManageApplication
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.util.LinkedList
 
 object AppDownLoadUtils {
     private val downloadQueue = LinkedList<Pair<String, String>>()
+    //添加安装集合
+    var installQuene= arrayListOf<Pair<String, String>>()
+
     private var isDownloading = false
     suspend fun addToDownloadQueue(url: String, appName: String) {
         downloadQueue.add(Pair(url, appName))
@@ -55,6 +59,7 @@ object AppDownLoadUtils {
                         } else {
                             currentRetry++
                         }
+                        delay(1000*15)
                         LogShow("下载后，开始安装")
                     }
                 }
@@ -65,10 +70,4 @@ object AppDownLoadUtils {
             }
         }
     }
-
-    data class DownloadItem(val url: String, val tag: String, val savepath: String, var progress: Int)
-
-    interface DownloadCallback {
-        fun onSuccess(downItem: DownloadItem)
-    }
 }

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

@@ -1,6 +1,8 @@
 import android.util.Log
 import com.billbook.lib.downloader.Download
 import com.billbook.lib.downloader.Downloader
+import com.xhly.corelib.Const
+import com.xhly.corelib.utils.LogShow
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -65,18 +67,20 @@ object DownLoadUtils {
                     try {
                         val downloader = Downloader.Builder().build()
                         val request = Download.Request.Builder()
-                            .url(it.url)
+                            .url(Const.URL1 +it.url)
                             .into(it.savepath)
                             .build()
                         val call = downloader.newCall(request)
                         call.execute(object : Download.Callback {
                             override fun onStart(call: Download.Call) {
+                                LogShow("开始下载")
                                 for (downloadCallback in callbackList) {
                                     downloadCallback.onStart(downItem)
                                 }
                             }
 
                             override fun onSuccess(call: Download.Call, response: Download.Response) {
+                                LogShow("下载成功")
                                 queue.poll()
                                 for (downloadCallback in callbackList) {
                                     downloadCallback.onSuccess(downItem)
@@ -84,6 +88,7 @@ object DownLoadUtils {
                             }
 
                             override fun onFailure(call: Download.Call, response: Download.Response) {
+                                LogShow("下载失败"+response.message)
                                 queue.poll()
                                 for (downloadCallback in callbackList) {
                                     downloadCallback.onFailure(downItem, response.message!!)
@@ -92,6 +97,7 @@ object DownLoadUtils {
 
                             override fun onLoading(call: Download.Call, current: Long, total: Long) {
                                 val progress = (current * 100 / total).toInt()
+                                LogShow("下载进度"+progress)
 //                                Log.i("详情", "$progress ${downItem.progress} ${callbackList.size}")
                                 if (progress != downItem.progress) {
                                     for (downloadCallback in callbackList) {

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

@@ -372,6 +372,10 @@ object StrategyUtils {
               ManageApplication.enableMassStorage(true)
               //允许OTG
               ManageApplication.setCustomOTG(true)
+              //关闭网络规则
+              ManageApplication.ClearIpHostRules()
+              //关闭App规则
+              ManageApplication.clearAppWhiteRule()
               //关闭网络白名单
               ManageApplication.setUrlWhiteListEnable(false)
 
@@ -405,4 +409,44 @@ object StrategyUtils {
 
           }
     }
+
+    //初始化管控的默认规则
+    public fun initControlStrategy(){
+        if (ModelNameUtils.IS_LianxX505f()) {
+            //是505f则执行
+            //启用白名单
+            ManageApplication.setUrlWhiteListEnable(true)
+            ManageApplication.addInstallPackageWhiteList(
+                arrayListOf(
+                    Const.CURRENTAPPPKG,
+                    Const.STOREAPPPKG
+                )
+            )
+            ManageApplication.setSleepTimeoutV3()
+            //给自己加入网络白名单
+            ManageApplication.addAppWhiteRule(arrayListOf(Const.CURRENTAPPPKG))
+            //禁止状态栏下拉，屏蔽底部虚拟键。
+            ManageApplication.disableStatusBarPanel(false)
+            ManageApplication.hideHomeSoftKey(true)
+            ManageApplication.hideMenuSoftKey(true)
+            ManageApplication.enableAccessibility()
+            ManageApplication.setCustomLauncher(
+                Const.CURRENTAPPPKG,
+                Const.CURRENTAPPPKG + ".ui.ManageActivity"
+            )
+            if (Const.isDebug){
+                ManageApplication.setPackageEnabled("com.xhly.easystud", true)
+                ManageApplication.setUrlWhiteListEnable(false)
+                ManageApplication.disableStatusBarPanel(false)
+                ManageApplication.hideHomeSoftKey(false)
+                ManageApplication.hideMenuSoftKey(false)
+            }
+            ManageApplication.urlWhiteListRead().forEach {
+                LogShow("白名单有$it")
+            }
+            ManageApplication.getWifiWhiteList().forEach {
+                LogShow("wifi白名单有$it")
+            }
+        }
+    }
 }