1.自动登录之前隐藏布局。

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

@@ -147,8 +147,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     //标记当前是否锁定
     private var mainLockFlag = false
     private var autoAppFlag = true
+
     //标记是否来自广播退出登录
-    private var loginoutFlag=false
+    private var loginoutFlag = false
 
     private var accountDialog: CustomDialog? = null
     private var quitAccountDialog: CustomDialog? = null
@@ -183,18 +184,24 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
 
     //判断是否在onresume状态
     private var isResumeFlag = true
+
     //判断是否在onDestroy状态
-    private var isDestroyFlag=false
+    private var isDestroyFlag = false
+
     //执行了自启请求
-    private var netAutoAppFlag=false
+    private var netAutoAppFlag = false
+
     //表示请求了策略更新
-    private var netStrategyDataFlag=false
+    private var netStrategyDataFlag = false
+
     //表示请求了退出
-    private var quitFlag=false
+    private var quitFlag = false
+
     //处理连续点击电源键的操作
-    private var lastClickPowerTime=0L
+    private var lastClickPowerTime = 0L
+
     //标记更新了user
-    private var updateUser=false
+    private var updateUser = false
 
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
 
@@ -248,10 +255,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                 registerLoginOutReceiver()
                 registerLoginEditReceiver()
                 registerXhlyUpdeteStrategyReceiver()
-                adapter?.userBean=it
+                adapter?.userBean = it
             }
