1.修改应用事件相关bean类数值。

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

@@ -4,62 +4,64 @@ object EventLog {
     /**
      * 更换SIM卡
      */
-    const val SIMEVENT = 1
+    const val SIMEVENT = 101
 
     /**
      * 违规开启蓝牙
      */
-    const val BLUETOOHEVENT = 2
+    const val BLUETOOHEVENT = 102
 
 
     /**
      * USB连接电脑
      */
-    const val USBCONNECTEVENT = 3
+    const val USBCONNECTEVENT = 103
 
     /**
      *  USB断开电脑
      */
-    const val USBDISCONNECTEVENT = 4
+    const val USBDISCONNECTEVENT = 104
 
     /**
      * 插入SD卡
      */
-    const val SDEMOUNTEDVENT = 5
+    const val SDEMOUNTEDVENT = 105
 
     /**
      * 拔出SD卡
      */
-    const val SDEJECTEVENT = 6
+    const val SDEJECTEVENT = 106
 
 
     /**
      * 账号登录
      */
-    const val ACCOUNTLOGINEVENT = 7
+    const val ACCOUNTLOGINEVENT =201
+
+
+    /**
+     * 首次使用
+     */
+    const val FIRSTEVENT = 202
 
     /**
      * 账号退出
      */
-    const val ACCOUNTQUITEVENT = 8
+    const val ACCOUNTQUITEVENT = 203
 
     /**
      * 安装应用
      */
-    const val APPINSTALLEVENT = 9
+    const val APPINSTALLEVENT = 211
 
     /**
      * 卸载应用
      */
-    const val APPUNINSTALLEVENT = 10
+    const val APPUNINSTALLEVENT = 212
 
     /**
      * 启动应用
      */
-    const val STARTAPPEVENT = 11
+    const val STARTAPPEVENT = 213
 
-    /**
-     * 首次使用
-     */
-    const val FIRSTEVENT = 12
 }

app/src/main/java/com/xhly/manageapp/bean/log/LogdOperateBean.kt

@@ -7,8 +7,8 @@ class LogdOperateBean {
     var sn: String = ""
 
     /**
-     * 事件：1更换SIM卡 2违规开启蓝牙 3USB连接电脑 4USB拔出电脑 5插入SD卡 6拔出SD卡 (1-6为违规)
-     * 7账号登录 8账号退出 9安装应用（安装了非应用商店应用违规） 10卸载应用（卸载强制安装应用违规） 11启动应用 12首次使用
+     * 事件：101更换SIM卡 102违规开启蓝牙 103USB连接电脑 104USB拔出电脑 105插入SD卡 1066拔出SD卡 (1-6为违规)
+     * 201账号登录 202首次使用 203账号退出 211安装应用（安装了非应用商店应用违规） 212卸载应用（卸载强制安装应用违规） 213启动应用
      */
     var doEvent: Int = 0
 

app/src/main/java/com/xhly/manageapp/bean/strategy/AppTimeManageBean.kt

@@ -5,15 +5,16 @@ class AppTimeManageBean {
     /**
      * 周几1-7
      */
-    private var week = 1
+    var week = 1
 
     /**
      * 开始时间
      */
-    private var starttime: String? = ""
+    var starttime: String? = ""
 
     /**
      * 结束时间
      */
-    private var stoptime: String? = ""
+    var stoptime: String? = ""
+
 }

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

@@ -8,10 +8,10 @@ object Const {
     //接口地址
     const val WSURL: String = "wss://mcwstest.xhkjedu.com/ws"
 
-    //标记平板禁用
+    //标记平板禁用（来源于socket）
     const val DISABLEPAD= "DISABLEPAD"
 
-    //标记平板在禁用或者使用的事件
+    //标记平板在禁用的事件范围（来源于策略）
     const val DISABLEPADTIME= "DISABLEPADTIME"
 
     //作为存储白名单应用的key

corelib/src/main/java/com/xhly/corelib/utils/baseUtils.kt

@@ -1,5 +1,6 @@
 package com.xhly.corelib.utils
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -8,6 +9,7 @@ import android.util.Base64
 import java.lang.reflect.ParameterizedType
 import java.text.DecimalFormat
 import java.text.SimpleDateFormat
+import java.time.format.DateTimeFormatter
 import java.util.Calendar
 import java.util.Date
 
@@ -47,12 +49,12 @@ fun Long.toFormat(format: String = "yyyy-MM-dd HH:mm:ss"): String {
 
 fun String.hourToCurrentDate(formatType: String = "HH:mm:ss"): Date {
     try {
-        var simpleDateFormat = SimpleDateFormat(formatType)
-        var parse = simpleDateFormat.parse(this)
-        var hours = parse.hours
-        var minutes = parse.minutes
-        var seconds = parse.seconds
-        var calendar = Calendar.getInstance()
+        val simpleDateFormat = SimpleDateFormat(formatType)
+        val parse = simpleDateFormat.parse(this)
+        val hours = parse.hours
+        val minutes = parse.minutes
+        val seconds = parse.seconds
+        val calendar = Calendar.getInstance()
         calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH))
         calendar.set(Calendar.HOUR_OF_DAY, hours)
         calendar.set(Calendar.MINUTE, minutes)
@@ -63,6 +65,22 @@ fun String.hourToCurrentDate(formatType: String = "HH:mm:ss"): Date {
     }
 }
 
+fun String.hourToCurrentDateLong(formatType: String = "HH:mm:ss"): Long {
+    try {
+        val simpleDateFormat = SimpleDateFormat(formatType)
+        val parse = simpleDateFormat.parse(this)
+        val calendar = Calendar.getInstance()
+        val year= calendar.get(Calendar.YEAR)
+        val day = calendar.get(Calendar.DAY_OF_YEAR)
+        calendar.timeInMillis=parse.time
+        calendar.set(Calendar.YEAR,year)
+        calendar.set(Calendar.DAY_OF_YEAR,day)
+        return calendar.time.time
+    } catch (e: Exception) {
+        return Date().time
+    }
+}
+
 fun Date.getBetweenDay(date: Date): String {
     try {
         var l = (this.time - date.time) / 1000 / 60 / 60 / 24
@@ -256,19 +274,20 @@ fun Context.getVersionName(): String {
 }
 
 //判断是否是链接
-fun String.isUrl():Boolean{
-    var rgex="^http(s)?:\\/\\/([\\w-]+\\.)+[\\w-]+(\\/[\\w- .\\/?%&=]*)?".toRegex()
-   return  rgex.containsMatchIn(this)
+fun String.isUrl(): Boolean {
+    var rgex = "^http(s)?:\\/\\/([\\w-]+\\.)+[\\w-]+(\\/[\\w- .\\/?%&=]*)?".toRegex()
+    return rgex.containsMatchIn(this)
 }
+
 //移除标点
-fun String.removePunctuation():String{
+fun String.removePunctuation(): String {
     return try {
-        if (this.isNotBlank()){
+        if (this.isNotBlank()) {
             this.replace(Regex("[^\\w\\s]"), "")
-        }else{
+        } else {
             ""
         }
-    }catch (e:java.lang.Exception){
+    } catch (e: java.lang.Exception) {
         ""
     }
 }