From ddb5d0020b1fbee53fd9a1fefa6a21f3e5239914 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Wed, 4 Nov 2026 13:58:47 +0800
Subject: [PATCH] 9

---
 .../activity/BindNumberActivity.java          | 32 ++++++++++-----
 .../gdxzExpert/activity/LoginNewActivity.java | 40 ++++++++++++++-----
 .../activity/LoginSetInfoActivity.java        |  2 +
 3 files changed, 52 insertions(+), 22 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 8e9420e..fcc435b 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/activity/BindNumberActivity.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/activity/BindNumberActivity.java
@@ -175,6 +175,7 @@ public class BindNumberActivity extends BaseActivity implements OnCallBackFromNe
                         Log.d("LoginTAG", "获取token成功：" + s);
                         //                mPhoneNumberAuthHelper.hideLoginLoading();
 //                        mPhoneNumberAuthHelper.quitLoginPage();
+                        mPhoneNumberAuthHelper.quitLoginPage();
                         getResultWithToken(tokenRet.getToken());
 
                     }
@@ -382,16 +383,21 @@ public class BindNumberActivity extends BaseActivity implements OnCallBackFromNe
             getLoginInfo(state,date);//友盟一键登录
         }
     }
-    public void getYunxin(JSONObject objs) throws JSONException {
-
-        String yx_accid =objs.getString("YX_accid");
-        String yx_token =objs.getString("YX_token");
-        SharePrefUtil.saveString(ct, Constant.yx_accid, yx_accid);
-        SharePrefUtil.saveString(ct, Constant.yx_token, yx_token);
-    }
-
-    public void getLoginInfo(int state,JSONObject objs) throws JSONException {
-        Log.d("LoginTAG","state "+state);
+    public void getYunxin(JSONObject objs) throws JSONException {
+
+        String yx_accid = objs.optString("YX_accid", "");
+        String yx_token = objs.optString("YX_token", "");
+        SharePrefUtil.saveString(ct, Constant.yx_accid, yx_accid);
+        SharePrefUtil.saveString(ct, Constant.yx_token, yx_token);
+    }
+
+    public void getLoginInfo(int state,JSONObject objs) throws JSONException {
+        if (mPhoneNumberAuthHelper != null) {
+            mPhoneNumberAuthHelper.hideLoginLoading();
+            mPhoneNumberAuthHelper.quitLoginPage();
+        }
+        getYunxin(objs);
+        Log.d("LoginTAG","state "+state);
         if (state != 6) {
             // 需要完善资料，跳转到完善资料页面
             // ToastUtil.showToast("登录成功,请完善资料");
@@ -423,7 +429,11 @@ public class BindNumberActivity extends BaseActivity implements OnCallBackFromNe
         }
 
     };
-    private void doLauncherAction() {
+    private void doLauncherAction() {
+        if (mPhoneNumberAuthHelper != null) {
+            mPhoneNumberAuthHelper.hideLoginLoading();
+            mPhoneNumberAuthHelper.quitLoginPage();
+        }
 
         closeProgressDialog();
         // ( 1.待审核 2.审核中 3.需要补充修改资料 4.再次提交审核 5.拒绝
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 bcf3856..2ec9fa8 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginNewActivity.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginNewActivity.java
@@ -421,6 +421,7 @@ public class LoginNewActivity extends BaseActivity implements OnCallBackFromNet
                         Log.d("LoginTAG", "获取token成功：" + s);
                         //                mPhoneNumberAuthHelper.hideLoginLoading();
 //                        mPhoneNumberAuthHelper.quitLoginPage();
+                        mPhoneNumberAuthHelper.quitLoginPage();
                         getResultWithToken(tokenRet.getToken());
 
                     }
@@ -779,16 +780,21 @@ public class LoginNewActivity extends BaseActivity implements OnCallBackFromNet
 
 
     }
-    public void getYunxin(JSONObject objs) throws JSONException {
-
-        String yx_accid =objs.getString("YX_accid");
-        String yx_token =objs.getString("YX_token");
-        SharePrefUtil.saveString(ct, Constant.yx_accid, yx_accid);
-        SharePrefUtil.saveString(ct, Constant.yx_token, yx_token);
-    }
-
-    public void getLoginInfo(int state,JSONObject objs) throws JSONException {
-
+    public void getYunxin(JSONObject objs) throws JSONException {
+
+        String yx_accid = objs.optString("YX_accid", "");
+        String yx_token = objs.optString("YX_token", "");
+        SharePrefUtil.saveString(ct, Constant.yx_accid, yx_accid);
+        SharePrefUtil.saveString(ct, Constant.yx_token, yx_token);
+    }
+
+    public void getLoginInfo(int state,JSONObject objs) throws JSONException {
+        if (mPhoneNumberAuthHelper != null) {
+            mPhoneNumberAuthHelper.hideLoginLoading();
+            mPhoneNumberAuthHelper.quitLoginPage();
+        }
+        getYunxin(objs);
+
         if (state != 6) {
             // 需要完善资料，跳转到完善资料页面
             // ToastUtil.showToast("登录成功,请完善资料");
@@ -1199,7 +1205,11 @@ public class LoginNewActivity extends BaseActivity implements OnCallBackFromNet
 
 
 
-    private void doLauncherAction() {
+    private void doLauncherAction() {
+        if (mPhoneNumberAuthHelper != null) {
+            mPhoneNumberAuthHelper.hideLoginLoading();
+            mPhoneNumberAuthHelper.quitLoginPage();
+        }
 
         closeProgressDialog();
         // ( 1.待审核 2.审核中 3.需要补充修改资料 4.再次提交审核 5.拒绝
@@ -1313,6 +1323,10 @@ public class LoginNewActivity extends BaseActivity implements OnCallBackFromNet
     private void startBind()
     {
 //        mPhoneNumberAuthHelper.quitLoginPage();
+        if (mPhoneNumberAuthHelper != null) {
+            mPhoneNumberAuthHelper.hideLoginLoading();
+            mPhoneNumberAuthHelper.quitLoginPage();
+        }
         Intent intent=new Intent(LoginNewActivity.this,BindNumberActivity.class);
         intent.putExtra("wechat_user_info",wechat_user_info);
         startActivity(intent);
@@ -1589,6 +1603,10 @@ public class LoginNewActivity extends BaseActivity implements OnCallBackFromNet
     }
 
     private void handleBackClose() {
+        if (mPhoneNumberAuthHelper != null) {
+            mPhoneNumberAuthHelper.hideLoginLoading();
+            mPhoneNumberAuthHelper.quitLoginPage();
+        }
         if (MainActivity.mMainActivity == null || MainActivity.mMainActivity.isFinishing() || MainActivity.mMainActivity.isDestroyed()) {
             Intent intent = new Intent(this, MainActivity.class);
             startActivity(intent);
diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginSetInfoActivity.java b/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginSetInfoActivity.java
index e557600..2d8f9ac 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginSetInfoActivity.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/activity/LoginSetInfoActivity.java
@@ -677,6 +677,8 @@ public class LoginSetInfoActivity extends BaseActivity implements
 		if (submit_myinfo != null && submit_myinfo.getVisibility() == View.VISIBLE && !StringUtil.isEmpty(mobile)) {
 			save(mobile);
 		}
+		cn.shangyu.gdxzExpert.base.AppManager.getAppManager().finishActivity(LoginNewActivity.class);
+		cn.shangyu.gdxzExpert.base.AppManager.getAppManager().finishActivity(BindNumberActivity.class);
 		if (MainActivity.mMainActivity == null || MainActivity.mMainActivity.isFinishing() || MainActivity.mMainActivity.isDestroyed()) {
 			Intent intent = new Intent(ct, MainActivity.class);
 			startActivity(intent);