1.增加socket消息处理。

2.拦截器临时使用其他设备型号用来请求app列表。
3.修改通知弹窗布局。
4.应用下载添加队列。

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

@@ -3,6 +3,8 @@ package com.xhly.manageapp
 import android.annotation.SuppressLint
 import android.app.ActivityManager
 import android.content.Context
+import android.content.Intent
+import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Toast
@@ -61,16 +63,19 @@ class AppAdapter(var context: Context, var data: ArrayList<AppInfo>) :
             holder.mBinding.itemCv.setImageDrawable(appInfo.ico)
             holder.mBinding.itemCv.setText(appInfo.name)
             holder.mBinding.itemCv.setOnClickListener {
-                var instance = Calendar.getInstance()
-                instance.set(Calendar.HOUR_OF_DAY, 11)
-                instance.set(Calendar.MINUTE, 0)
-               /* context.startActivity(appInfo.intent)*/
-                val appTimeStrategy = StrategyUtils.getAppTimeStrategy(context, appInfo.packageName)
-                LogShow("可以打开吗"+appTimeStrategy)
-                 if (appTimeStrategy){
-                    context.startActivity(appInfo.intent)
-                }else{
-                    Toaster.showLong("不在开放时间。")
+                try {
+                    var instance = Calendar.getInstance()
+                    instance.set(Calendar.HOUR_OF_DAY, 11)
+                    instance.set(Calendar.MINUTE, 0)
+                    /* context.startActivity(appInfo.intent)*/
+                    val appTimeStrategy = StrategyUtils.getAppTimeStrategy(context, appInfo.packageName)
+                    if (appTimeStrategy){
+                        context.startActivity(appInfo.intent)
+                    }else{
+                        Toaster.showLong(context.getString(R.string.apptimestoptips))
+                    }
+                }catch (e:Exception){
+                    LogShow("应用跳转问题是"+e.toString())
                 }
             }
         }

app/src/main/java/com/xhly/manageapp/bean/SocketMsgBean.kt

@@ -0,0 +1,6 @@
+package com.xhly.manageapp.bean
+
+class SocketMsgBean {
+    var content:String?=null
+    var title:String?=null
+}

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

@@ -16,6 +16,7 @@ import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.addCallback
+import androidx.lifecycle.viewModelScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
@@ -27,6 +28,7 @@ import com.xhly.corelib.bean.AppInfo
 import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.utils.AppUtils
 import com.xhly.corelib.utils.CustomOSUtils
+import com.xhly.corelib.utils.GsonUtils
 import com.xhly.corelib.utils.LogShow
 import com.xhly.corelib.utils.SharedPreferencesUtils
 import com.xhly.corelib.utils.SystemUtil
@@ -34,6 +36,7 @@ import com.xhly.manageapp.AppAdapter
 import com.xhly.manageapp.ManageApplication
 import com.xhly.manageapp.R
 import com.xhly.manageapp.bean.EventLog
+import com.xhly.manageapp.bean.SocketMsgBean
 import com.xhly.manageapp.bean.UpdateBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
@@ -45,15 +48,17 @@ import com.xhly.manageapp.service.websocket.AppSocket
 import com.xhly.manageapp.ui.ManageActivity
 import com.xhly.manageapp.ui.login.activity.LoginActivity
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
+import com.xhly.manageapp.utils.AppDownLoadUtils
 import com.xhly.manageapp.utils.PadInfoUtils
 import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.workmanager.TimingWorker
+import kotlinx.coroutines.launch
 import java.util.Calendar
 import java.util.concurrent.TimeUnit
 
 
 class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
-    lateinit var adapter: AppAdapter
+    var adapter: AppAdapter? = null
 
     private var mMyInstallReceiver: AppInstallReceiver? = null
     private var dataList: ArrayList<AppInfo> = arrayListOf()
@@ -84,11 +89,41 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
           startActivity(permissionIntent)*/
         // csdkManagerUtils.csdkManager.enableAccessibility("com.xhly.manageapp","com.xhly.manageapp.service.TestService",true)
         viewModel.getAppList()
