From 1bd64b0d278d0fa868d48fd4bc1e4b67c0d7335f Mon Sep 17 00:00:00 2001
From: Cold-Mint <cold_mint@qq.com>
Date: Fri, 30 Jun 2023 17:52:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=8B=E5=BA=8F=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E6=BF=80=E6=B4=BB=E7=8A=B6=E6=80=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/coldmint/rust/pro/LoginActivity.kt    |  8 ++++++-
 .../com/coldmint/rust/pro/MainActivity.kt     |  4 ++--
 .../rust/pro/fragments/AllUnitsFragment.kt    | 23 +++++++++++--------
 .../coldmint/rust/pro/tool/GlobalMethod.kt    |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/coldmint/rust/pro/LoginActivity.kt b/app/src/main/java/com/coldmint/rust/pro/LoginActivity.kt
index d199895..8c4cb77 100644
--- a/app/src/main/java/com/coldmint/rust/pro/LoginActivity.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/LoginActivity.kt
@@ -136,7 +136,8 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
                                     AppSettings.Setting.Token,
                                     userData.data.token
                                 )
-                                GlobalMethod.isActive = userData.data.activation
+                                //从服务器获取用户的激活信息。
+//                                GlobalMethod.isActive = userData.data.activation
                                 //更新本地激活时间
                                 val expirationTime = userData.data.expirationTime
                                 val time = ServerConfiguration.toLongTime(expirationTime)
@@ -181,6 +182,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
 
                                             }.show()
                                     }
+
                                     "找不到用户" -> {
                                         setErrorAndInput(
                                             viewBinding.accountView,
@@ -189,6 +191,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
                                         )
 
                                     }
+
                                     "找不到邮箱" -> {
                                         setErrorAndInput(
                                             viewBinding.accountView,
@@ -197,6 +200,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
                                         )
 
                                     }
+
                                     "密码错误" -> {
                                         setErrorAndInput(
                                             viewBinding.passwordView,
@@ -204,6 +208,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
                                             viewBinding.passwordInputLayout
                                         )
                                     }
+
                                     "请更改登录设备" -> {
                                         viewBinding.button.isEnabled = false
                                         verification(
@@ -274,6 +279,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
 
                                             })
                                     }
+
                                     else -> {
                                         Snackbar.make(
                                             viewBinding.button,
diff --git a/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt b/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt
index f0444b5..655a090 100644
--- a/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt
@@ -707,8 +707,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         }
 
         startViewModel.isActivationLiveData.observe(this) {
-            GlobalMethod.isActive = it
-            initNavigationMenu(it)
+//            GlobalMethod.isActive = it
+            initNavigationMenu(GlobalMethod.isActive)
         }
 
         startViewModel.verifyErrorMsgLiveData.observe(this) {
diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/AllUnitsFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/AllUnitsFragment.kt
index 823e299..798ad52 100644
--- a/app/src/main/java/com/coldmint/rust/pro/fragments/AllUnitsFragment.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/fragments/AllUnitsFragment.kt
@@ -81,15 +81,20 @@ class AllUnitsFragment(
     fun openEditActivity(file: SourceFile) {
         val handler = Handler(Looper.getMainLooper())
         executorService.submit {
-            val bundle = Bundle()
-            val path = file.file.absolutePath
-            bundle.putString("path", path)
-            bundle.putString("modPath", modClass!!.modFile.absolutePath)
-            addFileToHistory(file, handler = handler, whenAddComplete = {
-                val intent = Intent(requireContext(), EditActivity::class.java)
-                intent.putExtra("data", bundle)
-                requireActivity().startActivity(intent)
-            })
+            if (modClass == null) {
+                Snackbar.make(viewBinding.unitList, R.string.file_not_exist, Snackbar.LENGTH_SHORT)
+                    .show()
+            } else {
+                val bundle = Bundle()
+                val path = file.file.absolutePath
+                bundle.putString("path", path)
+                bundle.putString("modPath", modClass?.modFile?.absolutePath)
+                addFileToHistory(file, handler = handler, whenAddComplete = {
+                    val intent = Intent(requireContext(), EditActivity::class.java)
+                    intent.putExtra("data", bundle)
+                    requireActivity().startActivity(intent)
+                })
+            }
         }
     }
 
diff --git a/app/src/main/java/com/coldmint/rust/pro/tool/GlobalMethod.kt b/app/src/main/java/com/coldmint/rust/pro/tool/GlobalMethod.kt
index c3d6101..461961a 100644
--- a/app/src/main/java/com/coldmint/rust/pro/tool/GlobalMethod.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/tool/GlobalMethod.kt
@@ -45,7 +45,7 @@ object GlobalMethod {
     /**
      * 是否为激活状态
      */
-    var isActive = false
+    var isActive = true
     const val DEFAULT_GAME_PACKAGE = "com.corrodinggames.rts"
     const val DEBUG_SIGN = "963dfd616924b27f9247a35e45bc130a"
     const val RELEASE_SIGN = "5320b24894fe7ed449842a81a2dfceda"