1.添加违规事件处理的socket消息接口。

2.修改推送事件处理的消息接口。

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

@@ -171,11 +171,11 @@ class ManageApplication : MultiDexApplication() {
         }
 
         /**
-         * 打开关闭 wifi true：打开 wifi false：关闭 wifi
+         * 打开关闭 wifi true：打开 wifi false：关闭 wifi(禁用这个方法，防止用户误操作)
          */
         fun enableWifi(enableFlag: Boolean) {
             if (ModelNameUtils.IS_LianxX505f()) {
-                csdkManager?.enableWifi_v3(enableFlag)
+                //csdkManager?.enableWifi_v3(enableFlag)
             }
         }
 

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

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

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

@@ -7,9 +7,10 @@ object UriAdress {
     const val LOGDOPERATEADD = "/logdoperate/add"
 
     /**
-     * 设备推送事件接口
+     * 设备推送事件接口(1不用处理)
+     * 推送类型：1发送消息2解除锁定3锁定4更新策略5重启设备6恢复出厂7解除管控
      */
-    const val LOGPUSH_ADD = "/logPush/add"
+    const val LOGPUSH_RECEIVED = "/logPush/received"
 
     /**
      *应用启动日志-添加,用来记录app的使用时长。
@@ -100,4 +101,18 @@ object UriAdress {
      * 退出管控
      */
     const val EXIT_CONTROL="/password/exit_control"
+
+    /**
+     * 违规事件发送socket消息后，请求接口然后处理锁定
+     * sn 设备号
+     *  pushType  3锁定
+     */
+    const val EDIT_LOCKED="/logdoperate/edit_locked"
+
+    /**
+     * 违规事件发送socket消息后，请求接口然后处理恢复出厂设置
+     * sn 设备号
+     * pushType  6恢复出厂设置
+     */
+    const val EDIT_RESETED="/logdoperate/edit_reseted"
 }

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

@@ -40,6 +40,6 @@ interface LogService {
     /**
      * 设备--推送事件接口
      */
-    @POST(UriAdress.LOGPUSH_ADD)
+    @POST(UriAdress.LOGPUSH_RECEIVED)
     suspend fun postLogPushAdd(@Body logPushBean: LogPushBean)
 }

app/src/main/java/com/xhly/manageapp/ui/ManageActivity.kt

@@ -7,10 +7,16 @@ import android.content.Intent
 import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED
 import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED
 import android.content.pm.PackageManager.DONT_KILL_APP
+import android.graphics.Color
 import android.os.Environment
 import android.os.Environment.DIRECTORY_DOWNLOADS
 import android.os.storage.StorageManager
 import android.provider.Settings
+import android.view.View
+import android.widget.EditText
+import android.widget.TextView
+import com.kongzue.dialogx.dialogs.CustomDialog
+import com.kongzue.dialogx.interfaces.OnBindView
 import com.xhkjedu.manageapp.R
 import com.xhkjedu.manageapp.databinding.ActivityManageBinding
 import com.xhly.corelib.Const
@@ -18,6 +24,7 @@ import com.xhly.corelib.base.viewmodel.CommonBaseViewModel
 import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.utils.LogShow
 import com.xhly.manageapp.ManageApplication
+import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
 import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.viewmodel.BaseViewModel
