1.注销登录之前先请求接口判断当前状态。

2.添加注销登录确认弹窗。
3.登录页面自动同步时间时取消提示语。

app/src/main/java/com/xhly/manageapp/bean/school/SchoolDeviceSetBean.kt

@@ -79,4 +79,9 @@ class SchoolDeviceSetBean {
      * 是否隐藏图库:1是0否
      */
     var gallery=0
+
+    /**
+     * 本地使用，获取是来自于退出登录还是来自于更新应用设置时的请求,等于1表示来自于退出登录
+     */
+    var fromNetWorkType=0
 }

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

@@ -55,6 +55,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     private var showSettingNum=0
     private var waitDialog:WaitDialog?=null
     private var tipsDialog:CustomDialog?=null
+    private var syncTimeClickFlag=false
     override fun getBinding() = ActivityLoginBinding.inflate(layoutInflater)
 
     override fun initData() {
@@ -77,7 +78,10 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         }
         viewModel.timeResultData.observe(this){
             ManageApplication.setSysTime(it)
-            Toast(getString(R.string.syncsucess))
+            if (syncTimeClickFlag){
+                Toast(getString(R.string.syncsucess))
+            }
+            syncTimeClickFlag=false
         }
         viewModel.controlResultData.observe(this){
             //为真则可以进入管理页面
@@ -141,6 +145,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
             startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
         }
         mBinding.synctimeLlayout.setOnClickListener {
+               syncTimeClickFlag=true
                viewModel.postSyncTime()
         }
         mBinding.logoIv.setOnClickListener {

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

@@ -22,6 +22,7 @@ import android.os.Build
 import android.provider.Settings
 import android.view.MotionEvent
 import android.view.View
+import android.view.View.OnClickListener
 import android.view.WindowManager
 import android.widget.Button
 import android.widget.EditText
@@ -419,6 +420,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                     initSchoolSet(it)
                     mBinding.rv.visibility=View.VISIBLE
                     updateAppRv()
+                    if (it.fromNetWorkType==1){
+                        quitAccount(it)
+                    }
                 }
             }
         }
@@ -610,20 +614,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             }
         }
         mBinding.loginoutLlayout.setOnClickListener {
-            val schoolDeviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this@MainActivity)
-            //禁用注销则需要输入密码才能注销，不限制则直接注销登录
-            if (schoolDeviceSetBean != null && schoolDeviceSetBean.logout == 1) {
-                //禁用注销
-                showEditDialog()
-            } else {
-                try {
-                    val userBean = spUtils.getFromJson(
-                        Const.USERINFO, UserBean().javaClass
-                    ) as UserBean
-                    viewModel.loginOut(userBean.userid.toString(), "")
-                } catch (e: Exception) {
-
-                }
+            userBean?.let {
+                viewModel.getSchoolSetData(it.schoolid)
             }
         }
         mBinding.netsetLlayout.setOnClickListener {
@@ -665,6 +657,27 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         }
     }
 
