正在显示
4 个修改的文件
包含
17 行增加
和
14 行删除
此 diff 太大无法显示。
| @@ -58,7 +58,7 @@ class GlobalConfig { | @@ -58,7 +58,7 @@ class GlobalConfig { | ||
| 58 | classInfo.videoQuality = this.videoQuality; | 58 | classInfo.videoQuality = this.videoQuality; |
| 59 | classInfo.ssTunnelAppURL = this.ssTunnelAppURL; | 59 | classInfo.ssTunnelAppURL = this.ssTunnelAppURL; |
| 60 | classInfo.currentSceneTableId = this.currentSceneTableId; //文档区域的模块显示 | 60 | classInfo.currentSceneTableId = this.currentSceneTableId; //文档区域的模块显示 |
| 61 | - classInfo.serverAndLoacTimeDistanc=this.serverAndLoacTimeDistanc; | 61 | + classInfo.serverAndLoacTimeDistanc = this.serverAndLoacTimeDistanc; |
| 62 | return classInfo; | 62 | return classInfo; |
| 63 | 63 | ||
| 64 | } | 64 | } |
| @@ -83,6 +83,7 @@ class GlobalConfig { | @@ -83,6 +83,7 @@ class GlobalConfig { | ||
| 83 | 83 | ||
| 84 | classStatusInfo.recordStatus = this.recordStatus; //当前录制状态 | 84 | classStatusInfo.recordStatus = this.recordStatus; //当前录制状态 |
| 85 | classStatusInfo.silence = this.silence; //当前课堂禁言状态 | 85 | classStatusInfo.silence = this.silence; //当前课堂禁言状态 |
| 86 | + classStatusInfo.silenceUsers = this.silenceUsers; //当前课堂禁言状态 | ||
| 86 | classStatusInfo.selfSilence = this.selfSilence; //当前自由禁言状态 | 87 | classStatusInfo.selfSilence = this.selfSilence; //当前自由禁言状态 |
| 87 | classStatusInfo.recordTimestamp = this.recordTimestamp; //相对于首次开始录制的时间戳 | 88 | classStatusInfo.recordTimestamp = this.recordTimestamp; //相对于首次开始录制的时间戳 |
| 88 | classStatusInfo.recordFileName = this.recordFileName; //录制的文件名 | 89 | classStatusInfo.recordFileName = this.recordFileName; //录制的文件名 |
| @@ -93,7 +94,7 @@ class GlobalConfig { | @@ -93,7 +94,7 @@ class GlobalConfig { | ||
| 93 | classStatusInfo.activeDocCurPage = this.activeDocCurPage; //当前激活的文档的当前页 | 94 | classStatusInfo.activeDocCurPage = this.activeDocCurPage; //当前激活的文档的当前页 |
| 94 | 95 | ||
| 95 | classStatusInfo.currentSceneTableId = this.currentSceneTableId; //文档区域的模块显示 | 96 | classStatusInfo.currentSceneTableId = this.currentSceneTableId; //文档区域的模块显示 |
| 96 | - classStatusInfo.serverAndLoacTimeDistanc=this.serverAndLoacTimeDistanc; | 97 | + classStatusInfo.serverAndLoacTimeDistanc = this.serverAndLoacTimeDistanc; |
| 97 | return classStatusInfo; | 98 | return classStatusInfo; |
| 98 | } | 99 | } |
| 99 | //设置当前的课堂状态的信息 | 100 | //设置当前的课堂状态的信息 |
| @@ -134,6 +135,7 @@ class GlobalConfig { | @@ -134,6 +135,7 @@ class GlobalConfig { | ||
| 134 | 135 | ||
| 135 | // 全局禁言状态 | 136 | // 全局禁言状态 |
| 136 | this.silence = data.silence || false; | 137 | this.silence = data.silence || false; |
| 138 | + this.silenceUsers = JSON.parse(data.silenceUsers || '{}'); | ||
| 137 | 139 | ||
| 138 | this.recordStatus = data.recordStatus || this.recordStatus; //当前录制状态 | 140 | this.recordStatus = data.recordStatus || this.recordStatus; //当前录制状态 |
| 139 | this.recordTimestamp = data.recordTimestamp || this.recordTimestamp; //相对于首次开始录制的时间戳 | 141 | this.recordTimestamp = data.recordTimestamp || this.recordTimestamp; //相对于首次开始录制的时间戳 |
| @@ -413,6 +415,7 @@ GlobalConfig.classJoinSuccess = false; //是否已经加入课堂 | @@ -413,6 +415,7 @@ GlobalConfig.classJoinSuccess = false; //是否已经加入课堂 | ||
| 413 | GlobalConfig.recordPlaybackMaxTime = 0; //录制回放的总时间 | 415 | GlobalConfig.recordPlaybackMaxTime = 0; //录制回放的总时间 |
| 414 | GlobalConfig.recordStatus = false; //当前录制状态 | 416 | GlobalConfig.recordStatus = false; //当前录制状态 |
| 415 | GlobalConfig.silence = false; //当前课堂禁言状态 | 417 | GlobalConfig.silence = false; //当前课堂禁言状态 |
| 418 | +GlobalConfig.silenceUsers = {}; //当前课堂用户禁言状态 | ||
| 416 | GlobalConfig.selfSilence = {}; //当前课堂禁言状态 | 419 | GlobalConfig.selfSilence = {}; //当前课堂禁言状态 |
| 417 | GlobalConfig.recordTimestamp = 0; //相对于首次开始录制的进行时间 | 420 | GlobalConfig.recordTimestamp = 0; //相对于首次开始录制的进行时间 |
| 418 | GlobalConfig.recordFileName = ""; //录制的文件名,如 果为空就创建一个 | 421 | GlobalConfig.recordFileName = ""; //录制的文件名,如 果为空就创建一个 |
| @@ -422,7 +425,7 @@ GlobalConfig.recordReplaytickValues = {}; // 滚动条关键点,用于快进 | @@ -422,7 +425,7 @@ GlobalConfig.recordReplaytickValues = {}; // 滚动条关键点,用于快进 | ||
| 422 | GlobalConfig.isAutoStartClass = 0; //是否自动开始上课 0-否 ;1 是 | 425 | GlobalConfig.isAutoStartClass = 0; //是否自动开始上课 0-否 ;1 是 |
| 423 | 426 | ||
| 424 | GlobalConfig.updateClassInfoDelay = 30; //(秒),每隔30秒同步一次课堂状态的并保存到Sass | 427 | GlobalConfig.updateClassInfoDelay = 30; //(秒),每隔30秒同步一次课堂状态的并保存到Sass |
| 425 | -GlobalConfig.msDynamicChooseIpDelay = 60*3; //(秒)MS动态选点的间隔 | 428 | +GlobalConfig.msDynamicChooseIpDelay = 60 * 3; //(秒)MS动态选点的间隔 |
| 426 | //GlobalConfig.serverTimestamp=0;//当前的系统时间戳 用get set 获取 | 429 | //GlobalConfig.serverTimestamp=0;//当前的系统时间戳 用get set 获取 |
| 427 | 430 | ||
| 428 | GlobalConfig.activeDocId = 0; //当前激活的文档ID | 431 | GlobalConfig.activeDocId = 0; //当前激活的文档ID |
| @@ -473,6 +476,6 @@ GlobalConfig.ssTunnelAppURL = ''; //屏幕共享插件的地址 | @@ -473,6 +476,6 @@ GlobalConfig.ssTunnelAppURL = ''; //屏幕共享插件的地址 | ||
| 473 | GlobalConfig.serverTime = 0; //服务器当前时间戳 | 476 | GlobalConfig.serverTime = 0; //服务器当前时间戳 |
| 474 | GlobalConfig.serverAndLoacTimeDistanc = 0; //本地时间和服务器时间错的差值; | 477 | GlobalConfig.serverAndLoacTimeDistanc = 0; //本地时间和服务器时间错的差值; |
| 475 | 478 | ||
| 476 | -GlobalConfig.isMobile=false;//是否是移动端 | 479 | +GlobalConfig.isMobile = false; //是否是移动端 |
| 477 | export default GlobalConfig; | 480 | export default GlobalConfig; |
| 478 | 481 |
| @@ -141,7 +141,7 @@ class ConferApe extends Ape { | @@ -141,7 +141,7 @@ class ConferApe extends Ape { | ||
| 141 | } | 141 | } |
| 142 | } | 142 | } |
| 143 | //用户当前选择的MS | 143 | //用户当前选择的MS |
| 144 | - nodeInfoRecordPdu.msIpPort=GlobalConfig.MS_PUBLISH_IP+":"+GlobalConfig.MS_PUBLISH_PORT; | 144 | + nodeInfoRecordPdu.msIpPort = GlobalConfig.MS_PUBLISH_IP + ":" + GlobalConfig.MS_PUBLISH_PORT; |
| 145 | 145 | ||
| 146 | return nodeInfoRecordPdu; | 146 | return nodeInfoRecordPdu; |
| 147 | } | 147 | } |
| @@ -338,10 +338,10 @@ class ConferApe extends Ape { | @@ -338,10 +338,10 @@ class ConferApe extends Ape { | ||
| 338 | silenceClass(params) { | 338 | silenceClass(params) { |
| 339 | if (!GlobalConfig.isNormal) { | 339 | if (!GlobalConfig.isNormal) { |
| 340 | //同步禁言状态 | 340 | //同步禁言状态 |
| 341 | - if(params&¶ms.silence==true){ | ||
| 342 | - GlobalConfig.silence=true; | ||
| 343 | - }else { | ||
| 344 | - GlobalConfig.silence=false; | 341 | + if (params && params.silence == true) { |
| 342 | + GlobalConfig.silence = true; | ||
| 343 | + } else { | ||
| 344 | + GlobalConfig.silence = false; | ||
| 345 | } | 345 | } |
| 346 | this.sendUpdaterClassStatusInfo(params); | 346 | this.sendUpdaterClassStatusInfo(params); |
| 347 | } else { | 347 | } else { |
| @@ -421,10 +421,8 @@ class ConferApe extends Ape { | @@ -421,10 +421,8 @@ class ConferApe extends Ape { | ||
| 421 | loger.log('控制禁言状态->失败->参数错误', _param); | 421 | loger.log('控制禁言状态->失败->参数错误', _param); |
| 422 | return; | 422 | return; |
| 423 | } | 423 | } |
| 424 | - let msgObj = {}; | ||
| 425 | - msgObj.nodeId = _param.nodeId; | ||
| 426 | - msgObj.silence = _param.silence || {}; | ||
| 427 | - this.sendConferMsg({ "to": _param.nodeId, "message": JSON.stringify(msgObj), "actionType": ApeConsts.USER_ACTION_SILENCE_STATUS_CHANGE }); | 424 | + GlobalConfig.silenceUsers[_param.userId || _param.nodeId] = _param; |
| 425 | + this.sendUpdaterClassStatusInfo({ silenceUsers: GlobalConfig.silenceUsers }); | ||
| 428 | } | 426 | } |
| 429 | 427 | ||
| 430 | changeSilenceStatus(_param) { | 428 | changeSilenceStatus(_param) { |
| @@ -975,7 +973,8 @@ class ConferApe extends Ape { | @@ -975,7 +973,8 @@ class ConferApe extends Ape { | ||
| 975 | classStatusInfo.activeDocCurPage = GlobalConfig.activeDocCurPage; //当前激活的文档的当前页 | 973 | classStatusInfo.activeDocCurPage = GlobalConfig.activeDocCurPage; //当前激活的文档的当前页 |
| 976 | classStatusInfo.isStopAllPublishMedia = _param.isStopAllPublishMedia || false; | 974 | classStatusInfo.isStopAllPublishMedia = _param.isStopAllPublishMedia || false; |
| 977 | classStatusInfo.currentSceneTableId = GlobalConfig.currentSceneTableId; | 975 | classStatusInfo.currentSceneTableId = GlobalConfig.currentSceneTableId; |
| 978 | - classStatusInfo.silence =GlobalConfig.silence; | 976 | + classStatusInfo.silence = GlobalConfig.silence; |
| 977 | + classStatusInfo.silenceUsers = JSON.stringify(GlobalConfig.silenceUsers); | ||
| 979 | //loger.log("classStatusInfo--->", classStatusInfo); | 978 | //loger.log("classStatusInfo--->", classStatusInfo); |
| 980 | 979 | ||
| 981 | /* | 980 | /* |
| @@ -1026,6 +1026,7 @@ message RCClassStatusInfoPdu { | @@ -1026,6 +1026,7 @@ message RCClassStatusInfoPdu { | ||
| 1026 | optional bool isStopAllPublishMedia=22;//是否停止推流 | 1026 | optional bool isStopAllPublishMedia=22;//是否停止推流 |
| 1027 | optional uint32 currentSceneTableId=23;//文档区域的当前模块id | 1027 | optional uint32 currentSceneTableId=23;//文档区域的当前模块id |
| 1028 | optional bool silence=24;//课堂禁言 | 1028 | optional bool silence=24;//课堂禁言 |
| 1029 | + optional string silenceUsers=25;//课堂用户禁言状态列表 | ||
| 1029 | } | 1030 | } |
| 1030 | 1031 | ||
| 1031 | message RCConferenceRecordRequestPdu { | 1032 | message RCConferenceRecordRequestPdu { |
-
请 注册 或 登录 后发表评论