From 2c3e482b3e74820cabc709ac103264f1086ad470 Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Tue, 9 Sep 2025 18:25:18 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20:=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E6=B8=85=E7=A9=BA=E8=BF=94=E5=9B=9E=E6=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yingmao/clash/act/BandPhoneActivity.kt | 4 ++-- .../main/java/com/yingmao/clash/act/ChangePwdActivity.kt | 2 +- .../main/java/com/yingmao/clash/act/ForGetPwdActivity.kt | 7 ++++++- .../main/java/com/yingmao/clash/act/MineInfoActivity.kt | 2 +- app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt | 4 +++- app/src/main/java/com/yingmao/clash/act/SettingActivity.kt | 4 +++- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/BandPhoneActivity.kt b/app/src/main/java/com/yingmao/clash/act/BandPhoneActivity.kt index a139d70..230f68c 100644 --- a/app/src/main/java/com/yingmao/clash/act/BandPhoneActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/BandPhoneActivity.kt @@ -40,7 +40,7 @@ class BandPhoneActivity : BaseActivity() { super.onCreate(savedInstanceState) isBandPhone = intent.getBooleanExtra("isPhone", true); setContentView(R.layout.activity_band_phone) - val viewModel = ViewModelProvider(this).get(BandPhoneAtyVM::class.java) + val viewModel = ViewModelProvider(this)[BandPhoneAtyVM::class.java] etPhoneNumber = findViewById(R.id.et_phone_number) tvAccount = findViewById(R.id.tv_account) tvTitle = findViewById(R.id.tv_title) @@ -148,7 +148,7 @@ class BandPhoneActivity : BaseActivity() { //百度埋点完成注册 // BaiduAction.logAction(ActionType.REGISTER) val intent=Intent(CommonUtils.getApp(), LoginActivity::class.java) - intent.putExtra(BZYConstants.EXTRA_Bind_Account,phoneNumber) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK startActivity(intent) finish() } else { diff --git a/app/src/main/java/com/yingmao/clash/act/ChangePwdActivity.kt b/app/src/main/java/com/yingmao/clash/act/ChangePwdActivity.kt index e3aa27e..8aaea7e 100644 --- a/app/src/main/java/com/yingmao/clash/act/ChangePwdActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/ChangePwdActivity.kt @@ -122,7 +122,7 @@ class ChangePwdActivity : BaseActivity() { MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_REMEMBER_PASSWORD) cleanProfile() val intent=Intent(CommonUtils.getApp(), LoginActivity::class.java) - intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK startActivity(intent) finish() }else{ diff --git a/app/src/main/java/com/yingmao/clash/act/ForGetPwdActivity.kt b/app/src/main/java/com/yingmao/clash/act/ForGetPwdActivity.kt index 021b184..c8240c0 100644 --- a/app/src/main/java/com/yingmao/clash/act/ForGetPwdActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/ForGetPwdActivity.kt @@ -2,6 +2,7 @@ package com.yingmao.clash.act import android.annotation.SuppressLint import android.content.Context +import android.content.Intent import android.os.Build import android.os.Bundle import android.text.TextUtils @@ -22,6 +23,7 @@ import com.yingmao.clash.base.BaseNotTitleActivity import com.yingmao.clash.net.http.HttpReqType import com.yingmao.clash.net.http.HttpStatus import com.yingmao.clash.net.http.entity.SendSmsRsp +import com.yingmao.clash.util.CommonUtils import com.yingmao.clash.view.PasswordTransformationMethodBigDot import com.yingmao.clash.view.RxToast import com.yingmao.clash.view.dialog.RxDialogShapeLoading @@ -100,7 +102,10 @@ class ForGetPwdActivity : BaseActivity(), (httpStatus.rsp as SendSmsRsp).let { ssp -> if (ssp.code == "1000") { RxToast.success(resources.getString(R.string.ModifiedSuccessfully)) - this@ForGetPwdActivity.finish() + val intent=Intent(CommonUtils.getApp(), LoginActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK + startActivity(intent) + finish() } else { RxToast.error(resources.getString(R.string.ModificationFailed) + ssp.message) } diff --git a/app/src/main/java/com/yingmao/clash/act/MineInfoActivity.kt b/app/src/main/java/com/yingmao/clash/act/MineInfoActivity.kt index 6ca6388..731eb8e 100644 --- a/app/src/main/java/com/yingmao/clash/act/MineInfoActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/MineInfoActivity.kt @@ -69,7 +69,7 @@ class MineInfoActivity: BaseActivity() { mainAtyVM.stopHeartBeat() cleanProfile() val intent=Intent(CommonUtils.getApp(), LoginActivity::class.java) - intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK startActivity(intent) finish() } diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index fb968c8..d6b0da2 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -789,7 +789,9 @@ class NewMainActivity : BaseActivity() { stopUploadTimer() mainAtyVM.stopHeartBeat() cleanProfile() - startActivity(Intent(CommonUtils.getApp(), LoginActivity::class.java)) + val intent=Intent(CommonUtils.getApp(), LoginActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK + startActivity(intent) finish() } private fun cleanUserInfoToLogout() { diff --git a/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt b/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt index db10000..ae99549 100644 --- a/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt @@ -746,7 +746,9 @@ class SettingActivity : BaseActivity() { } mainAtyVM.stopHeartBeat() cleanProfile() - startActivity(Intent(CommonUtils.getApp(), LoginActivity::class.java)) + val intent=Intent(CommonUtils.getApp(), LoginActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK + startActivity(intent) finish() } private fun cleanProfile() {