正在显示
4 个修改的文件
包含
5 行增加
和
7 行删除
此 diff 太大无法显示。
| @@ -33,7 +33,7 @@ import QuestionApe from 'apes/QuestionApe'; | @@ -33,7 +33,7 @@ import QuestionApe from 'apes/QuestionApe'; | ||
| 33 | import UTF8 from 'utf-8'; | 33 | import UTF8 from 'utf-8'; |
| 34 | 34 | ||
| 35 | let loger = Loger.getLoger('McuClient'); | 35 | let loger = Loger.getLoger('McuClient'); |
| 36 | -let _sdkInfo = { "version": "v1.37.2.20170622", "author": "www.3mang.com" }; | 36 | +let _sdkInfo = { "version": "v1.37.4.20170622", "author": "www.3mang.com" }; |
| 37 | 37 | ||
| 38 | //APE | 38 | //APE |
| 39 | let _sass; | 39 | let _sass; |
| @@ -133,8 +133,6 @@ class GlobalConfig { | @@ -133,8 +133,6 @@ class GlobalConfig { | ||
| 133 | // 全局禁言状态 | 133 | // 全局禁言状态 |
| 134 | this.silence = data.silence || false; | 134 | this.silence = data.silence || false; |
| 135 | 135 | ||
| 136 | - // 自有禁言状态 | ||
| 137 | - this.selfSilence = data.selfSilence || ''; | ||
| 138 | this.recordStatus = data.recordStatus || this.recordStatus; //当前录制状态 | 136 | this.recordStatus = data.recordStatus || this.recordStatus; //当前录制状态 |
| 139 | this.recordTimestamp = data.recordTimestamp || this.recordTimestamp; //相对于首次开始录制的时间戳 | 137 | this.recordTimestamp = data.recordTimestamp || this.recordTimestamp; //相对于首次开始录制的时间戳 |
| 140 | this.recordFileName = data.recordFileName || this.recordFileName; //录制的文件名 | 138 | this.recordFileName = data.recordFileName || this.recordFileName; //录制的文件名 |
| @@ -404,7 +402,7 @@ GlobalConfig.classJoinSuccess = false; //是否已经加入课堂 | @@ -404,7 +402,7 @@ GlobalConfig.classJoinSuccess = false; //是否已经加入课堂 | ||
| 404 | GlobalConfig.recordPlaybackMaxTime = 0; //录制回放的总时间 | 402 | GlobalConfig.recordPlaybackMaxTime = 0; //录制回放的总时间 |
| 405 | GlobalConfig.recordStatus = false; //当前录制状态 | 403 | GlobalConfig.recordStatus = false; //当前录制状态 |
| 406 | GlobalConfig.silence = false; //当前课堂禁言状态 | 404 | GlobalConfig.silence = false; //当前课堂禁言状态 |
| 407 | -GlobalConfig.selfSilence = ''; //当前课堂禁言状态 | 405 | +GlobalConfig.selfSilence = {}; //当前课堂禁言状态 |
| 408 | GlobalConfig.recordTimestamp = 0; //相对于首次开始录制的进行时间 | 406 | GlobalConfig.recordTimestamp = 0; //相对于首次开始录制的进行时间 |
| 409 | GlobalConfig.recordFileName = ""; //录制的文件名,如 果为空就创建一个 | 407 | GlobalConfig.recordFileName = ""; //录制的文件名,如 果为空就创建一个 |
| 410 | GlobalConfig.recordDownloadUrl = ""; //下载地址 | 408 | GlobalConfig.recordDownloadUrl = ""; //下载地址 |
| @@ -95,7 +95,7 @@ class ConferApe extends Ape { | @@ -95,7 +95,7 @@ class ConferApe extends Ape { | ||
| 95 | getNodeInfo() { | 95 | getNodeInfo() { |
| 96 | let nodeInfoRecordPdu = new pdu['RCNodeInfoRecordPdu']; | 96 | let nodeInfoRecordPdu = new pdu['RCNodeInfoRecordPdu']; |
| 97 | nodeInfoRecordPdu.nodeId = GlobalConfig.nodeId; | 97 | nodeInfoRecordPdu.nodeId = GlobalConfig.nodeId; |
| 98 | - nodeInfoRecordPdu.selfSilence = JSON.stringify(GlobalConfig.selfSilence); | 98 | + nodeInfoRecordPdu.selfSilence = JSON.stringify(GlobalConfig.selfSilence)||""; |
| 99 | nodeInfoRecordPdu.name = GlobalConfig.userName; | 99 | nodeInfoRecordPdu.name = GlobalConfig.userName; |
| 100 | nodeInfoRecordPdu.role = ApeConsts.userTypesToId[GlobalConfig.userRole] || 1; //NR_NORMAL用户的身份,根据用户登录时的身份设置; | 100 | nodeInfoRecordPdu.role = ApeConsts.userTypesToId[GlobalConfig.userRole] || 1; //NR_NORMAL用户的身份,根据用户登录时的身份设置; |
| 101 | nodeInfoRecordPdu.level = GlobalConfig.level; | 101 | nodeInfoRecordPdu.level = GlobalConfig.level; |
| @@ -415,13 +415,13 @@ class ConferApe extends Ape { | @@ -415,13 +415,13 @@ class ConferApe extends Ape { | ||
| 415 | } | 415 | } |
| 416 | let msgObj = {}; | 416 | let msgObj = {}; |
| 417 | msgObj.nodeId = _param.nodeId; | 417 | msgObj.nodeId = _param.nodeId; |
| 418 | - msgObj.silence = _param.silence || ''; | 418 | + msgObj.silence = _param.silence ||{}; |
| 419 | this.sendConferMsg({ "to": _param.nodeId, "message": JSON.stringify(msgObj), "actionType": ApeConsts.USER_ACTION_SILENCE_STATUS_CHANGE }); | 419 | this.sendConferMsg({ "to": _param.nodeId, "message": JSON.stringify(msgObj), "actionType": ApeConsts.USER_ACTION_SILENCE_STATUS_CHANGE }); |
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | changeSilenceStatus(_param) { | 422 | changeSilenceStatus(_param) { |
| 423 | loger.log('切换禁言状态->', _param); | 423 | loger.log('切换禁言状态->', _param); |
| 424 | - GlobalConfig.selfSilence = _param.silence; | 424 | + GlobalConfig.selfSilence = _param.silence||{}; |
| 425 | this.updateUserInfo(); | 425 | this.updateUserInfo(); |
| 426 | } | 426 | } |
| 427 | 427 |
-
请 注册 或 登录 后发表评论