李勇

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

此 diff 太大无法显示。
... ... @@ -316,6 +316,7 @@ class AudioApe extends Ape {
let receiveChannelInfo={};
receiveChannelInfo.mediaId=unpackChannelInfo.channelId;
receiveChannelInfo.fromNodeId=unpackChannelInfo.fromNodeId;
receiveChannelInfo.userName=unpackChannelInfo.userName||"";
//消息不是自己同步的,需要处理
if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){
... ... @@ -375,6 +376,7 @@ class AudioApe extends Ape {
packPduModel.mediaType =_param.mediaType|| ApeConsts.MEDIA_TYPE_AUDIO;
packPduModel.timestamp =_param.timestamp||EngineUtils.creatTimestamp();
packPduModel.fromNodeId = GlobalConfig.nodeId;
packPduModel.userName=GlobalConfig.userName||"";
packPduModel.toNodeId = 0;
loger.log("packPdu",packPduModel);
return packPduModel;
... ...
... ... @@ -243,7 +243,7 @@ class VideoApe extends Ape {
}
return {"code": ApeConsts.RETURN_SUCCESS, "data": ""};
}
//发送到mcu同步(更新数据)
sendTableUpdateHandler(_channelInfo) {
loger.log("video===sendTableUpdateHandler ");
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 {
let receiveChannelInfo={};
receiveChannelInfo.mediaId=unpackChannelInfo.channelId;
receiveChannelInfo.fromNodeId=unpackChannelInfo.fromNodeId;
receiveChannelInfo.userName=unpackChannelInfo.userName||"";
//消息不是自己同步的,需要处理
if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){
//正在推流
... ... @@ -380,6 +381,7 @@ class VideoApe extends Ape {
packPduModel.mediaType =_param.mediaType|| ApeConsts.MEDIA_TYPE_VIDEO;
packPduModel.timestamp =_param.timestamp||0;
packPduModel.fromNodeId = GlobalConfig.nodeId;
packPduModel.userName=GlobalConfig.userName||"";
packPduModel.toNodeId = 0;
loger.log(packPduModel);
return packPduModel;
... ...
... ... @@ -777,6 +777,7 @@ message RCAudioChannelInfoPdu {
optional string site_id = 8;//站点号
optional string user_id = 9;//用户的userId
optional string stream_id = 10;//流名称
optional string user_name = 11;//用户的名字
}
message RCVideoChannelInfoPdu {
... ... @@ -790,6 +791,7 @@ message RCVideoChannelInfoPdu {
optional string site_id = 8;//站点号
optional string user_id = 9;//用户的userId
optional string stream_id = 10;//流名称
optional string user_name = 11;//用户的名字
}
message RCVideoChannelInfoRecordPdu {
... ...