diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {
diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
index 8416587..2352eb9 100644
--- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
@@ -22,6 +22,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -59,6 +60,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.deviceDetailData.observe(this) {

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {
diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
index 8416587..2352eb9 100644
--- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
@@ -22,6 +22,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -59,6 +60,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.deviceDetailData.observe(this) {
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index a928fc2..2b64158 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -20,6 +20,7 @@
 import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -64,6 +65,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(String.format(groupId + "项目设备列表"))
 

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {
diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
index 8416587..2352eb9 100644
--- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
@@ -22,6 +22,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -59,6 +60,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.deviceDetailData.observe(this) {
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index a928fc2..2b64158 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -20,6 +20,7 @@
 import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -64,6 +65,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(String.format(groupId + "项目设备列表"))
 
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index 68f4dfd..747c468 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -28,6 +28,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -74,6 +75,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
 
         //地图初始化

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {
diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
index 8416587..2352eb9 100644
--- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
@@ -22,6 +22,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -59,6 +60,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.deviceDetailData.observe(this) {
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index a928fc2..2b64158 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -20,6 +20,7 @@
 import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -64,6 +65,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(String.format(groupId + "项目设备列表"))
 
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index 68f4dfd..747c468 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -28,6 +28,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -74,6 +75,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
 
         //地图初始化
diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
index 5a451da..336839b 100644
--- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
@@ -19,6 +19,7 @@
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.extensions.timestampToLastMonthDate
 import com.pengxh.kt.lite.extensions.timestampToLastWeekDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -42,6 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         groupId = params[0]
         devCode = params[1]

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {
diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
index 8416587..2352eb9 100644
--- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
@@ -22,6 +22,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -59,6 +60,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.deviceDetailData.observe(this) {
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index a928fc2..2b64158 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -20,6 +20,7 @@
 import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -64,6 +65,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(String.format(groupId + "项目设备列表"))
 
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index 68f4dfd..747c468 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -28,6 +28,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -74,6 +75,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
 
         //地图初始化
diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
index 5a451da..336839b 100644
--- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
@@ -19,6 +19,7 @@
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.extensions.timestampToLastMonthDate
 import com.pengxh.kt.lite.extensions.timestampToLastWeekDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -42,6 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         groupId = params[0]
         devCode = params[1]
diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
index 44ed949..795d383 100644
--- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
@@ -13,6 +13,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
@@ -32,6 +33,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         // 设置默认账号密码
         binding.userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         binding.userPasswordView.setText(

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {
diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
index 8416587..2352eb9 100644
--- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
@@ -22,6 +22,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -59,6 +60,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.deviceDetailData.observe(this) {
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index a928fc2..2b64158 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -20,6 +20,7 @@
 import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -64,6 +65,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(String.format(groupId + "项目设备列表"))
 
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index 68f4dfd..747c468 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -28,6 +28,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -74,6 +75,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
 
         //地图初始化
diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
index 5a451da..336839b 100644
--- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
@@ -19,6 +19,7 @@
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.extensions.timestampToLastMonthDate
 import com.pengxh.kt.lite.extensions.timestampToLastWeekDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -42,6 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         groupId = params[0]
         devCode = params[1]
diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
index 44ed949..795d383 100644
--- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
@@ -13,6 +13,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
@@ -32,6 +33,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         // 设置默认账号密码
         binding.userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         binding.userPasswordView.setText(
diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
index b6b4e8a..337412a 100644
--- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
@@ -14,6 +14,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 
 class MainActivity : KotlinBaseActivity<ActivityMainBinding>() {
 
@@ -35,6 +36,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         //保留icon原图颜色
         binding.bottomNavigation.itemIconTintList = null
         binding.mainViewPager.adapter = TabPageViewAdapter(supportFragmentManager, fragmentPages)

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {
diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
index 8416587..2352eb9 100644
--- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
@@ -22,6 +22,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -59,6 +60,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.deviceDetailData.observe(this) {
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index a928fc2..2b64158 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -20,6 +20,7 @@
 import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -64,6 +65,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(String.format(groupId + "项目设备列表"))
 
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index 68f4dfd..747c468 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -28,6 +28,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -74,6 +75,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
 
         //地图初始化
diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
index 5a451da..336839b 100644
--- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
@@ -19,6 +19,7 @@
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.extensions.timestampToLastMonthDate
 import com.pengxh.kt.lite.extensions.timestampToLastWeekDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -42,6 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         groupId = params[0]
         devCode = params[1]
diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
index 44ed949..795d383 100644
--- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
@@ -13,6 +13,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
@@ -32,6 +33,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         // 设置默认账号密码
         binding.userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         binding.userPasswordView.setText(
diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
index b6b4e8a..337412a 100644
--- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
@@ -14,6 +14,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 
 class MainActivity : KotlinBaseActivity<ActivityMainBinding>() {
 
@@ -35,6 +36,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         //保留icon原图颜色
         binding.bottomNavigation.itemIconTintList = null
         binding.mainViewPager.adapter = TabPageViewAdapter(supportFragmentManager, fragmentPages)
diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt
index c8a8b04..6570d2d 100644
--- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt
@@ -15,6 +15,7 @@
 import com.casic.smarttube.extensions.initImmersionBar
 import com.casic.smarttube.utils.CenterMarkerView
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 
 
 class SelectLocationActivity : KotlinBaseActivity<ActivitySelectLocationBinding>(),
@@ -36,6 +37,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.mapView.onCreate(savedInstanceState)
 
         aMap = binding.mapView.map

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {
diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
index 8416587..2352eb9 100644
--- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
@@ -22,6 +22,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -59,6 +60,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.deviceDetailData.observe(this) {
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index a928fc2..2b64158 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -20,6 +20,7 @@
 import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -64,6 +65,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(String.format(groupId + "项目设备列表"))
 
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index 68f4dfd..747c468 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -28,6 +28,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -74,6 +75,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
 
         //地图初始化
diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
index 5a451da..336839b 100644
--- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
@@ -19,6 +19,7 @@
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.extensions.timestampToLastMonthDate
 import com.pengxh.kt.lite.extensions.timestampToLastWeekDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -42,6 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         groupId = params[0]
         devCode = params[1]
diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
index 44ed949..795d383 100644
--- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
@@ -13,6 +13,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
@@ -32,6 +33,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         // 设置默认账号密码
         binding.userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         binding.userPasswordView.setText(
diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
index b6b4e8a..337412a 100644
--- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
@@ -14,6 +14,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 
 class MainActivity : KotlinBaseActivity<ActivityMainBinding>() {
 
@@ -35,6 +36,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         //保留icon原图颜色
         binding.bottomNavigation.itemIconTintList = null
         binding.mainViewPager.adapter = TabPageViewAdapter(supportFragmentManager, fragmentPages)
diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt
index c8a8b04..6570d2d 100644
--- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt
@@ -15,6 +15,7 @@
 import com.casic.smarttube.extensions.initImmersionBar
 import com.casic.smarttube.utils.CenterMarkerView
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 
 
 class SelectLocationActivity : KotlinBaseActivity<ActivitySelectLocationBinding>(),
@@ -36,6 +37,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.mapView.onCreate(savedInstanceState)
 
         aMap = binding.mapView.map
diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt
index 5476786..91e8e64 100644
--- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt
@@ -9,6 +9,7 @@
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 
 @SuppressLint("CustomSplashScreen")
@@ -25,6 +26,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 

diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
index 9f04953..f728f37 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt
@@ -27,6 +27,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
+import com.pengxh.kt.lite.extensions.isNetworkConnected
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
@@ -57,8 +58,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         versionViewModel = ViewModelProvider(this)[VersionViewModel::class.java]
     }
 
@@ -94,9 +95,21 @@
             "尽情期待～".show(requireContext())
         }
 
-        binding.updateUserButton.setOnClickListener {
-            LoadingDialog.show(requireActivity(), "同步中，请稍后...")
-            userViewModel.getUserDetail()
+        binding.loginOutButton.setOnClickListener {
+            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
+                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
+                .setOnDialogButtonClickListener(object :
+                    AlertControlDialog.OnDialogButtonClickListener {
+                    override fun onConfirmClick() {
+                        if (!requireActivity().isNetworkConnected()) {
+                            "网络异常，退出失败".show(requireContext())
+                            return
+                        }
+                        loginViewModel.out(requireContext())
+                    }
+
+                    override fun onCancelClick() {}
+                }).build().show()
         }
 
         binding.changePwdLayout.setOnClickListener {
@@ -144,19 +157,6 @@
             }.start()
         }
 
-        binding.loginOutButton.setOnClickListener {
-            AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录")
-                .setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        loginViewModel.out(requireContext())
-                    }
-
-                    override fun onCancelClick() {}
-                }).build().show()
-        }
-
         /**
          * 数据监听
          * */
@@ -186,7 +186,6 @@
         loginViewModel.outResultData.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
-                requireContext().navigatePageTo<LoginActivity>()
                 ActivityStackManager.finishAllActivity()
             }
         }
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index f2e7692..8a1fc89 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -6,6 +6,7 @@
 import com.casic.smarttube.databinding.ActivityAboutUsBinding
 import com.casic.smarttube.extensions.initImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class AboutUsActivity : KotlinBaseActivity<ActivityAboutUsBinding>() {
@@ -28,6 +29,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}")
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index 407eacc..f01859a 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -37,6 +37,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
@@ -87,6 +88,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
         uploadImageViewModel.commonResultData.observe(this) {
             isUploading = false
diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
index 6050a4d..d67a6d5 100644
--- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt
@@ -8,6 +8,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 
 class BigImageActivity : KotlinBaseActivity<ActivityBigImageBinding>() {
@@ -20,6 +21,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0)
         val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY)
         if (urls == null || urls.size == 0) {
diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
index 8416587..2352eb9 100644
--- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt
@@ -22,6 +22,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -59,6 +60,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.deviceDetailData.observe(this) {
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index a928fc2..2b64158 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -20,6 +20,7 @@
 import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -64,6 +65,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(String.format(groupId + "项目设备列表"))
 
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index 68f4dfd..747c468 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -28,6 +28,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -74,6 +75,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
 
         //地图初始化
diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
index 5a451da..336839b 100644
--- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt
@@ -19,6 +19,7 @@
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.extensions.timestampToLastMonthDate
 import com.pengxh.kt.lite.extensions.timestampToLastWeekDate
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
@@ -42,6 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
         groupId = params[0]
         devCode = params[1]
diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
index 44ed949..795d383 100644
--- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt
@@ -13,6 +13,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
@@ -32,6 +33,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         // 设置默认账号密码
         binding.userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         binding.userPasswordView.setText(
diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
index b6b4e8a..337412a 100644
--- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt
@@ -14,6 +14,7 @@
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.ActivityStackManager
 
 class MainActivity : KotlinBaseActivity<ActivityMainBinding>() {
 
@@ -35,6 +36,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         //保留icon原图颜色
         binding.bottomNavigation.itemIconTintList = null
         binding.mainViewPager.adapter = TabPageViewAdapter(supportFragmentManager, fragmentPages)
diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt
index c8a8b04..6570d2d 100644
--- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt
@@ -15,6 +15,7 @@
 import com.casic.smarttube.extensions.initImmersionBar
 import com.casic.smarttube.utils.CenterMarkerView
 import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.ActivityStackManager
 
 
 class SelectLocationActivity : KotlinBaseActivity<ActivitySelectLocationBinding>(),
@@ -36,6 +37,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         binding.mapView.onCreate(savedInstanceState)
 
         aMap = binding.mapView.map
diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt
index 5476786..91e8e64 100644
--- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt
@@ -9,6 +9,7 @@
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.navigatePageTo
+import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
 
 @SuppressLint("CustomSplashScreen")
@@ -25,6 +26,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        ActivityStackManager.addActivity(this)
         userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index c0e40de..e30b5cf 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -70,7 +70,7 @@
             </LinearLayout>
 
             <Button
-                android:id="@+id/updateUserButton"
+                android:id="@+id/loginOutButton"
                 style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                 android:layout_width="@dimen/dp_80"
                 android:layout_height="@dimen/dp_40"
@@ -78,7 +78,7 @@
                 android:layout_centerVertical="true"
                 android:inset="0dp"
                 android:padding="0dp"
-                android:text="同步"
+                android:text="退出"
                 android:textSize="@dimen/sp_12" />
         </RelativeLayout>
 
@@ -216,19 +216,5 @@
                     android:textSize="@dimen/sp_16" />
             </RelativeLayout>
         </LinearLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <Button
-                android:id="@+id/loginOutButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_marginVertical="@dimen/dp_30"
-                android:text="退出登录" />
-        </RelativeLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file