李勇

1.音视频模块消息中增加用户名字

此 diff 太大无法显示。
@@ -316,6 +316,7 @@ class AudioApe extends Ape { @@ -316,6 +316,7 @@ class AudioApe extends Ape {
316 let receiveChannelInfo={}; 316 let receiveChannelInfo={};
317 receiveChannelInfo.mediaId=unpackChannelInfo.channelId; 317 receiveChannelInfo.mediaId=unpackChannelInfo.channelId;
318 receiveChannelInfo.fromNodeId=unpackChannelInfo.fromNodeId; 318 receiveChannelInfo.fromNodeId=unpackChannelInfo.fromNodeId;
  319 + receiveChannelInfo.userName=unpackChannelInfo.userName||"";
319 320
320 //消息不是自己同步的,需要处理 321 //消息不是自己同步的,需要处理
321 if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){ 322 if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){
@@ -375,6 +376,7 @@ class AudioApe extends Ape { @@ -375,6 +376,7 @@ class AudioApe extends Ape {
375 packPduModel.mediaType =_param.mediaType|| ApeConsts.MEDIA_TYPE_AUDIO; 376 packPduModel.mediaType =_param.mediaType|| ApeConsts.MEDIA_TYPE_AUDIO;
376 packPduModel.timestamp =_param.timestamp||EngineUtils.creatTimestamp(); 377 packPduModel.timestamp =_param.timestamp||EngineUtils.creatTimestamp();
377 packPduModel.fromNodeId = GlobalConfig.nodeId; 378 packPduModel.fromNodeId = GlobalConfig.nodeId;
  379 + packPduModel.userName=GlobalConfig.userName||"";
378 packPduModel.toNodeId = 0; 380 packPduModel.toNodeId = 0;
379 loger.log("packPdu",packPduModel); 381 loger.log("packPdu",packPduModel);
380 return packPduModel; 382 return packPduModel;
@@ -243,7 +243,7 @@ class VideoApe extends Ape { @@ -243,7 +243,7 @@ class VideoApe extends Ape {
243 } 243 }
244 return {"code": ApeConsts.RETURN_SUCCESS, "data": ""}; 244 return {"code": ApeConsts.RETURN_SUCCESS, "data": ""};
245 } 245 }
246 - 246 + //发送到mcu同步(更新数据)
247 sendTableUpdateHandler(_channelInfo) { 247 sendTableUpdateHandler(_channelInfo) {
248 loger.log("video===sendTableUpdateHandler "); 248 loger.log("video===sendTableUpdateHandler ");
249 let updateModelPdu = this.packPdu(_channelInfo, _channelInfo.channelId);//let updateModelPdu=this.packPdu({},ApeConsts.VIDEO_OBJ_TABLE_ID+2); 249 let updateModelPdu = this.packPdu(_channelInfo, _channelInfo.channelId);//let updateModelPdu=this.packPdu({},ApeConsts.VIDEO_OBJ_TABLE_ID+2);
@@ -321,6 +321,7 @@ class VideoApe extends Ape { @@ -321,6 +321,7 @@ class VideoApe extends Ape {
321 let receiveChannelInfo={}; 321 let receiveChannelInfo={};
322 receiveChannelInfo.mediaId=unpackChannelInfo.channelId; 322 receiveChannelInfo.mediaId=unpackChannelInfo.channelId;
323 receiveChannelInfo.fromNodeId=unpackChannelInfo.fromNodeId; 323 receiveChannelInfo.fromNodeId=unpackChannelInfo.fromNodeId;
  324 + receiveChannelInfo.userName=unpackChannelInfo.userName||"";
324 //消息不是自己同步的,需要处理 325 //消息不是自己同步的,需要处理
325 if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){ 326 if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){
326 //正在推流 327 //正在推流
@@ -380,6 +381,7 @@ class VideoApe extends Ape { @@ -380,6 +381,7 @@ class VideoApe extends Ape {
380 packPduModel.mediaType =_param.mediaType|| ApeConsts.MEDIA_TYPE_VIDEO; 381 packPduModel.mediaType =_param.mediaType|| ApeConsts.MEDIA_TYPE_VIDEO;
381 packPduModel.timestamp =_param.timestamp||0; 382 packPduModel.timestamp =_param.timestamp||0;
382 packPduModel.fromNodeId = GlobalConfig.nodeId; 383 packPduModel.fromNodeId = GlobalConfig.nodeId;
  384 + packPduModel.userName=GlobalConfig.userName||"";
383 packPduModel.toNodeId = 0; 385 packPduModel.toNodeId = 0;
384 loger.log(packPduModel); 386 loger.log(packPduModel);
385 return packPduModel; 387 return packPduModel;
@@ -777,6 +777,7 @@ message RCAudioChannelInfoPdu { @@ -777,6 +777,7 @@ message RCAudioChannelInfoPdu {
777 optional string site_id = 8;//站点号 777 optional string site_id = 8;//站点号
778 optional string user_id = 9;//用户的userId 778 optional string user_id = 9;//用户的userId
779 optional string stream_id = 10;//流名称 779 optional string stream_id = 10;//流名称
  780 + optional string user_name = 11;//用户的名字
780 } 781 }
781 782
782 message RCVideoChannelInfoPdu { 783 message RCVideoChannelInfoPdu {
@@ -790,6 +791,7 @@ message RCVideoChannelInfoPdu { @@ -790,6 +791,7 @@ message RCVideoChannelInfoPdu {
790 optional string site_id = 8;//站点号 791 optional string site_id = 8;//站点号
791 optional string user_id = 9;//用户的userId 792 optional string user_id = 9;//用户的userId
792 optional string stream_id = 10;//流名称 793 optional string stream_id = 10;//流名称
  794 + optional string user_name = 11;//用户的名字
793 } 795 }
794 796
795 message RCVideoChannelInfoRecordPdu { 797 message RCVideoChannelInfoRecordPdu {