From 685f52cd0d577285d27fecabb0bc711ff9830d02 Mon Sep 17 00:00:00 2001 From: haomingming Date: Wed, 4 Nov 2026 11:01:43 +0800 Subject: [PATCH] 9 --- .../gdxzExpert/activity/BindNumberActivity.java | 13 +++++++++++-- .../shangyu/gdxzExpert/activity/LoginActivity.java | 9 ++++++++- .../gdxzExpert/activity/LoginNewActivity.java | 6 +++++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/activity/BindNumberActivity.java b/app/src/main/java/cn/shangyu/gdxzExpert/activity/BindNumberActivity.java index 4421b09..8e9420e 100644 --- a/app/src/main/java/cn/shangyu/gdxzExpert/activity/BindNumberActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzExpert/activity/BindNumberActivity.java @@ -396,7 +396,8 @@ public class BindNumberActivity extends BaseActivity implements OnCallBackFromNe // 需要完善资料，跳转到完善资料页面 // ToastUtil.showToast("登录成功,请完善资料"); // 启动登录设置信息界面 - Log.d("LoginTAG","state1 "+state); + Log.d("LoginTAG","state1 "+state); + cn.shangyu.gdxzExpert.base.AppManager.getAppManager().finishActivity(LoginNewActivity.class); Intent intent = new Intent(this, LoginSetInfoActivity.class); intent.putExtra("checkInfo", checkInfo); intent.putExtra("state", state); @@ -438,7 +439,15 @@ public class BindNumberActivity extends BaseActivity implements OnCallBackFromNe // { intent.setClass(this, MainActivity.class); // } - intent.putExtra("launcher_from", 1); + Constant.islogout = 2; + SharePrefUtil.saveBoolean(ct, Constant.IS_LOGIN, true); + cn.shangyu.gdxzExpert.base.AppManager.getAppManager().finishActivity(LoginNewActivity.class); + intent.putExtra("launcher_from", 1); + if (MainActivity.mMainActivity == null || MainActivity.mMainActivity.isFinishing() || MainActivity.mMainActivity.isDestroyed()) { + startActivity(intent); + } + finish(); + if (false) startActivity(intent); Constant.islogout = 2; diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginActivity.java b/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginActivity.java index b47316a..89646e0 100644 --- a/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginActivity.java @@ -823,7 +823,14 @@ public class LoginActivity extends BaseActivity implements OnCallBackFromNet { // 6.已通过) // 注册成功跳转 Intent intent = new Intent(this, MainActivity.class); - intent.putExtra("launcher_from", 1); + Constant.islogout = 2; + SharePrefUtil.saveBoolean(ct, Constant.IS_LOGIN, true); + intent.putExtra("launcher_from", 1); + if (MainActivity.mMainActivity == null || MainActivity.mMainActivity.isFinishing() || MainActivity.mMainActivity.isDestroyed()) { + startActivity(intent); + } + this.finish(); + if (false) startActivity(intent); Constant.islogout = 2; diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginNewActivity.java b/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginNewActivity.java index e1a5599..bcf3856 100644 --- a/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginNewActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginNewActivity.java @@ -1217,7 +1217,11 @@ public class LoginNewActivity extends BaseActivity implements OnCallBackFromNet // } Constant.islogout = 2; SharePrefUtil.saveBoolean(ct, Constant.IS_LOGIN, true); - intent.putExtra("launcher_from", 1); + intent.putExtra("launcher_from", 1); + if (MainActivity.mMainActivity == null || MainActivity.mMainActivity.isFinishing() || MainActivity.mMainActivity.isDestroyed()) { + startActivity(intent); + } + if (false) startActivity(intent); Constant.islogout = 2;