From 136b3133ced5ee3497374c9ea0a480affbae521e Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 24 Jan 2024 11:08:56 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=92=88=E5=AF=B9google=20play?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=A0=B8=E8=B0=83=E6=95=B4=EF=BC=88=E6=97=A0?=
 =?UTF-8?q?=E9=9A=9C=E7=A2=8D=E7=9B=B8=E5=85=B3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nnbc123/app/base/BaseLoginAct.java    |  42 +++---
 .../res/drawable-xhdpi/ic_login_google.png    | Bin 2966 -> 3949 bytes
 .../res/layout/activity_common_web_view.xml   |  11 +-
 .../res/layout/activity_login_password.xml    |   1 +
 app/src/main/res/values/strings.xml           |   4 +-
 .../app/quick_pass/QuickPassLoginAct.java     |  22 ----
 .../res/layout/act_quick_pass.xml             | 120 ++++++++----------
 7 files changed, 88 insertions(+), 112 deletions(-)

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 de90a694c467540fe0d3bcf66562c91ef0affd52..f95294b50c87b23aa0525c04e57d2630bdaa71e3 100644
GIT binary patch
delta 3938
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

delta 2947
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

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">
 
             <ImageView
+                android:contentDescription="返回上一个网页"
                 android:id="@+id/iv_back"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
                 android:scaleType="center"
                 android:src="@drawable/arrow_left" />
 
             <ImageView
+                android:contentDescription="退出"
                 android:id="@+id/iv_close"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
                 android:scaleType="center"
                 android:layout_gravity="center_vertical|start"
                 android:src="@drawable/ic_close_black" />
@@ -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" />
 
     <ImageView
+        android:contentDescription="返回"
         android:id="@+id/iv_back"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38bc439e2..876e34b9e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
     <string name="hint_login_password_2">请输入密码</string>
     <string name="text_login_to_register">立即注册</string>
     <string name="text_login_forget_password">忘记密码</string>
-    <string name="text_login_protocol">同意%s与%s</string>
+    <string name="text_login_protocol">我已阅读并同意%s与%s</string>
     <string name="text_login_protocol_2">注册即代表同意 %s</string>
     <string name="text_login_protocol_3">阅读并同意%s与\n%s方可登录</string>
     <string name="text_how_to_set_pwd">未设置兔兔密码的用户记得前往\n兔兔设置密码哦 %s</string>
@@ -826,7 +826,7 @@
     </string>
     <string name="tip_privacy_agreement_desc">欢迎您点击查看%s和%s，当您点击“同意”即表示您已充分阅读、理解并接受《用户协议》和《隐私政策》的全部内容。</string>
     <string name="tip_privacy_agreement">《隐私政策》</string>
-    <string name="tip_user_agreement">《用户协议》</string>
+    <string name="tip_user_agreement">《用户服务协议》</string>
     <string name="my_family">家族</string>
 
     <string name="label_charge_gold">我的账户</string>
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" />
 
-<!--    <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--        android:id="@+id/cs_line"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="46dp"-->
-<!--        android:layout_marginStart="40dp"-->
-<!--        android:layout_marginTop="@dimen/dp_16"-->
-<!--        android:layout_marginEnd="40dp"-->
-<!--        android:background="@drawable/shape_login_btn_bg"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/cs_google">-->
+    <!--    <androidx.constraintlayout.widget.ConstraintLayout-->
+    <!--        android:id="@+id/cs_line"-->
+    <!--        android:layout_width="match_parent"-->
+    <!--        android:layout_height="46dp"-->
+    <!--        android:layout_marginStart="40dp"-->
+    <!--        android:layout_marginTop="@dimen/dp_16"-->
+    <!--        android:layout_marginEnd="40dp"-->
+    <!--        android:background="@drawable/shape_login_btn_bg"-->
+    <!--        app:layout_constraintTop_toBottomOf="@+id/cs_google">-->
 
