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

m-user/src/main/AndroidManifest.xml

@@ -70,10 +70,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/platform_NoTitleTheme" />
         <activity
-            android:name=".ui.AliAuthDemoActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/platform_NoTitleTheme" />
-        <activity
             android:name=".wxapi.WXEntryActivity"
             android:exported="true"
             android:launchMode="singleTop" />

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

@@ -191,7 +191,7 @@ object OneKeyLoginHelp {
             RelativeLayout.LayoutParams.WRAP_CONTENT
         )
         tvAuthParams.addRule(RelativeLayout.CENTER_HORIZONTAL, RelativeLayout.TRUE)
-        tvAuthParams.setMargins(0, RxImageTool.dp2px(250f), 0, 0)
+        tvAuthParams.setMargins(0, RxImageTool.dp2px(235f), 0, 0)
         when (phoneNumberAuthHelper.currentCarrierName) {
             "CUCC" -> {
                 tvAuth.text = "中国联通提供认证服务"
@@ -273,11 +273,11 @@ object OneKeyLoginHelp {
                 .setSloganHidden(true) //  设置slogan是否隐藏
                 .setNumberColor(Color.parseColor("#242424"))
                 .setNumberSize(24)
-                .setNumFieldOffsetY(215)
+                .setNumFieldOffsetY(200)
                 .setLogBtnBackgroundPath("bg_one_click_login") //  设置登录按钮背景图片
                 .setLogBtnTextColor(Color.parseColor("#ffffff")) //  设置登录按钮文字颜色
-                .setLogBtnTextSize(15)
-                .setLogBtnMarginLeftAndRight(40) //  设置登录按钮距离左右距离
+                .setLogBtnTextSize(17)
+                .setLogBtnMarginLeftAndRight(23) //  设置登录按钮距离左右距离
                 .setLogBtnHeight(78)
                 .setSwitchAccText("切换号码")
                 .setSwitchAccTextSize(15)
@@ -325,10 +325,10 @@ object OneKeyLoginHelp {
                 .setNumFieldOffsetY(unit +10)
                 .setLogBtnBackgroundPath("bg_one_click_login") //  设置登录按钮背景图片
                 .setLogBtnTextColor(Color.parseColor("#ffffff")) //  设置登录按钮颜色
-                .setLogBtnTextSize(16)
-                .setLogBtnMarginLeftAndRight(35) //  设置登录按钮距离左右距离
+                .setLogBtnTextSize(17)
+                .setLogBtnMarginLeftAndRight(23) //  设置登录按钮距离左右距离
                 .setLogBtnHeight(78)
-                .setLogBtnOffsetY((unit * 2.5).toInt())
+                .setLogBtnOffsetY(unit * 3-4)
                 .setSwitchAccText("其它方式登录")
                 .setSwitchAccTextSize(15)
                 .setSwitchAccTextColor(Color.parseColor("#666666"))
@@ -361,13 +361,13 @@ object OneKeyLoginHelp {
                         }
                     }
                     ResultCode.CODE_SUCCESS -> {                          // 获取token成功
-                        val param = PhoneLoginAutoParam(tokenRet.token, JPushUtils.getRegistrationID(),2,2,"",
-                            RxAppTool.getAppVersionName(BaseApp.Companion.getApp()))
+                        val param = PhoneLoginAutoParam(tokenRet.token, JPushUtils.getRegistrationID(),2,2,"", RxAppTool.getAppVersionName(BaseApp.Companion.getApp()))
                         LoginApiRequestUtil.autoLogin(param)
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe({
                                 if (it.code == 200) {
+                                    ToastUtil.toastShort("登录成功")
                                     saveUserData(it.data)
                                     if (it.data.firstLogin == 1) {//第一次登录：是注册
                                         StatusUtils.isFirstLogin = true

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

-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="5dp"
-                android:text="欢迎使用阿里巴巴本机认证服务"
-                android:textColor="#ff5000"
-                android:textSize="18dp" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/operator_name_tv"
-            android:layout_width="250dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="15dp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical">
-
-            <Button
-                android:id="@+id/login_button"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="10dp"
-                android:layout_marginTop="10dp"
-                android:layout_weight="1"
-                android:background="@color/platform_gray7"
-                android:text="获取登录Token" />
-
-            <Button
-                android:id="@+id/vaild_button"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="10dp"
-                android:layout_weight="1"
-                android:background="@color/platform_gray7"
-                android:text="获取认证token" />
-        </LinearLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file

ydl-platform/src/main/res/raw/api.properties

@@ -52,8 +52,8 @@ javaapi.test = https://testapi.ydl.com/api/
 javaapi.auto_test = https://auto_testapi.ydl.com/api/
 javaapi.prod = https://api.ydl.com/api/
 
-# 开启网关加密appKey和appSecret
+# 网关加密的appKey和appSecret
 appKey.test = 20BB42485BD448DE888DD745899C457D
 appSecret.test = ABA88F2FF7E64A688D2213B20A9B3A3E
-appKey.prod =
-appSecret.prod =
+appKey.prod = 49A4A1BBFBC74CA2B0B5C6B77FF13A80
+appSecret.prod = ABA88F2FF7E64A688D2213B20A9B3A3E

ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java

@@ -720,7 +720,11 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
                     if (overridePayUrl != null) {
                         return overridePayUrl;
                     }
-                    if (!TextUtils.isEmpty(url) && url.startsWith("http")) {
+
+                    if (!TextUtils.isEmpty(url)&&url.endsWith(".apk")){
+                        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                        startActivity(intent);
+                    } else if (!TextUtils.isEmpty(url) && url.startsWith("http")) {
                         loadUrl(setUrlHeightParams(url));
                     } else {
                         if (YDLRouterManager.Companion.router(url)) {
@@ -799,8 +803,10 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
                         return overridePayUrl;
                     }
 
-
-                    if (!TextUtils.isEmpty(url) && url.startsWith("http")) {
+                    if (!TextUtils.isEmpty(url)&&url.endsWith(".apk")){
+                        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                        startActivity(intent);
+                    } else if (!TextUtils.isEmpty(url) && url.startsWith("http")) {
                         loadUrl(setUrlHeightParams(url));
                     } else {
                         if (YDLRouterManager.Companion.router(url)) {