1.伴音和媒体共享模块的数据中增加总时间长度字段duration

@@ -35,7 +35,7 @@ import QuestionApe from 'apes/QuestionApe';
 import UTF8 from 'utf-8';
 import UTF8 from 'utf-8';
 
 
 let loger = Loger.getLoger('McuClient');
 let loger = Loger.getLoger('McuClient');
-let _sdkInfo = {"version": "v1.57.0.20170727", "author": "www.3mang.com"};
+let _sdkInfo = {"version": "v1.58.0.20170729", "author": "www.3mang.com"};
 
 
 //APE
 //APE
 let _sass;
 let _sass;
@@ -2296,7 +2296,8 @@ export default class MessageEntrance extends Emiter {
             "fileType": value.type,
             "fileType": value.type,
             "fileId": "" + value.id,
             "fileId": "" + value.id,
             "fileName": value.name,
             "fileName": value.name,
-            "seek": 0
+            "seek": 0,
+            "duration":parseInt(value.duration)||0
           };
           };
           this._sendMusicSharedUpload(paramInfo);
           this._sendMusicSharedUpload(paramInfo);
         }
         }
@@ -2321,7 +2322,8 @@ export default class MessageEntrance extends Emiter {
             "fileType": value.type,
             "fileType": value.type,
             "fileId": "" + value.id,
             "fileId": "" + value.id,
             "fileName": value.name,
             "fileName": value.name,
-            "seek": 0
+            "seek": 0,
+            "duration":parseInt(value.duration)||0
           };
           };
           this._sendMediaSharedUpload(paramInfo);
           this._sendMediaSharedUpload(paramInfo);
         }
         }

@@ -113,7 +113,14 @@ class MediaSharedApe extends Ape {
             this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
             this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
             return null;
             return null;
         }
         }
-        loger.log("媒体文件->更新 ", _pduDataModel);
+      //本地已经存储的数据
+      let localDataItem=this.mediaSharedList[_itemIdx];
+      if(localDataItem){
+        //把总时间取出来，外部更新的时候不传这个值
+        _pduDataModel.duration=localDataItem.duration||0;
+      }
+
+        loger.log("发送媒体文件->更新 ", _pduDataModel);
 
 
         let pduDataModel = this.packPdu(_pduDataModel, _itemIdx);
         let pduDataModel = this.packPdu(_pduDataModel, _itemIdx);
         let tableItemPdu = new pdu['RCRegistryTableItemPdu'];
         let tableItemPdu = new pdu['RCRegistryTableItemPdu'];
@@ -523,7 +530,7 @@ class MediaSharedApe extends Ape {
         pduDataModel.fileName = _param.fileName || "media_" + _itemIdx;//媒体文件的名字
         pduDataModel.fileName = _param.fileName || "media_" + _itemIdx;//媒体文件的名字
         pduDataModel.seek= parseInt(_param.seek) ||1;
         pduDataModel.seek= parseInt(_param.seek) ||1;
         pduDataModel.mediaVolume=parseInt(_param.mediaVolume)||0;
         pduDataModel.mediaVolume=parseInt(_param.mediaVolume)||0;
-
+        pduDataModel.duration=parseInt(_param.duration)||0
         return pduDataModel;
         return pduDataModel;
     }
     }
 
 

@@ -113,7 +113,13 @@ class MusicSharedApe extends Ape {
       this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
       this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
       return null;
       return null;
     }
     }
-    loger.log("伴音文件->更新 ", _pduDataModel);
+    //本地已经存储的数据
+    let localDataItem=this.musicSharedList[_itemIdx];
+    if(localDataItem){
+      //把总时间取出来，外部更新的时候不传这个值
+      _pduDataModel.duration=localDataItem.duration||0;
+    }
+    loger.log("发送伴音文件->更新 ", _pduDataModel);
 
 
     let pduDataModel = this.packPdu(_pduDataModel, _itemIdx);
     let pduDataModel = this.packPdu(_pduDataModel, _itemIdx);
     let tableItemPdu = new pdu['RCRegistryTableItemPdu'];
     let tableItemPdu = new pdu['RCRegistryTableItemPdu'];
@@ -526,9 +532,7 @@ class MusicSharedApe extends Ape {
     pduDataModel.fileName = _param.fileName || "music_" + _itemIdx; //伴音文件的名字
     pduDataModel.fileName = _param.fileName || "music_" + _itemIdx; //伴音文件的名字
     pduDataModel.seek = parseInt(_param.seek) || 1;
     pduDataModel.seek = parseInt(_param.seek) || 1;
     pduDataModel.musicVolume = parseInt(_param.musicVolume)||0;
     pduDataModel.musicVolume = parseInt(_param.musicVolume)||0;
-  /*  if (!pduDataModel.musicVolume) {
-      pduDataModel.musicVolume = 60;
-    }*/
+    pduDataModel.duration=parseInt(_param.duration)||0
     return pduDataModel;
     return pduDataModel;
   }
   }
 
 

@@ -131,7 +131,7 @@ class MCU extends Emiter {
       let sessionLabel = ApeConsts(pduMsg.sessionId);
       let sessionLabel = ApeConsts(pduMsg.sessionId);
       if (ape) {
       if (ape) {
         let subTypeLabel = pdu.id2type(pduMsg.subType);
         let subTypeLabel = pdu.id2type(pduMsg.subType);
-        loger.log('MCU-SecondLayer封装消息',
+       /* loger.log('MCU-SecondLayer封装消息',
           'sessionId',
           'sessionId',
           sessionLabel,
           sessionLabel,
           pduMsg.sessionId,
           pduMsg.sessionId,
@@ -139,7 +139,7 @@ class MCU extends Emiter {
           subTypeLabel,
           subTypeLabel,
           pduMsg.subType,
           pduMsg.subType,
           GlobalConfig.mcuDelay,
           GlobalConfig.mcuDelay,
-          GlobalConfig.messageDelay);
+          GlobalConfig.messageDelay);*/
 
 
         //延迟处理消息(3个条件--->ape允许延迟&&客户端设置需要延迟&&Sass设置的延迟时间大于0)
         //延迟处理消息(3个条件--->ape允许延迟&&客户端设置需要延迟&&Sass设置的延迟时间大于0)
         if (GlobalConfig.messageDelay &&
         if (GlobalConfig.messageDelay &&

@@ -757,6 +757,7 @@ message RCMediaSharedSendDataModelPdu {
     optional string file_name=9;//文件的名字
     optional string file_name=9;//文件的名字
     optional uint32 seek=10;//seek
     optional uint32 seek=10;//seek
     optional uint32 mediaVolume=11;//音量
     optional uint32 mediaVolume=11;//音量
+    optional uint32 duration=12;//总长度 秒
 }
 }
 
 
 message RCMusicSharedSendDataModelPdu {
 message RCMusicSharedSendDataModelPdu {
@@ -771,6 +772,8 @@ message RCMusicSharedSendDataModelPdu {
     optional string file_name=9;//文件的名字
     optional string file_name=9;//文件的名字
     optional uint32 seek=10;//seek
     optional uint32 seek=10;//seek
     optional uint32 musicVolume=11;//音量
     optional uint32 musicVolume=11;//音量
+    optional uint32 duration=12;//总长度 秒
+
 }
 }
 
 
 message RCDocBroadcastDataRequestPdu {
 message RCDocBroadcastDataRequestPdu {