李勇

1.修改录制回放时停止回放的接口,停止回放时时间进度清除

2.新增一个协议号505,用于第三方广播消息
此 diff 太大无法显示。
@@ -216,9 +216,9 @@ class RecordPlayBackParse extends Emiter { @@ -216,9 +216,9 @@ class RecordPlayBackParse extends Emiter {
216 _timerCounterUptate() { 216 _timerCounterUptate() {
217 this._recordPlaybackTimestamp = this._recordPlaybackTimestamp + 1;//计时 217 this._recordPlaybackTimestamp = this._recordPlaybackTimestamp + 1;//计时
218 if (this._recordPlaybackTimestamp >= this._recordPlaybackMaxTime) { 218 if (this._recordPlaybackTimestamp >= this._recordPlaybackMaxTime) {
219 - this._stopTimerCounter();  
220 loger.log("录制回放结束...当前时间->", this._recordPlaybackTimestamp, " 总时间->", this._recordPlaybackMaxTime); 219 loger.log("录制回放结束...当前时间->", this._recordPlaybackTimestamp, " 总时间->", this._recordPlaybackMaxTime);
221 - this._emit(MessageTypes.RECORD_PLAYBACK_UPDATE, {"status": STOP}); 220 + //this._stopTimerCounter();
  221 + this.stopRecordPlayback();
222 return; 222 return;
223 } 223 }
224 224
@@ -359,8 +359,8 @@ class RecordPlayBackParse extends Emiter { @@ -359,8 +359,8 @@ class RecordPlayBackParse extends Emiter {
359 359
360 //停止播放 360 //停止播放
361 stopRecordPlayback(_param) { 361 stopRecordPlayback(_param) {
362 - this._recordPlaybackTimestamp = 0;  
363 this._stopTimerCounter(); 362 this._stopTimerCounter();
  363 + this._recordPlaybackTimestamp = 0;
364 this._emit(MessageTypes.RECORD_PLAYBACK_UPDATE, {"status": STOP}); 364 this._emit(MessageTypes.RECORD_PLAYBACK_UPDATE, {"status": STOP});
365 } 365 }
366 366
@@ -105,4 +105,5 @@ RCPduPackage.RCPDU_SEND_CONFERENCE_DATA_REQUEST =500; @@ -105,4 +105,5 @@ RCPduPackage.RCPDU_SEND_CONFERENCE_DATA_REQUEST =500;
105 RCPduPackage.RCPDU_SEND_VIDEO_DATA_REQUEST = 501; 105 RCPduPackage.RCPDU_SEND_VIDEO_DATA_REQUEST = 501;
106 RCPduPackage.RCPDU_SEND_AUDIO_DATA_REQUEST = 502; 106 RCPduPackage.RCPDU_SEND_AUDIO_DATA_REQUEST = 502;
107 RCPduPackage.RCPDU_SEND_GIFT_DATA_REQUEST = 503; 107 RCPduPackage.RCPDU_SEND_GIFT_DATA_REQUEST = 503;
108 -RCPduPackage.RCPDU_SEND_CHAT_DATA_REQUEST = 504;  
  108 +RCPduPackage.RCPDU_SEND_CHAT_DATA_REQUEST = 504;
  109 +RCPduPackage.RCPDU_THIRD_BROADCAST_DATA_REQUEST = 505;//第三方广播消息
@@ -145,7 +145,7 @@ enum RCPduType_E { @@ -145,7 +145,7 @@ enum RCPduType_E {
145 RCPDU_SEND_AUDIO_DATA_REQUEST = 502; 145 RCPDU_SEND_AUDIO_DATA_REQUEST = 502;
146 RCPDU_SEND_GIFT_DATA_REQUEST = 503; 146 RCPDU_SEND_GIFT_DATA_REQUEST = 503;
147 RCPDU_SEND_CHAT_DATA_REQUEST = 504; 147 RCPDU_SEND_CHAT_DATA_REQUEST = 504;
148 - 148 + RCPDU_THIRD_BROADCAST_DATA_REQUEST = 505;
149 } 149 }
150 150
151 enum RCPduNodeType_E { 151 enum RCPduNodeType_E {