From 53820a23c746b96ac802009d93acf1e487514c25 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Thu, 25 Jan 2024 14:49:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5=E5=90=8E?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/quick_pass/QuickPassLoginAct.java     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java b/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java
index 349c03074..dfa4c070c 100644
--- a/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java
+++ b/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java
@@ -57,6 +57,9 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
 
     private TextView tvProtocolHint;
 
+    // 主登录按钮是：一键登录 还是 手机号登录
+    private boolean onPassLoginOrPhoneLogin = true;
+
     public static void start(Context context) {
         Intent intent = new Intent(context, QuickPassLoginAct.class);
         context.startActivity(intent);
@@ -125,9 +128,13 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
                 break;
 
             case R.id.tv_login_quick_pass:
-                StatisticManager.Instance().onEvent(
-                        StatisticsProtocol.EVENT_ONE_CLICK_LOGIN, "一键登录");
-                preFetchMobileNum();
+                if (onPassLoginOrPhoneLogin) {
+                    StatisticManager.Instance().onEvent(
+                            StatisticsProtocol.EVENT_ONE_CLICK_LOGIN, "一键登录");
+                    preFetchMobileNum();
+                } else {
+                    LoginPhoneActivity.start(QuickPassLoginAct.this);
+                }
                 break;
             case R.id.img_phone_login:
                 StatisticManager.Instance().onEvent(
@@ -292,9 +299,9 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
 
     @Override
     protected void showThirdPartLogin(boolean isShowWechat, boolean isShowQq, boolean isOneClick) {
+        super.showThirdPartLogin(isShowWechat, isShowQq, isOneClick);
         wxLogin.setVisibility(isShowWechat ? View.VISIBLE : View.INVISIBLE);
         qqLogin.setVisibility(isShowQq ? View.VISIBLE : View.INVISIBLE);
-
         if (isOneClick){
             login.prefetchMobileNumber(new QuickLoginPreMobileListener() {
                 @Override
@@ -304,13 +311,14 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
 
                 @Override
                 public void onGetMobileNumberError(String YDToken, final String msg) {
-                    tvLoginQuickPass.setVisibility(View.INVISIBLE);
+                    tvLoginQuickPass.setVisibility(View.VISIBLE);
+                    onPassLoginOrPhoneLogin = false;
+                    tvLoginQuickPass.setText("手机号登录");
                 }
             });
         }else {
             tvLoginQuickPass.setVisibility(View.INVISIBLE);
         }
-        super.showThirdPartLogin(isShowWechat, isShowQq, isOneClick);
     }
 
     private void setClickEnable(boolean enable) {