From 0cf0870889d65f5d11d0b2c8af7bca9442a7ba19 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 21 四月 2025 17:14:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2

---
 app/src/main/java/com/example/firstapp/activity/LoginActivity.kt |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/activity/LoginActivity.kt b/app/src/main/java/com/example/firstapp/activity/LoginActivity.kt
index fcb8a6b..6bde03a 100644
--- a/app/src/main/java/com/example/firstapp/activity/LoginActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/LoginActivity.kt
@@ -15,25 +15,42 @@
 import android.widget.Button
 import android.widget.CheckBox
 import android.widget.TextView
+import androidx.activity.viewModels
+import com.example.firstapp.MainActivity
 import com.example.firstapp.R
 import com.example.firstapp.databinding.ActivityLoginBinding
+import com.example.firstapp.ui.login.LoginViewModel
 import com.example.firstapp.utils.PreferencesManager
 import kotlin.system.exitProcess
 
 class LoginActivity : AppCompatActivity() {
     private lateinit var binding: ActivityLoginBinding
 
+    private val viewModel: LoginViewModel by viewModels()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityLoginBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setupViews()
 
-        val phone=PreferencesManager.getLastLoginPhone()
-        // 如果phone不存在则展示弹框
-        if (phone.isNullOrEmpty()) {
-            showConfirmDialog()
+        // 这里查看是否已经登录过,如果已经登录过则直接跳转到主页
+        // 获取token
+        val token = PreferencesManager.getToken()
+        if (!token.isNullOrEmpty()) {
+            startActivity(Intent(this, MainActivity::class.java))
+            finishAffinity() // 结束所有之前的Activity
+        }else{
+            setContentView(binding.root)
+            setupViews()
+
+            val phone=PreferencesManager.getLastLoginPhone()
+            // 如果phone不存在则展示弹框
+            if (phone.isNullOrEmpty()) {
+                showConfirmDialog()
+            }
         }
+
+
+
     }
 
     private fun setupViews() {

--
Gitblit v1.9.3