李勇

修复个人禁用状态的数据类型,接口的类型为object对象,在MCU传递过程中为JSON 字符串

此 diff 太大无法显示。
... ... @@ -33,7 +33,7 @@ import QuestionApe from 'apes/QuestionApe';
import UTF8 from 'utf-8';
let loger = Loger.getLoger('McuClient');
let _sdkInfo = { "version": "v1.37.2.20170622", "author": "www.3mang.com" };
let _sdkInfo = { "version": "v1.37.4.20170622", "author": "www.3mang.com" };
//APE
let _sass;
... ...
... ... @@ -133,8 +133,6 @@ class GlobalConfig {
// 全局禁言状态
this.silence = data.silence || false;
// 自有禁言状态
this.selfSilence = data.selfSilence || '';
this.recordStatus = data.recordStatus || this.recordStatus; //当前录制状态
this.recordTimestamp = data.recordTimestamp || this.recordTimestamp; //相对于首次开始录制的时间戳
this.recordFileName = data.recordFileName || this.recordFileName; //录制的文件名
... ... @@ -404,7 +402,7 @@ GlobalConfig.classJoinSuccess = false; //是否已经加入课堂
GlobalConfig.recordPlaybackMaxTime = 0; //录制回放的总时间
GlobalConfig.recordStatus = false; //当前录制状态
GlobalConfig.silence = false; //当前课堂禁言状态
GlobalConfig.selfSilence = ''; //当前课堂禁言状态
GlobalConfig.selfSilence = {}; //当前课堂禁言状态
GlobalConfig.recordTimestamp = 0; //相对于首次开始录制的进行时间
GlobalConfig.recordFileName = ""; //录制的文件名,如 果为空就创建一个
GlobalConfig.recordDownloadUrl = ""; //下载地址
... ...
... ... @@ -95,7 +95,7 @@ class ConferApe extends Ape {
getNodeInfo() {
let nodeInfoRecordPdu = new pdu['RCNodeInfoRecordPdu'];
nodeInfoRecordPdu.nodeId = GlobalConfig.nodeId;
nodeInfoRecordPdu.selfSilence = JSON.stringify(GlobalConfig.selfSilence);
nodeInfoRecordPdu.selfSilence = JSON.stringify(GlobalConfig.selfSilence)||"";
nodeInfoRecordPdu.name = GlobalConfig.userName;
nodeInfoRecordPdu.role = ApeConsts.userTypesToId[GlobalConfig.userRole] || 1; //NR_NORMAL用户的身份,根据用户登录时的身份设置;
nodeInfoRecordPdu.level = GlobalConfig.level;
... ... @@ -415,13 +415,13 @@ class ConferApe extends Ape {
}
let msgObj = {};
msgObj.nodeId = _param.nodeId;
msgObj.silence = _param.silence || '';
msgObj.silence = _param.silence ||{};
this.sendConferMsg({ "to": _param.nodeId, "message": JSON.stringify(msgObj), "actionType": ApeConsts.USER_ACTION_SILENCE_STATUS_CHANGE });
}
changeSilenceStatus(_param) {
loger.log('切换禁言状态->', _param);
GlobalConfig.selfSilence = _param.silence;
GlobalConfig.selfSilence = _param.silence||{};
this.updateUserInfo();
}
... ...