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

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

@@ -118,10 +118,7 @@ object OneKeyLoginHelp {
      *
      */
     fun toLoginActivity() {
-        ARouter.getInstance().build("/user/login")
-            .withBoolean("bind_phone", false)
-            .withBoolean("isFromGuide", mIsFromGuide)
-            .navigation()
+        RegisterAndLoginActivity.startFromGuide(mActivity,false, mIsFromGuide)
     }
 
     /**
@@ -132,10 +129,7 @@ object OneKeyLoginHelp {
         if (mIsOpenOneKeyLogin){
             getLoginToken(isOpenDialog)
         }else{
-            ARouter.getInstance().build("/user/login")
-                .withBoolean("bind_phone", false)
-                .withBoolean("isFromGuide", mIsFromGuide)
-                .navigation()
+            RegisterAndLoginActivity.startFromGuide(mActivity,false, mIsFromGuide)
         }
     }
 
@@ -238,7 +232,6 @@ object OneKeyLoginHelp {
                 .setView(otherLogin)
                 .setRootViewId(AuthRegisterViewConfig.RootViewId.ROOT_VIEW_ID_BODY)
                 .setCustomInterface {
-                    phoneNumberAuthHelper.quitLoginPage()
                     toLoginActivity()
                 }
                 .build()
@@ -287,9 +280,10 @@ object OneKeyLoginHelp {
                 .setAppPrivacyColor(Color.parseColor("#999999"), Color.parseColor("#1da1f2"))
                 .setCheckboxHidden(checkBoxHidden) //  设置是否同意协议的checkbox隐藏
                 .setPrivacyBefore(mPrivacyBeforeText)
+                .setPrivacyMargin(35)
                 .setScreenOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) //  设置竖屏
-                .setAuthPageActIn("in_activity", "out_activity")
-                .setAuthPageActOut("in_activity", "out_activity")
+//                .setAuthPageActIn("in_activity", "out_activity")
+//                .setAuthPageActOut("in_activity", "out_activity")
                 .create()
         )
     }
@@ -304,9 +298,6 @@ object OneKeyLoginHelp {
         phoneNumberAuthHelper.removeAuthRegisterViewConfig()
 
         val dialogHeight = RxImageTool.px2dp((RxDeviceTool.getScreenHeight(mActivity) * 0.45f))
-        //sdk默认控件的区域是marginTop50dp
-        val designHeight = dialogHeight - 50
-        val unit: Int = designHeight / 10
         phoneNumberAuthHelper.setAuthUIConfig(
             AuthUIConfig.Builder()
                 .setStatusBarColor(Color.TRANSPARENT)
@@ -322,22 +313,23 @@ object OneKeyLoginHelp {
                 .setSloganHidden(true) //  设置slogan是否隐藏
                 .setNumberColor(Color.parseColor("#242424"))
                 .setNumberSize(24)
-                .setNumFieldOffsetY(unit +10)
+                .setNumFieldOffsetY(38)
                 .setLogBtnBackgroundPath("bg_one_click_login") //  设置登录按钮背景图片
                 .setLogBtnTextColor(Color.parseColor("#ffffff")) //  设置登录按钮颜色
                 .setLogBtnTextSize(17)
                 .setLogBtnMarginLeftAndRight(23) //  设置登录按钮距离左右距离
-                .setLogBtnHeight(78)
-                .setLogBtnOffsetY(unit * 3-4)
+                .setLogBtnHeight(78) //
+                .setLogBtnOffsetY(90)
                 .setSwitchAccText("其它方式登录")
                 .setSwitchAccTextSize(15)
                 .setSwitchAccTextColor(Color.parseColor("#666666"))
-                .setSwitchOffsetY(160)
+                .setSwitchOffsetY(168)
                 .setAppPrivacyOne("壹点灵用户使用协议", "https://h5.ydl.com/SDUserProtol")
                 .setAppPrivacyTwo("隐私协议", "https://m.ydl.com/Protol/yinsi")
                 .setAppPrivacyColor(Color.parseColor("#999999"), Color.parseColor("#1da1f2"))
                 .setCheckboxHidden(checkBoxHidden) //  设置是否同意协议的checkbox隐藏
                 .setPrivacyBefore(mPrivacyBeforeText)
+                .setPrivacyMargin(35)
                 .setDialogHeight(dialogHeight)
                 .setDialogBottom(true)
                 .setScreenOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) //  设置竖屏
@@ -415,6 +407,7 @@ object OneKeyLoginHelp {
                         }
                     }
                     else -> {                                             // 其它失败原因
+                        mPhoneNumberAuthHelper?.hideLoginLoading()
                         // 跳转到原生登录界面
                         toLoginActivity()
                     }