-        }catch (e:Exception){
-            LogShow("错误是"+e.toString())
+        } catch (e: Exception) {
+            LogShow("错误是" + e.toString())
         }
         /*
          使用情况权限
@@ -352,7 +359,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                         LogShow("冻结失败" + e.toString())
                     }
                     unInstallAppList.clear()
-                    if (modelList.size>0){
+                    if (modelList.size > 0) {
                         ManageApplication.disableInstallation(true)
                         //modelList为0表示未打开应用策略，不删除应用,并且打开应用安装权限，其余情况关闭
                         appList.forEach { app ->
@@ -365,7 +372,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                                 ManageApplication.uninstallPackage(app.packageName)
                             }
                         }
-                    }else{
+                    } else {
                         //modelList为0表示未打开应用策略,所以打开打开应用安装权限
                         ManageApplication.disableInstallation(false)
                     }
@@ -457,8 +464,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         viewModel.viewModelScope.launch {
             viewModel.strategyData.collect {
                 //netStrategyDataFlag表示接口请求了，才可以接收数据
-                if (netStrategyDataFlag){
-                    netStrategyDataFlag=false
+                if (netStrategyDataFlag) {
+                    netStrategyDataFlag = false
                     it?.let {
                         spUtils.saveJson(Const.STRATEGYBEANKEY, it)
                         StrategyUtils.setStrategy(it)
@@ -527,8 +534,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                     mBinding.rv.visibility = View.VISIBLE
                     updateAppRv()
                     if (it.fromNetWorkType == 1) {
-                        if (quitFlag){
-                            quitFlag=false
+                        if (quitFlag) {
+                            quitFlag = false
                             quitAccount(it)
                         }
                     } else if (it.fromNetWorkType == 2) {
@@ -610,105 +617,113 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         }
 
         viewModel.viewModelScope.launch {
-            lifecycleScope.launch {
-                withContext(Dispatchers.IO){
-                    delay(2000)
-                }
-                viewModel.autoAppData.collect {
-                    it?.let {
-                        if (!netAutoAppFlag||isDestroyFlag){
-                            return@collect
-                        }else{
-                            netAutoAppFlag=false
-                        }
-                        //连接不为空，并且应用已安装则跳转应用
-                        /* it.authUrl="com.xhkjedu.xh_control_browser.MainActivity"
-                         it.appPackage="com.xhkjedu.xh_control_browser"*/
-                        LogShow("锁定了吧" + mainLockFlag)
-                        //未锁定则执行跳转，锁定则跳转主页再次锁定并且不在请求接口
-                        if (!mainLockFlag) {
-                            //如果地址为空并且请求为true则不跳转，否则跳转
-                            try {
-                                if ((it.authUrl.isNullOrEmpty()||it.appPackage.isNullOrEmpty())&&it.netSucessFlag){
-                                    //请求成功但地址为空，不跳转
-                                    canClickFlag = true
-                                    autoAppFlag = false
-                                    spUtils.saveJson(Const.AUTOAPPKEY, it)
-                                } else if ((!it.authUrl.isNullOrEmpty()&&!it.appPackage.isNullOrEmpty()) && AppUtils.isAppInstalled(this@MainActivity, it.appPackage)) {
-                                    //请求成功地址不为空，并且安装了跳转
-                                    spUtils.saveJson(Const.AUTOAPPKEY, it)
-                                    LogShow("打开app拉起111")
-                                    startAutoApp(it)
-                                } else if (!it.netSucessFlag){
-                                    //请求失败走缓存
-                                    val autoAppBean = spUtils.getFromJson(
-                                        Const.AUTOAPPKEY,
-                                        AutoAppBean().javaClass
-                                    ) as AutoAppBean
-                                    if ((!autoAppBean.authUrl.isNullOrEmpty()&&!autoAppBean.appPackage.isNullOrEmpty())&&
-                                        AppUtils.isAppInstalled(this@MainActivity, autoAppBean.appPackage) && !it.netSucessFlag) {
-                                        //缓存地址不为空，并且安装了则跳转
-                                        LogShow("打开app拉起222")
-                                        startAutoApp(autoAppBean)
-                                    } else {
-                                        //其余情况都允许触控
-                                        canClickFlag = true
-                                    }
-                                }else{
+            viewModel.autoAppData.collect {
+                it?.let {
+                    if (!netAutoAppFlag || isDestroyFlag) {
+                        mBinding.flayoutRoot.visibility = View.GONE
+                        return@collect
+                    } else {
+                        netAutoAppFlag = false
+                    }
+                    //连接不为空，并且应用已安装则跳转应用
+                    /* it.authUrl="com.xhkjedu.xh_control_browser.MainActivity"
+                     it.appPackage="com.xhkjedu.xh_control_browser"*/
+                    LogShow("锁定了吧" + mainLockFlag)
+                    //未锁定则执行跳转，锁定则跳转主页再次锁定并且不在请求接口
+                    if (!mainLockFlag) {
+                        //如果地址为空并且请求为true则不跳转，否则跳转
+                        try {
+                            if ((it.authUrl.isNullOrEmpty() || it.appPackage.isNullOrEmpty()) && it.netSucessFlag) {
+                                mBinding.flayoutRoot.visibility = View.GONE
+                                //请求成功但地址为空，不跳转
+                                canClickFlag = true
+                                autoAppFlag = false
+                                spUtils.saveJson(Const.AUTOAPPKEY, it)
+                            } else if ((!it.authUrl.isNullOrEmpty() && !it.appPackage.isNullOrEmpty()) && AppUtils.isAppInstalled(
+                                    this@MainActivity,
+                                    it.appPackage
+                                )
+                            ) {
+                                //请求成功地址不为空，并且安装了跳转
+                                spUtils.saveJson(Const.AUTOAPPKEY, it)
+                                LogShow("打开app拉起111")
+                                startAutoApp(it)
+                            } else if (!it.netSucessFlag) {
+                                //请求失败走缓存
+                                val autoAppBean = spUtils.getFromJson(
+                                    Const.AUTOAPPKEY,
+                                    AutoAppBean().javaClass
+                                ) as AutoAppBean
+                                if ((!autoAppBean.authUrl.isNullOrEmpty() && !autoAppBean.appPackage.isNullOrEmpty()) &&
+                                    AppUtils.isAppInstalled(
+                                        this@MainActivity,
+                                        autoAppBean.appPackage
+                                    ) && !it.netSucessFlag
+                                ) {
+                                    //缓存地址不为空，并且安装了则跳转
+                                    LogShow("打开app拉起222")
+                                    startAutoApp(autoAppBean)
+                                } else {
+                                    //其余情况都允许触控
                                     canClickFlag = true
+                                    mBinding.flayoutRoot.visibility = View.GONE
                                 }
-                            } catch (e: Exception) {
+                            } else {
+                                mBinding.flayoutRoot.visibility = View.GONE
                                 canClickFlag = true
                             }
-                        } else {
+                        } catch (e: Exception) {
                             canClickFlag = true
-                            autoAppFlag = false
-                            startIntentActivity(MainActivity().javaClass)
+                            mBinding.flayoutRoot.visibility = View.GONE
                         }
-
+                    } else {
+                        mBinding.flayoutRoot.visibility = View.GONE
+                        canClickFlag = true
+                        autoAppFlag = false
+                        startIntentActivity(MainActivity().javaClass)
                     }
                 }
-
             }
         }
         viewModel.timeResultData.observe(this) {
-            if (SystemUtil.updateTimeFlag){
-                SystemUtil.updateTimeFlag=false
+            if (SystemUtil.updateTimeFlag) {
+                SystemUtil.updateTimeFlag = false
                 ManageApplication.setSysTime(it)
-                LogShow("当前设置的时间是"+it+"|||"+SystemClock.getDateString(it))
+                LogShow("当前设置的时间是" + it + "|||" + SystemClock.getDateString(it))
                 try {
                     tipsDialog?.dismiss()
-                }catch (e:Exception){
+                } catch (e: Exception) {
 
                 }
             }
         }
         viewModel.viewModelScope.launch {
-            viewModel.mainLoginData.collect{bean->
-               bean?.let {suserBean->
-                    if (!updateUser){
+            viewModel.mainLoginData.collect { bean ->
+                bean?.let { suserBean ->
+                    if (!updateUser) {
                         return@collect
                     }
-                    updateUser=false
-                    if (suserBean.xhlyLoginSucess){
-                        userBean=suserBean
+                    updateUser = false
+                    if (suserBean.xhlyLoginSucess) {
+                        userBean = suserBean
                         val data = LogdOperateBean()
                         ManageApplication.getDeviceInfo()?.let {
                             data.sn = it
                         }
                         data.doEvent = EventLog.ACCOUNTLOGINEVENT
-                        data.comm=EventLog.ACCOUNTLOGINEVENTSTRING
+                        data.comm = EventLog.ACCOUNTLOGINEVENTSTRING
                         viewModel.eventLog(data)
-                        Const.USERID=suserBean.userid
-                        Const.USERNAME=suserBean.username.toString()
-                        Const.SCHOOLID=suserBean.schoolid
-                        Const.CLASSID=suserBean.classid
-                        spUtils.saveJson(Const.USERINFO,suserBean)
+                        Const.USERID = suserBean.userid
+                        Const.USERNAME = suserBean.username.toString()
+                        Const.SCHOOLID = suserBean.schoolid
+                        Const.CLASSID = suserBean.classid
+                        spUtils.saveJson(Const.USERINFO, suserBean)
                         val parseClassToJson = GsonUtils.parseClassToJson(suserBean)
-                        ZSpProvider.save(this@MainActivity,Const.USERINFO,parseClassToJson)
+                        ZSpProvider.save(this@MainActivity, Const.USERINFO, parseClassToJson)
                         AppSocket.onDestroy()
                         AppSocket.startSocket(ManageApplication.instance)
-                    }else{
+                        updateAllStrategy()
+                    } else {
                         suserBean.xhlyLoginMessage?.let {
                             Toast(it)
                         }
@@ -723,8 +738,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
 */
         lifecycleScope.launch {
             isCreatFlag = true
-            isDestroyFlag=false
-            withContext(Dispatchers.IO){
+            isDestroyFlag = false
+            withContext(Dispatchers.IO) {
                 delay(2000)
             }
             //自动同时一次时间
@@ -737,12 +752,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     }
 
 
-
     private fun startAutoApp(autoAppBean: AutoAppBean) {
         try {
             StrategyUtils.initMainResume()
             try {
-                canClickFlag=true
+                canClickFlag = true
                 val am = getSystemService(ACTIVITY_SERVICE) as ActivityManager
                 /*val runningTasks = am.getRunningTasks(1)
                 if (!runningTasks.isNullOrEmpty()){
@@ -755,23 +769,25 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                 }*/
 
                 //不在判断栈顶activity,现在根据进程名字判断,包含则不拉起（增加条件，当前页面为管控桌面则拉起）
-                var manageFlag=false
+                var manageFlag = false
                 val runningTasks = am.getRunningTasks(1)
-                if (!runningTasks.isNullOrEmpty()){
+                if (!runningTasks.isNullOrEmpty()) {
                     //判断栈顶是不是管控桌面
-                    manageFlag= runningTasks[0].topActivity?.className.toString() == this.javaClass.name
+                    manageFlag =
+                        runningTasks[0].topActivity?.className.toString() == this.javaClass.name
                 }
                 //当前不是管控桌面才判断下一步，是的话不判断进程。
-                if (!manageFlag){
+                if (!manageFlag) {
                     val runningApps = am.runningAppProcesses
-                    val filter = runningApps.filter { it.processName.equals(autoAppBean.appPackage!!) }
-                    if (filter.isNotEmpty()){
+                    val filter =
+                        runningApps.filter { it.processName.equals(autoAppBean.appPackage!!) }
+                    if (filter.isNotEmpty()) {
                         //允许触摸不然会出现无法触摸的问题
                         canClickFlag = true
                         return
                     }
                 }
-            }catch (e:Exception){
+            } catch (e: Exception) {
 
             }
             val launchIntent = Intent()
@@ -786,7 +802,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                 val parseClassToJson = GsonUtils.parseClassToJson(it)
                 launchIntent.putExtra("authData", parseClassToJson)
             }
-            if (isDestroyFlag){
+            if (isDestroyFlag) {
                 return
             }
             startActivity(launchIntent)
@@ -794,7 +810,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             canClickFlag = true
             LogShow("跳转问题是$e")
         }
-
+        mBinding.flayoutRoot.visibility = View.GONE
     }
 
     private fun showSucessToast() {
@@ -839,7 +855,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         }
         mBinding.loginoutLlayout.setOnClickListener {
             userBean?.let {
-                quitFlag=true
+                quitFlag = true
                 viewModel.getSchoolSetData(it.schoolid)
             }
         }
@@ -904,15 +920,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         //禁用注销则需要输入密码才能注销，不限制则直接注销登录
         if (schoolDeviceSetBean != null && schoolDeviceSetBean.logout == 1) {
             //禁用注销
-            if (accountDialog!=null&&accountDialog?.isShow!!){
+            if (accountDialog != null && accountDialog?.isShow!!) {
                 return
-            }else{
+            } else {
                 showEditDialog()
             }
         } else {
-            if (quitAccountDialog!=null&&quitAccountDialog?.isShow!!){
+            if (quitAccountDialog != null && quitAccountDialog?.isShow!!) {
                 return
-            }else{
+            } else {
                 showTwoBtnDialog(
                     getString(R.string.loginout), getString(R.string.loginouttips)
                 ) {
@@ -1019,9 +1035,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         updateMcApp()
         val appVersionCode = SystemUtil.getAppVersionCode(this, packageName)
         val appVersionName = SystemUtil.getAppVersionName(this, packageName)
-        mBinding.versionTv.text =if (com.xhkjedu.manageapp.BuildConfig.IS_DEBUG){
+        mBinding.versionTv.text = if (com.xhkjedu.manageapp.BuildConfig.IS_DEBUG) {
             "版本 v${appVersionName} (Build ${appVersionCode})测试版"
-        }else{
+        } else {
             "版本 v${appVersionName} (Build ${appVersionCode})正式版"
         }
         if (SystemUtil.isSuEnable()) {
@@ -1060,9 +1076,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                 useTimeStrategy(4)
                 hasNetFlag = false
                 lifecycleScope.launch {
-                    withContext(Dispatchers.IO){
+                    withContext(Dispatchers.IO) {
                         delay(2000)
-                        if (!NetworkUtils.isAvailable(applicationContext)){
+                        if (!NetworkUtils.isAvailable(applicationContext)) {
                             showTipsDialog(getString(R.string.checknettips))
                         }
                     }
@@ -1082,8 +1098,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             updateAllStrategy()
         } else {
             if (!isCreatFlag) {
-               //!isCreatFlag表示不是第一次启动时使用useTimeStrategy
-               useTimeStrategy(5)
+                //!isCreatFlag表示不是第一次启动时使用useTimeStrategy
+                useTimeStrategy(5)
             }
             isCreatFlag = false
         }
@@ -1096,7 +1112,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             Const.USERNAME = it.username.toString()
             viewModel.postDevicesetDetail(it.schoolid)
         }
-        netStrategyDataFlag=true
+        netStrategyDataFlag = true
         viewModel.postWallpaperPad()
         viewModel.updateStrategy()
         viewModel.uploadAppStrategy()
@@ -1326,7 +1342,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         locationClient?.start()
     }
 
-    private fun useTimeStrategy(type:Int) {
+    private fun useTimeStrategy(type: Int) {
         LogShow("开始获得时间策略$type")
         //获得sputils中的平板锁定策略
         try {
@@ -1373,7 +1389,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         }
         LogShow("锁定了吧" + mainLockFlag + "|||" + autoAppFlag)
         //自动退出时优先退出而不是拉起app
-        if (autoAppFlag&&!loginoutFlag) {
+        if (autoAppFlag && !loginoutFlag) {
             /*//因为对于学生端app退出登录的处理，所以类型为5（这时认为执行的时机是学生主动退出了登录，所以不拉起）时不执行拉起
             if (type!=5){
                 userBean?.let {
@@ -1383,7 +1399,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             }*/
             //没有单点登录所以不再判断
             userBean?.let {
-                netAutoAppFlag=true
+                netAutoAppFlag = true
                 viewModel.postAutoAppDetail(it.regionid)
             }
         }
@@ -1661,7 +1677,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
 
             Const.ACCOUNTLOGINOUT -> {
                 //退出则不拉起app
-                loginoutFlag=true
+                loginoutFlag = true
                 loginOut()
             }
 
@@ -1703,8 +1719,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                     startTimeTask(it, true)
                 }
                 screenFlag = true
-                if (System.currentTimeMillis()-lastClickPowerTime>50000){
-                    lastClickPowerTime=System.currentTimeMillis()
+                if (System.currentTimeMillis() - lastClickPowerTime > 50000) {
+                    lastClickPowerTime = System.currentTimeMillis()
                     Const.backNum++
                     updateResumeStrategy()
                 }
@@ -1726,12 +1742,14 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             Const.STARTLOCATION -> {
                 getLocation()
             }
-            Const.THIRDLOGINSUCCESS->{
-                loginoutFlag=false
-                 loginEdit(uiEvent.bundle)
+
+            Const.THIRDLOGINSUCCESS -> {
+                loginoutFlag = false
+                loginEdit(uiEvent.bundle)
             }
-            Const.LOGINOUTTOMAINACTIVITY->{
-                loginoutFlag=true
+
+            Const.LOGINOUTTOMAINACTIVITY -> {
+                loginoutFlag = true
             }
         }
     }
@@ -1739,29 +1757,29 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     private fun loginEdit(bundle: Bundle?) {
         bundle?.let {
             val string = it.getString("loginEdit")
-            if (string!=null){
+            if (string != null) {
                 try {
                     val mcUserBean = GsonUtils.parseJsonWithGson(string, McUserBean::class.java)
-                    val loginStudentBean=LoginStudentBean()
+                    val loginStudentBean = LoginStudentBean()
                     userBean?.let {
-                        loginStudentBean.userid=it.userid
-                        loginStudentBean.regionid=it.regionid
+                        loginStudentBean.userid = it.userid
+                        loginStudentBean.regionid = it.regionid
                     }
-                    loginStudentBean.username=mcUserBean?.username
-                    loginStudentBean.studentno=mcUserBean?.studentno
-                    loginStudentBean.cardid=mcUserBean?.cardid
-                    loginStudentBean.classname=mcUserBean?.classname
-                    loginStudentBean.schoolname=mcUserBean?.schoolname
-                    loginStudentBean.userphone=mcUserBean?.userphone
-                    if (mcUserBean?.usersex==1){
-                        loginStudentBean.usersex=1
-                    }else{
-                        loginStudentBean.usersex=0
+                    loginStudentBean.username = mcUserBean?.username
+                    loginStudentBean.studentno = mcUserBean?.studentno
+                    loginStudentBean.cardid = mcUserBean?.cardid
+                    loginStudentBean.classname = mcUserBean?.classname
+                    loginStudentBean.schoolname = mcUserBean?.schoolname
+                    loginStudentBean.userphone = mcUserBean?.userphone
+                    if (mcUserBean?.usersex == 1) {
+                        loginStudentBean.usersex = 1
+                    } else {
+                        loginStudentBean.usersex = 0
                     }
-                    updateUser=true
+                    updateUser = true
                     viewModel.editLogin(loginStudentBean)
-                }catch (e:Exception){
-                    Log.d("修改登录信息失败",e.toString())
+                } catch (e: Exception) {
+                    Log.d("修改登录信息失败", e.toString())
                 }
             }
         }
@@ -1939,11 +1957,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             var schoolDeviceSetBean: SchoolDeviceSetBean? = null
             schoolDeviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this)
             schoolDeviceSetBean?.let {
-                if (it.calendar==0){
+                if (it.calendar == 0) {
                     //如果不隐藏日历则需要先解除冻结，否则继续冻结,需要优先处理否则之后会存在读取不到日历安装包的情况
-                    ManageApplication.setPackageEnabled(Const.ANDROIDCALENDAR,true)
-                }else{
-                    ManageApplication.setPackageEnabled(Const.ANDROIDCALENDAR,false)
+                    ManageApplication.setPackageEnabled(Const.ANDROIDCALENDAR, true)
+                } else {
+                    ManageApplication.setPackageEnabled(Const.ANDROIDCALENDAR, false)
                 }
             }
             val storeList = arrayListOf<String>()
@@ -2106,10 +2124,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
 
     private fun registerBleStateReceiver() {
         val filter = IntentFilter()
-        mBleReceiver= BLEStateReceiver()
+        mBleReceiver = BLEStateReceiver()
         filter.addAction("android.bluetooth.adapter.action.STATE_CHANGED")
         filter.addAction("android.bluetooth.BluetoothAdapter.STATE_OFF")
-        filter.addAction("android.bluetooth.BluetoothAdapter.STATE_ON" )
+        filter.addAction("android.bluetooth.BluetoothAdapter.STATE_ON")
         registerReceiver(mBleReceiver, filter)
     }
 
@@ -2129,6 +2147,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         filter.addAction(Intent.ACTION_MEDIA_EJECT)
         registerReceiver(mSDReceiver, filter)
     }
+
     private fun registerLoginOutReceiver() {
         val filter = IntentFilter()
         mLoginOutReceiver = XhlyLoginOutReceiver()
@@ -2264,7 +2283,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
 
     override fun onDestroy() {
         super.onDestroy()
-        isDestroyFlag=true
+        isDestroyFlag = true
         if (timer != null) {
             timer?.cancel()
             timer = null
@@ -2273,7 +2292,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             //销毁时清除所有缓存
             val appList = AppUtils.GetAppList(this@MainActivity)
             StrategyUtils.clearMemory(this@MainActivity, appList)
-        }catch (e:Exception){
+        } catch (e: Exception) {
 
         }
         locationClient?.stop()
@@ -2352,8 +2371,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
         val x = mBinding.netsetLlayout.x
         val y = mBinding.netsetLlayout.y
-        if (ev!=null){
-            if (ev.x>=x&&ev.y>=y){
+        if (ev != null) {
+            if (ev.x >= x && ev.y >= y) {
                 super.dispatchTouchEvent(ev)
             }
         }
@@ -2365,8 +2384,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        when(keyCode){
-            KeyEvent.KEYCODE_HOME->{
+        when (keyCode) {
+            KeyEvent.KEYCODE_HOME -> {
                 return true
             }
         }

app/src/main/java/com/xhly/manageapp/viewmodel/BaseViewModel.kt

@@ -18,6 +18,7 @@ import com.xhly.manageapp.bean.scheme.AutoAppBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.network.log.LogService
 import com.xhly.manageapp.ui.login.netservice.LoginService
+import com.xhly.manageapp.utils.SystemClock
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -183,7 +184,9 @@ open class BaseViewModel : CommonBaseViewModel() {
                 SystemUtil.updateTimeFlag=true
                 val endTime = System.currentTimeMillis()
                 val obj = postSyncTime.obj
-                timeResult.value = obj + (endTime - startTime) / 2
+                val l = obj + (endTime - startTime) / 2
+                LogShow("设置的时间是"+SystemClock.getDateString(l))
+                timeResult.value = l
             } else {
                 if (!postSyncTime.msg.isNullOrEmpty()) {
                     netMessage.value = postSyncTime.msg

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

@@ -84,7 +84,14 @@
                 android:layout_marginTop="24dp"
                 android:overScrollMode="never" />
         </LinearLayout>
-
+        <LinearLayout
+            android:id="@+id/flayout_root"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/main_bg"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            />
         <LinearLayout
             android:id="@+id/lock_llayout"
             android:layout_width="match_parent"