-        viewModel.listAppData.observe(this) {
-            //获得应用集合，必装应用和推荐应用，再加上预装应用，其余应用需要静默卸载,必装应用需要进行静默下载和安装。
-            var appList = AppUtils.GetAppList(this)
-
+        viewModel.listAppData.observe(this) { modelList ->
+            //获得应用集合，必装应用和推荐应用，再加上预装应用，其余应用需要静默卸载,必装应用需要进行静默下载和安装。安装应用从forceapp接口获取
+            val appList = AppUtils.GetAppList(this)
+            appList.forEach { app ->
+                val filter = modelList.filter { it.appPackage.equals(app.packageName) }
+                //列表中不存在则将应用冻结或者卸载,目前是冻结
+                ManageApplication.setPackageEnabled(app.packageName, (filter.isNotEmpty()))
+            }
         }
+        viewModel.forceListAppData.observe(this) { modelList ->
+            //获得必装应用，未安装或者版本较低则更新
+            val appList = AppUtils.GetAppList(this)
+            modelList.forEach { app ->
+                //获得已安装的应用判断版本，未安装的则直接静默安装。
+                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 {
+                            AppDownLoadUtils.addToDownloadQueue(apkPath, appName)
+                        }
+                    }
+                } else {
+                    //不存在，直接下载安装。
+                    viewModel.viewModelScope.launch {
+                        AppDownLoadUtils.addToDownloadQueue(apkPath, appName)
+                    }
+                }
+            }
+        }
+
         viewModel.strategyData.observe(this) {
             spUtils.saveJson(Const.STRATEGYBEANKEY, it)
             StrategyUtils.setStrategy(it)
@@ -137,7 +172,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回
-            viewModel.getAppList()
+            /*    viewModel.getAppList()
+                viewModel.getForceAppList()*/
         }
     }
 
@@ -151,6 +187,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         updatePadInfo()
         updateMcApp()
         getLocation()
