Merge remote-tracking branch 'origin/接口返回错误埋日志' into 接口返回错误埋日志

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -20,8 +20,8 @@ import java.util.List;
 public final class DemoGlobalConfig implements IConfigModule {
     String APP_DOMAIN = "https://api.github.com/";
     //        public static String appEnv = YDLConstants.ENV_AUTO_TEST;
-    public static String appEnv = YDLConstants.ENV_TEST;
-//    public static String appEnv = YDLConstants.ENV_PROD;
+//    public static String appEnv = YDLConstants.ENV_TEST;
+    public static String appEnv = YDLConstants.ENV_PROD;
 
     @Override
     public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {

config.gradle

@@ -5,7 +5,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.48.96",
+            "m-confide"       : "0.0.48.97",
             "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.10",
@@ -39,7 +39,7 @@ ext {
             "ydl-webview"     : "0.0.38.36",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.13",
-            "m-audioim"       : "0.0.49.29.26",
+            "m-audioim"       : "0.0.49.29.27",
             "ydl-flutter-base": "0.0.14.20",
 
             //以下 几乎不会动
@@ -88,7 +88,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.48.96",
+            "m-confide"       : "0.0.48.97",
             "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.10",
@@ -120,7 +120,7 @@ ext {
             "ydl-webview"     : "0.0.38.36",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.11",
-            "m-audioim"       : "0.0.49.29.26",
+            "m-audioim"       : "0.0.49.29.27",
             "ydl-flutter-base": "0.0.14.20",
 
             //以下 几乎不会动

m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt

@@ -157,7 +157,11 @@ class YDLavManager {
                         }
                     }
                     RtmStatusCode.LocalInvitationError.LOCAL_INVITATION_ERR_INVITATION_EXPIRE -> { //呼叫邀请过期。被叫 ACK 响应呼叫邀请后 60 秒呼叫邀请未被取消、接受、拒绝，则呼叫邀请过期。
-                        if (act is AudioHomeActivity) {
+
+                     /*
+                     * 和IOS保持一致，当呼叫邀请为3的时候不处理
+                     * */
+                      /*  if (act is AudioHomeActivity) {
                             act.runOnUiThread {
                                 sendCustomNotification(response?.calleeId!!, response?.ChannelId!!, "5")
                                 callEndStatusUpdate(response.ChannelId!!, 2, "被叫超时未接听")
@@ -166,7 +170,7 @@ class YDLavManager {
 //                                act.uploadLog()
 //                                act.leaveChannel()
                             }
-                        }
+                        }*/
                     }
                 }
                 //呼叫失败日志输出