用户个人数据中增加新字段-摄像头、麦克风、是否举手、是否开启摄像头、是否开启麦克风

@@ -27,7 +27,7 @@ import Server from "config/Server";
 import UTF8 from 'utf-8';
 import UTF8 from 'utf-8';
 
 
 let loger = Loger.getLoger('McuClient');
 let loger = Loger.getLoger('McuClient');
-let _sdkInfo = {"version": "v1.10.2.20170428", "author": "www.3mang.com"};
+let _sdkInfo = {"version": "v1.10.3.20170503", "author": "www.3mang.com"};
 
 
 //APE
 //APE
 let _sass;
 let _sass;

@@ -355,11 +355,6 @@ GlobalConfig.msDynamicChooseIpDelay=15;//(秒)MS动态选点的间隔
 GlobalConfig.activeDocId=0;//当前激活的文档ID
 GlobalConfig.activeDocId=0;//当前激活的文档ID
 GlobalConfig.activeDocCurPage=1;//当前激活的文档的当前页
 GlobalConfig.activeDocCurPage=1;//当前激活的文档的当前页
 
 
-//视频质量相关设置
-GlobalConfig.fps=15;//帧频
-GlobalConfig.gop=3;//关键帧间隔(秒)
-GlobalConfig.videoQuality=2;//画面质量 0-低;1-中;2-高;
-
 
 
 GlobalConfig.classAllParam={};//Sass直接返回的所有课堂信息(最全)
 GlobalConfig.classAllParam={};//Sass直接返回的所有课堂信息(最全)
 GlobalConfig.classDetail={};//Sass直接返回的当前课堂基本信息
 GlobalConfig.classDetail={};//Sass直接返回的当前课堂基本信息
@@ -394,7 +389,19 @@ GlobalConfig.msListAll=[];//所有MS集合(sass+server)
 GlobalConfig.isRecordPlayBack=false;//是否是录制回放，默认是否
 GlobalConfig.isRecordPlayBack=false;//是否是录制回放，默认是否
 GlobalConfig.allowRecordMaxTime=14400;//(秒)允许录制的最长时间，默认是4小时
 GlobalConfig.allowRecordMaxTime=14400;//(秒)允许录制的最长时间，默认是4小时
 
 
-
 GlobalConfig.siteId_letv='shchuanbao';//乐视，MS不需要动态选点的站点
 GlobalConfig.siteId_letv='shchuanbao';//乐视，MS不需要动态选点的站点
 
 
+
+//视频质量相关设置
+//视频质量相关设置
+GlobalConfig.fps=15;//帧频
+GlobalConfig.gop=3;//关键帧间隔(秒)
+GlobalConfig.videoQuality=2;//画面质量 0-低;1-中;2-高;
+
+GlobalConfig.cameras=[];//摄像头列表
+GlobalConfig.microphones=[];//麦克风列表
+GlobalConfig.curCamera="";//当前选择的摄像头
+GlobalConfig.curMicrophone='';//当前选择的麦克风
+GlobalConfig.soundVolume=100;//音量（0-100）
+
 export  default GlobalConfig;
 export  default GlobalConfig;

@@ -96,7 +96,7 @@ ApeConsts.MS_TYPE_FMS= 1;//第三方FMS,目前一直用这个
 //用户状态
 //用户状态
 ApeConsts.USER_HAND_UP     = 0x0020;       // 举手
 ApeConsts.USER_HAND_UP     = 0x0020;       // 举手
 ApeConsts.USER_MIC_OPEN    = 0x0040;       // 麦克风开启
 ApeConsts.USER_MIC_OPEN    = 0x0040;       // 麦克风开启
-ApeConsts.USER_CAMERA_OPEN = 0x0080;       // 视频开启
+ApeConsts.USER_CAMERA_OPEN = 0x0080;       // 音视频开启
 
 
 
 
 
 

@@ -526,6 +526,7 @@ class ConferApe extends Ape {
 
 
     //更新人员列表数据
     //更新人员列表数据
     rosterUpdateHandler(nodeId, nodeData) {
     rosterUpdateHandler(nodeId, nodeData) {
+        nodeData.userRole=ApeConsts.userTypes[nodeData.role];
         //如果是自己的信息，不处理跳过
         //如果是自己的信息，不处理跳过
         if (nodeId == GlobalConfig.nodeId) {
         if (nodeId == GlobalConfig.nodeId) {
             loger.log("自己加入课堂的消息->",nodeId,"role-->", nodeData.role, ApeConsts.userTypes[nodeData.role]);
             loger.log("自己加入课堂的消息->",nodeId,"role-->", nodeData.role, ApeConsts.userTypes[nodeData.role]);
@@ -589,6 +590,7 @@ class ConferApe extends Ape {
                 loger.log("NR_INVISIBLE");
                 loger.log("NR_INVISIBLE");
                 return;
                 return;
             }
             }
+
             this._emit(MessageTypes.CLASS_INSERT_ROSTER, {"nodeId": nodeId, "nodeData": newNodeData});
             this._emit(MessageTypes.CLASS_INSERT_ROSTER, {"nodeId": nodeId, "nodeData": newNodeData});
             this.emitRosterChange();
             this.emitRosterChange();
 
 

@@ -209,6 +209,11 @@ class MCU extends Emiter {
         nodeInfoRecordPdu.userId = this.classInfo.userId;
         nodeInfoRecordPdu.userId = this.classInfo.userId;
         nodeInfoRecordPdu.role = ApeConsts.userTypesToId[this.classInfo.userRole] || 1; //NR_NORMAL用户的身份，根据用户登录时的身份设置
         nodeInfoRecordPdu.role = ApeConsts.userTypesToId[this.classInfo.userRole] || 1; //NR_NORMAL用户的身份，根据用户登录时的身份设置
         nodeInfoRecordPdu.level = 0;
         nodeInfoRecordPdu.level = 0;
+        nodeInfoRecordPdu.handUpTime=0;
+        nodeInfoRecordPdu.openCamera=0;
+        nodeInfoRecordPdu.openMicrophones=0;
+        nodeInfoRecordPdu.microphones=GlobalConfig.microphones;
+        nodeInfoRecordPdu.cameras=GlobalConfig.cameras;
 
 
         let conferenceRecord = {}; //RCConferenceRecord_T
         let conferenceRecord = {}; //RCConferenceRecord_T
         conferenceRecord._conference_id = this.classInfo.classId;
         conferenceRecord._conference_id = this.classInfo.classId;

@@ -847,6 +847,10 @@ message RCNodeInfoRecordPdu {
     optional uint32 handUpTime = 10;
     optional uint32 handUpTime = 10;
     optional uint32 deviceType = 11;
     optional uint32 deviceType = 11;
     optional uint32 mobileDirection = 12;
     optional uint32 mobileDirection = 12;
+    repeated string microphones = 13;
+    repeated string cameras = 14;
+    optional uint32 openCamera=15;
+    optional uint32 openMicrophones=16;
 }
 }
 
 
 message RCVotingPollSettingsPdu {
 message RCVotingPollSettingsPdu {