1.添加推送事件提交接口。

app/src/main/java/com/xhly/manageapp/ManageApplication.kt

@@ -524,6 +524,7 @@ class ManageApplication : MultiDexApplication() {
             if (Const.isDebug){
                 csdkManager?.setPackageEnabled("com.xhly.easystud", true)
                 setUrlWhiteListEnable(false)
+                disableStatusBarPanel(false)
             }
             csdkManager?.urlWhiteListRead()?.forEach {
                 LogShow("白名单有"+it.toString())

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

@@ -0,0 +1,36 @@
+package com.xhly.manageapp.bean.log
+
+/**
+ * 处理推送事件后的回调
+ */
+class LogPushBean {
+    /** app只处理6，2，3，7
+     * 推送类型：1发送消息2解除限制3限制使用4更新策略5重启设备6恢复出厂7解除管控
+     */
+    var pushType = 0
+
+    /**
+     * 推送对象：1学生2班级
+     */
+    var pushObj = 1
+
+    /**
+     * 推送目标：班级ID（pushObj=2）
+     */
+    var pushObjid = 0L
+
+    /**
+     * ：学生ids（pushObj=1）
+     */
+    var userids = longArrayOf()
+
+    /**
+     * 推送目标：学生名称/班级名称
+     */
+    var pushObjname = ""
+
+    /**
+     * 日志内容
+     */
+    var content = ""
+}

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

@@ -6,6 +6,10 @@ object UriAdress {
      */
     const val LOGDOPERATEADD = "/logdoperate/add"
 
+    /**
+     * 设备推送事件接口
+     */
+   const val LOGPUSH_ADD="/logPush/add"
     /**
      *应用启动日志-添加
      */

app/src/main/java/com/xhly/manageapp/network/log/LogService.kt

@@ -2,6 +2,7 @@ package com.xhly.manageapp.network.log
 
 import com.xhly.corelib.network.bean.ResponseData
 import com.xhly.manageapp.bean.log.LogAppStartBean
+import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.log.PadInfoBean
 import com.xhly.manageapp.bean.log.PadLocationBean
@@ -35,4 +36,10 @@ interface LogService {
      */
     @POST(UriAdress.PADDETAILADD)
     suspend fun postPadDetailAdd(@Body padInfoBean: PadInfoBean):ResponseData<Any?>
+
+    /**
+     * 设备--推送事件接口
+     */
+    @POST(UriAdress.LOGPUSH_ADD)
+    suspend fun postLogPushAdd(@Body logPushBean: LogPushBean)
 }

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

@@ -70,7 +70,7 @@ class AppSocket : SocketClient() {
         webData.mid = UUID.randomUUID().toString()
         val currentTimeSeconds = System.currentTimeMillis() / 1000
         webData.timeunix = currentTimeSeconds
-        webData.fid = "1"
+        webData.fid = ManageApplication.getDeviceInfo()
         val jsMD5 =
             MD5Utils.getJsMD5(webData.code.toString() + "_" + webData.mid + "_" + webData.timeunix.toString())
         webData.sign = MD5Utils.getJsMD5(jsMD5)

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

@@ -28,6 +28,7 @@ import com.xhly.manageapp.R
 import com.xhly.manageapp.bean.EventLog
 import com.xhly.manageapp.bean.LoginBean
 import com.xhly.manageapp.bean.SocketMsgBean
+import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.bean.user.UserBean
@@ -152,7 +153,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         }
         data.doEvent = EventLog.ACCOUNTLOGINEVENT
         viewModel.eventLog(data)
-        Const.USERID=userBean.userid.toString()
+        Const.USERID=userBean.userid
         Const.USERNAME=userBean.username.toString()
         spUtils.saveJson(Const.USERINFO,userBean)
         val parseClassToJson = GsonUtils.parseClassToJson(userBean)
@@ -213,11 +214,13 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
             Const.CODE2002.toString() -> {
                 spUtils.setParam(Const.DISABLEPAD, true)
                 useTimeStrategy()
+                postLogPush(3)
             }
 
             Const.CODE2003.toString() -> {
                 spUtils.setParam(Const.DISABLEPAD, false)
                 useTimeStrategy()
+                postLogPush(2)
             }
 
             Const.CODE2004.toString() -> {
@@ -229,11 +232,12 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
             }
 
             Const.CODE2006.toString() -> {
+                postLogPush(6)
                 ManageApplication.launchFactoryReset()
             }
 
             Const.CODE2007.toString() -> {
-
+                postLogPush(7)
             }
 
             Const.SDINSTALL -> {
@@ -299,6 +303,15 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
 
     }
 
+    private fun postLogPush(pushType:Int){
+        val pushBean=LogPushBean()
+        pushBean.pushType=pushType
+        pushBean.pushObjid=Const.SCHOOLID
+        pushBean.userids= longArrayOf(Const.USERID)
+        pushBean.pushObjname=Const.USERNAME
+        viewModel.postLogPushAdd(pushBean)
+    }
+
     private fun showNoticeDialog(msg: String) {
         CustomDialog.build()
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_notice_dialog) {

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

@@ -10,24 +10,16 @@ import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.network.log.LogService
 import com.xhly.manageapp.ui.login.netservice.LoginService
+import com.xhly.manageapp.viewmodel.BaseViewModel
+
+class LoginViewModel: BaseViewModel() {
 
-class LoginViewModel: CommonBaseViewModel() {
-    private var logService = RetrofitService.create<LogService>()
-    private var service=RetrofitService.create<LoginService>()
     private val loginResult=MutableLiveData<UserBean>()
     val loginData:LiveData<UserBean> =loginResult
-    private val pwdResult = MutableLiveData<Boolean>()
-    val pwdResultData: LiveData<Boolean> = pwdResult
-    fun getTest(){
-        launchUI {
-            val test = service.getTest()
-            LogShow(test.toString()+"|||"+test.msg)
-        }
-    }
 
     fun login(loginBean: LoginBean){
         launchUI {
-            val postLogin = service.postLogin(loginBean)
+            val postLogin = loginService.postLogin(loginBean)
             if (postLogin.code==0){
                 if (postLogin.obj!=null){
                     loginResult.value=postLogin.obj
@@ -43,25 +35,4 @@ class LoginViewModel: CommonBaseViewModel() {
         }
     }
 
-    fun eventLog(operateBean: LogdOperateBean) {
-        launchUI {
-            logService.postLogdoperateAdd(operateBean)
-        }
-    }
-
-    /**
-     * 解除当前锁屏
-     */
-    fun postPwdDetail(code: String, sn: String) {
-        launchUI {
-            val map = HashMap<String, Any>()
-            map["sn"] = sn
-            val result = service.postPwdDetail(map)
-            if (result.code == 0) {
-                pwdResult.value = result.obj.toString().contains(code)
-            } else {
-                pwdResult.value = false
-            }
-        }
-    }
 }

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

@@ -46,6 +46,7 @@ import com.xhly.manageapp.R
 import com.xhly.manageapp.bean.EventLog
 import com.xhly.manageapp.bean.SocketMsgBean
 import com.xhly.manageapp.bean.UpdateBean
+import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
@@ -350,7 +351,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     override fun onResume() {
         super.onResume()
         userBean?.let {
-            Const.USERID=it.userid.toString()
+            Const.USERID=it.userid
             Const.USERNAME=it.username.toString()
             viewModel.postDevicesetDetail(it.schoolid)
         }
@@ -541,6 +542,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
             Const.CODE2002.toString() -> {
                 //杀掉其他app之保留自己
+                postLogPush(3)
                 val appList = AppUtils.GetAppList(this)
                 StrategyUtils.clearMemory(this, appList)
                 spUtils.setParam(Const.DISABLEPAD, true)
@@ -549,6 +551,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
 
             Const.CODE2003.toString() -> {
+                postLogPush(2)
                 spUtils.setParam(Const.DISABLEPAD, false)
                 useTimeStrategy()
             }
@@ -564,10 +567,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
 
             Const.CODE2006.toString() -> {
+                postLogPush(6)
                 ManageApplication.launchFactoryReset()
             }
 
             Const.CODE2007.toString() -> {
+                postLogPush(7)
 
             }
 
@@ -677,6 +682,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
     }
 
+    private fun postLogPush(pushType:Int){
+        val pushBean= LogPushBean()
+        pushBean.pushType=pushType
+        pushBean.pushObjid=Const.SCHOOLID
+        pushBean.userids= longArrayOf(Const.USERID)
+        pushBean.pushObjname=Const.USERNAME
+        viewModel.postLogPushAdd(pushBean)
+    }
+
     private fun updateAppRv() {
         try {
             var schoolDeviceSetBean: SchoolDeviceSetBean? = null
@@ -805,7 +819,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         data.comm = "退出登录"
         data.doEvent = EventLog.ACCOUNTQUITEVENT
         viewModel.eventLog(data)
-        Const.USERID="1"
+        Const.USERID=1L
         Const.USERNAME=""
         WorkManager.getInstance(this).cancelAllWork()
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)

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

@@ -17,10 +17,10 @@ import com.xhly.manageapp.network.app.AppService
 import com.xhly.manageapp.network.log.LogService
 import com.xhly.manageapp.network.strategy.StrategyService
 import com.xhly.manageapp.ui.login.netservice.LoginService
+import com.xhly.manageapp.viewmodel.BaseViewModel
 
-class MainViewModel : CommonBaseViewModel() {
+class MainViewModel : BaseViewModel() {
     private val appService by lazy { RetrofitService.create<AppService>() }
-    private val loginService by lazy { RetrofitService.create<LoginService>() }
     private val strategyService by lazy { RetrofitService.create<StrategyService>() }
     private var logService = RetrofitService.create<LogService>()
     private val listData = MutableLiveData<ArrayList<AppModel>>()
@@ -44,8 +44,6 @@ class MainViewModel : CommonBaseViewModel() {
     val wallpaperData: LiveData<WallpaperBean> = wallpaper
     private val netWhiteList = MutableLiveData<ArrayList<String>>()
     val netWhiteListData: LiveData<ArrayList<String>> = netWhiteList
-    private val pwdResult = MutableLiveData<Boolean>()
-    val pwdResultData: LiveData<Boolean> = pwdResult
 
     fun getAppList() {
         launchUI {
@@ -93,11 +91,6 @@ class MainViewModel : CommonBaseViewModel() {
         }
     }
 
-    fun eventLog(operateBean: LogdOperateBean) {
-        launchUI {
-            logService.postLogdoperateAdd(operateBean)
-        }
-    }
 
     /**
      * 获得app时间使用策略
@@ -202,20 +195,4 @@ class MainViewModel : CommonBaseViewModel() {
             }
         }
     }
-
-    /**
-     * 解除当前锁屏
-     */
-    fun postPwdDetail(code: String, sn: String) {
-        launchUI {
-            val map = HashMap<String, Any>()
-            map["sn"] = sn
-            val result = loginService.postPwdDetail(map)
-            if (result.code == 0) {
-                pwdResult.value = result.obj.toString().contains(code)
-            } else {
-                pwdResult.value = false
-            }
-        }
-    }
 }

app/src/main/java/com/xhly/manageapp/viewmodel/BaseViewModel.kt

@@ -0,0 +1,51 @@
+package com.xhly.manageapp.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.xhly.corelib.base.viewmodel.CommonBaseViewModel
+import com.xhly.corelib.network.RetrofitService
+import com.xhly.manageapp.bean.log.LogPushBean
+import com.xhly.manageapp.bean.log.LogdOperateBean
+import com.xhly.manageapp.network.log.LogService
+import com.xhly.manageapp.ui.login.netservice.LoginService
+
+open class BaseViewModel : CommonBaseViewModel() {
+    protected val loginService: LoginService by lazy { RetrofitService.create<LoginService>() }
+    private val logService: LogService = RetrofitService.create<LogService>()
+    private val pwdResult = MutableLiveData<Boolean>()
+    val pwdResultData: LiveData<Boolean> = pwdResult
+
+    /**
+     * 解除当前锁屏
+     */
+    fun postPwdDetail(code: String, sn: String) {
+        launchUI {
+            val map = HashMap<String, Any>()
+            map["sn"] = sn
+            val result = loginService.postPwdDetail(map)
+            if (result.code == 0) {
+                pwdResult.value = result.obj.toString().contains(code)
+            } else {
+                pwdResult.value = false
+            }
+        }
+    }
+
+    /**
+     * 发送事件日志
+     */
+    fun eventLog(operateBean: LogdOperateBean) {
+        launchUI {
+            logService.postLogdoperateAdd(operateBean)
+        }
+    }
+
+    /**
+     * 发送事件推送日志
+     */
+    fun postLogPushAdd(logPushBean: LogPushBean) {
+        launchUI {
+            logService.postLogPushAdd(logPushBean)
+        }
+    }
+}

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

@@ -3,11 +3,19 @@ package com.xhly.corelib
 
 object Const {
     const val isDebug = true
+
     //用户id
-     var USERID = "1"
+    var USERID = 1L
+
     //用户姓名
     var USERNAME = ""
 
+    //学校id
+    var SCHOOLID = 0L
+
+    //班级id
+    var CLASSID = 0L
+
     //接口地址
     const val URL1: String = "https://mcapitest.xhkjedu.com/"
 
@@ -32,7 +40,7 @@ object Const {
     /**
      * 存储应用商店应用包名集合
      */
-    const val APPSTOREKEY="APPSTOREKEY"
+    const val APPSTOREKEY = "APPSTOREKEY"
 
     //401退出登录
     const val LOGIN_OUT_401 = "LOGIN_OUT_401"
@@ -117,7 +125,7 @@ object Const {
     const val USERINFO = "USERINFO"
 
     //存储学校设置的设备设置
-    const val SCHOOLSETDEVICE="SCHOOLSETDEVICE"
+    const val SCHOOLSETDEVICE = "SCHOOLSETDEVICE"
 
     //记录设备策略名称
     const val DEVICETYPE1 = "摄像头"
@@ -135,48 +143,55 @@ object Const {
     /**
      * 电话包名
      */
-    const val ANDROIDPHONE="com.android.contacts"
+    const val ANDROIDPHONE = "com.android.contacts"
+
     /**
      * 短信包名
      */
-    const val ANDROIDMMS="com.android.mms"
+    const val ANDROIDMMS = "com.android.mms"
+
     /**
      * 日历
      */
-    const val ANDROIDCALENDAR="com.android.calendar"
+    const val ANDROIDCALENDAR = "com.android.calendar"
+
     /**
      * 录音机
      */
-    const val ANDROIDRECORDER="com.android.soundrecorder"
+    const val ANDROIDRECORDER = "com.android.soundrecorder"
+
     /**
      *时钟
      */
-    const val ANDROIDDESKCLOCK="com.android.deskclock"
+    const val ANDROIDDESKCLOCK = "com.android.deskclock"
+
     /**
      * 联想相机相机
      */
-    const val ANDROIDCAMERA="com.dtab.camera"
+    const val ANDROIDCAMERA = "com.dtab.camera"
+
     /**
      * 联想相册
      */
-    const val ANDROIDGALLERY="com.android.gallery3d"
+    const val ANDROIDGALLERY = "com.android.gallery3d"
 
     /**
      *标记自定义的一键清理名称
      */
-    const val CUSTOMSPEEDAPP="CUSTOMSPEEDAPP"
+    const val CUSTOMSPEEDAPP = "CUSTOMSPEEDAPP"
 
     /**
      *标记自定义的清除缓存名称
      */
-    const val CUSTOMCLEARAPP="CUSTOMCLEARAPP"
+    const val CUSTOMCLEARAPP = "CUSTOMCLEARAPP"
 
     /**
      *标记自定义的自动旋转名称
      */
-    const val CUSTOMROTATIONAPP="CUSTOMROTATIONAPP"
+    const val CUSTOMROTATIONAPP = "CUSTOMROTATIONAPP"
+
     /**
      *标记自定义的修改密码
      */
-    const val CUSTOMCHANGEPSD="CUSTOMCHANGEPSD"
+    const val CUSTOMCHANGEPSD = "CUSTOMCHANGEPSD"
 }

corelib/src/main/java/com/xhly/corelib/network/ResponseInterceptor.kt

@@ -23,7 +23,7 @@ class ResponseInterceptor : Interceptor {
         return try {
             val requestBuilder: Request.Builder = request.newBuilder()
             //TODO 需要替换userid和机型
-            requestBuilder.header("XH-UserId",Const.USERID)
+            requestBuilder.header("XH-UserId",Const.USERID.toString())
             requestBuilder.header("XH-DeviceModel", Build.MODEL)
             request = requestBuilder.build()
             val originalResponse = chain.proceed(request)