1.登录页面添加事件响应和锁定功能。

2.添加事件2007常量。

README.md

@@ -15,3 +15,4 @@
 *   隐藏图库，相机开启后，该学校的所有设备桌面不再显示图库，相机
 *   禁用注销开启后，该学校的所有设备一旦登录成功，必须输入管理员密码才能退出登录
 *   限制使用时长后，客户端使用时间到了设备提醒休息，默认允许使用30分钟，这里你可以自行设置(可设置范围20~120分钟)
+解除管控， 去除所有限制，设置系统launcher为默认启动器，移除我们的启动器。

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

@@ -7,23 +7,36 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Build
 import android.view.View
+import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.addCallback
+import androidx.work.PeriodicWorkRequest
+import androidx.work.WorkManager
 import com.kongzue.dialogx.dialogs.CustomDialog
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.tbruyelle.rxpermissions2.RxPermissions
 import com.xhly.corelib.Const
+import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.utils.GsonUtils
+import com.xhly.corelib.utils.LogShow
 import com.xhly.corelib.utils.SystemUtil
 import com.xhly.manageapp.ManageApplication
 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.LogdOperateBean
+import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.contentprovider.ZSpProvider
 import com.xhly.manageapp.databinding.ActivityLoginBinding
+import com.xhly.manageapp.service.websocket.AppSocket
 import com.xhly.manageapp.ui.login.viewmodel.LoginViewModel
 import com.xhly.manageapp.ui.main.activity.MainActivity
+import com.xhly.manageapp.utils.StrategyUtils
+import com.xhly.manageapp.workmanager.TimingWorker
+import java.util.concurrent.TimeUnit
 
 class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     private var regioncode = ""
@@ -39,6 +52,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
                }
            }
        }
+        startWorkManager()
     }
 
     @SuppressLint("CheckResult")
@@ -120,4 +134,170 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
             }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
             .setAlign(CustomDialog.ALIGN.CENTER).show()
     }
+
+    override fun onUiEvent(uiEvent: UIEvent) {
+        super.onUiEvent(uiEvent)
+        when (uiEvent.getEvent()) {
+
+            Const.CODE2001.toString() -> {
+                val message = uiEvent.message
+                showNoticeDialog(message)
+            }
+
+            Const.CODE2002.toString() -> {
+                spUtils.setParam(Const.DISABLEPAD, true)
+                useTimeStrategy()
+            }
+
+            Const.CODE2003.toString() -> {
+                spUtils.setParam(Const.DISABLEPAD, false)
+                useTimeStrategy()
+            }
+
+            Const.CODE2004.toString() -> {
+
+            }
+
+            Const.CODE2005.toString() -> {
+                ManageApplication.rebootDevice()
+            }
+
+            Const.CODE2006.toString() -> {
+                ManageApplication.launchFactoryReset()
+            }
+
+            Const.CODE2007.toString() -> {
+
+            }
+
+
+            Const.LOGAPPSTART -> {
+
+            }
+
+
+            Const.SDINSTALL -> {
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "SD卡插入"
+                data.doEvent = EventLog.SDEMOUNTEDVENT
+                viewModel.eventLog(data)
+            }
+
+            Const.SDUNINSTALL -> {
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "SD卡拔出"
+                data.doEvent = EventLog.SDEJECTEVENT
+                viewModel.eventLog(data)
+            }
+
+            Const.SIMINSTALL -> {
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "SIM卡安装"
+                data.doEvent = EventLog.SIMEVENT
+                viewModel.eventLog(data)
+            }
+
+            Const.BLUETOOTHOPEN -> {
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "蓝牙打开"
+                data.doEvent = EventLog.BLUETOOHEVENT
+                viewModel.eventLog(data)
+            }
+
+            Const.USB_CONNECTED -> {
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "usb连接"
+                data.doEvent = EventLog.USBCONNECTEVENT
+                viewModel.eventLog(data)
+            }
+
+            Const.USB_NOCONNECTED -> {
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "usb断开"
+                data.doEvent = EventLog.USBDISCONNECTEVENT
+                viewModel.eventLog(data)
+            }
+        }
+
+    }
+
+    private fun showNoticeDialog(msg: String) {
+        CustomDialog.build()
+            .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_notice_dialog) {
+                override fun onBind(dialog: CustomDialog, v: View) {
+                    val closeBtn = v.findViewById<Button>(R.id.dialog_close_btn)
+                    val titleTv = v.findViewById<TextView>(R.id.dialog_title_tv)
+                    val contentTv = v.findViewById<TextView>(R.id.dialog_content_tv)
+                    try {
+                        val msgBean = GsonUtils.parseJsonWithGson(
+                            msg, SocketMsgBean().javaClass
+                        ) as SocketMsgBean
+                        titleTv.text = msgBean.title
+                        contentTv.text = msgBean.content
+                    } catch (e: Exception) {
+                        LogShow("解析失败"+e.toString())
+                    }
+                    closeBtn.setOnClickListener {
+                        dialog.dismiss()
+                    }
+                }
+            }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
+            .setAlign(CustomDialog.ALIGN.CENTER).show()
+    }
+
+    private fun useTimeStrategy() {
+        //获得sputils中的平板锁定策略
+        try {
+            //如果存储的是锁定则锁定
+            val param = spUtils.getParam(Const.DISABLEPAD, false) as Boolean
+            if (param) {
+                mBinding.loginMainLlayout.visibility = View.GONE
+                mBinding.lockLlayout.visibility = View.VISIBLE
+            } else {
+                mBinding.loginMainLlayout.visibility = View.VISIBLE
+                mBinding.lockLlayout.visibility = View.GONE
+            }
+        } catch (e: Exception) {
+            val param = spUtils.getParam(Const.DISABLEPAD, false) as Boolean
+            if (param) {
+                mBinding.loginMainLlayout.visibility = View.GONE
+                mBinding.lockLlayout.visibility = View.VISIBLE
+            } else {
+                mBinding.loginMainLlayout.visibility = View.VISIBLE
+                mBinding.lockLlayout.visibility = View.GONE
+            }
+        }
+    }
+
+    private fun startWorkManager() {
+        WorkManager.getInstance(this).cancelAllWork()
+        // 周期性任务时间最少15分钟 所以除以实际周期的时间  看需要加入几个任务
+        val taskList = arrayListOf(0, 5, 10)
+        for (taskNo in taskList) {
+            val request = PeriodicWorkRequest
+                // 最少15分钟 PeriodicWorkRequest
+                .Builder(TimingWorker::class.java, 15, TimeUnit.MINUTES)
+                // WorkRequest 根据实际周期以及任务的编号 延迟初始化 0，5，10 分别周期行执行
+                .setInitialDelay(taskNo.toLong(), TimeUnit.MINUTES).build()
+            WorkManager.getInstance(this).enqueue(request)
+        }
+    }
 }

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

