正在显示
4 个修改的文件
包含
23 行增加
和
19 行删除
| @@ -63,7 +63,7 @@ export default class MessageEntrance extends Emiter { | @@ -63,7 +63,7 @@ export default class MessageEntrance extends Emiter { | ||
| 63 | super(); | 63 | super(); |
| 64 | this.lastClassActiveTime=0;//最后一次课堂激活的时间戳 | 64 | this.lastClassActiveTime=0;//最后一次课堂激活的时间戳 |
| 65 | //sdk 信息 | 65 | //sdk 信息 |
| 66 | - GlobalConfig.sdkVersion = "v2.38.5.201712011"; | 66 | + GlobalConfig.sdkVersion = "v2.38.6.201712013"; |
| 67 | loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); | 67 | loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); |
| 68 | console.log("sdkVersion:" + GlobalConfig.sdkVersion); | 68 | console.log("sdkVersion:" + GlobalConfig.sdkVersion); |
| 69 | //设置 | 69 | //设置 |
| @@ -91,18 +91,20 @@ class MessengerMoudle { | @@ -91,18 +91,20 @@ class MessengerMoudle { | ||
| 91 | if (typeof _msg == 'object' && _msg.data) { | 91 | if (typeof _msg == 'object' && _msg.data) { |
| 92 | msgData = _msg.data; | 92 | msgData = _msg.data; |
| 93 | } | 93 | } |
| 94 | + if(msgData){ | ||
| 95 | + let msgPairs = msgData.split('__Messenger__'); | ||
| 96 | + let msg1 = msgPairs[1]; | ||
| 97 | + let pairs = msgPairs[0].split('|'); | ||
| 98 | + let prefix = pairs[0]; | ||
| 99 | + let name = pairs[1]; | ||
| 94 | 100 | ||
| 95 | - let msgPairs = msgData.split('__Messenger__'); | ||
| 96 | - let msg1 = msgPairs[1]; | ||
| 97 | - let pairs = msgPairs[0].split('|'); | ||
| 98 | - let prefix = pairs[0]; | ||
| 99 | - let name = pairs[1]; | ||
| 100 | - | ||
| 101 | - for (let i = 0; i < self.listenFunc.length; i++) { | ||
| 102 | - if (prefix + name === self.prefix + self.name) { | ||
| 103 | - self.listenFunc[i](msg1); | 101 | + for (let i = 0; i < self.listenFunc.length; i++) { |
| 102 | + if (prefix + name === self.prefix + self.name) { | ||
| 103 | + self.listenFunc[i](msg1); | ||
| 104 | + } | ||
| 104 | } | 105 | } |
| 105 | } | 106 | } |
| 107 | + | ||
| 106 | }; | 108 | }; |
| 107 | 109 | ||
| 108 | if (this.supportPostMessage) { | 110 | if (this.supportPostMessage) { |
| @@ -896,7 +896,6 @@ class WebRtcApe extends Emiter { | @@ -896,7 +896,6 @@ class WebRtcApe extends Emiter { | ||
| 896 | if (_params.videoResolution) { | 896 | if (_params.videoResolution) { |
| 897 | this.videoResolution = _params.videoResolution || this.videoResolution;//默认是240P 20 320x240 15 200 | 897 | this.videoResolution = _params.videoResolution || this.videoResolution;//默认是240P 20 320x240 15 200 |
| 898 | } | 898 | } |
| 899 | - | ||
| 900 | clearTimeout(this.changeDevicesDelay); | 899 | clearTimeout(this.changeDevicesDelay); |
| 901 | this.changeDevicesDelay = setTimeout(()=> { | 900 | this.changeDevicesDelay = setTimeout(()=> { |
| 902 | this.changePublishStatusAndServerRecord(WebRtcApe.RECORD_STATUS_0); | 901 | this.changePublishStatusAndServerRecord(WebRtcApe.RECORD_STATUS_0); |
| @@ -80,17 +80,20 @@ window.Messenger = (function () { | @@ -80,17 +80,20 @@ window.Messenger = (function () { | ||
| 80 | msg = msg.data; | 80 | msg = msg.data; |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | - var msgPairs = msg.split('__Messenger__'); | ||
| 84 | - var msg = msgPairs[1]; | ||
| 85 | - var pairs = msgPairs[0].split('|'); | ||
| 86 | - var prefix = pairs[0]; | ||
| 87 | - var name = pairs[1]; | 83 | + if(msg){ |
| 84 | + var msgPairs = msg.split('__Messenger__'); | ||
| 85 | + var msg = msgPairs[1]; | ||
| 86 | + var pairs = msgPairs[0].split('|'); | ||
| 87 | + var prefix = pairs[0]; | ||
| 88 | + var name = pairs[1]; | ||
| 88 | 89 | ||
| 89 | - for (var i = 0; i < self.listenFunc.length; i++) { | ||
| 90 | - if (prefix + name === self.prefix + self.name) { | ||
| 91 | - self.listenFunc[i](msg); | 90 | + for (var i = 0; i < self.listenFunc.length; i++) { |
| 91 | + if (prefix + name === self.prefix + self.name) { | ||
| 92 | + self.listenFunc[i](msg); | ||
| 93 | + } | ||
| 92 | } | 94 | } |
| 93 | } | 95 | } |
| 96 | + | ||
| 94 | }; | 97 | }; |
| 95 | 98 | ||
| 96 | if (supportPostMessage) { | 99 | if (supportPostMessage) { |
-
请 注册 或 登录 后发表评论