Browse Source

优化通话连接错误处理

weizhengliang 3 years ago
parent
commit
c3f9361ba7

+ 8 - 0
janus/src/main/java/com/wdkl/ncs/janus/client/JanusClient.java

@@ -48,6 +48,7 @@ public class JanusClient implements WebSocketChannel.WebSocketCallback {
 
     public static final int ERROR_CREATE_ROOM = 0x01;
     public static final int ERROR_ON_MESSAGE = 0x02;
+    public static final int ERROR_ON_CONNECT = 0x03;
 
     public JanusClient(String janusUrl, BigInteger userId) {
         this.janusUrl = janusUrl;
@@ -832,6 +833,13 @@ public class JanusClient implements WebSocketChannel.WebSocketCallback {
         stopKeepAliveTimer();
     }
 
+    @Override
+    public void onError(String err) {
+        if (janusCallback != null) {
+            janusCallback.onError(ERROR_ON_CONNECT, err);
+        }
+    }
+
     public String randomString(int length) {
         String str = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
         Random random = new Random();

+ 2 - 3
janus/src/main/java/com/wdkl/ncs/janus/client/VideoRoomCallback.java

@@ -307,9 +307,8 @@ public class VideoRoomCallback implements JanusClient.JanusCallback {
 
     @Override
     public void onError(int errorCode, String error) {
-        if (errorCode == JanusClient.ERROR_CREATE_ROOM) {
-            Log.e(TAG, error);
-//            EventBus.getDefault().post(new MsgEvent<BigInteger>(4));
+        Log.e(TAG, "errorCode=" + errorCode + ", error: " + error);
+        if (errorCode == JanusClient.ERROR_CREATE_ROOM || errorCode == JanusClient.ERROR_ON_CONNECT) {
             if (callSessionCallback != null) {
                 callSessionCallback.didError(error);
             }

+ 3 - 1
janus/src/main/java/com/wdkl/ncs/janus/client/WebSocketChannel.java

@@ -91,7 +91,7 @@ public class WebSocketChannel {
             Log.d(TAG, "onFailure " + t.getMessage());
             connected = false;
             if (webSocketCallback != null) {
-                webSocketCallback.onClosed();
+                webSocketCallback.onError(t.getMessage());
             }
         }
     }
@@ -106,5 +106,7 @@ public class WebSocketChannel {
         void onMessage(String text);
 
         void onClosed();
+
+        void onError(String err);
     }
 }