1.添加app安装后的更新日志调用

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

@@ -0,0 +1,13 @@
+package com.xhly.manageapp.bean.app
+
+class AppInstallBean {
+    var userid=0L
+    var appName:String?=""
+    var appVersion:String?=""
+    var appNum:Long=0L
+    var appPackage:String?=""
+    var sn:String?=""
+    var mac:String?=""
+    var schoolid:Long=0L
+    var regionid:Long?=null
+}

app/src/main/java/com/xhly/manageapp/bean/AppModel.java → app/src/main/java/com/xhly/manageapp/bean/app/AppModel.java

@@ -1,4 +1,4 @@
-package com.xhly.manageapp.bean;
+package com.xhly.manageapp.bean.app;
 
 import java.io.Serializable;
 import java.util.List;

app/src/main/java/com/xhly/manageapp/bean/ListAppBean.kt → app/src/main/java/com/xhly/manageapp/bean/app/ListAppBean.kt

@@ -1,4 +1,4 @@
-package com.xhly.manageapp.bean
+package com.xhly.manageapp.bean.app
 
 class ListAppBean {
     var appgroupid = 0

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

@@ -53,15 +53,23 @@ object UriAdress {
     const val PADDETAILADD = "/deviceDetail/add"
 
     /**
-     *用来统计版本更新消息，而不是用来版本更新(每次有app更新和安装都调用)
+     *用来统计版本更新消息，记录管控的版本
      */
     const val CLIENT_ADD = "/client/add"
 
+    /**
+     *设备已安装应用-批量添加
+     */
+    const val APPINSTALL_ADD = "/logAppInstall/batch_add"
+
     /**
      * 登录接口
      */
     const val ULOGIN_LOGIN = "/ulogin/login"
 
+
+
+
     /**
      * 登录校验接口
      */

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

@@ -41,12 +41,15 @@ import com.xhly.corelib.utils.CustomOSUtils
 import com.xhly.corelib.utils.FileUtils
 import com.xhly.corelib.utils.GsonUtils
 import com.xhly.corelib.utils.LogShow
+import com.xhly.corelib.utils.MD5Utils
 import com.xhly.corelib.utils.SharedPreferencesUtils
 import com.xhly.corelib.utils.SystemUtil
 import com.xhly.manageapp.AppAdapter
 import com.xhly.manageapp.ManageApplication
 import com.xhly.manageapp.bean.EventLog
 import com.xhly.manageapp.bean.SocketMsgBean
+import com.xhly.manageapp.bean.app.AppInstallBean
+import com.xhly.manageapp.bean.app.AppModel
 import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.log.UpdateBean
@@ -389,6 +392,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         super.onResume()
         useTimeStrategy()
         updatePadInfo()
+        updateMcApp()
         getLocation()
     }
 
@@ -415,23 +419,58 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         updatePadInfo()
     }
 
