Merge branch 'master' into master_融云升级

# Conflicts: # config.gradle
2024-04-15 13:08:27 +08:00
parent 8cf6271dc3 11ba2c45f8
commit 5c0b126072
71 changed files with 1879 additions and 480 deletions
--- a/config.gradle
+++ b/config.gradle
@@ -4,15 +4,14 @@ ext {
            buildToolsVersion: "29.0.2",
            minSdkVersion    : 23,
            targetSdkVersion : 33,
-            versionCode      : 469,
-            versionName      : "6.6.5",
-            namespace        : "com.pandoralive.shayu"
+            versionCode      : 468,
+            versionName      : "6.6.6"
    ]
    manifestPlaceholders = [
            //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //             测试
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",

            //百度语音识别

@@ -22,7 +21,7 @@ ext {
            baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",

 //            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包  3 samsung包
-            isGooglePlay     : 0,
+            isGooglePlay     : 3,
            //是否上报异常日志
            isUploadLog      : true,
            //是否打包成插件包模式