1.主页增加平板策略请求

app/src/main/AndroidManifest.xml

@@ -36,6 +36,7 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:appComponentFactory="androidx.core.app.CoreComponentFactory"
         android:supportsRtl="true"
         android:theme="@style/MyStyle"
         tools:targetApi="31">

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

@@ -1,13 +1,18 @@
 package com.xhly.manageapp.ui.main.activity
 
 import BaseActivity
+import android.Manifest
+import android.annotation.SuppressLint
 import android.app.ActivityManager
+import android.app.usage.StorageStatsManager
 import android.app.usage.UsageEvents
 import android.app.usage.UsageStatsManager
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.graphics.Color
+import android.os.Build
+import android.os.storage.StorageManager
 import android.provider.Settings
 import android.view.View
 import android.widget.Button
@@ -15,16 +20,19 @@ import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.addCallback
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 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.base.viewmodel.CommonBaseViewModel
 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.FileSizeUtil
 import com.xhly.corelib.utils.LogShow
+import com.xhly.corelib.utils.PhoneInfoUtils
+import com.xhly.corelib.utils.toFormat
 import com.xhly.manageapp.AppAdapter
 import com.xhly.manageapp.R
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
@@ -34,12 +42,12 @@ import com.xhly.manageapp.service.websocket.AppSocketService
 import com.xhly.manageapp.ui.ManageActivity
 import com.xhly.manageapp.ui.login.activity.LoginActivity
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
-import kotlinx.coroutines.launch
 import java.util.Calendar
 
 
 class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     lateinit var adapter: AppAdapter
+
     /*private var csdkManager = CSDKManager(this)*/
     private var mMyInstallReceiver: AppInstallReceiver? = null
     private var dataList: ArrayList<AppInfo> = arrayListOf()
@@ -51,6 +59,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             startIntentActivity(LoginActivity().javaClass)
         }
         val getAppList1 = AppUtils.GetAppList(this)
+        spUtils.get(Const.DISABLEAPP)
         dataList.addAll(getAppList1)
         adapter = AppAdapter(this, dataList)
         mBinding.rv.layoutManager = GridLayoutManager(this, 6, GridLayoutManager.VERTICAL, false)
@@ -62,17 +71,23 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         mBinding.resetbtn.setOnClickListener {
             UIEvent("2005").post()
         }
-        registerAppInstallReceiver()
-        /*
+        registerAppInstallReceiver()/*
          使用情况权限
          val permissionIntent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
           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)
+
+        }
     }
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
     }
+
     override fun initView() {
         mBinding.loginoutIv.setOnClickListener {
             showEditDialog()
@@ -81,30 +96,23 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             spUtils.setParam(Const.DISABLEAPP, false)
         }
         onBackPressedDispatcher.addCallback {
-          lifecycleScope.launch {
-            viewModel.getAppList()
-          }
             //屏蔽返回
+            getAppInfo()
         }
     }
 
 
     override fun onResume() {
         super.onResume()
-        AppSocketService.lastPkgName=""
-        getAppInfo()
+        AppSocketService.lastPkgName = ""/*getAppInfo()*/
         useStrategy()
-    /*    if (!isServiceON(this,AppSocketService::class.java.name)){
-            AppSocketService.openWebSocket(this)
-        }*/
-        /*      lifecycleScope.launch(Dispatchers.IO) {
-                  delay(20000)
-                  withContext(Dispatchers.Main) {
-                      Toast("冻结应用")
-                      *//*csdkManager.setPackageEnabled("com.android.calendar", true)*//*
-                *//* ManageApplication.killApplicationProcess("com.android.calendar")*//*
-            }
-        }*/
+        try {
+            var s =
+                "厂商" + CustomOSUtils.getSystemBrand() + "，型号" + CustomOSUtils.getSystemDevice() + "，系统版本" + CustomOSUtils.getSystemDisplay()
+        } catch (e: Exception) {
+            LogShow("没有数据")
+        }
+        requestPermissionAndShotView()
     }
 
     private fun useStrategy() {
@@ -117,30 +125,30 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 mBinding.stoptv.visibility = View.GONE
             }
             changeWhiteList()
+            viewModel.updateStrategy()
         } catch (e: Exception) {
 
         }
     }
 
