From 93775e1f3d79a1e11b839abbf24201dafcd9e646 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 25 四月 2025 13:45:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/activity/LoginActivity.kt | 31 +++++++++++++++++++++++++------
1 files changed, 25 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 36ac653..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() {
@@ -55,10 +72,12 @@
binding.tvUserAgreement.setOnClickListener {
// 打开用户协议
+ startContentActivity("用户协议", "服务使用协议")
}
binding.tvPrivacyPolicy.setOnClickListener {
// 打开隐私政策
+ startContentActivity("隐私协议", "隐私保护政策")
}
}
--
Gitblit v1.9.3