1.锁屏弹窗强制横屏

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

@@ -12,6 +12,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.drawable.BitmapDrawable
@@ -157,8 +158,14 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     private var changeCodeDialog: CustomDialog? = null
     private var tipsDialog: CustomDialog? = null
     private var systemDialog: AlertDialog? = null
-
+    //用于创建锁屏弹窗
     private var lockDialog: AlertDialog?=null
+    private var lockDialogTv:TextView?=null
+    private var lockDialogEt:EditText?=null
+    private var lockversionTv:TextView?=null
+    private var lockDialogNetset:View?=null
+    //表示是否是设置wifi是的话，暂时隐藏锁屏弹窗
+    private var goWifiFlag=false
 
     //创建应用卸载集合，方便获得应用信息
     private val unInstallAppList = arrayListOf<AppInfo>()
@@ -335,10 +342,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         viewModel.lockResultData.observe(this) {
             if (it) {
                 //获得违规状态后，锁定桌面
-                spUtils.setParam(Const.DISABLEPAD, true)
+                /*spUtils.setParam(Const.DISABLEPAD, true)
                 startIntentActivity(MainActivity().javaClass)
-                val appList = AppUtils.GetAppList(this)
-                StrategyUtils.clearMemory(this, appList)
+                clearAllMemory()*/
+                lockScreen()
             }
         }
         viewModel.resetlResultData.observe(this) {
@@ -630,10 +637,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
 
                             3 -> {
                                 //远程socket消息后，回调执行锁定
-                                val appList = AppUtils.GetAppList(this@MainActivity)
-                                StrategyUtils.clearMemory(this@MainActivity, appList)
+                                /*clearAllMemory()
                                 spUtils.setParam(Const.DISABLEPAD, true)
-                                startIntentActivity(MainActivity().javaClass)
+                                startIntentActivity(MainActivity().javaClass)*/
+                                lockScreen()
                             }
 
                             4 -> {
@@ -689,22 +696,27 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                     withContext(Dispatchers.IO) {
                         delay(3000)
                     }
-                    /*mBinding.flayoutRoot.visibility = View.GONE*/
                     canClickFlag = true
                     mBinding.userinfoLlayout.visibility = View.VISIBLE
                     mBinding.rv.visibility = View.VISIBLE
                 }
                 it?.let {
                     //连接不为空，并且应用已安装则跳转应用
-                    /* it.authUrl="com.xhkjedu.xh_control_browser.MainActivity"
-                     it.appPackage="com.xhkjedu.xh_control_browser"*/
                     LogShow("锁定了吧" + mainLockFlag)
                     //未锁定则执行跳转，锁定则跳转主页再次锁定并且不在请求接口
                     if (!mainLockFlag) {
-                        //如果地址为空并且请求为true则不跳转，否则跳转
+                        //如果地址为空并且请求为true则不跳转，否则跳转，如果现在为空则判断之前是否存在数据，存在则可能走了本地拉起，所以直接清除线程，把拉起清理掉
                         try {
-                            Log.d("网络跳转","自动拉起111")
                             if ((it.authUrl.isNullOrEmpty() || it.appPackage.isNullOrEmpty()) && it.netSucessFlag) {
+                                val autoAppBean = spUtils.getFromJson(
+                                    Const.AUTOAPPKEY,
+                                    AutoAppBean().javaClass
+                                ) as AutoAppBean
+                                //判断之前是否为空，不为空则清理之前的数据并且杀掉应用
+                                if ((!autoAppBean.authUrl.isNullOrEmpty() && !autoAppBean.appPackage.isNullOrEmpty())){
+                                    val appList = AppUtils.GetAppList(this@MainActivity)
+                                    StrategyUtils.clearMemory(this@MainActivity, appList)
+                                }
                                 //请求成功但地址为空，不跳转
                                 canClickFlag = true
                                 autoAppFlag = false
@@ -843,6 +855,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             } catch (e: Exception) {
 
             }
+
             val launchIntent = Intent()
             launchIntent.setComponent(
                 ComponentName(
@@ -858,6 +871,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             if (isDestroyFlag) {
                 return
             }
+            //启动之前清除其他应用
+            clearAllMemory()
+
             startActivity(launchIntent)
         } catch (e: Exception) {
             canClickFlag = true
@@ -927,12 +943,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         mBinding.codeenterCv.setOnClickListener {
             //如果密码一致,则解锁
             val code = mBinding.lockEt.text.toString()
-            if (code.isNullOrBlank()) {
-                return@setOnClickListener
-            }
-            ManageApplication.getDeviceInfo()?.let {
-                viewModel.postPwdDetail(code, it)
-            }
+            postPwdDetail(code)
         }
         mBinding.loginoutLlayout.setOnClickListener {
             userBean?.let {
@@ -941,10 +952,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             }
         }
         mBinding.netsetLlayout.setOnClickListener {
-            val intent = Intent(Settings.ACTION_WIFI_SETTINGS)
-            intent.putExtra("full_screen", true)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            startActivity(intent)
+             goWifiActivity()
         }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回键
@@ -955,6 +963,25 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             }
         }
     }
+    private fun postPwdDetail(code: String) {
+        if (!NetworkUtils.isAvailable(this)) {
+
+            return
+        }
+        if (code.isNullOrBlank()) {
+            return
+        }
+        ManageApplication.getDeviceInfo()?.let {
+            viewModel.postPwdDetail(code, it)
+        }
+    }
+
+    private fun goWifiActivity() {
+        val intent = Intent(Settings.ACTION_WIFI_SETTINGS)
+        intent.putExtra("full_screen", true)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
+    }
 
     //解锁屏幕
     private fun unBindBlock() {
@@ -1134,6 +1161,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     override fun onResume() {
         super.onResume()
         userBean?.let {
+            goWifiFlag=false
             StrategyUtils.initMainResume()
             val name = StringBuffer()
             if (!it.schoolName.isNullOrBlank()) {
@@ -1150,13 +1178,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             updateResumeStrategy()
             updatePadInfo()
             updateMcApp()
-            val appVersionCode = SystemUtil.getAppVersionCode(this, packageName)
-            val appVersionName = SystemUtil.getAppVersionName(this, packageName)
-            mBinding.versionTv.text = if (com.xhkjedu.manageapp.BuildConfig.IS_DEBUG) {
-                "版本 v${appVersionName} (Build ${appVersionCode})测试版"
-            } else {
-                "版本 v${appVersionName} (Build ${appVersionCode})正式版"
-            }
+            setVersionText(mBinding.versionTv)
             if (SystemUtil.isSuEnable()) {
                 //root了则调用接口
                 val data = LogdOperateBean()
@@ -1174,14 +1196,25 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         }
     }
 
+    private fun setVersionText(tv: TextView){
+        val appVersionCode = SystemUtil.getAppVersionCode(this, packageName)
+        val appVersionName = SystemUtil.getAppVersionName(this, packageName)
+        tv.text = if (com.xhkjedu.manageapp.BuildConfig.IS_DEBUG) {
+            "版本 v${appVersionName} (Build ${appVersionCode})测试版"
+        } else {
+            "版本 v${appVersionName} (Build ${appVersionCode})正式版"
+        }
+    }
+
     override fun onPause() {
         super.onPause()
-        LogShow("锁定了吧显示弹窗吗222")
-        if (userBean!=null){
-            if (mainLockFlag){
-                showLockDialog(true)
-            }else{
-                showLockDialog(false)
+        if (!goWifiFlag){
+            if (userBean!=null){
+                if (mainLockFlag){
+                    showLockDialog(true)
+                }else{
+                    showLockDialog(false)
+                }
             }
         }
     }
@@ -1552,7 +1585,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                 }
             }*/
             //没有单点登录所以不再判断
-            LogShow("锁定了吧打开app拉起请求，type==$type")
+            LogShow("锁定了吧打开app拉起请求，type==$type"+(userBean==null))
             userBean?.let {
                 netAutoAppFlag = true
                 viewModel.postAutoAppDetail(it.regionid)
@@ -2086,14 +2119,42 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         }
     }
 
-    private fun showLockDialog(showFlag:Boolean) {
+    private fun showLockDialog(showFlag:Boolean,timeBlockFlag:Boolean?=null,codeBlockFlag:Boolean?=null) {
+        //根据锁定类型，显示不同的文本
+        var codeText=""
+        if (showFlag){
+            if (timeBlockFlag!=null&&codeBlockFlag!=null){
+                if (codeBlockFlag) {
+                    codeText=getString(R.string.locktips)
+                } else if (timeBlockFlag) {
+                    codeText=getString(R.string.timelocktips)
+                }
+            }else{
+                var block = false
+                val strategyBean =
+                    spUtils.getFromJson(Const.STRATEGYBEANKEY, StrategyBean::class.java) as StrategyBean
+                strategyBean?.let { bean ->
+                    //获得是否在使用时间范围
+                    block = StrategyUtils.getPadTimeStrategy(bean)
+                }
+                val param = spUtils.getParam(Const.DISABLEPAD, false) as Boolean
+                if (param) {
+                    codeText=getString(R.string.locktips)
+                } else if (block) {
+                    codeText=getString(R.string.timelocktips)
+                }else{
+                    codeText=getString(R.string.locktips)
+                }
+            }
+        }
          if (lockDialog==null){
              val v = View.inflate(this, R.layout.dialog_locklayout, null)
              val lockllayout=v.findViewById<View>(R.id.lock_llayout)
              val codeenter_cv=v.findViewById<View>(R.id.codeenter_cv)
-             val lock_et=v.findViewById<EditText>(R.id.lock_et)
-             val locktips_tv=v.findViewById<TextView>(R.id.locktips_tv)
-             locktips_tv.text="这是弹窗"
+             lockDialogEt=v.findViewById<EditText>(R.id.lock_et)
+             lockDialogTv=v.findViewById<TextView>(R.id.locktips_tv)
+             lockversionTv=v.findViewById<TextView>(R.id.version_tv)
+             lockDialogNetset=v.findViewById<View>(R.id.netset_llayout)
              lockllayout.setOnClickListener {
                  //限制最多1分钟请求一次策略,
                  if (lastTimeLong + 1 * 60 * 1000 < System.currentTimeMillis()) {
@@ -2101,15 +2162,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                      updateAllStrategy()
                  }
              }
+             lockDialogNetset?.setOnClickListener {
+                 goWifiActivity()
+                 goWifiFlag=true
+                 lockDialog?.dismiss()
+             }
              codeenter_cv.setOnClickListener {
                  //如果密码一致,则解锁
-                 val code = lock_et.text.toString()
-                 if (code.isNullOrBlank()) {
-                     return@setOnClickListener
-                 }
-                 ManageApplication.getDeviceInfo()?.let {
-                     viewModel.postPwdDetail(code, it)
-                 }
+                 val code = lockDialogEt?.text.toString()
+                 postPwdDetail(code)
              }
              lockDialog =
                  AlertDialog.Builder(this).create()
@@ -2122,9 +2183,19 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                  lockDialog?.window?.setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT)
              }
          }
-        LogShow("锁定了吧显示弹窗吗"+showFlag+"|||"+mainLockFlag + "|||" + autoAppFlag)
+        //强制弹窗横屏
+        val attributes = lockDialog?.window?.attributes
+        attributes?.screenOrientation= ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+        lockDialog?.window?.attributes = attributes
+
+
         lockDialog?.apply {
+            lockDialogEt?.setText("")
             if (showFlag){
+                lockversionTv?.apply {
+                    setVersionText(this)
+                }
+                lockDialogTv?.text=codeText
                 if (!isShowing) {
                     show()
                 }
@@ -2493,8 +2564,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     }
 
     private fun loginOutSucess() {
-        val appList = AppUtils.GetAppList(this@MainActivity)
-        StrategyUtils.clearMemory(this@MainActivity, appList)
+        clearAllMemory()
         spUtils.setParam(Const.DISABLEPAD, false)
         WorkManager.getInstance(this).cancelAllWork()
         spUtils.clearData()
@@ -2505,6 +2575,24 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         finish()
     }
 
+    //已经确定执行锁定屏幕的回调方法
+    private fun lockScreen(){
+        spUtils.setParam(Const.DISABLEPAD, true)
+        showLockDialog(true)
+        startIntentActivity(MainActivity().javaClass)
+        clearAllMemory()
+    }
+
+    private fun clearAllMemory(){
+        try {
+            //清除所有缓存
+            val appList = AppUtils.GetAppList(this@MainActivity)
+            StrategyUtils.clearMemory(this@MainActivity, appList)
+        } catch (e: Exception) {
+
+        }
+    }
+
 
     override fun onDestroy() {
         super.onDestroy()
@@ -2513,13 +2601,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             timer?.cancel()
             timer = null
         }
-        try {
-            //销毁时清除所有缓存
-            val appList = AppUtils.GetAppList(this@MainActivity)
-            StrategyUtils.clearMemory(this@MainActivity, appList)
-        } catch (e: Exception) {
-
-        }
+        //销毁时清除所有缓存
+        clearAllMemory()
         locationClient?.stop()
         AppSocket.onDestroy()
         DownLoadUtils.removeCallback(this)

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

@@ -56,4 +56,45 @@
         android:text="@string/locktips"
         android:textColor="@color/codetipscolor"
         android:textSize="17sp" />
+   <RelativeLayout
+       android:layout_width="match_parent"
+       android:layout_height="match_parent">
+       <TextView
+           android:id="@+id/version_tv"
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           android:layout_gravity="bottom|left"
+           android:layout_alignParentBottom="true"
+           android:layout_marginLeft="10dp"
+           android:layout_marginBottom="10dp"
+           android:textColor="#253A70"
+           android:textSize="8sp" />
+
+       <LinearLayout
+           android:id="@+id/netset_llayout"
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           android:layout_alignParentRight="true"
+           android:layout_marginRight="10dp"
+           android:layout_alignParentBottom="true"
+           android:layout_marginBottom="10dp"
+           android:paddingLeft="10dp"
+           android:paddingTop="10dp"
+           android:gravity="center"
+           android:orientation="horizontal">
+
+           <ImageView
+               android:layout_width="10dp"
+               android:layout_height="10dp"
+               android:layout_marginRight="3dp"
+               android:src="@drawable/icon_wifiset" />
+
+           <TextView
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:text="@string/netset"
+               android:textColor="#253A70"
+               android:textSize="8sp" />
+       </LinearLayout>
+   </RelativeLayout>
 </LinearLayout>