From ee6f6b80a16a3dc850702b65e6e037ba56a81d3d Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Wed, 13 May 2020 16:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95=E6=8C=89?= =?UTF-8?q?=E9=94=AE=E5=90=8E=E7=AB=AF=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/base/BaseLoginAct.java | 14 +++++++++++--- .../com/yizhuan/erban/ui/login/LoginActivity.java | 1 + .../erban/quick_pass/QuickPassLoginAct.java | 6 ++++-- .../xchat_android_core/bean/LoginTipsInfo.java | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java b/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java index e93396dae..66876d579 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java @@ -37,6 +37,7 @@ public abstract class BaseLoginAct extends BaseActivity { protected TextView tvProtocol; protected TextView wxLogin; protected TextView qqLogin; + protected TextView tvLoginQuickPass; protected TextView tvLoginTip; protected TextView tvDesc; @@ -104,19 +105,20 @@ public abstract class BaseLoginAct extends BaseActivity { showTvDesc(loginTipsInfo.getTips()); showTvLoginTip(loginTipsInfo.isShowWechat() || loginTipsInfo.isShowQq()); - showThirdPartLogin(loginTipsInfo.isShowWechat(), loginTipsInfo.isShowQq()); + showThirdPartLogin(loginTipsInfo.isShowWechat(), loginTipsInfo.isShowQq(),loginTipsInfo.isShowOneClick()); } else { showTvLoginTip(false); - showThirdPartLogin(false, false); + showThirdPartLogin(false, false,false); } } }); } - protected void showThirdPartLogin(boolean isShowWechat, boolean isShowQq) { + protected void showThirdPartLogin(boolean isShowWechat, boolean isShowQq,boolean isShowOneClick) { showwxLogin(isShowWechat); showqqLogin(isShowQq); + showOneClickLogin(isShowOneClick); } private void showTvLoginTip(boolean visible) { @@ -137,6 +139,12 @@ public abstract class BaseLoginAct extends BaseActivity { } } + private void showOneClickLogin(boolean visible) { + if (tvLoginQuickPass != null) { + tvLoginQuickPass.setVisibility(visible ? View.VISIBLE : View.GONE); + } + } + private void showTvDesc(String tips) { if (tvDesc != null && !TextUtils.isEmpty(tips)) { SpannableStringBuilder builder = new SpannableStringBuilder(tips); diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java index 68f5fe036..9020742b3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java @@ -112,6 +112,7 @@ public class LoginActivity extends BaseLoginAct implements View.OnClickListener wxLogin = findViewById(R.id.img_wx_login); qqLogin = findViewById(R.id.img_qq_login); tvLoginTip = findViewById(R.id.tv_login_tip); + tvLoginQuickPass = findViewById(R.id.tv_login_quick_pass); codeEditText = findViewById(R.id.et_code); getCodeButton = findViewById(R.id.btn_get_code); tvDesc = findViewById(R.id.tv_desc); diff --git a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java index 62510e38f..ca9ab6034 100644 --- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java +++ b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java @@ -98,6 +98,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe tvLoginQuickPass = findViewById(R.id.tv_login_quick_pass); tvProtocol = findViewById(R.id.tv_protocol); wxLogin = findViewById(R.id.img_wx_login); + tvLoginQuickPass = findViewById(R.id.tv_login_quick_pass); qqLogin = findViewById(R.id.img_qq_login); tvLoginTip = findViewById(R.id.tv_login_tip); tvDesc = findViewById(R.id.tv_desc); @@ -282,10 +283,11 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe } @Override - protected void showThirdPartLogin(boolean isShowWechat, boolean isShowQq) { + protected void showThirdPartLogin(boolean isShowWechat, boolean isShowQq,boolean isOneClick) { wxLogin.setVisibility(isShowWechat?View.VISIBLE:View.INVISIBLE); qqLogin.setVisibility(isShowWechat?View.VISIBLE:View.INVISIBLE); - super.showThirdPartLogin(isShowWechat, isShowQq); + tvLoginQuickPass.setVisibility(isOneClick?View.VISIBLE:View.INVISIBLE); + super.showThirdPartLogin(isShowWechat, isShowQq,isOneClick); } private void setClickEnable(boolean enable) { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java index 29b4e8870..b3fc4166f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java @@ -7,4 +7,5 @@ public class LoginTipsInfo { private String tips; private boolean showWechat; private boolean showQq; + private boolean showOneClick; }