zhoufan 10 kuukautta sitten
vanhempi
commit
88c3e6998b

+ 7 - 7
midware-service/src/main/java/midware/service/eslclient/EslEventListenerEvent.java

280
                                         if (!opType.equals("MakeCall") || calleeNum.equals(chanNames[2])) {
280
                                         if (!opType.equals("MakeCall") || calleeNum.equals(chanNames[2])) {
281
                                             actionNotice(opType, callerAgent.getAgent(), callId, true);
281
                                             actionNotice(opType, callerAgent.getAgent(), callId, true);
282
                                             if (opType.equals("Meeting")) {
282
                                             if (opType.equals("Meeting")) {
283
-                                                if (chan.getSessionSort() == 3) {
284
-                                                    if (eslClientService.talkJoinMeeting(callId)) {
285
-                                                        if (session != null) {
283
+                                                if (session != null) {
284
+                                                    if (!session.isMeeting()) {
285
+                                                        if (eslClientService.talkJoinMeeting(callId)) {
286
                                                             session.setMeeting(true);
286
                                                             session.setMeeting(true);
287
                                                             try {
287
                                                             try {
288
                                                                 Thread.sleep(500);
288
                                                                 Thread.sleep(500);
292
                                                             eslClientService.setConferenceExitSound(callId, true);
292
                                                             eslClientService.setConferenceExitSound(callId, true);
293
                                                         }
293
                                                         }
294
                                                     }
294
                                                     }
295
-                                                }
296
-                                                //第一个人静音和禁听
297
-                                                if (session != null && session.isMeetingMute()) {
298
-                                                    eslClientService.setConferenceIsMute(callId, callId, true, "");
295
+                                                    //第一个人静音和禁听
296
+                                                    if (session.isMeetingMute()) {
297
+                                                        eslClientService.setConferenceIsMute(callId, callId, true, "");
298
+                                                    }
299
                                                 }
299
                                                 }
300
                                             }
300
                                             }
301
                                         }
301
                                         }