1.usb监听增加限制，2秒内不算。

2.跳转wifi设置，增加flag防止跳回桌面。
3.修改注销弹窗密码提示。
3.锁定时隐藏各种弹窗。

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

@@ -73,7 +73,9 @@ class AppAdapter(var context: Context, var data: ArrayList<AppInfo>) :
                    Toaster.show(context.getString(R.string.checknettips))
                }
             }else if (appInfo.packageName.equals(Const.WIFISEETTINGPKG)){
-                context.startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
+                val intent = Intent(Settings.ACTION_WIFI_SETTINGS)
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(intent)
             }else if (appInfo.packageName.equals(Const.STOREAPPPKG)){
                 //跳转应用商店
                 if (!AppUtils.isAppInstalled(context,appInfo.packageName)){

app/src/main/java/com/xhly/manageapp/broadcastreceiver/USBReceiver.kt

@@ -15,7 +15,12 @@ class USBReceiver : BroadcastReceiver() {
         val booleanExtra3 = intent.getBooleanExtra(USB_FUNCTION_ADB, false)
         LogShow("USBReceiver获取权限成功：1.链接==$booleanExtra,mtp==$booleanExtra1,ptp==$booleanExtra2,adb==$booleanExtra3")
         if (booleanExtra){
-            UIEvent(Const.USB_CONNECTED).post()
+            val currentTimeMillis = System.currentTimeMillis()
+            //两秒以上再次收到消息才再次发送，否则认为监听连续触发不处理
+            if ((installLastTime ==0L||(currentTimeMillis -installLastTime >2000))){
+                installLastTime = currentTimeMillis
+                UIEvent(Const.USB_CONNECTED).post()
+            }
         }else{
             UIEvent(Const.USB_NOCONNECTED).post()
         }
@@ -27,5 +32,6 @@ class USBReceiver : BroadcastReceiver() {
         const val USB_FUNCTION_PTP = "ptp"
         const val USB_FUNCTION_ADB = "adb"
         const val USB_CONNECTED = "connected"
+        var installLastTime=0L
     }
 }

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

@@ -142,7 +142,9 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
             hiddenSoft(mBinding.accountEt)
         }
         mBinding.netsetLlayout.setOnClickListener {
-            startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
+            val intent = Intent(Settings.ACTION_WIFI_SETTINGS)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            startActivity(intent)
         }
         mBinding.synctimeLlayout.setOnClickListener {
                syncTimeClickFlag=true

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

@@ -126,6 +126,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     private var autoAppFlag=true
 
     private var accountDialog:CustomDialog?=null
+    private var quitAccountDialog:CustomDialog?=null
+    private var changeCodeDialog:CustomDialog?=null
+
     private var tipsDialog:CustomDialog?=null
     //创建应用卸载集合，方便获得应用信息
     private val unInstallAppList= arrayListOf<AppInfo>()
@@ -627,7 +630,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             }
         }
         mBinding.netsetLlayout.setOnClickListener {
-            startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
+            val intent = Intent(Settings.ACTION_WIFI_SETTINGS)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            startActivity(intent)
         }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回键
