李勇

1.修改视频模块和音频模块 消息广播监听的消息名定义

@@ -275,7 +275,7 @@ export default class MessageEntrance extends Emiter { @@ -275,7 +275,7 @@ export default class MessageEntrance extends Emiter {
275 GlobalConfig.password = _param.password || ""; 275 GlobalConfig.password = _param.password || "";
276 GlobalConfig.hasCamera=(typeof _param.hasCamera=="boolean")? _param.hasCamera:false; 276 GlobalConfig.hasCamera=(typeof _param.hasCamera=="boolean")? _param.hasCamera:false;
277 GlobalConfig.hasMicrophone=(typeof _param.hasMicrophone=="boolean")? _param.hasMicrophone:false; 277 GlobalConfig.hasMicrophone=(typeof _param.hasMicrophone=="boolean")? _param.hasMicrophone:false;
278 - debugger; 278 + //debugger;
279 //开始校验 279 //开始校验
280 if (_sass) { 280 if (_sass) {
281 _sass.passwordAndMd5Checking(GlobalConfig.getClassInfo()); 281 _sass.passwordAndMd5Checking(GlobalConfig.getClassInfo());
@@ -29,11 +29,11 @@ MessageTypes.CHAT_RECEIVE = 'chat.receive'; @@ -29,11 +29,11 @@ MessageTypes.CHAT_RECEIVE = 'chat.receive';
29 29
30 //视频模块事件定义 30 //视频模块事件定义
31 MessageTypes.VIDEO_UPDATE = 'video.update'; 31 MessageTypes.VIDEO_UPDATE = 'video.update';
32 -MessageTypes.VIDEO_COMMAND= 'video.command'; 32 +MessageTypes.VIDEO_BROADCAST= 'video.broadcast';
33 33
34 //音频模块事件定义 34 //音频模块事件定义
35 MessageTypes.AUDIO_UPDATE = 'audio.update'; 35 MessageTypes.AUDIO_UPDATE = 'audio.update';
36 -MessageTypes.AUDIO_COMMAND= 'audio.command'; 36 +MessageTypes.AUDIO_BROADCAST= 'audio.broadcast';
37 37
38 38
39 //文档模块事件定义 39 //文档模块事件定义
@@ -230,7 +230,7 @@ class AudioApe extends Ape { @@ -230,7 +230,7 @@ class AudioApe extends Ape {
230 if (audioReceivePdu.toNodeId != 0 && audioReceivePdu.toNodeId != GlobalConfig.nodeId) { 230 if (audioReceivePdu.toNodeId != 0 && audioReceivePdu.toNodeId != GlobalConfig.nodeId) {
231 loger.log('音频消息不处理 toNodeId=', audioReceivePdu.toNodeId, "my nodeId=", GlobalConfig.nodeId); 231 loger.log('音频消息不处理 toNodeId=', audioReceivePdu.toNodeId, "my nodeId=", GlobalConfig.nodeId);
232 } else { 232 } else {
233 - this._emit(MessageTypes.AUDIO_COMMAND, audioReceivePdu); 233 + this._emit(MessageTypes.AUDIO_BROADCAST, audioReceivePdu);
234 } 234 }
235 } 235 }
236 236
@@ -244,7 +244,7 @@ class VideoApe extends Ape { @@ -244,7 +244,7 @@ class VideoApe extends Ape {
244 if (videoReceivePdu.toNodeId != 0 && videoReceivePdu.toNodeId != GlobalConfig.nodeId) { 244 if (videoReceivePdu.toNodeId != 0 && videoReceivePdu.toNodeId != GlobalConfig.nodeId) {
245 loger.log('视频消息不处理 toNodeId=', videoReceivePdu.toNodeId, "my nodeId=", GlobalConfig.nodeId); 245 loger.log('视频消息不处理 toNodeId=', videoReceivePdu.toNodeId, "my nodeId=", GlobalConfig.nodeId);
246 } else { 246 } else {
247 - this._emit(MessageTypes.VIDEO_COMMAND, videoReceivePdu); 247 + this._emit(MessageTypes.VIDEO_BROADCAST, videoReceivePdu);
248 } 248 }
249 } 249 }
250 250