签名修改,APP logo修改

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":{

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')
+            storeFile file('../yinbao.jks')
-            storePassword "moshen2020"
+            storePassword "yinbao2020"
-            keyAlias "moshen"
+            keyAlias "yinbao"
-            keyPassword "moshen2020"
+            keyPassword "yinbao2020"
             v2SigningEnabled true
             v1SigningEnabled true
         }
 
         v1 {
-            storeFile file('../moshen.jks')
+            storeFile file('../yinbao.jks')
-            storePassword "moshen2020"
+            storePassword "yinbao2020"
-            keyAlias "moshen"
+            keyAlias "yinbao"
-            keyPassword "moshen2020"
+            keyPassword "yinbao2020"
             v2SigningEnabled false
             v1SigningEnabled true
         }

app/src/main/AndroidManifest.xml

@@ -437,7 +437,7 @@
                 <!-- 此处scheme值需要替换为后台设置中的scheme值 -->
                 <data
                     android:host="linkedme"
-                    android:scheme="yinyouapp" />
+                    android:scheme="yinbaoapp" />
 
                 <action android:name="android.intent.action.VIEW" />
 

app/src/main/java/com/mango/moshen/radish/activity/RadishRecordActivity.java

@@ -125,7 +125,7 @@ public class RadishRecordActivity extends BaseMvpActivity<IRadishRecordView, Rad
             mTitleBar.addAction(new TitleBar.ImageAction(R.mipmap.common_ic_help_white) {
                 @Override
                 public void performAction(View view) {
-                    CommonWebViewActivity.start(RadishRecordActivity.this, UriProvider.JAVA_WEB_URL + "/yinyou/modules/rule/radish.html");
+                    CommonWebViewActivity.start(RadishRecordActivity.this, UriProvider.JAVA_WEB_URL + "/yinyou/modules/rule-yinyou/radish.html");
                 }
             });
         }

app/src/main/java/com/mango/moshen/radish/signin/view/RuleDialog.java

@@ -31,6 +31,6 @@ public class RuleDialog extends BaseBindingDialog<DialogRuleBinding> {
         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");
     }
 }

channel.txt

@@ -3,20 +3,4 @@ yingyongbao
 vivo
 oppo
 xiaomi
-xingqiu0
+huawei
-xingqiu1
-xingqiu2
-xingqiu3
-xingqiu4
-xingqiu5
-xingqiu6
-xingqiu7
-xingqiu8
-xingqiu9
-xingqiu10
-yingyongbao01
-yingyongbao02
-yingyongbao03
-gongzhonghao
-toutiao
-kuaishou-xxl-01

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);
     }
 
     /**

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
      */

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_name=5.3.0
-version_code=462
+version_code=530

mob.gradle

@@ -9,12 +9,12 @@ MobSDK {
         gui false
         devInfo {
             Wechat {
-                appId "wx65d13b22662a9c68"
+                appId "wx85aba24d53f9ae6d"
-                appSecret "1bc805724f29a441ff66be5c32ff9ab4"
+                appSecret "62002f3e3ee55dd211c828de650f0394"
             }
             WechatMoments {
-                appId "wx65d13b22662a9c68"
+                appId "wx85aba24d53f9ae6d"
-                appSecret "1bc805724f29a441ff66be5c32ff9ab4"
+                appSecret "62002f3e3ee55dd211c828de650f0394"
             }
             QQ {
                 appId "101937205"

tmpmob/ShareSDK/assets/ShareSDK.xml

@@ -16,8 +16,8 @@
 <Tumblr Enable="false" />
 <Email Enable="false" />
 <ShortMessage Enable="false" />
-<Wechat AppId="wx65d13b22662a9c68" AppSecret="1bc805724f29a441ff66be5c32ff9ab4" />
+<Wechat AppId="wx85aba24d53f9ae6d" AppSecret="62002f3e3ee55dd211c828de650f0394" />
-<WechatMoments AppId="wx65d13b22662a9c68" AppSecret="1bc805724f29a441ff66be5c32ff9ab4" />
+<WechatMoments AppId="wx85aba24d53f9ae6d" AppSecret="62002f3e3ee55dd211c828de650f0394" />
 <QQ AppId="101937205" AppKey="458ed9d671ba4b177799189db5fbc434" ShareByAppClient="true" />
 <Instapaper Enable="false" />
 <Pocket Enable="false" />