@@ -699,7 +704,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     }
 
     private fun showChangeCodeDialog() {
-        CustomDialog.build()
+        changeCodeDialog=null
+        changeCodeDialog=CustomDialog.build()
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_changecode_dialog) {
                 override fun onBind(dialog: CustomDialog, v: View) {
                     //TODO 修改密码接口没有
@@ -1070,10 +1076,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             }
             val param = spUtils.getParam(Const.DISABLEPAD, false) as Boolean
             if (param || block) {
-                mBinding.mainLlayout.visibility = View.GONE
-                mBinding.lockLlayout.visibility = View.VISIBLE
                 //隐藏账号编辑弹窗
                 accountDialog?.dismiss()
+                quitAccountDialog?.dismiss()
+                changeCodeDialog?.dismiss()
+                mBinding.mainLlayout.visibility = View.GONE
+                mBinding.lockLlayout.visibility = View.VISIBLE
                 mainLockFlag=true
                 //锁定时可以点击
                 canClickFlag=true
@@ -1662,49 +1670,47 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     }
 
     private fun showEditDialog() {
-        if (accountDialog==null){
-            accountDialog = CustomDialog.build()
-                .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_edit_dialog) {
-                    override fun onBind(dialog: CustomDialog, v: View) {
-                        var 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.exit)
-                        enterTv.setOnClickListener {
-                            val code = editText.text
-                            if ((!code.isNullOrBlank()) && code.length >= 6 && code.length <= 16) {
-                                dialog.dismiss()
-                                try {
-                                    val userBean = spUtils.getFromJson(
-                                        Const.USERINFO, UserBean().javaClass
-                                    ) as UserBean
-                                    viewModel.loginOut(userBean.userid.toString(), code.toString())
-                                } catch (e: Exception) {
+        accountDialog =null
+        accountDialog = CustomDialog.build()
+            .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_edit_dialog) {
+                override fun onBind(dialog: CustomDialog, v: View) {
+                    var 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.exit)
+                    enterTv.setOnClickListener {
+                        val code = editText.text
+                        if ((!code.isNullOrBlank()) && code.length >= 6 && code.length <= 16) {
+                            dialog.dismiss()
+                            try {
+                                val userBean = spUtils.getFromJson(
+                                    Const.USERINFO, UserBean().javaClass
+                                ) as UserBean
+                                viewModel.loginOut(userBean.userid.toString(), code.toString())
+                            } catch (e: Exception) {
 
-                                }
+                            }
+                        }else{
+                            if (code.isNullOrBlank()){
+                                Toast(getString(R.string.codenoempty))
                             }else{
-                                if (code.isNullOrBlank()){
-                                    Toast(getString(R.string.codenoempty))
-                                }else{
-                                    Toast(getString(R.string.codetips))
-                                }
+                                Toast(getString(R.string.quitcodetips))
                             }
                         }
-                        cancelTv.setOnClickListener {
-                            dialog.dismiss()
-                        }
                     }
-                }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
-                .setAlign(CustomDialog.ALIGN.CENTER).show()
-        }else{
-            accountDialog?.show()
-        }
+                    cancelTv.setOnClickListener {
+                        dialog.dismiss()
+                    }
+                }
+            }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
+            .setAlign(CustomDialog.ALIGN.CENTER).show()
     }
 
     private fun showTwoBtnDialog(title:String,content:String,onClickListener: OnClickListener) {
-        CustomDialog.build()
+        quitAccountDialog=null
+        quitAccountDialog=CustomDialog.build()
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_twobtn_dialog) {
                 override fun onBind(dialog: CustomDialog, v: View) {
                     val closeBtn = v.findViewById<TextView>(R.id.dialog_cancel_tv)

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

@@ -261,6 +261,10 @@ object StrategyUtils {
                 if (schoolDeviceSetBean.camera == 1 && appinfo.packageName.equals(Const.ANDROIDCAMERA)) {
                     return@forEach
                 }
+                //是否隐藏相机:1是0否
+                if (schoolDeviceSetBean.camera == 1 && appinfo.packageName.equals(Const.ANDROIDCAMERA6)) {
+                    return@forEach
+                }
                 //是否隐藏相册:1是0否(505f)
                 if (schoolDeviceSetBean.gallery == 1 && appinfo.packageName.equals(Const.ANDROIDGALLERY)) {
                     return@forEach

app/src/main/res/values/strings.xml

@@ -28,6 +28,7 @@
     <string name="newcodetips">请输入新密码</string>
     <string name="enternewcodetips">请输入确认新密码</string>
     <string name="codetips">密码必须是6-16位的英文字母、数字组合</string>
+    <string name="quitcodetips">密码必须是6位数字</string>
     <string name="locktips">您的设备已违规或者被管理员锁定，请联系管理员</string>
     <string name="timelocktips">当前时间不可用，请在规定时间内使用</string>
     <string name="codeerror">密码不正确</string>

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

@@ -259,10 +259,15 @@ object Const {
     const val ANDROIDDESKCLOCK = "com.android.deskclock"
 
     /**
-     * 联想相机相机
+     * 联想相机505f
      */
     const val ANDROIDCAMERA = "org.codeaurora.snapcam"
 
+    /**
+     * 联想相机6e6f
+     */
+    const val ANDROIDCAMERA6 = "com.dtab.camera"
+
     /**
      * 联想相册505f
      */
@@ -281,6 +286,7 @@ object Const {
         ANDROIDCALENDAR,
         ANDROIDDESKCLOCK,
         ANDROIDCAMERA,
+        ANDROIDCAMERA6,
         ANDROIDGALLERY,
         ANDROIDGALLERY6
     )