1.添加初始应用存储和后续展示处理。

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

@@ -103,10 +103,7 @@ class ManageApplication : MultiDexApplication() {
          */
         fun setPackageEnabled(pkg: String, enableFlag: Boolean) {
             if (ModelNameUtils.IS_LianxX505f()) {
-                //TODO 暂不处理系统应用
-               /* if (!pkg.startsWith("com.android.")) {
-                    csdkManager?.setPackageEnabled(pkg, enableFlag)
-                }*/
+                csdkManager?.setPackageEnabled(pkg, enableFlag)
             }
         }
 

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

@@ -17,7 +17,9 @@ import com.kongzue.dialogx.dialogs.CustomDialog
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.tbruyelle.rxpermissions2.RxPermissions
 import com.xhly.corelib.Const
+import com.xhly.corelib.bean.AppInfo
 import com.xhly.corelib.eventbus.UIEvent
+import com.xhly.corelib.utils.AppUtils
 import com.xhly.corelib.utils.GsonUtils
 import com.xhly.corelib.utils.LogShow
 import com.xhly.corelib.utils.SystemUtil
@@ -60,8 +62,8 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
 
     @SuppressLint("CheckResult")
     override fun initView() {
+        initFirstUse()
         setSoftInput(mBinding.root)
-
         mBinding.loginBtn.setOnClickListener {
             val rxPermissions = RxPermissions(this)
             val request = rxPermissions.request(Manifest.permission.READ_PHONE_STATE)
@@ -79,6 +81,27 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         }
     }
 
+    private fun initFirstUse() {
+        val firstFlag = currentSpUtils.getParam(Const.FIRSTFLAG, true) as Boolean
+        if (firstFlag){
+            //如果第一次使用则提交登录事件，并且保存初始app
+            val data = LogdOperateBean()
+            ManageApplication.getDeviceInfo()?.let {
+                data.sn = it
+            }
+            data.comm = "退出登录"
+            data.doEvent = EventLog.ACCOUNTQUITEVENT
+            viewModel.eventLog(data)
+            val firstAppList = AppUtils.GetAppList(this)
+            //保存初始应用，只保留包名，因为drawble数据存储时有问题
+            val pkgNameList= arrayListOf<String>()
+            firstAppList.forEach {
+                pkgNameList.add(it.packageName)
+            }
+            currentSpUtils.saveJson(Const.FIRSTAPPLIST,pkgNameList)
+        }
+    }
+
     private fun login() {
         val account = mBinding.accountEt.text.toString()
         val code = mBinding.codeEt.text.toString()

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

@@ -25,6 +25,7 @@ import androidx.work.WorkManager
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomViewTarget
 import com.bumptech.glide.request.transition.Transition
+import com.google.gson.reflect.TypeToken
 import com.kongzue.dialogx.dialogs.CustomDialog
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.tbruyelle.rxpermissions2.RxPermissions
@@ -46,6 +47,7 @@ import com.xhly.manageapp.bean.SocketMsgBean
 import com.xhly.manageapp.bean.UpdateBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
+import com.xhly.manageapp.bean.strategy.AppTimeManageBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
@@ -56,6 +58,7 @@ 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.CurrentAppSharedPreferencesUtils
 import com.xhly.manageapp.utils.CustomAppUtils
 import com.xhly.manageapp.utils.PadInfoUtils
 import com.xhly.manageapp.utils.StrategyUtils
@@ -74,6 +77,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     private var dataList: ArrayList<AppInfo> = arrayListOf()
     private var userBean: UserBean? = null
     private var timer: Timer?=null
+    private val currentSpUtils by lazy {  CurrentAppSharedPreferencesUtils.getInstance(this) }
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
 
     override fun initData() {
@@ -101,10 +105,23 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         viewModel.listAppData.observe(this) { modelList ->
             //获得应用集合，必装应用和推荐应用，再加上预装应用，其余应用需要静默卸载,必装应用需要进行静默下载和安装。安装应用从forceapp接口获取
             val appList = AppUtils.GetAppList(this)
+            val firstAppList= arrayListOf<String>()
+            try {
+                //获得预装应用的包名
+                val currentList =
+                    currentSpUtils.getFromJson(Const.FIRSTAPPLIST, ArrayList<String>().javaClass) as ArrayList<String>
+                firstAppList.addAll(currentList)
+            }catch (e:Exception){
+               LogShow("冻结失败"+e.toString())
+            }
             appList.forEach { app ->
                 val filter = modelList.filter { it.appPackage.equals(app.packageName) }
-                //列表中不存在则将应用冻结或者卸载,目前是冻结
-                ManageApplication.setPackageEnabled(app.packageName, (filter.isNotEmpty()))
+                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()))
+                }
             }
         }
         viewModel.forceListAppData.observe(this) { modelList ->
@@ -693,6 +710,13 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     }
 
     private fun loginOut() {
+        val data = LogdOperateBean()
+        ManageApplication.getDeviceInfo()?.let {
+            data.sn = it
+        }
+        data.comm = "退出登录"
+        data.doEvent = EventLog.ACCOUNTQUITEVENT
+        viewModel.eventLog(data)
         WorkManager.getInstance(this).cancelAllWork()
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
         startIntentActivity(LoginActivity().javaClass)

corelib/src/main/java/com/xhly/corelib/Const.kt

@@ -22,6 +22,9 @@ object Const {
     //存储是否是第一次打开的key
     const val FIRSTFLAG = "FIRSTFLAG"
 
+    //存储是否是第一次打开的key
+    const val FIRSTAPPLIST = "FIRSTAPPLIST"
+
     //401退出登录
     const val LOGIN_OUT_401 = "LOGIN_OUT_401"
 

corelib/src/main/java/com/xhly/corelib/bean/AppInfo.java

@@ -3,7 +3,9 @@ package com.xhly.corelib.bean;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 
-public class AppInfo {
+import java.io.Serializable;
+
+public class AppInfo implements Serializable {
     private String packageName; //包名
     private Drawable ico;       //图标
     private String Name;        //应用标签