+        ManageApplication.lockTaskPackages().forEach {
+            LogShow("获得的姓名是"+it)
+        }
         try {
             var s =
                 "厂商" + CustomOSUtils.getSystemBrand() + "，型号" + CustomOSUtils.getSystemDevice() + "，系统版本" + CustomOSUtils.getSystemDisplay()
@@ -298,13 +337,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         super.onUiEvent(uiEvent)
         when (uiEvent.getEvent()) {
             "update" -> {
-                dataList.clear()
-                val getAppList1 = AppUtils.GetAppList(this)
-                dataList.addAll(getAppList1)
-                adapter.notifyDataSetChanged()
-                dataList.forEach {
-                    LogShow("app包名" + it.packageName)
-                }
+                updateAppRv()
             }
 
             Const.CODE2001.toString() -> {
@@ -323,6 +356,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
 
             Const.CODE2004.toString() -> {
+                //TODO 更新策略是否需要通过应用接口处理应用
                 //请求接口更新策略
                 viewModel.uploadAppStrategy()
                 viewModel.updateStrategy()
@@ -355,14 +389,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
 
             Const.APPINSTALL -> {
-                try {
-                    dataList.clear()
-                    val getAppList1 = AppUtils.GetAppList(this)
-                    dataList.addAll(getAppList1)
-                    adapter.notifyDataSetChanged()
-                } catch (e: Exception) {
+                updateAppRv()
+            }
 
-                }
+            Const.APPUNINSTALL -> {
+                updateAppRv()
             }
 
             Const.SDINSTALL -> {
@@ -431,6 +462,23 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
     }
 
+    private fun updateAppRv() {
+        try {
+            dataList.clear()
+            val appList = AppUtils.GetAppList(this)
+            dataList.addAll(appList)
+            if (adapter == null) {
+                adapter = AppAdapter(this, dataList)
+                mBinding.rv.adapter = adapter
+            }
+            adapter?.let {
+                it.notifyDataSetChanged()
+            }
+        } catch (e: Exception) {
+
+        }
+    }
+
     fun checkAccessibility(context: Context): Boolean {
         // 判断辅助功能是否开启
         if (!isServiceON(this, ManageAccessibilityService::class.java.name)) {
@@ -509,9 +557,21 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_notice_dialog) {
                 override fun onBind(dialog: CustomDialog, v: View) {
                     val closeBtn = v.findViewById<Button>(R.id.dialog_close_btn)
+                    val titleTv = v.findViewById<TextView>(R.id.dialog_title_tv)
+                    val contentTv = v.findViewById<TextView>(R.id.dialog_content_tv)
+                    try {
+                        val msgBean =
+                            GsonUtils.parseJsonWithGson(
+                                msg,
+                                SocketMsgBean().javaClass
+                            ) as SocketMsgBean
+                        titleTv.text = msgBean.title
+                        contentTv.text = msgBean.content
+                    } catch (e: Exception) {
+
+                    }
                     closeBtn.setOnClickListener {
                         dialog.dismiss()
-
                     }
                 }
             }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))

app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt

@@ -56,8 +56,10 @@ class MainViewModel : CommonBaseViewModel() {
 
     fun getForceAppList(){
         launchUI {
-            var postForceApp = appService.postForceApp()
-
+            val result= appService.postForceApp()
+            if (result.code==0&&result.obj!=null&&result.obj.isNotEmpty()){
+                forceData.value=result.obj
+            }
         }
     }
 

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

@@ -0,0 +1,68 @@
+package com.xhly.manageapp.utils
+
+import com.billbook.lib.downloader.Download
+import com.billbook.lib.downloader.Downloader
+import com.xhly.corelib.Const
+import com.xhly.corelib.utils.LogShow
+import com.xhly.manageapp.ManageApplication
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.util.LinkedList
+
+object AppDownLoadUtils {
+    private val downloadQueue = LinkedList<Pair<String, String>>()
+    private var isDownloading = false
+    suspend fun addToDownloadQueue(url: String, appName: String) {
+        downloadQueue.add(Pair(url, appName))
+        if (!isDownloading) {
+            startNextDownload()
+        }
+    }
+
+    private suspend fun startNextDownload() {
+        if (downloadQueue.isNotEmpty()) {
+            val (url, appName) = downloadQueue.removeFirst()
+            downLoadFile(url, appName)
+        } else {
+            isDownloading = false
+        }
+    }
+
+    private suspend fun downLoadFile(url: String, appName: String) {
+        withContext(Dispatchers.IO) {
+            try {
+                //val file = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+                ManageApplication.instance?.let { context ->
+                    var currentRetry = 0
+                    var successful = false
+                    while(currentRetry<3&&!successful){
+                        val file = context.getExternalFilesDir(null)
+                        val name = file.toString()
+                        val downloader = Downloader.Builder().build()
+                        val request = Download.Request.Builder()
+                            .url(Const.URL1 + url)
+                            .into(File(name, "$appName.apk"))
+                            .build()
+                        LogShow("开始下载")
+                        val execute = downloader.newCall(request).execute()
+                        successful = execute.isSuccessful()
+                        LogShow("下载结果" + successful)
+                        if (successful) {
+                            withContext(Dispatchers.Main) {
+                                ManageApplication.installPackage(File(name, "$appName.apk").toString())
+                            }
+                        } else {
+                            currentRetry++
+                        }
+                        LogShow("下载后，开始安装")
+                    }
+                }
+            } catch (e: Exception) {
+
+            } finally {
+                startNextDownload()
+            }
+        }
+    }
+}

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

@@ -20,12 +20,25 @@
         android:gravity="center_horizontal"
         android:orientation="vertical"
         android:padding="15dp">
-
-        <TextView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1" />
+            android:layout_weight="1">
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/dialog_title_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
 
+                <TextView
+                    android:id="@+id/dialog_content_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.core.widget.NestedScrollView>
         <Button
             android:id="@+id/dialog_close_btn"
             android:layout_width="350dp"

corelib/src/main/java/com/xhly/corelib/network/ResponseInterceptor.kt

@@ -21,11 +21,10 @@ class ResponseInterceptor : Interceptor {
         var request = chain.request()
         return try {
             val requestBuilder: Request.Builder = request.newBuilder()
-            //TODO 需要替换token
-         /*   requestBuilder.header("Authorization", "Bearer ${Const.token}")
-            requestBuilder.header("Accept-Language", "zh-Hans")*/
+            //TODO 需要替换userid和机型
             requestBuilder.header("XH-UserId","1")
-            requestBuilder.header("XH-DeviceModel", Build.MODEL)
+           /* requestBuilder.header("XH-DeviceModel", Build.MODEL)*/
+            requestBuilder.header("XH-DeviceModel", "CPN-W09")
             request = requestBuilder.build()
             val originalResponse = chain.proceed(request)
             val responseBody = originalResponse.body

corelib/src/main/java/com/xhly/corelib/utils/baseUtils.kt

@@ -65,7 +65,7 @@ fun String.hourToCurrentDate(formatType: String = "HH:mm:ss"): Date {
     }
 }
 
-fun String.hourToCurrentDateLong(formatType: String = "HH:mm:ss"): Long {
+fun String.hourToCurrentDateLong(formatType: String = "HH:mm"): Long {
     try {
         val simpleDateFormat = SimpleDateFormat(formatType)
         val parse = simpleDateFormat.parse(this)
@@ -104,7 +104,7 @@ fun Any.LogTag(): String {
 }
 
 fun Any.LogShow(s: String) {
-    LogUtils.d(LogTag(), s)
+    LogUtils.e(LogTag(), s)
 }
 
 fun Double.getScaleSize(