Browse Source

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

2.添加应用安装接口使用
20241218TB223FC(测试jar包)
wangwanlei 10 months ago
parent
commit
54f67a9fb2

+ 1
- 1
app/src/main/java/com/xhly/manageapp/network/UriAdress.kt View File

53
     const val PADDETAILADD = "/deviceDetail/add"
53
     const val PADDETAILADD = "/deviceDetail/add"
54
 
54
 
55
     /**
55
     /**
56
-     *用来统计版本更新消息,而不是用来版本更新(每次更新和安装都调用)
56
+     *用来统计版本更新消息,而不是用来版本更新(每次有app更新和安装都调用)
57
      */
57
      */
58
     const val CLIENT_ADD = "/client/add"
58
     const val CLIENT_ADD = "/client/add"
59
 
59
 

+ 33
- 34
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt View File

7
 import android.content.Context
7
 import android.content.Context
8
 import android.content.Intent
8
 import android.content.Intent
9
 import android.content.IntentFilter
9
 import android.content.IntentFilter
10
+import android.content.pm.PackageInfo
10
 import android.content.pm.PackageManager
11
 import android.content.pm.PackageManager
11
 import android.graphics.Color
12
 import android.graphics.Color
12
 import android.graphics.drawable.Drawable
13
 import android.graphics.drawable.Drawable
379
 
380
 
380
     override fun onResume() {
381
     override fun onResume() {
381
         super.onResume()
382
         super.onResume()
383
+        useTimeStrategy()
384
+        updatePadInfo()
385
+    }
386
+
387
+    private fun updateAllStrategy(){
382
         userBean?.let {
388
         userBean?.let {
383
             Const.USERID = it.userid
389
             Const.USERID = it.userid
384
             Const.USERNAME = it.username.toString()
390
             Const.USERNAME = it.username.toString()
399
         viewModel.postAppNetWhiteList()
405
         viewModel.postAppNetWhiteList()
400
         useTimeStrategy()
406
         useTimeStrategy()
401
         updatePadInfo()
407
         updatePadInfo()
402
-        updateMcApp()
403
         getLocation()
408
         getLocation()
404
     }
409
     }
405
 
410
 
406
-    private fun updateMcApp() {
407
-        //每天请求一次app更新接口,这个接口是用于提交版本信息统计
411
+    private fun updateAppInstallInfo(packageInfo: PackageInfo) {
408
         try {
412
         try {
409
-            var userBean = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass) as UserBean
410
-            //存储pad更新请求时间,如果为同一天则不在上传,不然继续上传
411
-            val padTime = spUtils.getParam(Const.PADUPDATETIMEKEY, 0L) as Long
412
-            val instance = Calendar.getInstance()
413
-            val currentYear = instance.get(Calendar.YEAR)
414
-            val currentDay = instance.get(Calendar.DAY_OF_YEAR)
415
-            instance.timeInMillis = padTime
416
-            val year = instance.get(Calendar.YEAR)
417
-            val day = instance.get(Calendar.DAY_OF_YEAR)
418
-            if (!(currentYear == year && currentDay == day)) {
419
-                val updateBean = UpdateBean()
420
-                ManageApplication.getDeviceInfo()?.let {
421
-                    updateBean.sn = it
422
-                }
423
-                val packageInfo =
424
-                    packageManager.getPackageInfo(packageName, PackageManager.GET_META_DATA)
425
-                updateBean.cversion = packageInfo.versionName
426
-                updateBean.schoolid = userBean.schoolid
427
-                updateBean.userid = userBean.userid
428
-                updateBean.regionid = userBean.regionid
429
-                viewModel.updateMcApp(updateBean)
413
+            val userBean = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass) as UserBean
414
+            val updateBean = UpdateBean()
415
+            ManageApplication.getDeviceInfo()?.let {
416
+                updateBean.sn = it
430
             }
417
             }
431
-        } catch (e: Exception) {
418
+            updateBean.cversion = packageInfo.versionName
419
+            updateBean.schoolid = userBean.schoolid
420
+            updateBean.userid = userBean.userid
421
+            updateBean.regionid = userBean.regionid
422
+            viewModel.updateAppInstallInfo(updateBean)
423
+        }catch (e:Exception){
432
 
424
 
433
         }
425
         }
434
     }
426
     }
641
             }
633
             }
642
 
634
 
