1.修改Soekct消息类型

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

@@ -0,0 +1,13 @@
+package com.xhly.manageapp.bean.strategy
+
+class PadViolateBean {
+    /**
+     * 违规类型：1已ROOT 2安装非商店应用 3更换SIM卡 4USB连接电脑
+     */
+    var violateType: String? = "0"
+
+    /**
+     * 处理方式（中文分号隔开）
+     */
+    var handle_method: String? = ""
+}

app/src/main/java/com/xhly/manageapp/service/websocket/AppSocket.kt

@@ -21,6 +21,7 @@ import com.xhly.manageapp.bean.log.LogAppStartBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.network.log.LogService
 import com.xhly.websocket.bean.WebSocketData
+import com.xhly.websocket.bean.WebSocketUserBean
 import com.xhly.websocket.service.SocketClient
 import com.xhly.websocket.service.WebSocketHelper
 import com.xhly.websocket.utils.SocketPushUtils
@@ -68,14 +69,19 @@ class AppSocket : SocketClient() {
         super.onConnectedSuccess()
         UIEvent(Const.UPDATE_CONNECTED_SUCCESS).post()
         val webData = WebSocketData()
-        webData.code = 1002
+        webData.code = 1001
         webData.mid = UUID.randomUUID().toString()
         val currentTimeSeconds = System.currentTimeMillis() / 1000
         webData.timeunix = currentTimeSeconds
-        webData.fid = 1
+        webData.fid = "1"
         val jsMD5 =
             MD5Utils.getJsMD5(webData.code.toString() + "_" + webData.mid + "_" + webData.timeunix.toString())
         webData.sign = MD5Utils.getJsMD5(jsMD5)
+        val socketUserBean = WebSocketUserBean()
+        socketUserBean.usertype = 1
+        socketUserBean.username = "测试"
+        socketUserBean.userid = ManageApplication.getDeviceInfo()
+        webData.body = socketUserBean
         WebSocketHelper.getInstance().sendSocketString(GsonUtils.parseClassToJson(webData))
     }
 
@@ -92,6 +98,16 @@ class AppSocket : SocketClient() {
                 goMainActivity()
             }
 
+            Const.CODE2003.toString() -> {
+                Toast.makeText(context, "解除限制", Toast.LENGTH_LONG).show()
+                spUtils.setParam(Const.DISABLEAPP, false)
+                goMainActivity()
+            }
+
+            Const.CODE2004.toString() -> {
+               //请求接口更新策略
+            }
+
             Const.CODE2005.toString() -> {
                 ManageApplication.rebootDevice()
             }

app/src/main/java/com/xhly/manageapp/service/websocket/AppSocketService.kt

@@ -3,12 +3,10 @@ package com.xhly.manageapp.service.websocket
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.app.Service
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.os.Environment
 import android.widget.Toast
 import com.billbook.lib.downloader.Download
 import com.billbook.lib.downloader.Downloader
@@ -88,7 +86,7 @@ open class AppSocketService : LongConnService() {
         webData.mid = UUID.randomUUID().toString()
         val currentTimeSeconds = System.currentTimeMillis() / 1000
         webData.timeunix = currentTimeSeconds
-        webData.fid = 1
+        webData.fid = "1"
         val jsMD5 =
             MD5Utils.getJsMD5(webData.code.toString() + "_" + webData.mid + "_" + webData.timeunix.toString())
         webData.sign = MD5Utils.getJsMD5(jsMD5)
@@ -247,7 +245,7 @@ open class AppSocketService : LongConnService() {
                 val successful = execute.isSuccessful()
                 LogShow("下载结果" + successful)
                 if (successful) {
-                    withContext(Dispatchers.Main){
+                    withContext(Dispatchers.Main) {
                         ManageApplication.installPackage(File(name, "test.apk").toString())
                     }
                 }

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

@@ -14,6 +14,9 @@ object Const {
     //作为存储白名单应用的key
     const val WHITELISTAPP = "WHITELISTAPP"
 
+    //存储是否是第一次打开的key
+    const val FIRSTFLAG = "FIRSTFLAG"
+
     //401退出登录
     const val LOGIN_OUT_401 = "LOGIN_OUT_401"
 
@@ -52,4 +55,7 @@ object Const {
 
     //标记应用卸载
     const val APPUNINSTALL = "APPUNINSTALL"
+
+    //标记更新策略
+    const val UPDATESTRATEGY = "UPDATESTRATEGY"
 }

websocket/src/main/java/com/xhly/websocket/bean/WebSocketData.kt

@@ -8,7 +8,7 @@ class WebSocketData() {
 
     //两次md5加密timeunix
     var sign: String? = null
-    var fid: Int = 0
-    var tids: IntArray = intArrayOf()
+    var fid: String? = "0"
+    var tids: Array<String?> = arrayOf()
     var body: Any? = null
 }

websocket/src/main/java/com/xhly/websocket/bean/WebSocketUserBean.kt

@@ -0,0 +1,9 @@
+package com.xhly.websocket.bean
+
+class WebSocketUserBean {
+    var userid: String? = ""
+    var username: String? = ""
+
+    //1是管理员，2是学生
+    var usertype = 1
+}