@@ -6,10 +6,13 @@ import com.xhly.corelib.base.viewmodel.CommonBaseViewModel
 import com.xhly.corelib.network.RetrofitService
 import com.xhly.corelib.utils.LogShow
 import com.xhly.manageapp.bean.LoginBean
+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
 
 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
@@ -37,4 +40,10 @@ class LoginViewModel: CommonBaseViewModel() {
             }
         }
     }
+
+    fun eventLog(operateBean: LogdOperateBean) {
+        launchUI {
+            logService.postLogdoperateAdd(operateBean)
+        }
+    }
 }

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

@@ -424,6 +424,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 ManageApplication.launchFactoryReset()
             }
 
+            Const.CODE2007.toString() -> {
+
+            }
+
             Const.LOGAPPSTART -> {
                 val message = uiEvent.message
                 if (AppSocket.lastPkgName == message) {

app/src/main/res/layout/activity_login.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/login_main_llayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
@@ -95,9 +96,9 @@
                     android:layout_marginTop="165dp"
                     android:background="@null"
                     android:digits="@string/psw_style"
-                    android:inputType="numberPassword"
                     android:gravity="center_vertical"
                     android:hint="@string/inputcode"
+                    android:inputType="numberPassword"
                     android:singleLine="true"
                     android:textColor="@color/black"
                     android:textColorHint="#FFB8C2D9"
@@ -130,4 +131,61 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/lock_llayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/main_bg"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="157dp"
+            android:layout_height="151dp"
+            android:layout_marginTop="104dp"
+            android:src="@drawable/icon_lock" />
+
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="53dp"
+            android:layout_marginTop="26dp">
+
+            <EditText
+                android:id="@+id/lock_et"
+                android:layout_width="357dp"
+                android:layout_height="53dp"
+                android:background="@drawable/shape_shadow_bg"
+                android:hint="@string/passcode"
+                android:paddingLeft="28dp"
+                android:paddingRight="28dp"
+                android:singleLine="true"
+                android:textColor="@color/codetipscolor"
+                android:textColorHint="@color/codehintcolor"
+                android:textSize="16sp" />
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/codeenter_cv"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="center_vertical|right"
+                android:layout_marginRight="18dp"
+                app:cardBackgroundColor="@color/white">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="11dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/icon_etenter" />
+            </androidx.cardview.widget.CardView>
+        </FrameLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:text="@string/locktips"
+            android:textColor="@color/codetipscolor"
+            android:textSize="17sp" />
+    </LinearLayout>
+</FrameLayout>

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

@@ -46,6 +46,9 @@ object Const {
     //恢复出厂
     const val CODE2006 = 2006
 
+    //解除管控
+    const val CODE2007 = 2007
+
     //消息确认回发
     const val CODE666 = 666
 

websocket/src/main/java/com/xhly/websocket/utils/SocketPushUtils.kt

@@ -63,6 +63,11 @@ object SocketPushUtils {
                         UIEvent(Const.CODE2006.toString()).post()
                     }
 
+                    Const.CODE2007 -> {
+                        //恢复出厂
+                        UIEvent(Const.CODE2007.toString()).post()
+                    }
+
                     666 -> {
                         //消息确认回发mid 消息id