643
             Const.APPINSTALL -> {
635
             Const.APPINSTALL -> {
644
-                val message = uiEvent.message
645
-                updateAppRv()
646
-                val data = LogdOperateBean()
647
-                ManageApplication.getDeviceInfo()?.let {
648
-                    data.sn = it
636
+                try {
637
+                    val message = uiEvent.message
638
+                    updateAppRv()
639
+                    val data = LogdOperateBean()
640
+                    ManageApplication.getDeviceInfo()?.let {
641
+                        data.sn = it
642
+                    }
643
+                    val packageInfo =
644
+                        packageManager.getPackageInfo(message, PackageManager.GET_META_DATA)
645
+                    data.comm = "App安装"
646
+                    data.appPackage = message
647
+                    data.doEvent = EventLog.APPINSTALLEVENT
648
+                    viewModel.eventLog(data)
649
+                    updateAppInstallInfo(packageInfo)
650
+                }catch (e:Exception){
651
+
649
                 }
652
                 }
650
-                data.comm = "App安装"
651
-                data.appPackage = message
652
-                data.doEvent = EventLog.APPINSTALLEVENT
653
-                viewModel.eventLog(data)
654
             }
653
             }
655
 
654
 
656
             Const.APPUNINSTALL -> {
655
             Const.APPUNINSTALL -> {

+ 4
- 1
app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt View File

120
         }
120
         }
121
     }
121
     }
122
 
122
 
123
-    fun updateMcApp(updateBean: UpdateBean) {
123
+    /**
124
+     * 添加应用安装和更新消息
125
+     */
126
+    fun updateAppInstallInfo(updateBean: UpdateBean) {
124
         launchUI {
127
         launchUI {
125
             val postClientAdd = appService.postClientAdd(updateBean)
128
             val postClientAdd = appService.postClientAdd(updateBean)
126
             if (postClientAdd.code == 0) {
129
             if (postClientAdd.code == 0) {

+ 19
- 9
corelib/src/main/java/com/xhly/corelib/Const.kt View File

4
 object Const {
4
 object Const {
5
     const val isDebug = false
5
     const val isDebug = false
6
 
6
 
7
+    //记录点击返回的次数,超过10次请求策略
8
+    var backNum = 0
9
+
7
     /**
10
     /**
8
      * 当前应用包名
11
      * 当前应用包名
9
      */
12
      */
10
-    const val CURRENTAPPPKG="com.xhkjedu.manageapp"
13
+    const val CURRENTAPPPKG = "com.xhkjedu.manageapp"
11
 
14
 
12
     /**
15
     /**
13
      * 商店包名
16
      * 商店包名
14
      */
17
      */
15
-    const val STOREAPPPKG="com.xhkjedu.xh_control_appstore"
18
+    const val STOREAPPPKG = "com.xhkjedu.xh_control_appstore"
16
 
19
 
17
     /**
20
     /**
18
      * 存储管控是否已解除的key
21
      * 存储管控是否已解除的key
19
      */
22
      */
20
-    const val EXIT_CONTROL="EXIT_CONTROL"
23
+    const val EXIT_CONTROL = "EXIT_CONTROL"
24
+
21
     //用户id
25
     //用户id
22
-    var USERID :Long?= 1L
26
+    var USERID: Long? = 1L
23
 
27
 
24
     //用户姓名
28
     //用户姓名
25
-    var USERNAME:String? = ""
29
+    var USERNAME: String? = ""
26
 
30
 
27
     //学校id
31
     //学校id
28
-    var SCHOOLID:Long? = null
32
+    var SCHOOLID: Long? = null
29
 
33
 
30
     //班级id
34
     //班级id
31
-    var CLASSID :Long?= null
35
+    var CLASSID: Long? = null
32
 
36
 
33
     //标记上次打开的包名,当连续打开同一包名时,不认为打开多次
37
     //标记上次打开的包名,当连续打开同一包名时,不认为打开多次
34
     var LASTPKGNAME = ""
38
     var LASTPKGNAME = ""
175
     const val DEVICETYPE10 = "OTG"
179
     const val DEVICETYPE10 = "OTG"
176
 
180
 
177
 
181
 
178
-
179
     //记录系统应用名称
182
     //记录系统应用名称
180
     /**
183
     /**
181
      * 电话包名
184
      * 电话包名
215
     /**
218
     /**
216
      * 这几个应用由学校设置接口处理
219
      * 这几个应用由学校设置接口处理
217
      */
220
      */
218
-    val  schoolSetAppList= arrayListOf(ANDROIDPHONE,ANDROIDMMS,ANDROIDCALENDAR,ANDROIDDESKCLOCK,ANDROIDCAMERA,ANDROIDGALLERY)
221
+    val schoolSetAppList = arrayListOf(
222
+        ANDROIDPHONE,
223
+        ANDROIDMMS,
224
+        ANDROIDCALENDAR,
225
+        ANDROIDDESKCLOCK,
226
+        ANDROIDCAMERA,
227
+        ANDROIDGALLERY
228
+    )
219
 
229
 
220
     /**
230
     /**
221
      *标记自定义的一键清理名称
231
      *标记自定义的一键清理名称

Loading…
Cancel
Save