Merge branch 'feat/lp/lp_confide_5' into 'd/v_confide_2.0'

feat: 一键登录换图

See merge request app_android_lib/YDL-Component!88

m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt

@@ -342,12 +342,13 @@ object OneKeyLoginHelp {
                 .setAppPrivacyTwo("隐私协议", appPrivacyTwo)
                 .setAppPrivacyColor(Color.parseColor("#bfbfbf"), Color.parseColor("#991da1f2"))
                 .setCheckboxHidden(checkBoxHidden) //  设置是否同意协议的checkbox隐藏
-                .setCheckBoxHeight(16)
-                .setCheckBoxWidth(16)
+                .setCheckBoxHeight(24)
+                .setCheckBoxWidth(24)
                 .setCheckedImgPath("user_login_protocol_selected_new")
                 .setUncheckedImgPath("user_login_protocol_unselected_new")
                 .setPrivacyBefore(mPrivacyBeforeText)
                 .setPrivacyMargin(35)
+                .setProtocolGravity(Gravity.CENTER_VERTICAL)
                 .setScreenOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) //  设置竖屏
 //                .setAuthPageActIn("in_activity", "out_activity")
 //                .setAuthPageActOut("in_activity", "out_activity")
@@ -394,12 +395,13 @@ object OneKeyLoginHelp {
                 .setAppPrivacyTwo("隐私协议", "https://m.ydl.com/Protol/yinsi")
                 .setAppPrivacyColor(Color.parseColor("#bfbfbf"), Color.parseColor("#991da1f2"))
                 .setCheckboxHidden(checkBoxHidden) //  设置是否同意协议的checkbox隐藏
-                .setCheckBoxHeight(16)
-                .setCheckBoxWidth(16)
+                .setCheckBoxHeight(24)
+                .setCheckBoxWidth(24)
                 .setCheckedImgPath("user_login_protocol_selected_new")
                 .setUncheckedImgPath("user_login_protocol_unselected_new")
                 .setPrivacyBefore(mPrivacyBeforeText)
                 .setPrivacyMargin(35)
+                .setProtocolGravity(Gravity.CENTER_VERTICAL)
                 .setDialogHeight(dialogHeight)
                 .setDialogBottom(true)
                 .setScreenOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) //  设置竖屏

m-user/src/main/res/layout/user_activity_register_and_login_new.xml

@@ -185,8 +185,8 @@
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:id="@+id/iv_select_protocol"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:src="@drawable/user_login_protocol_unselected_new" />
 
         <TextView