@@ -57,7 +64,7 @@ class ManageActivity : BaseActivity<BaseViewModel, ActivityManageBinding>() {
 
     override fun initView() {
         mBinding.closemanageBtn.setOnClickListener {
-            StrategyUtils.releaseControl()
+            showEditDialog()
         }
         mBinding.adbopenBtn.setOnClickListener {
             Toast("设置" + ManageApplication.enableUsbDebugging(true))
@@ -259,6 +266,36 @@ class ManageActivity : BaseActivity<BaseViewModel, ActivityManageBinding>() {
         }
     }
 
+    private fun showEditDialog() {
+        CustomDialog.build()
+            .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_edit_dialog) {
+                override fun onBind(dialog: CustomDialog, v: View) {
+                    val titleTv = v.findViewById<TextView>(R.id.dialog_title_tv)
+                    val enterTv = v.findViewById<TextView>(R.id.dialog_enter_tv)
+                    val cancelTv = v.findViewById<TextView>(R.id.dialog_cancel_tv)
+                    val editText = v.findViewById<EditText>(R.id.dialog_et)
+                    editText.hint = getString(R.string.inputcode)
+                    titleTv.text = getString(R.string.exitcontrol)
+                    enterTv.setOnClickListener {
+                        val code = editText.text
+                        if ((!code.isNullOrBlank()) && code.length >= 6) {
+                            dialog.dismiss()
+                            try {
+                                viewModel.postExitControl(code.toString())
+                            } catch (e: Exception) {
+
+                            }
+                        }
+                    }
+                    cancelTv.setOnClickListener {
+                        dialog.dismiss()
+                    }
+                }
+            }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
+            .setAlign(CustomDialog.ALIGN.CENTER).show()
+    }
+
+
     override fun finish() {
         super.finish()
         UIEvent("update").post()

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

@@ -234,22 +234,20 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
             }
 
             Const.CODE2002.toString() -> {
+                postLogPush(3)
                 spUtils.setParam(Const.DISABLEPAD, true)
                 useTimeStrategy()
-                postLogPush(3)
             }
 
             Const.CODE2003.toString() -> {
+                postLogPush(2)
                 spUtils.setParam(Const.DISABLEPAD, false)
                 useTimeStrategy()
-                postLogPush(2)
             }
 
-            Const.CODE2004.toString() -> {
-
-            }
 
             Const.CODE2005.toString() -> {
+                postLogPush(5)
                 ManageApplication.rebootDevice()
             }
 
@@ -329,13 +327,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     private fun postLogPush(pushType:Int){
         val pushBean=LogPushBean()
         pushBean.pushType=pushType
-        pushBean.pushObjid=Const.SCHOOLID
-        Const.USERID?.let {
-            pushBean.userids= longArrayOf(it)
-        }
-        Const.USERNAME?.let {
-            pushBean.pushObjname=it
-        }
+        pushBean.sn=ManageApplication.getDeviceInfo()?:""
         viewModel.postLogPushAdd(pushBean)
     }
 

app/src/main/java/com/xhly/manageapp/ui/login/netservice/LoginService.kt

@@ -53,4 +53,19 @@ interface LoginService {
     @POST(UriAdress.EXIT_CONTROL)
     suspend fun postExitControl(@Body map:HashMap<String,Any>):ResponseData<CodeDetailBean>
 
+    /**
+     * 违规事件发送socket消息后，请求接口然后处理锁定
+     * sn 设备号
+     *  pushType  3锁定
+     */
+    @POST(UriAdress.EDIT_LOCKED)
+    suspend fun postExitLocked(@Body map:HashMap<String,Any>):ResponseData<CodeDetailBean>
+
+    /**
+     * 违规事件发送socket消息后，请求接口然后处理恢复出厂设置
+     * sn 设备号
+     * pushType  6恢复出厂设置
+     */
+    @POST(UriAdress.EDIT_RESETED)
+    suspend fun postExitReseted(@Body map:HashMap<String,Any>):ResponseData<CodeDetailBean>
 }

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

@@ -12,7 +12,6 @@ import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.provider.Settings
-import android.text.TextUtils
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
@@ -106,11 +105,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         viewModel.listAppData.observe(this) { modelList ->
             //存储商店应用包名到本地
             val appNameList = arrayListOf<String>()
-            val whiteList= arrayListOf<String>()
+            val whiteList = arrayListOf<String>()
             modelList.forEach {
                 appNameList.add(it.appPackage)
-                if (it.whited==1){
-                   whiteList.add(it.appPackage)
+                if (it.whited == 1) {
+                    whiteList.add(it.appPackage)
                 }
             }
             ManageApplication.addAppWhiteRule(whiteList)
@@ -136,7 +135,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 LogShow("${app.name},被冻结" + (filter.isEmpty() && appInfos.isEmpty()))
                 if (filter.isEmpty() && appInfos.isEmpty()) {
                     //ManageApplication.setPackageEnabled(app.packageName, (filter.isNotEmpty()))
-                     ManageApplication.uninstallPackage(app.packageName)
+                    ManageApplication.uninstallPackage(app.packageName)
                 }
             }
         }
@@ -238,6 +237,19 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 Toast(getString(R.string.codeerror))
             }
         }
