Merge remote-tracking branch 'origin/4.1.64' into 4.1.64

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

@@ -185,7 +185,7 @@ object OneKeyLoginHelp {
             RelativeLayout.LayoutParams.WRAP_CONTENT
         )
         tvAuthParams.addRule(RelativeLayout.CENTER_HORIZONTAL, RelativeLayout.TRUE)
-        tvAuthParams.setMargins(0, RxImageTool.dp2px(235f), 0, 0)
+        tvAuthParams.setMargins(0, RxImageTool.dp2px(255f), 0, 0)
         when (phoneNumberAuthHelper.currentCarrierName) {
             "CUCC" -> {
                 tvAuth.text = "中国联通提供认证服务"
@@ -223,7 +223,7 @@ object OneKeyLoginHelp {
             RxImageTool.dp2px(68f)
         )
         otherLogin.text = "其他方式登录"
-        otherLogin.setTextColor(Color.parseColor("#666666"))
+        otherLogin.setTextColor(Color.parseColor("#999999"))
         otherLogin.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15f)
         otherLogin.gravity = Gravity.CENTER
         otherLogin.layoutParams = layoutParams
@@ -266,18 +266,19 @@ object OneKeyLoginHelp {
                 .setSloganHidden(true) //  设置slogan是否隐藏
                 .setNumberColor(Color.parseColor("#242424"))
                 .setNumberSize(24)
-                .setNumFieldOffsetY(200)
+                .setNumFieldOffsetY(220)
                 .setLogBtnBackgroundPath("bg_one_click_login") //  设置登录按钮背景图片
                 .setLogBtnTextColor(Color.parseColor("#ffffff")) //  设置登录按钮文字颜色
                 .setLogBtnTextSize(17)
-                .setLogBtnMarginLeftAndRight(23) //  设置登录按钮距离左右距离
                 .setLogBtnHeight(78)
-                .setSwitchAccText(" 切换号码 ")
+                .setLogBtnOffsetY(290)
+                .setSwitchAccText("切换号码")
                 .setSwitchAccTextSize(15)
-                .setSwitchAccTextColor(Color.parseColor("#1DA1F2"))
+                .setSwitchAccTextColor(Color.parseColor("#999999"))
+                .setSwitchOffsetY(370)
                 .setAppPrivacyOne(appPrivacyOneTip, appPrivacyOne)
                 .setAppPrivacyTwo("隐私协议", appPrivacyTwo)
-                .setAppPrivacyColor(Color.parseColor("#999999"), Color.parseColor("#1da1f2"))
+                .setAppPrivacyColor(Color.parseColor("#bfbfbf"), Color.parseColor("#991da1f2"))
                 .setCheckboxHidden(checkBoxHidden) //  设置是否同意协议的checkbox隐藏
                 .setPrivacyBefore(mPrivacyBeforeText)
                 .setPrivacyMargin(35)
@@ -304,7 +305,7 @@ object OneKeyLoginHelp {
                 .setWebViewStatusBarColor(Color.TRANSPARENT)
                 .setStatusBarUIFlag(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
                 .setNavText("登录解锁更多功能")
-                .setNavTextColor(Color.parseColor("#242424"))
+                .setNavTextColor(Color.parseColor("#999999"))
                 .setWebNavTextColor(Color.parseColor("#242424")) //  设置协议页面标题字体颜色
                 .setNavReturnImgPath("one_key_login_dialog_close")
                 .setWebNavColor(Color.WHITE)
@@ -313,20 +314,19 @@ object OneKeyLoginHelp {
                 .setSloganHidden(true) //  设置slogan是否隐藏
                 .setNumberColor(Color.parseColor("#242424"))
                 .setNumberSize(24)
-                .setNumFieldOffsetY(38)
+                .setNumFieldOffsetY(40)
                 .setLogBtnBackgroundPath("bg_one_click_login") //  设置登录按钮背景图片
                 .setLogBtnTextColor(Color.parseColor("#ffffff")) //  设置登录按钮颜色
                 .setLogBtnTextSize(17)
-                .setLogBtnMarginLeftAndRight(23) //  设置登录按钮距离左右距离
-                .setLogBtnHeight(78) //
-                .setLogBtnOffsetY(90)
-                .setSwitchAccText(" 其它方式登录 ")
+                .setLogBtnHeight(78)
+                .setLogBtnOffsetY(80)
+                .setSwitchAccText("其它方式登录")
                 .setSwitchAccTextSize(15)
-                .setSwitchAccTextColor(Color.parseColor("#666666"))
-                .setSwitchOffsetY(168)
+                .setSwitchAccTextColor(Color.parseColor("#999999"))
+                .setSwitchOffsetY_B(80)
                 .setAppPrivacyOne("壹点灵用户使用协议", "https://h5.ydl.com/SDUserProtol")
                 .setAppPrivacyTwo("隐私协议", "https://m.ydl.com/Protol/yinsi")
-                .setAppPrivacyColor(Color.parseColor("#999999"), Color.parseColor("#1da1f2"))
+                .setAppPrivacyColor(Color.parseColor("#bfbfbf"), Color.parseColor("#991da1f2"))
                 .setCheckboxHidden(checkBoxHidden) //  设置是否同意协议的checkbox隐藏
                 .setPrivacyBefore(mPrivacyBeforeText)
                 .setPrivacyMargin(35)

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

@@ -493,7 +493,11 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             tv_protocol.visibility = View.GONE
             other_login_style.visibility=View.GONE
         } else {
-            LoginUtils.LoginSuccessOperate(this)
+            if (isFromGuide) {
+                LoginUtils.LoginSuccessOperate(this)
+            }else{
+                finish()
+            }
         }
     }
 
@@ -586,8 +590,12 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         ll_success.visibility = View.GONE
         ToastUtil.toastShort("登录成功")
         handler!!.postDelayed({
-            LoginUtils.LoginSuccessOperate(this)
-        }, 1500)
+            if (isFromGuide) {
+                LoginUtils.LoginSuccessOperate(this)
+            }else{
+                finish()
+            }
+        }, 1000)
     }
 
     private fun finishPrePage() {

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

@@ -70,7 +70,7 @@
         app:layout_constraintStart_toStartOf="@id/view_lin"
         app:layout_constraintTop_toBottomOf="@id/view_lin"
         android:layout_marginTop="@dimen/platform_dp_10"
-        android:text="密码为6-16个字符，数字或英文字母组合"
+        android:text="密码为6-16个字符，数字和英文字母组合"
         app:layout_constraintEnd_toEndOf="@id/view_lin"
         android:layout_marginEnd="@dimen/platform_dp_27"
         android:id="@+id/forget_password_hint"