diff --git a/app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java b/app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java
index 819765647..675829c44 100644
--- a/app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java
+++ b/app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java
@@ -1,12 +1,13 @@
package com.nnbc123.app.base;
import android.graphics.Color;
+import android.graphics.Typeface;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
+import android.text.style.StyleSpan;
import android.view.View;
-import android.widget.CheckBox;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -20,7 +21,7 @@ import com.nnbc123.core.UriProvider;
public abstract class BaseLoginAct extends BaseActivity {
- protected CheckBox tvProtocol;
+ protected TextView tvProtocol;
protected boolean canClick = true;
@@ -37,11 +38,29 @@ public abstract class BaseLoginAct extends BaseActivity {
String privacyAgreementTip = context.getString(R.string.tip_privacy_agreement);
String userAgreementTip = context.getString(R.string.tip_user_agreement);
- String privacyAgreementDescTip = context.getString(R.string.text_login_protocol, privacyAgreementTip, userAgreementTip);
+ String privacyAgreementDescTip = context.getString(R.string.text_login_protocol, userAgreementTip, privacyAgreementTip);
SpannableString ss = new SpannableString(privacyAgreementDescTip);
int privacyAgreementTipIndex = privacyAgreementDescTip.indexOf(privacyAgreementTip);
int userAgreementTipIndex = privacyAgreementDescTip.indexOf(userAgreementTip);
+ ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.text_normal_282828)) {
+ @Override
+ public void onClick(@NonNull View widget) {
+ if (!canClick) {
+ return;
+ }
+ if (widget instanceof TextView)
+ ((TextView) widget).setHighlightColor(getResources().getColor(android.R.color.transparent));
+
+ CommonWebViewActivity.start(context, UriProvider.getUserProtocolUrl());
+ }
+ }, userAgreementTipIndex, userAgreementTipIndex + userAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+
+ ss.setSpan(
+ new StyleSpan(Typeface.BOLD), userAgreementTipIndex, userAgreementTipIndex + userAgreementTip.length(),
+ Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+ );
+
ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.text_normal_282828)) {
@Override
public void onClick(@NonNull View widget) {
@@ -55,18 +74,11 @@ public abstract class BaseLoginAct extends BaseActivity {
}
}, privacyAgreementTipIndex, privacyAgreementTipIndex + privacyAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
- ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.text_normal_282828)) {
- @Override
- public void onClick(@NonNull View widget) {
- if (!canClick) {
- return;
- }
- if (widget instanceof TextView)
- ((TextView) widget).setHighlightColor(getResources().getColor(android.R.color.transparent));
-
- CommonWebViewActivity.start(context, UriProvider.getUserProtocolUrl());
- }
- }, userAgreementTipIndex, userAgreementTipIndex + privacyAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+ ss.setSpan(
+ new StyleSpan(Typeface.BOLD),
+ privacyAgreementTipIndex, privacyAgreementTipIndex + privacyAgreementTip.length(),
+ Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+ );
tvProtocol.setText(ss);
tvProtocol.setHighlightColor(Color.TRANSPARENT);
diff --git a/app/src/main/res/drawable-xhdpi/ic_login_google.png b/app/src/main/res/drawable-xhdpi/ic_login_google.png
index de90a694c..f95294b50 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_login_google.png and b/app/src/main/res/drawable-xhdpi/ic_login_google.png differ
diff --git a/app/src/main/res/layout/activity_common_web_view.xml b/app/src/main/res/layout/activity_common_web_view.xml
index 7cb5da685..1cb5b51db 100644
--- a/app/src/main/res/layout/activity_common_web_view.xml
+++ b/app/src/main/res/layout/activity_common_web_view.xml
@@ -20,16 +20,18 @@
android:orientation="horizontal">
@@ -50,6 +52,7 @@
android:id="@+id/img_share"
android:layout_width="22dp"
android:layout_height="22dp"
+ android:contentDescription="分享"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="15dp"
android:src="@drawable/ic_share_white"
diff --git a/app/src/main/res/layout/activity_login_password.xml b/app/src/main/res/layout/activity_login_password.xml
index d3d6f440c..62219b3ad 100644
--- a/app/src/main/res/layout/activity_login_password.xml
+++ b/app/src/main/res/layout/activity_login_password.xml
@@ -26,6 +26,7 @@
app:layout_constraintStart_toStartOf="parent" />
请输入密码
立即注册
忘记密码
- 同意%s与%s
+ 我已阅读并同意%s与%s
注册即代表同意 %s
阅读并同意%s与\n%s方可登录
未设置兔兔密码的用户记得前往\n兔兔设置密码哦 %s
@@ -826,7 +826,7 @@
欢迎您点击查看%s和%s，当您点击“同意”即表示您已充分阅读、理解并接受《用户协议》和《隐私政策》的全部内容。
《隐私政策》
- 《用户协议》
+ 《用户服务协议》
家族
我的账户
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 9d2617d95..7d44cbddc 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
@@ -9,7 +9,6 @@ import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.view.KeyEvent;
import android.view.View;
-import android.widget.TextView;
import androidx.core.content.ContextCompat;
@@ -17,7 +16,6 @@ import com.netease.nim.uikit.StatusBarUtil;
import com.nnbc123.app.R;
import com.nnbc123.app.base.BaseLoginAct;
import com.nnbc123.app.ui.login.LoginPasswordActivity;
-import com.nnbc123.core.DemoCache;
import com.nnbc123.core.auth.AuthModel;
import com.nnbc123.core.auth.event.LoginEvent;
import com.nnbc123.core.auth.exception.AccountCancelException;
@@ -29,7 +27,6 @@ import com.nnbc123.library.common.Constants;
import com.nnbc123.library.common.SpConstants;
import com.nnbc123.library.common.util.SPUtils;
import com.nnbc123.library.utils.AppMetaDataUtil;
-import com.nnbc123.library.utils.SingleToastUtil;
import com.trello.rxlifecycle3.android.ActivityEvent;
import org.greenrobot.eventbus.EventBus;
@@ -46,12 +43,8 @@ import io.reactivex.disposables.Disposable;
public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListener {
- private static final String NEED_CHECKED_PROTOCOL = "need_checked_protocol";
-
private static final int quickPassRequestCode = 1000;
- private TextView tvProtocolHint;
-
public static void start(Context context) {
Intent intent = new Intent(context, QuickPassLoginAct.class);
context.startActivity(intent);
@@ -70,7 +63,6 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
private void onFindViews() {
tvProtocol = findViewById(R.id.tv_protocol);
- tvProtocolHint = findViewById(R.id.tv_protocol_hint);
if (AppMetaDataUtil.getChannelID().equals(Constants.CHANNEL_GOOGLE)) {
findViewById(R.id.cs_google).setVisibility(View.VISIBLE);
} else {
@@ -97,24 +89,10 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
@Override
protected void setProtocol() {
super.setProtocol();
- if (DemoCache.readBoolean(NEED_CHECKED_PROTOCOL, false)) {
- tvProtocol.setChecked(true);
- }
-
- tvProtocol.setOnCheckedChangeListener((buttonView, isChecked) -> {
- if (isChecked) {
- tvProtocolHint.setVisibility(View.GONE);
- DemoCache.saveBoolean(NEED_CHECKED_PROTOCOL, true);
- }
- });
}
@Override
public void onClick(View v) {
- if (!tvProtocol.isChecked()) {
- tvProtocolHint.setVisibility(View.VISIBLE);
- return;
- }
switch (v.getId()) {
case R.id.tv_password_login:
LoginPasswordActivity.start(QuickPassLoginAct.this);
diff --git a/app/src/module_quick_pass/res/layout/act_quick_pass.xml b/app/src/module_quick_pass/res/layout/act_quick_pass.xml
index daebfb14b..24d01b701 100644
--- a/app/src/module_quick_pass/res/layout/act_quick_pass.xml
+++ b/app/src/module_quick_pass/res/layout/act_quick_pass.xml
@@ -34,10 +34,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
- android:layout_marginEnd="@dimen/dp_15"
+ android:layout_marginEnd="@dimen/dp_5"
+ android:padding="10dp"
android:text="密码登录"
android:textColor="@color/text_normal_282828"
- android:textSize="@dimen/sp_15"
+ android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -89,87 +90,68 @@
app:layout_constraintTop_toTopOf="@+id/cs_google"
tools:visibility="visible" />
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-