音视频模块消息中增加角色身份userRole

李勇
Commit 7048a3badcb38a6ca80dff966fec7be4158ddfca 7048a3ba 1 parent d28ee076
src/apes/AudioApe.js
src/apes/VideoApe.js
src/pdus/pro.js
--- a/src/apes/AudioApe.js
查看文件 @7048a3b
+++ b/src/apes/AudioApe.js
查看文件 @7048a3b
@@ -41,13 +41,13 @@ class AudioApe extends Ape {
     /////////////发送数据操作////////////////////////////////////////////
     //获取播流地址
     getAudioPlayPath(_param) {
-        loger.log('getAudioPlayPath');
+        loger.log('获取播流地址->');
         return this.mediaModule.getMediaPlayPath(_param);
     }
     //获取推流地址
     getAudioPublishPath(_param) {
-        loger.log('getAudioPublishPath');
+        loger.log('获取推流地址->');
         if(!this.mcu.connected){
             loger.warn(GlobalConfig.getCurrentStatus());
             return {"code": ApeConsts.RETURN_FAILED, "data": "已经断开连接"};;
@@ -57,7 +57,7 @@ class AudioApe extends Ape {
     //获取当前所有频道信息
     getAllChannelInfo(_param){
-        loger.log('getAllChannelInfo');
+        loger.log('获取当前所有频道信息->');
         return this.mediaModule.getAllMediaChannelInfo();
     }
@@ -70,7 +70,7 @@ class AudioApe extends Ape {
         if (_param == null||_param.publishUrl == null)
         {
-            loger.warn('publishAudio,参数错误', _param);
+            loger.warn('推流->参数错误', _param);
             this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
             return {"code": ApeConsts.RETURN_FAILED, "data": "参数错误"};
         }
@@ -78,7 +78,7 @@ class AudioApe extends Ape {
         //根据推流的地址获取对应的频道信息
         let needPublishChannelInfo=this.mediaModule.getNeedPublishMediaChannel(_param.publishUrl);
         if(needPublishChannelInfo==null){
-            loger.warn('publishVideo,推流数据已经无效', _param);
+            loger.warn('推流->推流数据已经无效', _param);
             return {"code": ApeConsts.RETURN_FAILED,  "data": "推流数据已经无效"};
         }
@@ -93,7 +93,7 @@ class AudioApe extends Ape {
         //判断当前是否还有空闲的channle
         let freeChannel = this.mediaModule.getFreeMediaChannel();
         if (freeChannel == 0) {
-            loger.warn("publishAudio,没有空闲的channel ");
+            loger.warn("推流->不能再打开更多的设备");
             return {"code": ApeConsts.RETURN_FAILED, "data": "不能再打开更多的设备","mediaChannels":this.mediaModule.mediaChannels};
         }
@@ -116,7 +116,7 @@ class AudioApe extends Ape {
     //停止推流，
     stopPublishAudio(_param) {
-        loger.log('stopPublishAudio ->_param',_param);
+        loger.log('停止推流 ->',_param);
         if(!this.mcu.connected){
             loger.warn(GlobalConfig.getCurrentStatus());
             return {"code": ApeConsts.RETURN_FAILED, "data": "已经断开连接"};
@@ -317,7 +317,7 @@ class AudioApe extends Ape {
             receiveChannelInfo.mediaId=unpackChannelInfo.channelId;
             receiveChannelInfo.fromNodeId=unpackChannelInfo.fromNodeId;
             receiveChannelInfo.userName=unpackChannelInfo.userName||"";
-
+            receiveChannelInfo.userRole=unpackChannelInfo.userRole||ApeConsts.normal;
             //消息不是自己同步的，需要处理
             if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){
                 //正在推流
@@ -340,11 +340,11 @@ class AudioApe extends Ape {
                 if(replay.code==0){
                     receiveChannelInfo.replay=replay.playUrl;
                 }
-                loger.log("AUDIO_PLAY",receiveChannelInfo);
+                loger.log("AUDIO_PLAY->",receiveChannelInfo);
                 //广播播放视频的消息
                 this._emit(MessageTypes.AUDIO_PLAY, receiveChannelInfo);
             }else {
-                loger.log("AUDIO_STOP",receiveChannelInfo);
+                loger.log("AUDIO_STOP->",receiveChannelInfo);
                 //流已经停止
                 this._emit(MessageTypes.AUDIO_STOP, receiveChannelInfo);
             }
@@ -358,9 +358,9 @@ class AudioApe extends Ape {
     ///////数据的封包和解包/////////////////////////////////////////
     packPdu(_param, _itemIdx) {
-        loger.log("packPdu ");
         //验证坐标点集合数组是否合法
         if (_param == null || _itemIdx == null) {
+            loger.warn("packPdu->失败");
             this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
             return null;
         }
@@ -378,22 +378,22 @@ class AudioApe extends Ape {
         packPduModel.fromNodeId = GlobalConfig.nodeId;
         packPduModel.userName=GlobalConfig.userName||"";
         packPduModel.toNodeId = 0;
-        loger.log("packPdu",packPduModel);
+        packPduModel.userRole=GlobalConfig.userRole||ApeConsts.normal;
+        loger.log("packPdu->",packPduModel);
         return packPduModel;
     }
     unPackPdu(owner, itemIdx, itemData) {
-        loger.log("unPackPdu ");
         if (owner == null || itemIdx == null || itemData == null) {
             this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
             return null;
         }
         try {
             let packChannelInfo = pdu['RCAudioChannelInfoPdu'].decode(itemData);
-            loger.log(packChannelInfo);
+            loger.log("unPackPdu->",packChannelInfo);
             return packChannelInfo;
         } catch (err) {
-            loger.log("unPackPdu error，itemIdx=" + itemIdx + "  err:" + err.message);
+            loger.log("unPackPdu error->itemIdx=" + itemIdx + "  err:" + err.message);
         }
         return null;
     }
--- a/src/apes/VideoApe.js
查看文件 @7048a3b
+++ b/src/apes/VideoApe.js
查看文件 @7048a3b
@@ -47,7 +47,7 @@ class VideoApe extends Ape {
     //获取推流地址
     getPublishVideoPath(_param) {
-        loger.log('getPublishVideoPath');
+        loger.log('获取推流地址->');
         if(!this.mcu.connected){
             loger.warn(GlobalConfig.getCurrentStatus());
             return {"code": ApeConsts.RETURN_FAILED, "data": "已经断开连接"};;
@@ -57,7 +57,7 @@ class VideoApe extends Ape {
     //获取当前所有频道信息
     getAllChannelInfo(_param){
-        loger.log('getAllChannelInfo');
+        loger.log('获取当前所有频道信息->');
         return this.mediaModule.getAllMediaChannelInfo();
     }
@@ -70,7 +70,7 @@ class VideoApe extends Ape {
         if (_param == null||_param.publishUrl == null)
         {
-            loger.warn('publishVideo,参数错误', _param);
+            loger.warn('推流->参数错误', _param);
             this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
             return {"code": ApeConsts.RETURN_FAILED,  "data": "参数错误"};
         }
@@ -78,7 +78,7 @@ class VideoApe extends Ape {
         //根据推流的地址获取对应的频道信息
         let needPublishChannelInfo=this.mediaModule.getNeedPublishMediaChannel(_param.publishUrl);
         if(needPublishChannelInfo==null){
-            loger.warn('publishVideo,推流数据已经无效', _param);
+            loger.warn('推流->推流数据已经无效', _param);
             return {"code": ApeConsts.RETURN_FAILED,  "data": "推流数据已经无效"};
         }
@@ -93,7 +93,7 @@ class VideoApe extends Ape {
         //判断当前是否还有空闲的channle
         let freeChannel = this.mediaModule.getFreeMediaChannel();
         if (freeChannel == 0) {
-            loger.warn("publishVideo,没有空闲的channel ");
+            loger.warn("推流->不能再打开更多的设备 ");
             return {"code": ApeConsts.RETURN_FAILED,  "data": "不能再打开更多的设备","mediaChannels":this.mediaModule.mediaChannels};
         }
@@ -118,7 +118,7 @@ class VideoApe extends Ape {
     //停止推流，
     stopPublishVideo(_param) {
-        loger.log('stopPublishVideo ->_param',_param);
+        loger.log('停止推流->',_param);
         if(!this.mcu.connected){
             loger.warn(GlobalConfig.getCurrentStatus());
             return {"code": ApeConsts.RETURN_FAILED, "data": "已经断开连接"};
@@ -321,6 +321,7 @@ class VideoApe extends Ape {
             receiveChannelInfo.mediaId=unpackChannelInfo.channelId;
             receiveChannelInfo.fromNodeId=unpackChannelInfo.fromNodeId;
             receiveChannelInfo.userName=unpackChannelInfo.userName||"";
+            receiveChannelInfo.userRole=unpackChannelInfo.userRole||ApeConsts.normal;
             //消息不是自己同步的，需要处理
             if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){
                 //正在推流
@@ -382,6 +383,7 @@ class VideoApe extends Ape {
         packPduModel.fromNodeId = GlobalConfig.nodeId;
         packPduModel.userName=GlobalConfig.userName||"";
         packPduModel.toNodeId = 0;
+        packPduModel.userRole=GlobalConfig.userRole||ApeConsts.normal;
         loger.log(packPduModel);
         return packPduModel;
     }
--- a/src/pdus/pro.js
查看文件 @7048a3b
+++ b/src/pdus/pro.js
查看文件 @7048a3b
@@ -788,6 +788,7 @@ message RCAudioChannelInfoPdu {
     optional string user_id = 9;//用户的userId
     optional string stream_id = 10;//流名称
     optional string user_name = 11;//用户的名字
+    optional string user_role = 12;//用户的身份
 }
 message RCVideoChannelInfoPdu {
@@ -802,6 +803,7 @@ message RCVideoChannelInfoPdu {
     optional string user_id = 9;//用户的userId
     optional string stream_id = 10;//流名称
     optional string user_name = 11;//用户的名字
+    optional string user_role = 12;//用户的身份
 }
 message RCVideoChannelInfoRecordPdu {