李勇

人员信息中增加 音视频质量的字段和ip字段

此 diff 太大无法显示。
... ... @@ -27,7 +27,7 @@ import Server from "config/Server";
import UTF8 from 'utf-8';
let loger = Loger.getLoger('McuClient');
let _sdkInfo = {"version": "v1.10.3.20170503", "author": "www.3mang.com"};
let _sdkInfo = {"version": "v1.10.5.20170503", "author": "www.3mang.com"};
//APE
let _sass;
... ...
... ... @@ -397,7 +397,6 @@ GlobalConfig.siteId_letv='shchuanbao';//乐视,MS不需要动态选点的站
GlobalConfig.fps=15;//帧频
GlobalConfig.gop=3;//关键帧间隔(秒)
GlobalConfig.videoQuality=2;//画面质量 0-低;1-中;2-高;
GlobalConfig.cameras=[];//摄像头列表
GlobalConfig.microphones=[];//麦克风列表
GlobalConfig.curCamera="";//当前选择的摄像头
... ...
... ... @@ -18,6 +18,8 @@ MessageTypes.CLASS_JOIN_MCU_SUCCESS ="class_join_mcu_success"// 'join.mcu.succes
MessageTypes.CLASS_JOIN_SUCCESS ="class_join_success"// 'join.class.success';
MessageTypes.CLASS_UPDATE_ROSTER_NUM ="class_update_roster_num";// 'roster_num.message';
MessageTypes.CLASS_INSERT_ROSTER ="class_insert_roster";// 'roster.insert.message';
MessageTypes.CLASS_UPDATE_ROSTER ="class_update_roster";// 'roster.insert.message';
MessageTypes.CLASS_DELETE_ROSTER ="class_delete_roster"// 'roster.delete.message';
MessageTypes.CLASS_NONENTITY_ROSTER ="class_nonenetity_roster";// 'roster.nonentity.message';
... ...
... ... @@ -575,28 +575,28 @@ class ConferApe extends Ape {
let rosterExists = this.rosters[nodeId];
this.rosters[nodeId] = nodeData;
let userDataObj = null;
if (!rosterExists) {
try {
userDataObj = pdu['RCNodeInfoUserDataPdu'].decode(nodeData.userData);
} catch (err) {
loger.log("RCNodeInfoUserDataPdu decode err", err.message);
}
let newNodeData = nodeData;
newNodeData.userData = userDataObj;
//如果是监课,不告诉其他人
if (nodeData.role == ApeConsts.NR_INVISIBLE) {
loger.log("NR_INVISIBLE");
return;
}
try {
userDataObj = pdu['RCNodeInfoUserDataPdu'].decode(nodeData.userData);
} catch (err) {
loger.log("RCNodeInfoUserDataPdu decode err", err.message);
}
let newNodeData = nodeData;
newNodeData.userData = userDataObj;
//如果是监课,不告诉其他人
if (nodeData.role == ApeConsts.NR_INVISIBLE) {
loger.log("NR_INVISIBLE");
return;
}
if (!rosterExists) {
this._emit(MessageTypes.CLASS_INSERT_ROSTER, {"nodeId": nodeId, "nodeData": newNodeData});
this.emitRosterChange();
} else {
//loger.log("更新人员列表数据,rosterExists已经存在",rosterExists);
this._emit(MessageTypes.CLASS_UPDATE_ROSTER, {"nodeId": nodeId, "nodeData": newNodeData});
}
}
//踢出用户
... ...
... ... @@ -214,6 +214,8 @@ class MCU extends Emiter {
nodeInfoRecordPdu.openMicrophones=0;
nodeInfoRecordPdu.microphones=GlobalConfig.microphones;
nodeInfoRecordPdu.cameras=GlobalConfig.cameras;
nodeInfoRecordPdu.videoQuality=GlobalConfig.videoQuality;//设置分辨率的
nodeInfoRecordPdu.userIp=GlobalConfig.userIp;
let conferenceRecord = {}; //RCConferenceRecord_T
conferenceRecord._conference_id = this.classInfo.classId;
... ...
... ... @@ -851,6 +851,8 @@ message RCNodeInfoRecordPdu {
repeated string cameras = 14;
optional uint32 openCamera=15;
optional uint32 openMicrophones=16;
optional uint32 videoQuality=17;//设置分辨率的
optional string userIp=18;
}
message RCVotingPollSettingsPdu {
... ...