1.修改应用安装接口注释

2.添加应用安装接口使用

app/src/main/java/com/xhly/manageapp/network/UriAdress.kt

@@ -53,7 +53,7 @@ object UriAdress {
     const val PADDETAILADD = "/deviceDetail/add"
 
     /**
-     *用来统计版本更新消息，而不是用来版本更新(每次更新和安装都调用)
+     *用来统计版本更新消息，而不是用来版本更新(每次有app更新和安装都调用)
      */
     const val CLIENT_ADD = "/client/add"
 

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

@@ -7,6 +7,7 @@ import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -379,6 +380,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
     override fun onResume() {
         super.onResume()
+        useTimeStrategy()
+        updatePadInfo()
+    }
+
+    private fun updateAllStrategy(){
         userBean?.let {
             Const.USERID = it.userid
             Const.USERNAME = it.username.toString()
@@ -399,36 +405,22 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         viewModel.postAppNetWhiteList()
         useTimeStrategy()
         updatePadInfo()
-        updateMcApp()
         getLocation()
     }
 
-    private fun updateMcApp() {
-        //每天请求一次app更新接口，这个接口是用于提交版本信息统计
+    private fun updateAppInstallInfo(packageInfo: PackageInfo) {
         try {
-            var userBean = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass) as UserBean
-            //存储pad更新请求时间，如果为同一天则不在上传，不然继续上传
-            val padTime = spUtils.getParam(Const.PADUPDATETIMEKEY, 0L) as Long
-            val instance = Calendar.getInstance()
-            val currentYear = instance.get(Calendar.YEAR)
-            val currentDay = instance.get(Calendar.DAY_OF_YEAR)
-            instance.timeInMillis = padTime
-            val year = instance.get(Calendar.YEAR)
-            val day = instance.get(Calendar.DAY_OF_YEAR)
-            if (!(currentYear == year && currentDay == day)) {
-                val updateBean = UpdateBean()
-                ManageApplication.getDeviceInfo()?.let {
-                    updateBean.sn = it
-                }
-                val packageInfo =
-                    packageManager.getPackageInfo(packageName, PackageManager.GET_META_DATA)
-                updateBean.cversion = packageInfo.versionName
-                updateBean.schoolid = userBean.schoolid
-                updateBean.userid = userBean.userid
-                updateBean.regionid = userBean.regionid
-                viewModel.updateMcApp(updateBean)
+            val userBean = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass) as UserBean
+            val updateBean = UpdateBean()
+            ManageApplication.getDeviceInfo()?.let {
+                updateBean.sn = it
             }
-        } catch (e: Exception) {
+            updateBean.cversion = packageInfo.versionName
+            updateBean.schoolid = userBean.schoolid
+            updateBean.userid = userBean.userid
+            updateBean.regionid = userBean.regionid
+            viewModel.updateAppInstallInfo(updateBean)
+        }catch (e:Exception){
 
         }
     }
@@ -641,16 +633,23 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
 
             Const.APPINSTALL -> {
-                val message = uiEvent.message
-                updateAppRv()
-                val data = LogdOperateBean()
-                ManageApplication.getDeviceInfo()?.let {
-                    data.sn = it
+                try {
+                    val message = uiEvent.message
+                    updateAppRv()
+                    val data = LogdOperateBean()
+                    ManageApplication.getDeviceInfo()?.let {
+                        data.sn = it
+                    }
+                    val packageInfo =
+                        packageManager.getPackageInfo(message, PackageManager.GET_META_DATA)
+                    data.comm = "App安装"
+                    data.appPackage = message
+                    data.doEvent = EventLog.APPINSTALLEVENT
+                    viewModel.eventLog(data)
+                    updateAppInstallInfo(packageInfo)
+                }catch (e:Exception){
+
                 }
-                data.comm = "App安装"
-                data.appPackage = message
-                data.doEvent = EventLog.APPINSTALLEVENT
-                viewModel.eventLog(data)
             }
 
             Const.APPUNINSTALL -> {

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

@@ -120,7 +120,10 @@ class MainViewModel : BaseViewModel() {
         }
     }
 
-    fun updateMcApp(updateBean: UpdateBean) {
+    /**
+     * 添加应用安装和更新消息
+     */
+    fun updateAppInstallInfo(updateBean: UpdateBean) {
         launchUI {
             val postClientAdd = appService.postClientAdd(updateBean)
             if (postClientAdd.code == 0) {

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

@@ -4,31 +4,35 @@ package com.xhly.corelib
 object Const {
     const val isDebug = false
 
+    //记录点击返回的次数，超过10次请求策略
+    var backNum = 0
+
     /**
      * 当前应用包名
      */
-    const val CURRENTAPPPKG="com.xhkjedu.manageapp"
+    const val CURRENTAPPPKG = "com.xhkjedu.manageapp"
 
     /**
      * 商店包名
      */
-    const val STOREAPPPKG="com.xhkjedu.xh_control_appstore"
+    const val STOREAPPPKG = "com.xhkjedu.xh_control_appstore"
 
     /**
      * 存储管控是否已解除的key
      */
-    const val EXIT_CONTROL="EXIT_CONTROL"
+    const val EXIT_CONTROL = "EXIT_CONTROL"
+
     //用户id
-    var USERID :Long?= 1L
+    var USERID: Long? = 1L
 
     //用户姓名
-    var USERNAME:String? = ""
+    var USERNAME: String? = ""
 
     //学校id
-    var SCHOOLID:Long? = null
+    var SCHOOLID: Long? = null
 
     //班级id
-    var CLASSID :Long?= null
+    var CLASSID: Long? = null
 
     //标记上次打开的包名，当连续打开同一包名时，不认为打开多次
     var LASTPKGNAME = ""
@@ -175,7 +179,6 @@ object Const {
     const val DEVICETYPE10 = "OTG"
 
 
-
     //记录系统应用名称
     /**
      * 电话包名
@@ -215,7 +218,14 @@ object Const {
     /**
      * 这几个应用由学校设置接口处理
      */
-    val  schoolSetAppList= arrayListOf(ANDROIDPHONE,ANDROIDMMS,ANDROIDCALENDAR,ANDROIDDESKCLOCK,ANDROIDCAMERA,ANDROIDGALLERY)
+    val schoolSetAppList = arrayListOf(
+        ANDROIDPHONE,
+        ANDROIDMMS,
+        ANDROIDCALENDAR,
+        ANDROIDDESKCLOCK,
+        ANDROIDCAMERA,
+        ANDROIDGALLERY
+    )
 
     /**
      *标记自定义的一键清理名称