-    private fun changeWhiteList() {
-/*        //获得当前白名单
-        val packageWhiteList = csdkManager.installPackageWhiteList
-        LogShow("当前白名单$packageWhiteList")
-        //获得从网络获取的白名单
-        val jsonArray = spUtils.getFromJson(Const.WHITELISTAPP, ArrayList<String>().javaClass)
-        val removeList = arrayListOf<String>()
-        //移除白名单外的应用，并设置新的白名单
-        if (jsonArray != null) {
-            val whiteList = jsonArray as ArrayList<String>
-            packageWhiteList.forEach { pkg ->
-                val filter = whiteList.filter { it == pkg }
-                if (filter.isEmpty()) {
-                    removeList.add(pkg)
+    private fun changeWhiteList() {/*        //获得当前白名单
+                val packageWhiteList = csdkManager.installPackageWhiteList
+                LogShow("当前白名单$packageWhiteList")
+                //获得从网络获取的白名单
+                val jsonArray = spUtils.getFromJson(Const.WHITELISTAPP, ArrayList<String>().javaClass)
+                val removeList = arrayListOf<String>()
+                //移除白名单外的应用，并设置新的白名单
+                if (jsonArray != null) {
+                    val whiteList = jsonArray as ArrayList<String>
+                    packageWhiteList.forEach { pkg ->
+                        val filter = whiteList.filter { it == pkg }
+                        if (filter.isEmpty()) {
+                            removeList.add(pkg)
+                        }
+                    }
+                    ManageApplication.addInstallPackageWhiteList(whiteList)
                 }
-            }
-            ManageApplication.addInstallPackageWhiteList(whiteList)
-        }
-        ManageApplication.removeInstallPackageWhiteList(removeList)*/
+                ManageApplication.removeInstallPackageWhiteList(removeList)*/
     }
 
     override fun onUiEvent(uiEvent: UIEvent) {
@@ -155,15 +163,16 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                     LogShow("app包名" + it.packageName)
                 }
             }
+
             Const.APPINSTALL -> {
-               try {
-                   dataList.clear()
-                   val getAppList1 = AppUtils.GetAppList(this)
-                   dataList.addAll(getAppList1)
-                   adapter.notifyDataSetChanged()
-               }catch (e:Exception){
-
-               }
+                try {
+                    dataList.clear()
+                    val getAppList1 = AppUtils.GetAppList(this)
+                    dataList.addAll(getAppList1)
+                    adapter.notifyDataSetChanged()
+                } catch (e: Exception) {
+
+                }
             }
 
             "策略更新" -> {
@@ -174,11 +183,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
     private fun getAppInfo() {
         //统计使用时长
-        var instance = Calendar.getInstance()
-        instance.set(Calendar.HOUR_OF_DAY, 0)
-        instance.set(Calendar.MINUTE, 0)
-        instance.set(Calendar.SECOND, 1)
-        var timeInMillis = instance.timeInMillis
+        var instance = Calendar.getInstance()/*  instance.set(Calendar.HOUR_OF_DAY, 0)
+          instance.set(Calendar.MINUTE, 0)
+          instance.set(Calendar.SECOND, 1)*/
+        var timeInMillis = instance.timeInMillis - 1000 * 60 * 10
         val usageManager = getSystemService(USAGE_STATS_SERVICE) as UsageStatsManager
         if (usageManager != null) {
             val intervalType = UsageStatsManager.INTERVAL_DAILY
@@ -213,6 +221,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                         if (event.packageName.equals("com.xhly.manageapp")) {
                             totalStartTime = event.timeStamp
                         }
+
+                        if (event.packageName.equals("mark.via")) {
+                            LogShow("打开时间" + event.timeStamp.toFormat())
+
+                        }
                     }
 
                     UsageEvents.Event.ACTIVITY_PAUSED -> {
@@ -224,6 +237,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                             }
                             it.foregroundTime += (event.timeStamp - it.startTime)
                         }
+                        if (event.packageName.equals("mark.via")) {
+                            LogShow("关闭时间" + event.timeStamp.toFormat())
+                        }
                         if (event.packageName.equals("com.xhly.manageapp")) {
                             totalTime += (event.timeStamp - totalStartTime)
                         }
@@ -232,12 +248,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
 
             dataList.filter { it.foregroundTime > 0L }.forEach {
-                LogShow("events应用时长统计" + it.name + "使用时间" + millisecondsToHMS(it.foregroundTime))
+                // LogShow("events应用时长统计" + it.name + "使用时间" + millisecondsToHMS(it.foregroundTime))
             }
             if (totalTime > 0L) {
-                LogShow("events应用时长统计com.xhly.manageapp使用时间" + millisecondsToHMS(totalTime))
+                // LogShow("events应用时长统计com.xhly.manageapp使用时间" + millisecondsToHMS(totalTime))
             } else {
-                LogShow("events应用时长统计com.xhly.manageapp使用时间无法获取")
+                // LogShow("events应用时长统计com.xhly.manageapp使用时间无法获取")
             }
         }
     }
