Merge branch '1.10.6' into develop

# Conflicts: # core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java # gradle.properties
2023-09-26 14:27:54 +08:00
parent 1dd5d64a09 d2fb38f094
commit f51dec1101
3 changed files with 5 additions and 3 deletions
--- a/channel.txt
+++ b/channel.txt
@@ -1 +1,2 @@
-official
+official
+fir
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
@@ -71,7 +71,7 @@ public class XChatConstants {
    /**
     * 聲網 key
     */
-    public static final String AGORA_KEY = "83a19e8b6aa94ec18efba13dc8fc354a"; //已更換
+    public static final String AGORA_KEY = "f8713b6ec98c4c01adaf34cb4fa091b1"; //已更換

    /**
     * 阿裏雲日誌空間名字
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,7 @@ android.injected.testOnly=false
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableResourceOptimizations=false
+
 # mob
 MobSDK.spEdition=FP

@@ -33,4 +34,4 @@ version_name=2.0.0
 version_code=2000

 #systemProp.https.proxyHost=127.0.0.1
-#systemProp.https.proxyPort=4780
+#systemProp.https.proxyPort=7890