+        viewModel.lockResultData.observe(this){
+            if (it){
+                spUtils.setParam(Const.DISABLEPAD, true)
+                startIntentActivity(MainActivity().javaClass)
+                val appList = AppUtils.GetAppList(this)
+                StrategyUtils.clearMemory(this, appList)
+            }
+        }
+        viewModel.resetlResultData.observe(this){
+            if (it){
+                ManageApplication.launchFactoryReset()
+            }
+        }
         startWorkManager()
     }
 
@@ -253,11 +265,19 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
         mBinding.loginoutIv.setOnClickListener {
             val schoolDeviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this@MainActivity)
+            //禁用注销则需要输入密码才能注销，不限制则直接注销登录
             if (schoolDeviceSetBean != null && schoolDeviceSetBean.logout == 1) {
                 //禁用注销
-                return@setOnClickListener
-            } else {
                 showEditDialog()
+            } else {
+                try {
+                    val userBean = spUtils.getFromJson(
+                        Const.USERINFO, UserBean().javaClass
+                    ) as UserBean
+                    viewModel.loginOut(userBean.userid.toString(), "")
+                } catch (e: Exception) {
+
+                }
             }
         }
         mBinding.codeenterCv.setOnClickListener {
@@ -363,14 +383,14 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             Const.USERID = it.userid
             Const.USERNAME = it.username.toString()
             viewModel.postDevicesetDetail(it.schoolid)
-            val name=StringBuffer()
-            if (!it.schoolName.isNullOrBlank()){
+            val name = StringBuffer()
+            if (!it.schoolName.isNullOrBlank()) {
                 name.append(it.schoolName)
             }
-            if (!it.classname.isNullOrBlank()){
+            if (!it.classname.isNullOrBlank()) {
                 name.append(it.classname)
             }
-            mBinding.userschoolTv.text =name.toString()
+            mBinding.userschoolTv.text = name.toString()
         }
         viewModel.postWallpaperPad()
         viewModel.updateStrategy()
@@ -580,12 +600,14 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
 
             Const.CODE2004.toString() -> {
+                postLogPush(4)
                 //请求接口更新策略
                 viewModel.uploadAppStrategy()
                 viewModel.updateStrategy()
             }
 
             Const.CODE2005.toString() -> {
+                postLogPush(5)
                 ManageApplication.rebootDevice()
             }
 
@@ -706,19 +728,25 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             Const.ACCOUNTLOGINOUT -> {
                 loginOut()
             }
+
+            Const.CODE3002.toString() -> {
+                val deviceInfo = ManageApplication.getDeviceInfo()
+                val sn= deviceInfo ?: ""
+                viewModel.postExitLocked(sn)
+            }
+
+            Const.CODE3006.toString() -> {
+                val deviceInfo = ManageApplication.getDeviceInfo()
+                val sn= deviceInfo ?: ""
+                viewModel.postExitReseted(sn)
+            }
         }
     }
 
     private fun postLogPush(pushType: Int) {
         val pushBean = LogPushBean()
         pushBean.pushType = pushType
-        pushBean.pushObjid = Const.SCHOOLID
-        Const.USERID?.let {
-            pushBean.userids = longArrayOf(it)
-        }
-        Const.USERNAME?.let {
-            pushBean.pushObjname = it
-        }
+        pushBean.sn=ManageApplication.getDeviceInfo()?:""
         viewModel.postLogPushAdd(pushBean)
     }
 
