修改登录页面隐私协议UI

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/LoginActivity.kt

@@ -76,10 +76,10 @@ class LoginActivity : BaseMVPActivity<ActivityLoginBinding, LoginPresenter>(),
                 ToastUtil.getInstance().showShort("密码不可为空")
                 return@setOnClickListener;
             }
-//            if (!viewBinding.cbPrivacy.isChecked) {
-//                ToastUtil.getInstance().showShort("请勾选用户协议")
-//                return@setOnClickListener
-//            }
+            if (!viewBinding.cbPrivacy.isChecked) {
+                ToastUtil.getInstance().showShort("请勾选用户协议")
+                return@setOnClickListener
+            }
             presenter?.onLoginByPwd(et_phone_num?.text.toString(), et_password?.text.toString());
         }
     }

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/VerifyCodeLoginActivity.java

@@ -103,10 +103,10 @@ public class VerifyCodeLoginActivity extends BaseMVPActivity<ActivityVerifyCodeL
         }
 
         if (v.getId() == R.id.tv_send_verify_code) {
-//            if (!viewBinding.cbPrivacy.isChecked()) {
-//                ToastUtil.getInstance().showShort("请勾选用户协议");
-//                return;
-//            }
+            if (!viewBinding.cbPrivacy.isChecked()) {
+                ToastUtil.getInstance().showShort("请勾选用户协议");
+                return;
+            }
             //获取验证码
             String phone = viewBinding.etPhoneNum.getText().toString();
             if (phone.length() != 11 || !PhoneUtils.isMobile(phone)) {

usercenter/src/main/res/layout/activity_login.xml

@@ -138,11 +138,9 @@
         app:layout_constraintTop_toBottomOf="@+id/mLoginBtn" />
 
     <CheckBox
-        android:visibility="gone"
         android:id="@+id/cb_privacy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
         android:layout_marginTop="10dp"
         android:background="@android:color/transparent"
         android:button="@null"
@@ -153,11 +151,12 @@
         android:text="@string/read_privacy_and_agree_str"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintRight_toLeftOf="@+id/tv_privacy"
         app:layout_constraintLeft_toLeftOf="@+id/tv_login_by_code"
         app:layout_constraintTop_toBottomOf="@+id/tv_login_by_code" />
 
     <TextView
-        android:visibility="gone"
         android:id="@+id/tv_privacy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -165,6 +164,7 @@
         tools:text="《用户注册协议》和《隐私政策》"
         android:textColor="@color/color_2dc7aa"
         android:textSize="@dimen/sp_12"
+        app:layout_constraintRight_toRightOf="@+id/tv_login_by_code"
         app:layout_constraintBottom_toBottomOf="@+id/cb_privacy"
         app:layout_constraintLeft_toRightOf="@+id/cb_privacy"
         app:layout_constraintTop_toTopOf="@+id/cb_privacy" />

usercenter/src/main/res/layout/activity_verify_code_login.xml

@@ -114,7 +114,6 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_send_verify_code" />
 
     <CheckBox
-        android:visibility="gone"
         android:id="@+id/cb_privacy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -135,7 +134,6 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_login_by_code" />
 
     <TextView
-        android:visibility="gone"
         android:id="@+id/tv_privacy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"