diff --git a/common/build.gradle b/common/build.gradle index d59049c32..9e67d69a0 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -213,7 +213,7 @@ dependencies { api 'com.yanzhenjie.recyclerview:x:1.3.2' //华为支付插件包 - //api project(':lib_huawei') +// api project(':lib_huawei') //google插件包 api project(':lib_google') diff --git a/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java b/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java index 36b326d0c..1d1fc7334 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java @@ -149,11 +149,11 @@ public class GuardUpgradePopup extends CenterPopupView { IMLoginModel userInfo = IMLoginManager.get(getContext()).getUserInfo(); htmlUrl.append(CommonAppConfig.HOST) .append("/h5/Guard/level.html?") - .append("&token=") + .append("token=") .append(userInfo.getToken()) .append("&uid=") .append(userInfo.getId()) - .append("&&anchorUid=") + .append("&anchorUid=") .append(mLiveUid) .append("&isZh=") .append(((WordUtil.isNewZh()) ? "1" : "0")); diff --git a/config.gradle b/config.gradle index 72fe88cbe..516ec9bb3 100644 --- a/config.gradle +++ b/config.gradle @@ -4,7 +4,7 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 21, targetSdkVersion : 33, - versionCode : 469, + versionCode : 468, versionName : "6.6.6" ] manifestPlaceholders = [ @@ -21,7 +21,7 @@ ext { baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包 3 samsung包 - isGooglePlay : 0, + isGooglePlay : 3, //是否上报异常日志 isUploadLog : true, //是否打包成插件包模式 diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java index 13721933c..638405778 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java @@ -291,11 +291,11 @@ public class LiveGuardDialog extends AbsDialogPopupWindow { IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); htmlUrl.append(CommonAppConfig.HOST) .append("/h5/Guard/mission.html?") - .append("&token=") + .append("token=") .append(userInfo.getToken()) .append("&uid=") .append(userInfo.getId()) - .append("&&anchorUid=") + .append("&anchorUid=") .append(mLiveUid) .append("&isZh=") .append(((WordUtil.isNewZh()) ? "1" : "0")); @@ -317,11 +317,11 @@ public class LiveGuardDialog extends AbsDialogPopupWindow { IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); htmlUrl.append(CommonAppConfig.HOST) .append("/h5/Guard/level.html?") - .append("&token=") + .append("token=") .append(userInfo.getToken()) .append("&uid=") .append(userInfo.getId()) - .append("&&anchorUid=") + .append("&anchorUid=") .append(mLiveUid) .append("&isZh=") .append(((WordUtil.isNewZh()) ? "1" : "0")); diff --git a/main/src/main/res/layout/view_main_home.xml b/main/src/main/res/layout/view_main_home.xml index 1e99b6ebd..dc97db9b1 100644 --- a/main/src/main/res/layout/view_main_home.xml +++ b/main/src/main/res/layout/view_main_home.xml @@ -51,8 +51,8 @@ android:paddingTop="1dp" android:text="@string/main_type_theater" android:textColor="#B1B1B1" - android:layout_marginBottom="3dp" - android:textSize="16dp" + android:layout_marginBottom="2dp" + android:textSize="17dp" android:textStyle="bold" />