@@ -736,15 +764,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                         Const.FIRSTAPPLIST,
                         ArrayList<String>().javaClass
                     ) as ArrayList<String>
-                val removeList= arrayListOf<AppInfo>()
-               currentList.forEach {pkg->
-                   //学校控制之外的预装应用加入移除集合
-                   if (!Const.schoolSetAppList.contains(pkg)){
-                       appList.filter { it.packageName==pkg }.forEach {
-                           removeList.add(it)
-                       }
-                   }
-               }
+                val removeList = arrayListOf<AppInfo>()
+                currentList.forEach { pkg ->
+                    //学校控制之外的预装应用加入移除集合
+                    if (!Const.schoolSetAppList.contains(pkg)) {
+                        appList.filter { it.packageName == pkg }.forEach {
+                            removeList.add(it)
+                        }
+                    }
+                }
                 //移除学校控制之外预装应用
                 appList.removeAll(removeList)
             } catch (e: Exception) {

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

@@ -18,6 +18,11 @@ open class BaseViewModel : CommonBaseViewModel() {
     val timeResultData: LiveData<Long> = timeResult
     private val controlResult = MutableLiveData<Boolean>()
     val controlResultData: LiveData<Boolean> = controlResult
+    private val lockResult = MutableLiveData<Boolean>()
+    val lockResultData: LiveData<Boolean> = lockResult
+    private val resetResult = MutableLiveData<Boolean>()
+    val resetlResultData: LiveData<Boolean> = resetResult
+
     /**
      * 解除当前锁屏
      */
@@ -75,7 +80,7 @@ open class BaseViewModel : CommonBaseViewModel() {
     fun postExitControl(password:String){
         launchUI {
             val map=HashMap<String,Any>()
-            map[password]=password
+            map["password"]=password
             val result= loginService.postExitControl(map)
             if (result.code==0){
                 val codeDetailBean = result.obj
@@ -87,4 +92,46 @@ open class BaseViewModel : CommonBaseViewModel() {
             }
         }
     }
+
+    /**
+     * 违规事件发送socket消息后，请求接口然后处理锁定
+     * sn 设备号
+     *  pushType  3锁定
+     */
+    fun postExitLocked(sn:String,pushType:Int=3){
+        launchUI {
+            val map=HashMap<String,Any>()
+            map["sn"]=sn
+            map["pushType"]=pushType
+            val result = loginService.postExitLocked(map)
+            if (result.code==0){
+                lockResult.value=true
+            }else{
+                if (!result.msg.isNullOrEmpty()){
+                    netMessage.value=result.msg
+                }
+            }
+        }
+    }
+
+    /**
+     * 违规事件发送socket消息后，请求接口然后处理恢复出厂设置
+     * sn 设备号
+     * pushType  6恢复出厂设置
+     */
+    fun postExitReseted(sn:String,pushType:Int=6){
+        launchUI {
+            val map=HashMap<String,Any>()
+            map["sn"]=sn
+            map["pushType"]=pushType
+            val result = loginService.postExitReseted(map)
+            if (result.code==0){
+                resetResult.value=true
+            }else{
+                if (!result.msg.isNullOrEmpty()){
+                    netMessage.value=result.msg
+                }
+            }
+        }
+    }
 }

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

@@ -93,11 +93,15 @@ object Const {
     const val CODE2007 = 2007
 
 
-    //违规事件自动调用的限制使用
+    /**
+     * 违规事件自动调用的锁定
+     */
     const val CODE3002 = 3002
 
 
-    //违规事件自动调用的恢复出厂设置
+    /**
+     * 违规事件自动调用的恢复出厂设置
+     */
     const val CODE3006 = 3006
 
     //消息确认回发