@@ -247,8 +263,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         if (!isServiceON(this, ManageAccessibilityService::class.java.name)) {
             // 引导至辅助功能设置页面
             context.startActivity(
-                Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             )
             Toast.makeText(context, "请先开启 \"Activity 栈\" 的辅助功能", Toast.LENGTH_LONG).show()
             return false
@@ -294,8 +309,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
 
     private fun showEditDialog() {
-        CustomDialog
-            .build()
+        CustomDialog.build()
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_edit_dialog) {
                 override fun onBind(dialog: CustomDialog, v: View) {
                     var titleTv = v.findViewById<TextView>(R.id.dialog_title_tv)
@@ -317,9 +331,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             .setAlign(CustomDialog.ALIGN.CENTER).show()
     }
 
-    private fun showNoticeDialog(){
-        CustomDialog
-            .build()
+    private fun showNoticeDialog() {
+        CustomDialog.build()
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_notice_dialog) {
                 override fun onBind(dialog: CustomDialog, v: View) {
                     var closeBtn = v.findViewById<Button>(R.id.dialog_close_btn)
@@ -345,4 +358,24 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
         LogShow("MainActivity被销毁")
     }
+
+    /**
+     * 请求运行时权限
+     */
+    @SuppressLint("CheckResult")
+    private fun requestPermissionAndShotView() {
+        val phoneInfoUtils = PhoneInfoUtils(this)
+
+        var iccid = ""
+        val rxPermissions = RxPermissions(this)
+        var request = rxPermissions.request(Manifest.permission.READ_PHONE_STATE)
+        request.subscribe({ granted: Boolean ->
+            if (granted) {
+                iccid = phoneInfoUtils.iccid
+                LogShow("手机信息" + iccid + "||" + iccid)
+            }
+        }, {
+            LogShow("手机信息失败了" + it.message)
+        })
+    }
 }

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

@@ -1,20 +1,51 @@
 package com.xhly.manageapp.ui.main.viewmodel
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import com.xhly.corelib.base.viewmodel.CommonBaseViewModel
 import com.xhly.corelib.network.RetrofitService
-import com.xhly.corelib.utils.LogShow
+import com.xhly.manageapp.bean.AppModel
 import com.xhly.manageapp.bean.ListAppBean
+import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.network.app.AppService
+import com.xhly.manageapp.network.strategy.StrategyService
 
 class MainViewModel : CommonBaseViewModel() {
     private val appService by lazy { RetrofitService.create<AppService>() }
-
+    private val strategyService by lazy { RetrofitService.create<StrategyService>() }
+    private val listData = MutableLiveData<ArrayList<AppModel>>()
+    val listAppData: LiveData<ArrayList<AppModel>> = listData
+    private val strategy=MutableLiveData<StrategyBean>()
+    val strategyData=strategy
     fun getAppList() {
         launchUI {
             val postListApp = appService.postListApp(ListAppBean())
-            postListApp.obj.forEach {
-                LogShow("数据是" + it.appName)
+            if (postListApp.code == 0) {
+                if (postListApp.obj != null && postListApp.obj.isNotEmpty()) {
+                    listData.value = postListApp.obj
+                } else {
+                    listData.value = arrayListOf()
+                }
+            } else {
+                if (!postListApp.msg.isNullOrEmpty()) {
+                    netMessage.value = postListApp.msg
+                }
             }
         }
     }
+
+    fun updateStrategy() {
+          launchUI {
+              val postDetailPad = strategyService.postDetailPad()
+              if (postDetailPad.code == 0) {
+                  if (postDetailPad.obj != null) {
+                     strategy.value=postDetailPad.obj
+                  }
+              } else {
+                  if (!postDetailPad.msg.isNullOrEmpty()) {
+                      netMessage.value = postDetailPad.msg
+                  }
+              }
+          }
+    }
 }