From 103dd95625f9f99a0adb273a6a23be3efacdbb36 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期一, 17 八月 2026 09:23:12 +0800
Subject: [PATCH] 修复问题
---
app/src/main/java/com/igo/user/ui/login/LoginActivity.kt | 7 +++++--
app/src/main/java/com/igo/user/ui/mine/ChangePwdActivity.kt | 3 ---
app/src/main/java/com/igo/user/ui/HomeActivity.kt | 12 +++++++-----
app/src/main/java/com/igo/user/utils/Const.kt | 2 --
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/igo/user/ui/HomeActivity.kt b/app/src/main/java/com/igo/user/ui/HomeActivity.kt
index afdfcb7..01900a4 100644
--- a/app/src/main/java/com/igo/user/ui/HomeActivity.kt
+++ b/app/src/main/java/com/igo/user/ui/HomeActivity.kt
@@ -25,6 +25,7 @@
import com.igo.user.network.entity.Function
import com.igo.user.network.entity.UserInfo
import com.igo.user.network.request
+import com.igo.user.ui.mine.ChangePwdActivity
import com.igo.user.ui.mine.FeedbackActivity
import com.igo.user.ui.mine.InvokeListActivity
import com.igo.user.ui.mine.MsgActivity
@@ -63,6 +64,10 @@
private val func by lazy {
arrayListOf<Function>()
+ }
+
+ private val isSetPassword by lazy {
+ intent.getStringExtra("isSetPassword")
}
override fun setContentView(): View {
@@ -337,7 +342,7 @@
//显示提示设置密码弹窗
private fun showNoticeSetPasswordDialog() {
- if (SPUtils.instance().getString(Const.User.NEED_SET_PASSWORD) == "1") {
+ if (isSetPassword == "1") {
HttpManager.queryUserInfo().request(this) { _, data ->
data?.also {
SPUtils.instance().put(Const.User.PHONE, it.phone).apply()
@@ -350,10 +355,7 @@
)
tipDialog.setCallback(object : TipDialog.OnClickCallback {
override fun onOk() {
- startActivity<VerifyPhoneForUpdatePwdActivity>(
- "phone" to it.phone,
- "title" to getString(R.string.set_password)
- )
+ startActivity<ChangePwdActivity>("phone" to Const.User.PHONE)
}
override fun onCancel() {
diff --git a/app/src/main/java/com/igo/user/ui/login/LoginActivity.kt b/app/src/main/java/com/igo/user/ui/login/LoginActivity.kt
index c656374..dd15886 100644
--- a/app/src/main/java/com/igo/user/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/igo/user/ui/login/LoginActivity.kt
@@ -434,12 +434,15 @@
.put(Const.User.TOKEN, it.optString("token"))
.put(Const.User.USER_ID, it.optInt("id"))
.put(Const.User.EMAIL, it.optString("email"))
- .put(Const.User.NEED_SET_PASSWORD, it.optString("isSetPassword"))
.apply()
/* if (it.optString("email").isEmpty()) {
startActivity<FinishMailActivity>("isRegister" to true)
}*/
- startActivity<HomeActivity>("isOpen" to HomeActivity.isOpenHome, "func" to HomeActivity.funcHome)
+ startActivity<HomeActivity>(
+ "isOpen" to HomeActivity.isOpenHome,
+ "func" to HomeActivity.funcHome,
+ "isSetPassword" to it.optString("isSetPassword")
+ )
finish()
}
},
diff --git a/app/src/main/java/com/igo/user/ui/mine/ChangePwdActivity.kt b/app/src/main/java/com/igo/user/ui/mine/ChangePwdActivity.kt
index fbb98e7..22be8ee 100644
--- a/app/src/main/java/com/igo/user/ui/mine/ChangePwdActivity.kt
+++ b/app/src/main/java/com/igo/user/ui/mine/ChangePwdActivity.kt
@@ -37,9 +37,6 @@
return@onClick
}
HttpManager.updatePassword(s).request(this@ChangePwdActivity) { _, _ ->
- SPUtils.instance()
- .put(Const.User.NEED_SET_PASSWORD, "2")
- .apply()
myToast(getString(R.string.密码设置成功))
finish()
}
diff --git a/app/src/main/java/com/igo/user/utils/Const.kt b/app/src/main/java/com/igo/user/utils/Const.kt
index cd88270..2ad187c 100644
--- a/app/src/main/java/com/igo/user/utils/Const.kt
+++ b/app/src/main/java/com/igo/user/utils/Const.kt
@@ -80,8 +80,6 @@
const val APP_ID = "appid"
const val IS_AGREE = "isAgree"
const val NO_PHONE = "noPhone"
- //是否设置了密码（1=否，2=是）
- const val NEED_SET_PASSWORD = "needSetPassword"
}
object Share {
--
Gitblit v1.7.1