1.删除平板端的解除管控

2.添加解除管控的存储常量

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

@@ -51,21 +51,10 @@ class ManageActivity : BaseActivity<BaseViewModel, ActivityManageBinding>() {
     override fun initData() {
         //同意运行时权限
         ManageApplication.setRuntimePermissions(true)
-        viewModel.controlResultData.observe(this){
-            if(it){
-                currentSpUtils.saveJson(Const.EXIT_CONTROL,type)
-                StrategyUtils.releaseControl()
-            }else{
-                Toast(getString(R.string.codeerror))
-            }
-        }
     }
 
 
     override fun initView() {
-        mBinding.closemanageBtn.setOnClickListener {
-            showEditDialog()
-        }
         mBinding.adbopenBtn.setOnClickListener {
             Toast("设置" + ManageApplication.enableUsbDebugging(true))
         }

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

@@ -258,7 +258,8 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
 
             Const.CODE2007.toString() -> {
                 postLogPush(7)
-                StrategyUtils.releaseControl()
+                currentSpUtils.setParam(Const.EXIT_CONTROL,true)
+                StrategyUtils.releaseControl(this)
             }
 
             Const.SDINSTALL -> {

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

@@ -618,7 +618,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
             Const.CODE2007.toString() -> {
                 postLogPush(7)
-                StrategyUtils.releaseControl()
+                currentSpUtils.setParam(Const.EXIT_CONTROL,true)
+                StrategyUtils.releaseControl(this)
             }
 
             Const.LOGAPPSTART -> {

app/src/main/java/com/xhly/manageapp/utils/StrategyUtils.kt

@@ -338,7 +338,7 @@ object StrategyUtils {
     /**
      * 解除管控
      */
-    public fun releaseControl(){
+    public fun releaseControl(context: Context){
           try {
               //允许截屏
               ManageApplication.enableCaptureScreen(true)
@@ -363,20 +363,23 @@ object StrategyUtils {
               //关闭网络白名单
               ManageApplication.setUrlWhiteListEnable(false)
               //设置默认启动器
-              ManageApplication.setCustomLauncher("com.tblenovo.launcher","com.android.iotlauncher.IotLauncher")
-              try {
-                  val launchIntent = Intent()
-                  launchIntent.setComponent(
-                      ComponentName(
-                          "com.tblenovo.launcher",
-                          "com.android.iotlauncher.IotLauncher"
+              if (ModelNameUtils.IS_LianxX505f()){
+                  //505f的桌面名称
+                  ManageApplication.setCustomLauncher("com.tblenovo.launcher","com.android.iotlauncher.IotLauncher")
+                  try {
+                      val launchIntent = Intent()
+                      launchIntent.setComponent(
+                          ComponentName(
+                              "com.tblenovo.launcher",
+                              "com.android.iotlauncher.IotLauncher"
+                          )
                       )
-                  )
-                  launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                  ManageApplication.instance?.startActivity(launchIntent)
-                  exitProcess(0)
-              }catch (e:Exception){
-                  Toaster.showLong("失败原因"+e.toString())
+                      launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                      context.startActivity(launchIntent)
+                      exitProcess(0)
+                  }catch (e:Exception){
+                      Toaster.showLong("失败原因"+e.toString())
+                  }
               }
           }catch (e:Exception){