+    private fun quitAccount(schoolDeviceSetBean:SchoolDeviceSetBean?){
+       /* val schoolDeviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this@MainActivity)*/
+        //禁用注销则需要输入密码才能注销，不限制则直接注销登录
+        if (schoolDeviceSetBean != null && schoolDeviceSetBean.logout == 1) {
+            //禁用注销
+            showEditDialog()
+        } else {
+            showTwoBtnDialog(getString(R.string.loginout),getString(R.string.loginouttips)
+            ) {
+                try {
+                    val userBean = spUtils.getFromJson(
+                        Const.USERINFO, UserBean().javaClass
+                    ) as UserBean
+                    viewModel.loginOut(userBean.userid.toString(), "")
+                } catch (e: Exception) {
+
+                }
+            }
+        }
+    }
+
     private fun showChangeCodeDialog() {
         CustomDialog.build()
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_changecode_dialog) {
@@ -1116,8 +1129,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
 
             Const.CODE2001.toString() -> {
                 val message = uiEvent.message
-                /*
-                showNoticeDialog(message)*/
                 //检查权限
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     if (!Settings.canDrawOverlays(this)) {
@@ -1645,25 +1656,23 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         }
     }
 
-    private fun showNoticeDialog(msg: String) {
+    private fun showTwoBtnDialog(title:String,content:String,onClickListener: OnClickListener) {
         CustomDialog.build()
-            .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_notice_dialog) {
+            .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_twobtn_dialog) {
                 override fun onBind(dialog: CustomDialog, v: View) {
-                    val closeBtn = v.findViewById<Button>(R.id.dialog_close_btn)
+                    val closeBtn = v.findViewById<TextView>(R.id.dialog_cancel_tv)
+                    val enterBtn = v.findViewById<TextView>(R.id.dialog_enter_tv)
                     val titleTv = v.findViewById<TextView>(R.id.dialog_title_tv)
                     val contentTv = v.findViewById<TextView>(R.id.dialog_content_tv)
-                    try {
-                        val msgBean = GsonUtils.parseJsonWithGson(
-                            msg, SocketMsgBean().javaClass
-                        ) as SocketMsgBean
-                        titleTv.text = msgBean.title
-                        contentTv.text = msgBean.content
-                    } catch (e: Exception) {
-                        LogShow("解析失败" + e.toString())
-                    }
+                    titleTv.text=title
+                    contentTv.text=content
                     closeBtn.setOnClickListener {
                         dialog.dismiss()
                     }
+                    enterBtn.setOnClickListener {
+                      dialog.dismiss()
+                      onClickListener.onClick(it)
+                    }
                 }
             }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
             .setAlign(CustomDialog.ALIGN.CENTER).show()

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

@@ -235,6 +235,24 @@ class MainViewModel : BaseViewModel() {
         }
     }
 
+    fun getSchoolSetData(schoolid: Long,fromeNetWorkType:Int=1){
+        launchUI {
+            val map = HashMap<String, Any>()
+            map["schoolid"] = schoolid
+            val result = strategyService.postDevicesetDetail(map)
+            if (result.code == 0) {
+                if (result.obj!=null){
+                    result.obj.fromNetWorkType=fromeNetWorkType
+                    schoolSet.value = result.obj
+                }else{
+                    netMessage.value ="请求获得数据为空"
+                }
+            } else {
+                netMessage.value = result.msg
+            }
+        }
+    }
+
     /**
      * 获得壁纸
      */

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

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="353dp"
+    android:layout_height="185dp"
+    android:background="@drawable/shape_whiteradiu_bg"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/dialog_title_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="22dp"
+        android:text="@string/regioncode"
+        android:textColor="#253A70"
+        android:textSize="18sp" />
+
+    <TextView
+        android:id="@+id/dialog_content_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="22dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="15dp"
+        android:text="@string/regioncode"
+        android:textColor="#253A70"
+        android:textSize="16sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/dialog_cancel_tv"
+            android:layout_width="147dp"
+            android:layout_height="40dp"
+            android:background="@drawable/shape_tv_noselect_bg"
+            android:gravity="center"
+            android:text="@string/cancel"
+            android:textColor="#339DFF"
+            android:textSize="17sp" />
+
+        <FrameLayout
+            android:layout_width="147dp"
+            android:layout_height="40dp"
+            android:layout_marginLeft="17dp">
+
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:layout_width="147dp"
+                android:layout_height="40dp"
+                android:gravity="center"
+                android:scaleType="centerCrop"
+                android:src="@drawable/icon_login"
+
+                app:riv_corner_radius="10dp" />
+
+            <TextView
+                android:id="@+id/dialog_enter_tv"
+                android:layout_width="147dp"
+                android:layout_height="40dp"
+                android:gravity="center"
+                android:text="@string/enter"
+                android:textColor="@color/white"
+                android:textSize="17sp" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>

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

@@ -37,6 +37,7 @@
     <string name="speedend">加速完成</string>
     <string name="clearend">清理缓存完成</string>
     <string name="loginout">注销</string>
+    <string name="loginouttips">是否注销登录？</string>
     <string name="appstore">星火应用商店</string>
     <string name="netset">网络设置</string>
     <string name="synctime">同步时间</string>