diff --git a/app/agconnect-services.json b/app/agconnect-services.json index 80b1bb133..efd89caf7 100644 --- a/app/agconnect-services.json +++ b/app/agconnect-services.json @@ -23,7 +23,7 @@ "project_id":"736430079245711652", "app_id":"104321113", "api_key":"CwEAAAAAZgS4/Nw1+/PybMG5CZXzJmlHHHnj0Tp2FOXQG3RtKUdpAsiQiXttqCXlHWA8GdUzGjtnq6oQh2Ogfe8JOs8ihePgJLg=", - "package_name":"com.mango.moshen" + "package_name":"com.mango.xiaoyouplay" }, "oauth_client":{ "client_id":"104321113", @@ -31,7 +31,7 @@ }, "app_info":{ "app_id":"104321113", - "package_name":"com.mango.moshen" + "package_name":"com.mango.xiaoyouplay" }, "service":{ "analytics":{ @@ -53,12 +53,12 @@ "configuration_version":"3.0", "appInfos":[ { - "package_name":"com.mango.moshen", + "package_name":"com.mango.xiaoyouplay", "client":{ "app_id":"104321113" }, "app_info":{ - "package_name":"com.mango.moshen", + "package_name":"com.mango.xiaoyouplay", "app_id":"104321113" }, "oauth_client":{ diff --git a/app/build.gradle b/app/build.gradle index 7b25c2eda..471622f4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { compileSdkVersion 30 defaultConfig { - applicationId "com.mango.moshen" + applicationId "com.mango.xiaoyouplay" minSdkVersion 21 targetSdkVersion 29 versionCode Integer.valueOf(version_code) @@ -66,19 +66,19 @@ android { signingConfigs { v2 { - storeFile file('../moshen.jks') - storePassword "moshen2020" - keyAlias "moshen" - keyPassword "moshen2020" + storeFile file('../yinbao.jks') + storePassword "yinbao2020" + keyAlias "yinbao" + keyPassword "yinbao2020" v2SigningEnabled true v1SigningEnabled true } v1 { - storeFile file('../moshen.jks') - storePassword "moshen2020" - keyAlias "moshen" - keyPassword "moshen2020" + storeFile file('../yinbao.jks') + storePassword "yinbao2020" + keyAlias "yinbao" + keyPassword "yinbao2020" v2SigningEnabled false v1SigningEnabled true } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aecac28b1..430bdef2f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -437,7 +437,7 @@ + android:scheme="yinbaoapp" /> diff --git a/app/src/main/java/com/mango/moshen/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/mango/moshen/radish/activity/RadishRecordActivity.java index 7c0426be5..c2cb9f915 100644 --- a/app/src/main/java/com/mango/moshen/radish/activity/RadishRecordActivity.java +++ b/app/src/main/java/com/mango/moshen/radish/activity/RadishRecordActivity.java @@ -125,7 +125,7 @@ public class RadishRecordActivity extends BaseMvpActivity { binding.wvRule.setWebViewClient(new WebViewClient()); // 设置Webview的user-agent binding.wvRule.getSettings().setUserAgentString(binding.wvRule.getSettings().getUserAgentString() + " tutuAppAndroid erbanAppAndroid"); - binding.wvRule.loadUrl(UriProvider.JAVA_WEB_URL + "/yinyou/modules/rule/rule-popup.html"); + binding.wvRule.loadUrl(UriProvider.JAVA_WEB_URL + "/yinyou/modules/rule-yinyou/rule-popup.html"); } } diff --git a/app/src/main/res/drawable-xhdpi/about_logo.png b/app/src/main/res/drawable-xhdpi/about_logo.png index f76a604bc..7ea388feb 100644 Binary files a/app/src/main/res/drawable-xhdpi/about_logo.png and b/app/src/main/res/drawable-xhdpi/about_logo.png differ diff --git a/app/src/main/res/mipmap-hdpi/app_logo.png b/app/src/main/res/mipmap-hdpi/app_logo.png index 94401d9dd..c49f03c45 100644 Binary files a/app/src/main/res/mipmap-hdpi/app_logo.png and b/app/src/main/res/mipmap-hdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-xhdpi/app_logo.png b/app/src/main/res/mipmap-xhdpi/app_logo.png index f76a604bc..c49f03c45 100644 Binary files a/app/src/main/res/mipmap-xhdpi/app_logo.png and b/app/src/main/res/mipmap-xhdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/app_logo.png b/app/src/main/res/mipmap-xxhdpi/app_logo.png index 1b89c3c8e..c49f03c45 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/app_logo.png and b/app/src/main/res/mipmap-xxhdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/app_logo.png b/app/src/main/res/mipmap-xxxhdpi/app_logo.png index db0afcd13..c49f03c45 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/app_logo.png and b/app/src/main/res/mipmap-xxxhdpi/app_logo.png differ diff --git a/channel.txt b/channel.txt index 082b57b03..433012bf2 100644 --- a/channel.txt +++ b/channel.txt @@ -3,20 +3,4 @@ yingyongbao vivo oppo xiaomi -xingqiu0 -xingqiu1 -xingqiu2 -xingqiu3 -xingqiu4 -xingqiu5 -xingqiu6 -xingqiu7 -xingqiu8 -xingqiu9 -xingqiu10 -yingyongbao01 -yingyongbao02 -yingyongbao03 -gongzhonghao -toutiao -kuaishou-xxl-01 \ No newline at end of file +huawei \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/mango/core/UriProvider.java b/core/src/diff_src_erban/java/com/mango/core/UriProvider.java index 4f87f0387..0fc5d9757 100644 --- a/core/src/diff_src_erban/java/com/mango/core/UriProvider.java +++ b/core/src/diff_src_erban/java/com/mango/core/UriProvider.java @@ -75,7 +75,7 @@ public class UriProvider { * 帮助页 */ public static String getHelp() { - return IM_SERVER_URL.concat("/yinyou/modules/rule/guide.html"); + return IM_SERVER_URL.concat("/yinyou/modules/rule-yinyou/guide.html"); } /** @@ -170,7 +170,7 @@ public class UriProvider { * @return */ public static String getUserProtocolUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/protocol.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/protocol.html"); } /** @@ -213,7 +213,7 @@ public class UriProvider { * @return */ public static String getRechargeAgreementUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/rechargeAgreement.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/rechargeAgreement.html"); } /** @@ -235,7 +235,7 @@ public class UriProvider { } public static String getCommnunityNorms() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/community-norms.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/community-norms.html"); } /** @@ -244,7 +244,7 @@ public class UriProvider { * @return */ public static String getPrivacyAgreement() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/privacy-wap.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/privacy-wap.html"); } public static String getLinkUrl(String linkUrl) { @@ -288,7 +288,7 @@ public class UriProvider { * @return */ public static String getRedPacketRule() { - return JAVA_WEB_URL.concat("yinyou/modules/rule/red-packet-rule.html"); + return JAVA_WEB_URL.concat("yinyou/modules/rule-yinyou/red-packet-rule.html"); } @@ -298,7 +298,7 @@ public class UriProvider { * @return */ public static String getDatingRule() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/dating.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/dating.html"); } /** @@ -342,7 +342,7 @@ public class UriProvider { * @return */ public static String getSDKPermissionUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/sdk.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/sdk.html"); } /** @@ -351,28 +351,28 @@ public class UriProvider { * @return */ public static String getDeivcePermissionUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/permissions.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/permissions.html"); } /** * 隐私协议-个人信息 */ public static String getPersonalInfoUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/personal-info.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/personal-info.html"); } /** * 隐私指引 */ public static String getPrivacyUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/privacy-wap.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/privacy-wap.html"); } /** * 贵族中心帮助页 */ public static String getVipHelpUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/introduction-patrician.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/introduction-patrician.html"); } /** @@ -386,35 +386,35 @@ public class UriProvider { * 用户充值协议 */ public static String getChargeAgreementUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/rechargeAgreement.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/rechargeAgreement.html"); } /** * 用户注册服务协议 */ public static String getRegistrationAgreementUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/protocol.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/protocol.html"); } /** * 直播服务协议 */ public static String getLiveServiceAgreementUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/live-protocol.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/live-protocol.html"); } /** * 社区规范 */ public static String getCommunitySpecificationUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/community-norms.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/community-norms.html"); } /** * 账号注销协议 */ public static String getCancellationAgreementUrl() { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/logout-agreement.html"); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/logout-agreement.html"); } /** @@ -471,7 +471,7 @@ public class UriProvider { * 幸运礼物说明 */ public static String getLuckyGiftRule(int giftID) { - return JAVA_WEB_URL.concat("/yinyou/modules/rule/luckyGiftRule.html?giftID=" + giftID); + return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/luckyGiftRule.html?giftID=" + giftID); } /** diff --git a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java index 8f6a2bbec..9c3646987 100644 --- a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java @@ -200,7 +200,7 @@ public class XChatConstants { /** * 登录页面「如何登录」对应的 H5 页面 */ - public static final String LOGIN_ERBAN_ACCOUNT_URL = "/yinyou/modules/rule/login_tips.html"; + public static final String LOGIN_ERBAN_ACCOUNT_URL = "/yinyou/modules/rule-yinyou/login_tips.html"; public static final String ROOM_INTRODUCTION = "可点击房间话题查看本房间公告"; public static final String DATING_TIPS_OPEN = "相亲玩法已开启,请点击主持人麦位选择主持人"; @@ -277,7 +277,7 @@ public class XChatConstants { * Referer (RELEASE) */ public static final String KEY_REFERER_RELEASE = "https://yinyou.api.shengxuanwangluo.com/"; - public static final String APP_MARK = "yinyou"; + public static final String APP_MARK = "yinbao"; /** * 聊天室文本消息易盾反垃圾业务id */ diff --git a/gradle.properties b/gradle.properties index 09da4aa35..60673ef76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,9 +21,9 @@ MobSDK.spEdition=FP with_flutter_aar=true with_jenkins=false -only_arm64=false +only_arm64=true channel_file=channel.txt -version_name=4.6.2 -version_code=462 \ No newline at end of file +version_name=5.3.0 +version_code=530 \ No newline at end of file diff --git a/mob.gradle b/mob.gradle index 1b052eb69..24576d4bc 100644 --- a/mob.gradle +++ b/mob.gradle @@ -9,12 +9,12 @@ MobSDK { gui false devInfo { Wechat { - appId "wx65d13b22662a9c68" - appSecret "1bc805724f29a441ff66be5c32ff9ab4" + appId "wx85aba24d53f9ae6d" + appSecret "62002f3e3ee55dd211c828de650f0394" } WechatMoments { - appId "wx65d13b22662a9c68" - appSecret "1bc805724f29a441ff66be5c32ff9ab4" + appId "wx85aba24d53f9ae6d" + appSecret "62002f3e3ee55dd211c828de650f0394" } QQ { appId "101937205" diff --git a/moshen.jks b/moshen.jks deleted file mode 100644 index d8989f530..000000000 Binary files a/moshen.jks and /dev/null differ diff --git a/tmpmob/ShareSDK/assets/ShareSDK.xml b/tmpmob/ShareSDK/assets/ShareSDK.xml index 64acd372a..24b227eb1 100644 --- a/tmpmob/ShareSDK/assets/ShareSDK.xml +++ b/tmpmob/ShareSDK/assets/ShareSDK.xml @@ -16,8 +16,8 @@ - - + + diff --git a/yinbao.jks b/yinbao.jks new file mode 100644 index 000000000..ff0f3df67 Binary files /dev/null and b/yinbao.jks differ diff --git a/yinyou.jks b/yinyou.jks deleted file mode 100644 index dc259fe59..000000000 Binary files a/yinyou.jks and /dev/null differ