1.添加解除限制的密码判断接口。

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

@@ -70,4 +70,9 @@ object UriAdress {
      * 获得壁纸
      */
     const val WALLPAPERPAD="/wallpaper/detail_pad"
+
+    /**
+     * 解除当前锁屏
+     */
+    const val PWD_DEATIL_USERPAD="/password/detail_userpad"
 }

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

@@ -57,6 +57,13 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
                }
            }
        }
+        viewModel.pwdResultData.observe(this){
+            if (it){
+                unBindBlock()
+            }else{
+                Toast(getString(R.string.codeerror))
+            }
+        }
         startWorkManager()
     }
 
@@ -66,6 +73,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         setSoftInput(mBinding.root)
         mBinding.loginBtn.setOnClickListener {
             val rxPermissions = RxPermissions(this)
+            //有无权限都要登录
             val request = rxPermissions.request(Manifest.permission.READ_PHONE_STATE)
             request.subscribe({
                 login()
@@ -76,6 +84,16 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         mBinding.codeLoginIv.setOnClickListener {
             showEditDialog()
         }
+        mBinding.codeenterCv.setOnClickListener {
+            //如果密码一致,则解锁
+            val code = mBinding.lockEt.text.toString()
+            if (code.isNullOrBlank()){
+                return@setOnClickListener
+            }
+            ManageApplication.getDeviceInfo()?.let {
+                viewModel.postPwdDetail(code,it)
+            }
+        }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回
         }
@@ -142,6 +160,14 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         finish()
     }
 
+    private fun unBindBlock() {
+        spUtils.setParam(Const.DISABLEPAD, false)
+        useTimeStrategy()
+        if (mBinding.loginMainLlayout.visibility == View.GONE) {
+            Toast(getString(R.string.padtimestoptips))
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         useTimeStrategy()

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

@@ -21,4 +21,10 @@ interface LoginService {
      */
     @POST(UriAdress.ULOGIN_LOGIN_OUT)
     suspend fun postLoginOut(@Body map:HashMap<String,Any>): ResponseData<Any>
+
+    /**
+     * 解除当前锁屏
+     */
+    @POST(UriAdress.PWD_DEATIL_USERPAD)
+    suspend fun postPwdDetail(@Body map:HashMap<String,Any>):ResponseData<Any>
 }

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

@@ -16,6 +16,8 @@ class LoginViewModel: CommonBaseViewModel() {
     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()
@@ -46,4 +48,20 @@ class LoginViewModel: CommonBaseViewModel() {
             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

@@ -179,6 +179,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         viewModel.loginOutData.observe(this) {
             if (it) {
                 loginOut()
+            }else{
+                Toast(getString(R.string.codeerror))
             }
         }
         viewModel.updateInfoData.observe(this) {
@@ -219,6 +221,13 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         viewModel.netWhiteListData.observe(this){
            StrategyUtils.setNetWhiteList(it)
         }
+        viewModel.pwdResultData.observe(this){
+            if (it){
+                unBindBlock()
+            }else{
+                Toast(getString(R.string.codeerror))
+            }
+        }
         startWorkManager()
     }
 
@@ -243,10 +252,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
         mBinding.codeenterCv.setOnClickListener {
             //如果密码一致,则解锁
-            spUtils.setParam(Const.DISABLEPAD, false)
-            useTimeStrategy()
-            if (mBinding.mainLlayout.visibility == View.GONE) {
-                Toast(getString(R.string.apptimestoptips))
+            val code = mBinding.lockEt.text.toString()
+            if (code.isNullOrBlank()){
+                return@setOnClickListener
+            }
+            ManageApplication.getDeviceInfo()?.let {
+                viewModel.postPwdDetail(code,it)
             }
         }
         onBackPressedDispatcher.addCallback {
@@ -255,6 +266,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
     }
 
+    //解锁屏幕
+    private fun unBindBlock() {
+        spUtils.setParam(Const.DISABLEPAD, false)
+        useTimeStrategy()
+        if (mBinding.mainLlayout.visibility == View.GONE) {
+            Toast(getString(R.string.padtimestoptips))
+        }
+    }
+
     private fun getChangeCodeListener():AppAdapter.ChangePwdListener{
         return object :AppAdapter.ChangePwdListener{
             override fun changeCode() {
@@ -446,7 +466,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 mBinding.mainLlayout.visibility = View.VISIBLE
                 mBinding.lockLlayout.visibility = View.GONE
             }
-            changeWhiteList()
+            mBinding.lockEt.setText("")
         } catch (e: Exception) {
             val param = spUtils.getParam(Const.DISABLEPAD, false) as Boolean
             if (param) {
@@ -459,26 +479,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
     }
 
-    private fun changeWhiteList() {/*        //获得当前白名单
-                val packageWhiteList = csdkManager.installPackageWhiteList
-                LogShow("当前白名单$packageWhiteList")
-                //获得从网络获取的白名单
-                val jsonArray = spUtils.getFromJson(Const.WHITELISTAPP, ArrayList<String>().javaClass)
-                val removeList = arrayListOf<String>()
-                //移除白名单外的应用，并设置新的白名单
-                if (jsonArray != null) {
-                    val whiteList = jsonArray as ArrayList<String>
-                    packageWhiteList.forEach { pkg ->
-                        val filter = whiteList.filter { it == pkg }
-                        if (filter.isEmpty()) {
-                            removeList.add(pkg)
-                        }
-                    }
-                    ManageApplication.addInstallPackageWhiteList(whiteList)
-                }
-                ManageApplication.removeInstallPackageWhiteList(removeList)*/
-    }
-
     private fun initSchoolSet(schoolDeviceSetBean: SchoolDeviceSetBean? = null) {
         schoolDeviceSetBean?.let {bean->
             //是否启用截屏:1是0否

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

@@ -38,12 +38,14 @@ class MainViewModel : CommonBaseViewModel() {
     val updateInfoData: LiveData<Boolean> = updateInfo
     private val loginOut = MutableLiveData<Boolean>()
     val loginOutData: LiveData<Boolean> = loginOut
-    private val schoolSet=MutableLiveData<SchoolDeviceSetBean>()
-    val schoolSetData:LiveData<SchoolDeviceSetBean> =schoolSet
-    private val wallpaper=MutableLiveData<WallpaperBean>()
-    val wallpaperData:LiveData<WallpaperBean> =wallpaper
-    private val netWhiteList=MutableLiveData<ArrayList<String>>()
-    val netWhiteListData:LiveData<ArrayList<String>> =netWhiteList
+    private val schoolSet = MutableLiveData<SchoolDeviceSetBean>()
+    val schoolSetData: LiveData<SchoolDeviceSetBean> = schoolSet
+    private val wallpaper = MutableLiveData<WallpaperBean>()
+    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 {
@@ -60,21 +62,21 @@ class MainViewModel : CommonBaseViewModel() {
                 }
             }
             //获得必装应用
-            val result= appService.postForceApp()
-            if (result.code==0&&result.obj!=null&&result.obj.isNotEmpty()){
-                forceData.value=result.obj
+            val result = appService.postForceApp()
+            if (result.code == 0 && result.obj != null && result.obj.isNotEmpty()) {
+                forceData.value = result.obj
             }
         }
     }
 
-/*    fun getForceAppList(){
-        launchUI {
-            val result= appService.postForceApp()
-            if (result.code==0&&result.obj!=null&&result.obj.isNotEmpty()){
-                forceData.value=result.obj
+    /*    fun getForceAppList(){
+            launchUI {
+                val result= appService.postForceApp()
+                if (result.code==0&&result.obj!=null&&result.obj.isNotEmpty()){
+                    forceData.value=result.obj
+                }
             }
-        }
-    }*/
+        }*/
 
     fun updateStrategy() {
         launchUI {
@@ -154,13 +156,13 @@ class MainViewModel : CommonBaseViewModel() {
     /**
      * 获得设备设置管理
      */
-    fun postDevicesetDetail(schoolid:Long) {
+    fun postDevicesetDetail(schoolid: Long) {
         launchUI {
             val map = HashMap<String, Any>()
             map["schoolid"] = schoolid
             val result = strategyService.postDevicesetDetail(map)
             if (result.code == 0) {
-               schoolSet.value=result.obj
+                schoolSet.value = result.obj
             } else {
                 netMessage.value = result.msg
             }
@@ -170,11 +172,11 @@ class MainViewModel : CommonBaseViewModel() {
     /**
      * 获得壁纸
      */
-    fun postWallpaperPad(){
+    fun postWallpaperPad() {
         launchUI {
             val postWallpaperPad = appService.postWallpaperPad()
-            if (postWallpaperPad.code==0){
-                wallpaper.value=postWallpaperPad.obj
+            if (postWallpaperPad.code == 0) {
+                wallpaper.value = postWallpaperPad.obj
             }
         }
     }
@@ -182,21 +184,37 @@ class MainViewModel : CommonBaseViewModel() {
     /**
      * 获得网址白名单
      */
-    fun postAppNetWhiteList(){
+    fun postAppNetWhiteList() {
         launchUI {
             val postAppNetWhiteList = strategyService.postAppNetWhiteList()
-            if (postAppNetWhiteList.code==0){
-                 val urlList= arrayListOf<String>()
+            if (postAppNetWhiteList.code == 0) {
+                val urlList = arrayListOf<String>()
                 postAppNetWhiteList.obj.forEach {
-                    if (it.contains(";")){
-                        it.split(";").forEach {str->
+                    if (it.contains(";")) {
+                        it.split(";").forEach { str ->
                             urlList.add(str)
                         }
-                    }else{
+                    } else {
                         urlList.add(it)
                     }
                 }
-                  netWhiteList.value=urlList
+                netWhiteList.value = urlList
+            }
+        }
+    }
+
+    /**
+     * 解除当前锁屏
+     */
+    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/res/values/strings.xml

@@ -2,7 +2,7 @@
     <string name="app_name">XhlyManageApp</string>
     <string name="stoptips">已被禁用，无法操作</string>
     <string name="apptimestoptips">应用不在可用时间!</string>
-    <string name="timestoptips">当前时段不可用</string>
+    <string name="padtimestoptips">平板不在可用时间！</string>
     <string name="inputaccount">请输入账号</string>
     <string name="inputcode">请输入密码</string>
     <string name="inputregioncode">请输入区域码</string>
@@ -29,6 +29,7 @@
     <string name="enternewcodetips">请输入确认新密码</string>
     <string name="codetips">密码必须是6-16位的英文字母、数字组合</string>
     <string name="locktips">您的设备已违规或者被管理员限制使用，请联系管理员</string>
+    <string name="codeerror">密码不正确。</string>
     <string name="durationtips">当前使用时间过长，请休息后再使用。\n</string>
     <string name="openrotation">自动旋转已开启</string>
     <string name="closerotation">自动旋转已关闭</string>