-    private fun updateAppInstallInfo(packageInfo: PackageInfo) {
+    private fun updateAppInstallInfo() {
         try {
+            //获得已安装应用列表
+            val appList = AppUtils.GetAppList(this)
+            try {
+                //获得预装应用的包名
+                val currentList =
+                    currentSpUtils.getFromJson(
+                        Const.FIRSTAPPLIST,
+                        ArrayList<String>().javaClass
+                    ) as ArrayList<String>
+                val removeList = arrayListOf<AppInfo>()
+                currentList.forEach { pkg ->
+                    //除了管控之类的我们的app之外的预装都不在统计范围
+                    if (Const.CURRENTAPPPKG!=pkg&&Const.STOREAPPPKG!=pkg) {
+                        appList.filter { it.packageName == pkg }.forEach {
+                            removeList.add(it)
+                        }
+                    }
+                }
+                //除了管控之类的我们的app之外的预装都不在统计范围,所以移除
+                appList.removeAll(removeList)
+            } catch (e: Exception) {
+
+            }
             val userBean = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass) as UserBean
-            val updateBean = UpdateBean()
-            ManageApplication.getDeviceInfo()?.let {
-                updateBean.sn = it
+            val appInstallList= arrayListOf<AppInstallBean>()
+            appList.forEach {
+                val appInstallBean=AppInstallBean()
+                appInstallBean.userid=userBean.userid
+                appInstallBean.appName=it.name
+                appInstallBean.appVersion=it.versionName
+                appInstallBean.appNum=it.versionNum
+                appInstallBean.appPackage=it.packageName
+                ManageApplication.getDeviceInfo()?.let {sn->
+                    appInstallBean.sn = sn
+                }
+                ManageApplication.getDeviceInfo(1)?.let {mac->
+                    appInstallBean.mac = mac
+                }
+                appInstallBean.schoolid=userBean.schoolid
+                appInstallBean.regionid=userBean.regionid
+                appInstallList.add(appInstallBean)
             }
-            updateBean.cversion = packageInfo.versionName
-            updateBean.schoolid = userBean.schoolid
-            updateBean.userid = userBean.userid
-            updateBean.regionid = userBean.regionid
-            viewModel.updateAppInstallInfo(updateBean)
+
+            viewModel.updateAppInstallInfo(appInstallList)
         }catch (e:Exception){
 
         }
     }
 
+
     @SuppressLint("CheckResult")
     private fun updatePadInfo() {
         try {
@@ -464,6 +503,38 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
     }
 
+
+
+    private fun updateMcApp() {
+        //每天请求一次app更新接口，这个接口是用于提交管控自身的版本信息统计
+        try {
+            val 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)
+            }
+        } catch (e: Exception) {
+
+        }
+    }
+
     @SuppressLint("CheckResult")
     private fun getLocation() {
         val rxPermissions = RxPermissions(this)
@@ -650,11 +721,13 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                     }
                     val packageInfo =
                         packageManager.getPackageInfo(message, PackageManager.GET_META_DATA)
-                    data.comm = "App安装"
+                    val label =
+                        packageManager.getApplicationLabel(packageInfo.applicationInfo)
+                    data.comm = "App安装,应用名：${label}"
                     data.appPackage = message
                     data.doEvent = EventLog.APPINSTALLEVENT
                     viewModel.eventLog(data)
-                    updateAppInstallInfo(packageInfo)
+                    updateAppInstallInfo()
                 }catch (e:Exception){
 
                 }
@@ -781,6 +854,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                         }
                     }
                 }
+                //如果包含应用商店也移除，因为会在自定义app中添加
+                appList.filter { it.packageName == Const.STOREAPPPKG}.forEach {
+                    removeList.add(it)
+                }
                 //移除学校控制之外预装应用
                 appList.removeAll(removeList)
             } catch (e: Exception) {

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

@@ -5,10 +5,11 @@ import androidx.lifecycle.MutableLiveData
 import com.xhly.corelib.Const
 import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.network.RetrofitService
-import com.xhly.manageapp.bean.AppModel
-import com.xhly.manageapp.bean.ListAppBean
+import com.xhly.manageapp.bean.app.AppModel
+import com.xhly.manageapp.bean.app.ListAppBean
 import com.xhly.manageapp.bean.log.UpdateBean
 import com.xhly.manageapp.bean.WallpaperBean
+import com.xhly.manageapp.bean.app.AppInstallBean
 import com.xhly.manageapp.bean.log.PadInfoBean
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
@@ -121,9 +122,19 @@ class MainViewModel : BaseViewModel() {
     }
 
     /**
-     * 添加应用安装和更新消息
+     * 添加安装的app的更新日志，每次安装应用后扫描并上传所有app
      */
-    fun updateAppInstallInfo(updateBean: UpdateBean) {
+    fun updateAppInstallInfo(list:List<AppInstallBean>) {
+        launchUI {
+            val result = appService.postAppInstallAdd(list)
+        }
+    }
+
+
+    /**
+     * 每天请求一次app更新接口，这个接口是用于提交管控自身的版本信息统计
+     */
+    fun updateMcApp(updateBean: UpdateBean) {
         launchUI {
             val postClientAdd = appService.postClientAdd(updateBean)
             if (postClientAdd.code == 0) {