-<!--        <androidx.appcompat.widget.AppCompatTextView-->
-<!--            android:id="@+id/tv_line"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="46dp"-->
-<!--            android:background="@drawable/shape_login_btn_bg"-->
-<!--            android:gravity="center"-->
-<!--            android:text="@string/login_line"-->
-<!--            android:textColor="#6D6B89"-->
-<!--            android:textSize="16sp"-->
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="parent" />-->
+    <!--        <androidx.appcompat.widget.AppCompatTextView-->
+    <!--            android:id="@+id/tv_line"-->
+    <!--            android:layout_width="match_parent"-->
+    <!--            android:layout_height="46dp"-->
+    <!--            android:background="@drawable/shape_login_btn_bg"-->
+    <!--            android:gravity="center"-->
+    <!--            android:text="@string/login_line"-->
+    <!--            android:textColor="#6D6B89"-->
+    <!--            android:textSize="16sp"-->
+    <!--            app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--            app:layout_constraintTop_toTopOf="parent" />-->
 
-<!--        <androidx.appcompat.widget.AppCompatImageView-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginStart="@dimen/dp_28"-->
-<!--            android:src="@drawable/ic_login_line"-->
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="parent" />-->
+    <!--        <androidx.appcompat.widget.AppCompatImageView-->
+    <!--            android:layout_width="wrap_content"-->
+    <!--            android:layout_height="wrap_content"-->
+    <!--            android:layout_marginStart="@dimen/dp_28"-->
+    <!--            android:src="@drawable/ic_login_line"-->
+    <!--            app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--            app:layout_constraintStart_toStartOf="parent"-->
+    <!--            app:layout_constraintTop_toTopOf="parent" />-->
 
-<!--        <androidx.appcompat.widget.AppCompatTextView-->
-<!--            android:id="@+id/tv_line_last_login"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginTop="-10dp"-->
-<!--            android:layout_marginEnd="-10dp"-->
-<!--            android:background="@drawable/bg_last_login"-->
-<!--            android:gravity="center"-->
-<!--            android:text="@string/last_login"-->
-<!--            android:textColor="@color/color_F5F6FA"-->
-<!--            android:textSize="@dimen/sp_12"-->
-<!--            android:visibility="gone"-->
-<!--            app:layout_constraintEnd_toEndOf="@+id/cs_line"-->
-<!--            app:layout_constraintTop_toTopOf="@+id/cs_line"-->
-<!--            tools:visibility="visible" />-->
+    <!--        <androidx.appcompat.widget.AppCompatTextView-->
+    <!--            android:id="@+id/tv_line_last_login"-->
+    <!--            android:layout_width="wrap_content"-->
+    <!--            android:layout_height="wrap_content"-->
+    <!--            android:layout_marginTop="-10dp"-->
+    <!--            android:layout_marginEnd="-10dp"-->
+    <!--            android:background="@drawable/bg_last_login"-->
+    <!--            android:gravity="center"-->
+    <!--            android:text="@string/last_login"-->
+    <!--            android:textColor="@color/color_F5F6FA"-->
+    <!--            android:textSize="@dimen/sp_12"-->
+    <!--            android:visibility="gone"-->
+    <!--            app:layout_constraintEnd_toEndOf="@+id/cs_line"-->
+    <!--            app:layout_constraintTop_toTopOf="@+id/cs_line"-->
+    <!--            tools:visibility="visible" />-->
 
-<!--    </androidx.constraintlayout.widget.ConstraintLayout>-->
+    <!--    </androidx.constraintlayout.widget.ConstraintLayout>-->
 
-    <CheckBox
+    <TextView
         android:id="@+id/tv_protocol"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginBottom="@dimen/dp_50"
-        android:button="@null"
-        android:drawableStart="@drawable/selector_login_radio_btn"
-        android:drawablePadding="@dimen/dp_5"
+        android:layout_marginBottom="@dimen/dp_40"
+        android:padding="10dp"
         android:text="@string/text_login_protocol"
         android:textColor="@color/text_secondary_878b9c"
-        android:textSize="@dimen/dp_11"
+        android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         tools:ignore="SpUsage" />
 
-    <TextView
-        android:id="@+id/tv_protocol_hint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:background="@drawable/bg_login_protocol_hint"
-        android:gravity="center_horizontal|bottom"
-        android:paddingBottom="6dp"
-        android:text="同意隐私政策和用户协议后，才可以注册登录哦~"
-        android:textColor="@color/white"
-        android:textSize="10dp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_protocol"
-        tools:visibility="visible" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>