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

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

@@ -84,6 +84,7 @@ object OneKeyLoginHelp {
         // 获取渠道
         val channel = WalleChannelReader.getChannel(activity)
         checkBoxHidden = !(channel == "huawei" || channel == "vivo")
+        LogUtil.e("checkBoxHidde:$checkBoxHidden")
     }
 
     /**
@@ -283,6 +284,9 @@ 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)
@@ -298,17 +302,17 @@ object OneKeyLoginHelp {
                 .setSloganHidden(true) //  设置slogan是否隐藏
                 .setNumberColor(Color.parseColor("#242424"))
                 .setNumberSize(24)
-                .setNumFieldOffsetY(60)
+                .setNumFieldOffsetY(unit +10)
                 .setLogBtnBackgroundPath("bg_one_click_login") //  设置登录按钮背景图片
                 .setLogBtnTextColor(Color.parseColor("#ffffff")) //  设置登录按钮颜色
                 .setLogBtnTextSize(16)
                 .setLogBtnMarginLeftAndRight(35) //  设置登录按钮距离左右距离
                 .setLogBtnHeight(78)
-                .setLogBtnOffsetY(90)
+                .setLogBtnOffsetY((unit * 2.5).toInt())
                 .setSwitchAccText("其它方式登录")
                 .setSwitchAccTextSize(15)
                 .setSwitchAccTextColor(Color.parseColor("#666666"))
-                .setSwitchOffsetY(168)
+                .setSwitchOffsetY(160)
                 .setAppPrivacyOne("壹点灵用户使用协议", "https://h5.ydl.com/SDUserProtol")
                 .setAppPrivacyTwo("隐私协议", "https://m.ydl.com/Protol/yinsi")
                 .setAppPrivacyColor(Color.parseColor("#999999"), Color.parseColor("#1da1f2"))

m-user/src/main/res/values/styles.xml

-<resources xmlns:tools="http://schemas.android.com/tools">
-
-
-    <style name="authsdk_activity_dialog" parent="Theme.AppCompat.Light.NoActionBar" tools:ignore="ResourceName">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-        <item name="android:windowIsFloating">true</item>
-    </style>
+<resources>
 
     <style name="user_new_divide_color_style">
         <item name="android:layout_width">match_parent</item>

ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/EncryptionParams.java

@@ -25,7 +25,6 @@ public class EncryptionParams {
 //                .collect(Collectors.joining()).trim()
 //                .concat();
         String sign = ("path"+path+"timestamp"+timestamp+"version1.0.0").concat(HttpConfig.Companion.getENCRYPTION_APP_SECRET());
-        LogUtil.e("sign",sign);
         sign = MD5Util.md5(sign).toUpperCase();
         return sign;
     }