1.媒体共享模块增加数据更新接口；2.录制回放增加媒体共享的消息

李勇
Commit 2943aba28b3f96187edd05eafe5888378fdcaa35 2943aba2 1 parent ffee9ac2
dist/McuClient.js
src/EngineEntrance.js
src/RecordPlayBackParse.js
src/apes/Ape.js
src/apes/MediaSharedApe.js
--- a/dist/McuClient.js
查看文件 @2943aba
+++ b/dist/McuClient.js
查看文件 @2943aba
--- a/src/EngineEntrance.js
查看文件 @2943aba
+++ b/src/EngineEntrance.js
查看文件 @2943aba
@@ -30,7 +30,7 @@ import MediaSharedApe from 'apes/MediaSharedApe';
 import UTF8 from 'utf-8';
 let loger = Loger.getLoger('McuClient');
-let _sdkInfo = {"version": "v1.30.5.20170605", "author": "www.3mang.com"};
+let _sdkInfo = {"version": "v1.30.6.20170606", "author": "www.3mang.com"};
 //APE
 let _sass;
@@ -205,9 +205,9 @@ export default class MessageEntrance extends Emiter {
         this.mediaSharedPlay = this._sendMediaSharedPlay.bind(this); //播放
         this.mediaSharedStop = this._sendMediaSharedStop.bind(this);//停止
-        this.mediaSharedPause=this._sendMediaSharedPause.bind(this);//暂停
-        this.mediaSharedSeek=this._sendMediaSharedSeek.bind(this);//seek
-
+        //this.mediaSharedPause=this._sendMediaSharedPause.bind(this);//暂停
+        //this.mediaSharedSeek=this._sendMediaSharedSeek.bind(this);//seek
+        this.mediaSharedUpdate=this._sendMediaSharedUpdate.bind(this); //更新媒体的状态
         this.setDeviceInfo = this._setDeviceInfo.bind(this);//设置设备信息(麦克风，摄像头等等.....)
         this.setMessageDelay = this._setMessageDelay.bind(this);//设置是否延迟消息
@@ -1533,6 +1533,16 @@ export default class MessageEntrance extends Emiter {
             _mediaShareApe.mediaSharedDelete(_param);
         }
     }
+    //更新媒体文件的状态信息
+    _sendMediaSharedUpdate(_param){
+        if (!_mcu.connected) {
+            loger.warn(GlobalConfig.getCurrentStatus());
+            return;
+        }
+        if (_mediaShareApe) {
+            _mediaShareApe.mediaSharedUpdate(_param);
+        }
+    }
     //播放
     _sendMediaSharedPlay(_param){
         if (!_mcu.connected) {
--- a/src/RecordPlayBackParse.js
查看文件 @2943aba
+++ b/src/RecordPlayBackParse.js
查看文件 @2943aba
@@ -40,7 +40,7 @@ class RecordPlayBackParse extends Emiter {
         this._audioApeMssages = {};//音频数据
         this._docApeMssages = {};//文档数据
         this._whiteApeMssages = {};//白板数据
-
+        this._mediaShareApeMssages={};//媒体共享
         this._timerCounter = new TimerCounter();//计时器
         this._timerCounter.addTimerCallBack(this._timerCounterUptate.bind(this), 1);
     }
@@ -168,6 +168,9 @@ class RecordPlayBackParse extends Emiter {
                     case ApeConsts.DOCSHARING_SESSION_ID:
                         this.saveParseData(data, timestamp, this._docApeMssages);
                         break;
+                    case ApeConsts.MEDIA_SESSION_ID:
+                        this.saveParseData(data, timestamp, this._mediaShareApeMssages);
+                        break;
                     case ApeConsts.WHITEBOARD_SESSION_ID:
                         this.saveParseData(data, timestamp, this._whiteApeMssages);
                         break;
@@ -232,6 +235,7 @@ class RecordPlayBackParse extends Emiter {
         this._searchMessageFromTime(this._recordPlaybackTimestamp, this._conferApeMssages,"conferApe");
         this._searchMessageFromTime(this._recordPlaybackTimestamp, this._chatApeMssages,"chatApe");
         this._searchMessageFromTime(this._recordPlaybackTimestamp, this._docApeMssages,"docApe");
+        this._searchMessageFromTime(this._recordPlaybackTimestamp, this._mediaShareApeMssages,"mediaShareApe")
         this._searchMessageFromTime(this._recordPlaybackTimestamp, this._whiteApeMssages,"whiteApe");
         this._searchMessageFromTime(this._recordPlaybackTimestamp, this._videoApeMssages,"videoAp");
         this._searchMessageFromTime(this._recordPlaybackTimestamp, this._audioApeMssages,"audioApe");
--- a/src/apes/Ape.js
查看文件 @2943aba
+++ b/src/apes/Ape.js
查看文件 @2943aba
@@ -359,10 +359,11 @@ export default class Ape extends Emiter {
         loger.log('Ape发送数据UNIFORM PDU');
         //console.log(appPdu);
         //loger.log('当前的状态============',GlobalConfig.getCurrentStatus().code);
-        if (GlobalConfig.getCurrentStatus().code == 0 || GlobalConfig.getCurrentStatus().code == 1) {
-            this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_SEND_FAILED_NO_JOIN);
-            return;
-        }
+        //if (GlobalConfig.getCurrentStatus().code == 0 || GlobalConfig.getCurrentStatus().code == 1) {
+        //    this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_SEND_FAILED_NO_JOIN);
+        //    return;
+        //}
+
         if(!this._classInfo){
             loger.warn('Ape发送数据UNIFORM PDU->失败->ape课堂数据无效->', this._classInfo);
             return;
--- a/src/apes/MediaSharedApe.js
查看文件 @2943aba
+++ b/src/apes/MediaSharedApe.js
查看文件 @2943aba
@@ -183,6 +183,29 @@ class MediaSharedApe extends Ape {
         GlobalConfig.activeMediaSeek=1;
     }
+    //更新媒体文件（播放，暂停，停止，seek）
+    mediaSharedUpdate(_param){
+        if (_param == null || _param.itemIdx == null) {
+            loger.warn('媒体文件更新失败->参数错误', _param);
+            this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
+            return;
+        }
+
+        //获取已经存在的数据
+        let pduDataModel = this.mediaSharedList[_param.itemIdx];
+        if (pduDataModel == null) {
+            loger.warn('更新媒体文件->媒体文件不存在', _param);
+            this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
+            return;
+        }
+
+        //更新当前选择的媒体文件数据的字段
+        pduDataModel.status =parseInt(_param.status)||0;//默认是0
+        pduDataModel.seek=parseInt(_param.seek)||1;
+        //更新当前选择的媒体文件
+        this.updaterMediaShared(pduDataModel, pduDataModel.itemIdx);
+    }
+
     //播放媒体文件
     mediaSharedPlay(paramInfo) {
         loger.log('切换媒体文件->', paramInfo);