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) {