修复房间已存在时,可能导致通话不成功

app/src/main/java/com/wdkl/ncs/entraceguard/activity/MainActivity.kt

@@ -333,7 +333,7 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
                 var tcpModel = messageEvent.tcpModel as TcpModel
                 if(tcpModel.type.equals(TcpType.TIME)&&tcpModel.action.equals(TcpAction.TimeAction.SYNC)){
                     var time = 0L
-                    var timeZone = "Asia/shanghai"
+                    var timeZone = "Asia/Shanghai"
                     if(canPaseJson(tcpModel.data.toString())){
                         var json = JSON.parseObject(tcpModel.data.toString())
                         time=json.getLong("time")*1000+200

janus/src/main/java/com/wdkl/ncs/janus/client/JanusClient.java

@@ -492,25 +492,27 @@ public class JanusClient implements WebSocketChannel.WebSocketCallback {
                 JSONObject data = msg.getJSONObject("plugindata").getJSONObject("data");
                 if (data.getString("videoroom").equals("event")) {
                     if (data.has("error")) {
-                        if (data.getInt("error_code") == 427) {
+                        if (data.getInt("error_code") == 427) { //房间已存在，直接加入即可
+
                             //拨打
-                            if (EnumType.CallState.Outgoing == callState) {
-                                destroyRoom(handleId, new DestroyRoomCallback() {
-                                    @Override
-                                    public void onSuccess() {
-                                        createRoom(handleId, newRoomId);
-                                    }
-
-                                    @Override
-                                    public void onFailed() {
-                                        janusCallback.onError(ERROR_CREATE_ROOM, "创建房间失败");
-                                    }
-                                });
-                            }
-                            //接收
-                            else if (EnumType.CallState.Incoming == callState) {
-                                janusCallback.onCreateRoom(handleId);
-                            }
+//                            if (EnumType.CallState.Outgoing == callState) {
+//                                destroyRoom(handleId, new DestroyRoomCallback() {
+//                                    @Override
+//                                    public void onSuccess() {
+//                                        createRoom(handleId, newRoomId);
+//                                    }
+//
+//                                    @Override
+//                                    public void onFailed() {
+//                                        janusCallback.onError(ERROR_CREATE_ROOM, "创建房间失败");
+//                                    }
+//                                });
+//                            }
+//                            //接收
+//                            else if (EnumType.CallState.Incoming == callState) {
+//                                janusCallback.onCreateRoom(handleId);
+//                            }
+                            janusCallback.onCreateRoom(handleId);
                         } else {
                             janusCallback.onError(ERROR_CREATE_ROOM, "创建房间失败");
                         }