合并

@@ -58,6 +58,7 @@ class GlobalConfig {
     classInfo.videoQuality = this.videoQuality;
     classInfo.ssTunnelAppURL = this.ssTunnelAppURL;
     classInfo.currentSceneTableId = this.currentSceneTableId; //文档区域的模块显示
+    classInfo.serverAndLoacTimeDistanc=this.serverAndLoacTimeDistanc;
     return classInfo;
 
   }
@@ -92,6 +93,7 @@ class GlobalConfig {
       classStatusInfo.activeDocCurPage = this.activeDocCurPage; //当前激活的文档的当前页
 
       classStatusInfo.currentSceneTableId = this.currentSceneTableId; //文档区域的模块显示
+      classStatusInfo.serverAndLoacTimeDistanc=this.serverAndLoacTimeDistanc;
       return classStatusInfo;
     }
     //设置当前的课堂状态的信息
@@ -133,8 +135,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; //录制的文件名
@@ -413,7 +413,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();
   }