李勇

1.修改会议状态,点击退出课堂的时候状态要还原到未开始状态

@@ -73,7 +73,7 @@ return /******/ (function(modules) { // webpackBootstrap @@ -73,7 +73,7 @@ return /******/ (function(modules) { // webpackBootstrap
73 /******/ } 73 /******/ }
74 74
75 /******/ var hotApplyOnUpdate = true; 75 /******/ var hotApplyOnUpdate = true;
76 -/******/ var hotCurrentHash = "3960713dc1161612a7cd"; // eslint-disable-line no-unused-vars 76 +/******/ var hotCurrentHash = "7b3b06343680209ac38c"; // eslint-disable-line no-unused-vars
77 /******/ var hotCurrentModuleData = {}; 77 /******/ var hotCurrentModuleData = {};
78 /******/ var hotCurrentParents = []; // eslint-disable-line no-unused-vars 78 /******/ var hotCurrentParents = []; // eslint-disable-line no-unused-vars
79 79
@@ -814,6 +814,7 @@ return /******/ (function(modules) { // webpackBootstrap @@ -814,6 +814,7 @@ return /******/ (function(modules) { // webpackBootstrap
814 _this.sendStartClass = _this._sendStartClass; 814 _this.sendStartClass = _this._sendStartClass;
815 _this.sendPauseClass = _this._sendPauseClass; 815 _this.sendPauseClass = _this._sendPauseClass;
816 _this.sendCloseClass = _this._sendCloseClass; 816 _this.sendCloseClass = _this._sendCloseClass;
  817 +
817 //chatApe 818 //chatApe
818 _this.sendChatMsg = _this._sendChatMsg; 819 _this.sendChatMsg = _this._sendChatMsg;
819 820
@@ -825,7 +826,6 @@ return /******/ (function(modules) { // webpackBootstrap @@ -825,7 +826,6 @@ return /******/ (function(modules) { // webpackBootstrap
825 826
826 //whiteBoradApe 827 //whiteBoradApe
827 _this.sendInsertAnnotaion = _this._sendInsertAnnotaion; 828 _this.sendInsertAnnotaion = _this._sendInsertAnnotaion;
828 - //this.sendUpdaterAnnotaion=this._sendUpdaterAnnotaion;//暂时关闭更新接口  
829 _this.sendDeleteAnnotaion = _this._sendDeleteAnnotaion; 829 _this.sendDeleteAnnotaion = _this._sendDeleteAnnotaion;
830 _this.sendDeleteAllAnnotation = _this._sendDeleteAllAnnotation; 830 _this.sendDeleteAllAnnotation = _this._sendDeleteAllAnnotation;
831 831
@@ -835,6 +835,7 @@ return /******/ (function(modules) { // webpackBootstrap @@ -835,6 +835,7 @@ return /******/ (function(modules) { // webpackBootstrap
835 _this.sendDocumentDelete = _this._sendDocumentDelete; //删除文档 835 _this.sendDocumentDelete = _this._sendDocumentDelete; //删除文档
836 _this.sendDocumentDeleteAll = _this._documentDeleteAll; //删除所有文档 836 _this.sendDocumentDeleteAll = _this._documentDeleteAll; //删除所有文档
837 _this.sendDocumentCommand = _this._sendDocumentCommand; //操作文档(翻页、缩放、滚动...) 837 _this.sendDocumentCommand = _this._sendDocumentCommand; //操作文档(翻页、缩放、滚动...)
  838 +
838 return _this; 839 return _this;
839 } 840 }
840 841
@@ -947,7 +948,6 @@ return /******/ (function(modules) { // webpackBootstrap @@ -947,7 +948,6 @@ return /******/ (function(modules) { // webpackBootstrap
947 key: '_sassInitSuccessHandler', 948 key: '_sassInitSuccessHandler',
948 value: function _sassInitSuccessHandler(_data) { 949 value: function _sassInitSuccessHandler(_data) {
949 //{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1} 950 //{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
950 -  
951 //储存数据 951 //储存数据
952 _GlobalConfig2.default.md5 = _data.md5 || ""; //这个暂时用假数据,后台接口写完就有数据了 952 _GlobalConfig2.default.md5 = _data.md5 || ""; //这个暂时用假数据,后台接口写完就有数据了
953 _GlobalConfig2.default.msType = _data.msType || 1; 953 _GlobalConfig2.default.msType = _data.msType || 1;
@@ -960,10 +960,7 @@ return /******/ (function(modules) { // webpackBootstrap @@ -960,10 +960,7 @@ return /******/ (function(modules) { // webpackBootstrap
960 } else { 960 } else {
961 _GlobalConfig2.default.passwordRequired = _data.passwordRequired || false; 961 _GlobalConfig2.default.passwordRequired = _data.passwordRequired || false;
962 } 962 }
963 -  
964 - loger.log('向SASS平台获取入会验证信息成功.');  
965 -  
966 - //this._emit(MessageTypes.CLASS_INIT_SUCCESS,initSuccessCallBackData); 963 + loger.log('SASS平台获取入会验证信息成功.');
967 964
968 //设置当前的会议状态 965 //设置当前的会议状态
969 _GlobalConfig2.default.setCurrentStatus(_GlobalConfig2.default.statusCode_1); 966 _GlobalConfig2.default.setCurrentStatus(_GlobalConfig2.default.statusCode_1);
@@ -982,21 +979,11 @@ return /******/ (function(modules) { // webpackBootstrap @@ -982,21 +979,11 @@ return /******/ (function(modules) { // webpackBootstrap
982 } 979 }
983 } 980 }
984 981
985 - //使用固定的假数据  
986 -  
987 - }, {  
988 - key: '_setDebugData',  
989 - value: function _setDebugData(_data) {}  
990 - //loger.log("setDebugData "+_data);  
991 - //GlobalConfig.setDebugData(_data);  
992 -  
993 -  
994 // 通过SASS平台验证 982 // 通过SASS平台验证
995 983
996 }, { 984 }, {
997 key: '_sassVerifySuccessHandler', 985 key: '_sassVerifySuccessHandler',
998 value: function _sassVerifySuccessHandler(_data) { 986 value: function _sassVerifySuccessHandler(_data) {
999 -  
1000 //返回值 987 //返回值
1001 /* flag 数值型 无 True:成功 988 /* flag 数值型 无 True:成功
1002 Flag:失败 989 Flag:失败
@@ -1061,8 +1048,7 @@ return /******/ (function(modules) { // webpackBootstrap @@ -1061,8 +1048,7 @@ return /******/ (function(modules) { // webpackBootstrap
1061 key: '_h5SassGetClassParaSuccessHandler', 1048 key: '_h5SassGetClassParaSuccessHandler',
1062 value: function _h5SassGetClassParaSuccessHandler(_data) { 1049 value: function _h5SassGetClassParaSuccessHandler(_data) {
1063 loger.log('获取api/meeting/detail.do完成.'); 1050 loger.log('获取api/meeting/detail.do完成.');
1064 - //console.log(_data.docListPrepare);  
1065 - //console.log(_data.mcuList); 1051 +
1066 //包含整个会议最全的信息,储存数据 1052 //包含整个会议最全的信息,储存数据
1067 if (_data) { 1053 if (_data) {
1068 _GlobalConfig2.default.setDocListPrepare(_data.docListPrepare); //提前上传的文档列表 1054 _GlobalConfig2.default.setDocListPrepare(_data.docListPrepare); //提前上传的文档列表
@@ -1092,10 +1078,8 @@ return /******/ (function(modules) { // webpackBootstrap @@ -1092,10 +1078,8 @@ return /******/ (function(modules) { // webpackBootstrap
1092 1078
1093 _GlobalConfig2.default.MCUServerIP = _data.MCUServerIP; 1079 _GlobalConfig2.default.MCUServerIP = _data.MCUServerIP;
1094 _GlobalConfig2.default.MCUServerPort = _data.MCUServerPort; 1080 _GlobalConfig2.default.MCUServerPort = _data.MCUServerPort;
1095 - //GlobalConfig.classRole=_data.classRole;  
1096 _GlobalConfig2.default.classId = _data.classId; 1081 _GlobalConfig2.default.classId = _data.classId;
1097 _GlobalConfig2.default.h5Module = _data.h5Module; 1082 _GlobalConfig2.default.h5Module = _data.h5Module;
1098 - //GlobalConfig.isHost=_data.isHost;  
1099 _GlobalConfig2.default.maxAudioChannels = _data.maxAudioChannels; 1083 _GlobalConfig2.default.maxAudioChannels = _data.maxAudioChannels;
1100 _GlobalConfig2.default.maxVideoChannels = _data.maxVideoChannels; 1084 _GlobalConfig2.default.maxVideoChannels = _data.maxVideoChannels;
1101 _GlobalConfig2.default.maxMediaChannels = _data.maxMediaChannels; 1085 _GlobalConfig2.default.maxMediaChannels = _data.maxMediaChannels;
@@ -1105,7 +1089,6 @@ return /******/ (function(modules) { // webpackBootstrap @@ -1105,7 +1089,6 @@ return /******/ (function(modules) { // webpackBootstrap
1105 _GlobalConfig2.default.msType = _data.msType; 1089 _GlobalConfig2.default.msType = _data.msType;
1106 _GlobalConfig2.default.nodeId = _data.nodeId; 1090 _GlobalConfig2.default.nodeId = _data.nodeId;
1107 _GlobalConfig2.default.password = _data.password; 1091 _GlobalConfig2.default.password = _data.password;
1108 - //GlobalConfig.passwordRequired 老师的默认是true  
1109 _GlobalConfig2.default.portal = _data.portal; 1092 _GlobalConfig2.default.portal = _data.portal;
1110 _GlobalConfig2.default.role = _data.role; 1093 _GlobalConfig2.default.role = _data.role;
1111 _GlobalConfig2.default.siteId = _data.siteId; 1094 _GlobalConfig2.default.siteId = _data.siteId;
@@ -1124,7 +1107,6 @@ return /******/ (function(modules) { // webpackBootstrap @@ -1124,7 +1107,6 @@ return /******/ (function(modules) { // webpackBootstrap
1124 // GlobalConfig.MCUServerPort=_data.MCUServerPort; 1107 // GlobalConfig.MCUServerPort=_data.MCUServerPort;
1125 1108
1126 initSuccessCallBackData.doc = _GlobalConfig2.default.doc; //文档服务器地址 1109 initSuccessCallBackData.doc = _GlobalConfig2.default.doc; //文档服务器地址
1127 - //initSuccessCallBackData.classRole=GlobalConfig.classRole;  
1128 initSuccessCallBackData.classId = _GlobalConfig2.default.classId; 1110 initSuccessCallBackData.classId = _GlobalConfig2.default.classId;
1129 initSuccessCallBackData.className = _GlobalConfig2.default.className; 1111 initSuccessCallBackData.className = _GlobalConfig2.default.className;
1130 initSuccessCallBackData.h5Module = _GlobalConfig2.default.h5Module; 1112 initSuccessCallBackData.h5Module = _GlobalConfig2.default.h5Module;
@@ -1132,9 +1114,8 @@ return /******/ (function(modules) { // webpackBootstrap @@ -1132,9 +1114,8 @@ return /******/ (function(modules) { // webpackBootstrap
1132 initSuccessCallBackData.maxAudioChannels = _GlobalConfig2.default.maxAudioChannels; 1114 initSuccessCallBackData.maxAudioChannels = _GlobalConfig2.default.maxAudioChannels;
1133 initSuccessCallBackData.maxVideoChannels = _GlobalConfig2.default.maxVideoChannels; 1115 initSuccessCallBackData.maxVideoChannels = _GlobalConfig2.default.maxVideoChannels;
1134 initSuccessCallBackData.maxMediaChannels = _GlobalConfig2.default.maxMediaChannels; 1116 initSuccessCallBackData.maxMediaChannels = _GlobalConfig2.default.maxMediaChannels;
1135 - // GlobalConfig.mcuClassInfo=_data.mcuClassInfo;  
1136 initSuccessCallBackData.mcuDelay = _GlobalConfig2.default.mcuDelay; 1117 initSuccessCallBackData.mcuDelay = _GlobalConfig2.default.mcuDelay;
1137 - //GlobalConfig.md5=_data.md5; 1118 +
1138 initSuccessCallBackData.msType = _GlobalConfig2.default.msType; 1119 initSuccessCallBackData.msType = _GlobalConfig2.default.msType;
1139 initSuccessCallBackData.nodeId = _GlobalConfig2.default.nodeId; 1120 initSuccessCallBackData.nodeId = _GlobalConfig2.default.nodeId;
1140 initSuccessCallBackData.password = _GlobalConfig2.default.password; 1121 initSuccessCallBackData.password = _GlobalConfig2.default.password;
@@ -1159,30 +1140,8 @@ return /******/ (function(modules) { // webpackBootstrap @@ -1159,30 +1140,8 @@ return /******/ (function(modules) { // webpackBootstrap
1159 _joinClassSuccessCallBackFun(initSuccessCallBackData); 1140 _joinClassSuccessCallBackFun(initSuccessCallBackData);
1160 } 1141 }
1161 } 1142 }
1162 - //// MCU 会议失败  
1163 - //_joinClassFailureHandler(_data){  
1164 - // GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_1);  
1165 - // loger.log("_joinClassFailureHandler",_data);  
1166 - // if(_joinClassFailureCallBackFun){  
1167 - // let callBackObj={"code":_data,"message":""};  
1168 - // _joinClassFailureCallBackFun(callBackObj);  
1169 - // }  
1170 - //}  
1171 -  
1172 1143
1173 //ConferApe 1144 //ConferApe
1174 - // 参会处理  
1175 -  
1176 - }, {  
1177 - key: 'conferenceHandler',  
1178 - value: function conferenceHandler(msg_type) {  
1179 - var msg = {  
1180 - type: msg_type,  
1181 - data: null  
1182 - };  
1183 - this._emit(msg.type, msg);  
1184 - }  
1185 -  
1186 //开始上课 1145 //开始上课
1187 1146
1188 }, { 1147 }, {
@@ -1267,15 +1226,7 @@ return /******/ (function(modules) { // webpackBootstrap @@ -1267,15 +1226,7 @@ return /******/ (function(modules) { // webpackBootstrap
1267 _whiteboard_ape.sendInsetAnnotaion(_param); 1226 _whiteboard_ape.sendInsetAnnotaion(_param);
1268 } 1227 }
1269 } 1228 }
1270 - //更新标注,发送信息  
1271 1229
1272 - }, {  
1273 - key: '_sendUpdaterAnnotaion',  
1274 - value: function _sendUpdaterAnnotaion(_param) {  
1275 - if (_whiteboard_ape) {  
1276 - _whiteboard_ape.sendUpdaterAnnotaion(_param);  
1277 - }  
1278 - }  
1279 //删除标注,发送信息 1230 //删除标注,发送信息
1280 1231
1281 }, { 1232 }, {
@@ -1343,44 +1294,36 @@ return /******/ (function(modules) { // webpackBootstrap @@ -1343,44 +1294,36 @@ return /******/ (function(modules) { // webpackBootstrap
1343 } 1294 }
1344 } 1295 }
1345 1296
1346 - // 白板笔记更新(svg)  
1347 -  
1348 - }, {  
1349 - key: 'annoUpdateHandler',  
1350 - value: function annoUpdateHandler(annoInfo) {  
1351 - var activeDocId = _confer_ape.activeDocId;  
1352 - var docItem = _doc_ape.docList[activeDocId];  
1353 - if (docItem && annoInfo.id == docItem.wbid) {  
1354 - this._emit(_MessageTypes2.default.DOC_ANNOTATION, annoInfo);  
1355 - }  
1356 - }  
1357 -  
1358 - // 文档变更-笔记处理  
1359 -  
1360 - }, {  
1361 - key: 'docShowHandler',  
1362 - value: function docShowHandler(docItem) {  
1363 - loger.log('Doc Show ->' + docItem.id + '|' + docItem.curPageNo);  
1364 - var annoInfo = _whiteboard_ape.annoInfos[docItem.wbid];  
1365 - if (annoInfo) {  
1366 - this._emit(_MessageTypes2.default.DOC_ANNOTATION, annoInfo);  
1367 - } else {  
1368 - this._emit(_MessageTypes2.default.DOC_ANNOTATION);  
1369 - }  
1370 - } 1297 + /* // 白板笔记更新(svg)
  1298 + annoUpdateHandler(annoInfo) {
  1299 + const activeDocId = _confer_ape.activeDocId;
  1300 + const docItem = _doc_ape.docList[activeDocId];
  1301 + if (docItem && annoInfo.id == docItem.wbid) {
  1302 + this._emit(MessageTypes.DOC_ANNOTATION, annoInfo);
  1303 + }
  1304 + }*/
1371 1305
1372 - // 文档切换 1306 + /* // 文档变更-笔记处理
  1307 + docShowHandler(docItem) {
  1308 + loger.log('Doc Show ->' + docItem.id + '|' + docItem.curPageNo);
  1309 + const annoInfo = _whiteboard_ape.annoInfos[docItem.wbid];
  1310 + if (annoInfo) {
  1311 + this._emit(MessageTypes.DOC_ANNOTATION, annoInfo);
  1312 + } else {
  1313 + this._emit(MessageTypes.DOC_ANNOTATION);
  1314 +
  1315 + }
  1316 + }*/
1373 1317
1374 - }, {  
1375 - key: 'docSwitchHandler',  
1376 - value: function docSwitchHandler() {  
1377 - var activeDocId = _confer_ape.activeDocId;  
1378 - loger.log('Switch Doc Active -> ' + activeDocId);  
1379 - var docItem = _doc_ape.docList[activeDocId];  
1380 - if (docItem) {  
1381 - this._emit(_MessageTypes2.default.DOC_SHOW, docItem);  
1382 - }  
1383 - } 1318 + /* // 文档切换
  1319 + docSwitchHandler() {
  1320 + const activeDocId = _confer_ape.activeDocId;
  1321 + loger.log('Switch Doc Active -> ' + activeDocId);
  1322 + const docItem = _doc_ape.docList[activeDocId];
  1323 + if (docItem) {
  1324 + this._emit(MessageTypes.DOC_SHOW, docItem);
  1325 + }
  1326 + }*/
1384 1327
1385 //// 文档变更,白板也需要做处理 1328 //// 文档变更,白板也需要做处理
1386 1329
@@ -2750,7 +2693,7 @@ return /******/ (function(modules) { // webpackBootstrap @@ -2750,7 +2693,7 @@ return /******/ (function(modules) { // webpackBootstrap
2750 ApeConsts.CLASS_STATUS_WAIT = 0; //课堂还未开始 2693 ApeConsts.CLASS_STATUS_WAIT = 0; //课堂还未开始
2751 ApeConsts.CLASS_STATUS_STARTED = 1; //直播中 2694 ApeConsts.CLASS_STATUS_STARTED = 1; //直播中
2752 ApeConsts.CLASS_STATUS_PAUSE = 2; //暂停 2695 ApeConsts.CLASS_STATUS_PAUSE = 2; //暂停
2753 - ApeConsts.CLASS_STATUS_CLOSE = 3; //结束 2696 + ApeConsts.CLASS_STATUS_CLOSE = 3; //结束//这个是点击结束会议,把所有人踢出课堂,然后把状态值还原为0*************
2754 ApeConsts.CLASS_STATUS_UPTATE = 4; //更新课堂状态信息 2697 ApeConsts.CLASS_STATUS_UPTATE = 4; //更新课堂状态信息
2755 2698
2756 ApeConsts.CLASS_WAIT_START = "class.wait.start"; //课堂还未开始 2699 ApeConsts.CLASS_WAIT_START = "class.wait.start"; //课堂还未开始
@@ -14826,8 +14769,10 @@ return /******/ (function(modules) { // webpackBootstrap @@ -14826,8 +14769,10 @@ return /******/ (function(modules) { // webpackBootstrap
14826 }, { 14769 }, {
14827 key: 'startClass', 14770 key: 'startClass',
14828 value: function startClass(_param) { 14771 value: function startClass(_param) {
  14772 + if (_GlobalConfig2.default.classStatus == _ApeConsts2.default.CLASS_STATUS_WAIT) {
  14773 + _GlobalConfig2.default.classStartTime = _EngineUtils2.default.creatTimestampStr();
  14774 + }
14829 _GlobalConfig2.default.classStatus = _ApeConsts2.default.CLASS_STATUS_STARTED; 14775 _GlobalConfig2.default.classStatus = _ApeConsts2.default.CLASS_STATUS_STARTED;
14830 - _GlobalConfig2.default.classStartTime = _EngineUtils2.default.creatTimestampStr();  
14831 _param.actionType = ACTION_TYPE_1; 14776 _param.actionType = ACTION_TYPE_1;
14832 this.sendUpdaterClassStatusInfo(_param); 14777 this.sendUpdaterClassStatusInfo(_param);
14833 } 14778 }
@@ -14846,7 +14791,8 @@ return /******/ (function(modules) { // webpackBootstrap @@ -14846,7 +14791,8 @@ return /******/ (function(modules) { // webpackBootstrap
14846 }, { 14791 }, {
14847 key: 'closeClass', 14792 key: 'closeClass',
14848 value: function closeClass(_param) { 14793 value: function closeClass(_param) {
14849 - _GlobalConfig2.default.classStatus = _ApeConsts2.default.CLASS_STATUS_CLOSE; 14794 + //把所有人都踢出课堂,然后把状态值还原为1
  14795 + _GlobalConfig2.default.classStatus = _ApeConsts2.default.CLASS_STATUS_WAIT; //
14850 _GlobalConfig2.default.classStopTime = _EngineUtils2.default.creatTimestampStr(); 14796 _GlobalConfig2.default.classStopTime = _EngineUtils2.default.creatTimestampStr();
14851 _param.actionType = ACTION_TYPE_3; 14797 _param.actionType = ACTION_TYPE_3;
14852 this.sendUpdaterClassStatusInfo(_param); 14798 this.sendUpdaterClassStatusInfo(_param);
@@ -15409,11 +15355,6 @@ return /******/ (function(modules) { // webpackBootstrap @@ -15409,11 +15355,6 @@ return /******/ (function(modules) { // webpackBootstrap
15409 this.tableDeleteHandler(object_id, tableDeleteData); 15355 this.tableDeleteHandler(object_id, tableDeleteData);
15410 break; 15356 break;
15411 case _pdus2.default.RCPDU_REG_TABLE_UPDATE_PDU: 15357 case _pdus2.default.RCPDU_REG_TABLE_UPDATE_PDU:
15412 - /* let tableUpdateData1 = pdu['RCRegistryWBUpdateItemPdu'].decode(user_data);  
15413 - let rosterUpdateItems1 = tableUpdateData1.items;  
15414 - let rosterUpdateItemsLen1 = rosterUpdateItems1.length;  
15415 - console.log("RCRegistryWBUpdateItemPdu "+rosterUpdateItemsLen1);  
15416 - console.log(rosterUpdateItems1);*/  
15417 var tableUpdateData = _pdus2.default['RCRegistryTableUpdateItemPdu'].decode(user_data); 15358 var tableUpdateData = _pdus2.default['RCRegistryTableUpdateItemPdu'].decode(user_data);
15418 var tableUpdateItems = tableUpdateData.items; 15359 var tableUpdateItems = tableUpdateData.items;
15419 var tableUpdateItemsLen = tableUpdateItems.length; 15360 var tableUpdateItemsLen = tableUpdateItems.length;
@@ -101,6 +101,7 @@ export default class MessageEntrance extends Emiter { @@ -101,6 +101,7 @@ export default class MessageEntrance extends Emiter {
101 this.sendStartClass=this._sendStartClass; 101 this.sendStartClass=this._sendStartClass;
102 this.sendPauseClass=this._sendPauseClass; 102 this.sendPauseClass=this._sendPauseClass;
103 this.sendCloseClass=this._sendCloseClass; 103 this.sendCloseClass=this._sendCloseClass;
  104 +
104 //chatApe 105 //chatApe
105 this.sendChatMsg=this._sendChatMsg; 106 this.sendChatMsg=this._sendChatMsg;
106 107
@@ -110,10 +111,8 @@ export default class MessageEntrance extends Emiter { @@ -110,10 +111,8 @@ export default class MessageEntrance extends Emiter {
110 this.publishVideo=this._publishVideo; 111 this.publishVideo=this._publishVideo;
111 this.stopPublishVideo=this._stopPublishVideo; 112 this.stopPublishVideo=this._stopPublishVideo;
112 113
113 -  
114 //whiteBoradApe 114 //whiteBoradApe
115 this.sendInsertAnnotaion=this._sendInsertAnnotaion; 115 this.sendInsertAnnotaion=this._sendInsertAnnotaion;
116 - //this.sendUpdaterAnnotaion=this._sendUpdaterAnnotaion;//暂时关闭更新接口  
117 this.sendDeleteAnnotaion=this._sendDeleteAnnotaion; 116 this.sendDeleteAnnotaion=this._sendDeleteAnnotaion;
118 this.sendDeleteAllAnnotation=this._sendDeleteAllAnnotation; 117 this.sendDeleteAllAnnotation=this._sendDeleteAllAnnotation;
119 118
@@ -123,6 +122,7 @@ export default class MessageEntrance extends Emiter { @@ -123,6 +122,7 @@ export default class MessageEntrance extends Emiter {
123 this.sendDocumentDelete= this. _sendDocumentDelete;//删除文档 122 this.sendDocumentDelete= this. _sendDocumentDelete;//删除文档
124 this.sendDocumentDeleteAll= this._documentDeleteAll;//删除所有文档 123 this.sendDocumentDeleteAll= this._documentDeleteAll;//删除所有文档
125 this.sendDocumentCommand= this._sendDocumentCommand;//操作文档(翻页、缩放、滚动...) 124 this.sendDocumentCommand= this._sendDocumentCommand;//操作文档(翻页、缩放、滚动...)
  125 +
126 } 126 }
127 127
128 128
@@ -213,7 +213,6 @@ export default class MessageEntrance extends Emiter { @@ -213,7 +213,6 @@ export default class MessageEntrance extends Emiter {
213 // 用classId向SASS平台获取入会验证信息成功 213 // 用classId向SASS平台获取入会验证信息成功
214 _sassInitSuccessHandler(_data) { 214 _sassInitSuccessHandler(_data) {
215 //{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1} 215 //{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
216 -  
217 //储存数据 216 //储存数据
218 GlobalConfig.md5=_data.md5||"";//这个暂时用假数据,后台接口写完就有数据了 217 GlobalConfig.md5=_data.md5||"";//这个暂时用假数据,后台接口写完就有数据了
219 GlobalConfig.msType=_data.msType||1; 218 GlobalConfig.msType=_data.msType||1;
@@ -226,10 +225,7 @@ export default class MessageEntrance extends Emiter { @@ -226,10 +225,7 @@ export default class MessageEntrance extends Emiter {
226 }else { 225 }else {
227 GlobalConfig.passwordRequired=_data.passwordRequired||false; 226 GlobalConfig.passwordRequired=_data.passwordRequired||false;
228 } 227 }
229 -  
230 - loger.log('向SASS平台获取入会验证信息成功.');  
231 -  
232 - //this._emit(MessageTypes.CLASS_INIT_SUCCESS,initSuccessCallBackData); 228 + loger.log('SASS平台获取入会验证信息成功.');
233 229
234 //设置当前的会议状态 230 //设置当前的会议状态
235 GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_1); 231 GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_1);
@@ -248,15 +244,8 @@ export default class MessageEntrance extends Emiter { @@ -248,15 +244,8 @@ export default class MessageEntrance extends Emiter {
248 } 244 }
249 } 245 }
250 246
251 - //使用固定的假数据  
252 - _setDebugData(_data){  
253 - //loger.log("setDebugData "+_data);  
254 - //GlobalConfig.setDebugData(_data);  
255 - }  
256 -  
257 // 通过SASS平台验证 247 // 通过SASS平台验证
258 _sassVerifySuccessHandler(_data) { 248 _sassVerifySuccessHandler(_data) {
259 -  
260 //返回值 249 //返回值
261 /* flag 数值型 无 True:成功 250 /* flag 数值型 无 True:成功
262 Flag:失败 251 Flag:失败
@@ -317,8 +306,7 @@ export default class MessageEntrance extends Emiter { @@ -317,8 +306,7 @@ export default class MessageEntrance extends Emiter {
317 //获取会议所有参数 api/meeting/detail.do? flash中的接口文件是 getClassParam.do 306 //获取会议所有参数 api/meeting/detail.do? flash中的接口文件是 getClassParam.do
318 _h5SassGetClassParaSuccessHandler(_data){ 307 _h5SassGetClassParaSuccessHandler(_data){
319 loger.log('获取api/meeting/detail.do完成.'); 308 loger.log('获取api/meeting/detail.do完成.');
320 - //console.log(_data.docListPrepare);  
321 - //console.log(_data.mcuList); 309 +
322 //包含整个会议最全的信息,储存数据 310 //包含整个会议最全的信息,储存数据
323 if(_data){ 311 if(_data){
324 GlobalConfig.setDocListPrepare(_data.docListPrepare); //提前上传的文档列表 312 GlobalConfig.setDocListPrepare(_data.docListPrepare); //提前上传的文档列表
@@ -346,10 +334,8 @@ export default class MessageEntrance extends Emiter { @@ -346,10 +334,8 @@ export default class MessageEntrance extends Emiter {
346 334
347 GlobalConfig.MCUServerIP=_data.MCUServerIP; 335 GlobalConfig.MCUServerIP=_data.MCUServerIP;
348 GlobalConfig.MCUServerPort=_data.MCUServerPort; 336 GlobalConfig.MCUServerPort=_data.MCUServerPort;
349 - //GlobalConfig.classRole=_data.classRole;  
350 GlobalConfig.classId=_data.classId; 337 GlobalConfig.classId=_data.classId;
351 GlobalConfig.h5Module=_data.h5Module; 338 GlobalConfig.h5Module=_data.h5Module;
352 - //GlobalConfig.isHost=_data.isHost;  
353 GlobalConfig.maxAudioChannels=_data.maxAudioChannels; 339 GlobalConfig.maxAudioChannels=_data.maxAudioChannels;
354 GlobalConfig.maxVideoChannels=_data.maxVideoChannels; 340 GlobalConfig.maxVideoChannels=_data.maxVideoChannels;
355 GlobalConfig.maxMediaChannels=_data.maxMediaChannels; 341 GlobalConfig.maxMediaChannels=_data.maxMediaChannels;
@@ -359,7 +345,6 @@ export default class MessageEntrance extends Emiter { @@ -359,7 +345,6 @@ export default class MessageEntrance extends Emiter {
359 GlobalConfig.msType=_data.msType; 345 GlobalConfig.msType=_data.msType;
360 GlobalConfig.nodeId=_data.nodeId; 346 GlobalConfig.nodeId=_data.nodeId;
361 GlobalConfig.password=_data.password; 347 GlobalConfig.password=_data.password;
362 - //GlobalConfig.passwordRequired 老师的默认是true  
363 GlobalConfig.portal=_data.portal; 348 GlobalConfig.portal=_data.portal;
364 GlobalConfig.role=_data.role; 349 GlobalConfig.role=_data.role;
365 GlobalConfig.siteId=_data.siteId; 350 GlobalConfig.siteId=_data.siteId;
@@ -378,7 +363,6 @@ export default class MessageEntrance extends Emiter { @@ -378,7 +363,6 @@ export default class MessageEntrance extends Emiter {
378 // GlobalConfig.MCUServerPort=_data.MCUServerPort; 363 // GlobalConfig.MCUServerPort=_data.MCUServerPort;
379 364
380 initSuccessCallBackData.doc=GlobalConfig.doc;//文档服务器地址 365 initSuccessCallBackData.doc=GlobalConfig.doc;//文档服务器地址
381 - //initSuccessCallBackData.classRole=GlobalConfig.classRole;  
382 initSuccessCallBackData.classId=GlobalConfig.classId; 366 initSuccessCallBackData.classId=GlobalConfig.classId;
383 initSuccessCallBackData.className=GlobalConfig.className; 367 initSuccessCallBackData.className=GlobalConfig.className;
384 initSuccessCallBackData.h5Module=GlobalConfig.h5Module; 368 initSuccessCallBackData.h5Module=GlobalConfig.h5Module;
@@ -386,9 +370,8 @@ export default class MessageEntrance extends Emiter { @@ -386,9 +370,8 @@ export default class MessageEntrance extends Emiter {
386 initSuccessCallBackData.maxAudioChannels=GlobalConfig.maxAudioChannels; 370 initSuccessCallBackData.maxAudioChannels=GlobalConfig.maxAudioChannels;
387 initSuccessCallBackData.maxVideoChannels=GlobalConfig.maxVideoChannels; 371 initSuccessCallBackData.maxVideoChannels=GlobalConfig.maxVideoChannels;
388 initSuccessCallBackData.maxMediaChannels=GlobalConfig.maxMediaChannels; 372 initSuccessCallBackData.maxMediaChannels=GlobalConfig.maxMediaChannels;
389 - // GlobalConfig.mcuClassInfo=_data.mcuClassInfo;  
390 initSuccessCallBackData.mcuDelay=GlobalConfig.mcuDelay; 373 initSuccessCallBackData.mcuDelay=GlobalConfig.mcuDelay;
391 - //GlobalConfig.md5=_data.md5; 374 +
392 initSuccessCallBackData.msType=GlobalConfig.msType; 375 initSuccessCallBackData.msType=GlobalConfig.msType;
393 initSuccessCallBackData.nodeId=GlobalConfig.nodeId; 376 initSuccessCallBackData.nodeId=GlobalConfig.nodeId;
394 initSuccessCallBackData.password=GlobalConfig.password; 377 initSuccessCallBackData.password=GlobalConfig.password;
@@ -413,27 +396,8 @@ export default class MessageEntrance extends Emiter { @@ -413,27 +396,8 @@ export default class MessageEntrance extends Emiter {
413 _joinClassSuccessCallBackFun(initSuccessCallBackData); 396 _joinClassSuccessCallBackFun(initSuccessCallBackData);
414 } 397 }
415 } 398 }
416 - //// MCU 会议失败  
417 - //_joinClassFailureHandler(_data){  
418 - // GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_1);  
419 - // loger.log("_joinClassFailureHandler",_data);  
420 - // if(_joinClassFailureCallBackFun){  
421 - // let callBackObj={"code":_data,"message":""};  
422 - // _joinClassFailureCallBackFun(callBackObj);  
423 - // }  
424 - //}  
425 -  
426 399
427 //ConferApe 400 //ConferApe
428 - // 参会处理  
429 - conferenceHandler(msg_type) {  
430 - var msg = {  
431 - type: msg_type,  
432 - data: null  
433 - };  
434 - this._emit(msg.type, msg);  
435 - }  
436 -  
437 //开始上课 401 //开始上课
438 _sendStartClass(_param){ 402 _sendStartClass(_param){
439 if(_confer_ape){ 403 if(_confer_ape){
@@ -498,19 +462,14 @@ export default class MessageEntrance extends Emiter { @@ -498,19 +462,14 @@ export default class MessageEntrance extends Emiter {
498 _whiteboard_ape.sendInsetAnnotaion(_param); 462 _whiteboard_ape.sendInsetAnnotaion(_param);
499 } 463 }
500 } 464 }
501 - //更新标注,发送信息  
502 - _sendUpdaterAnnotaion(_param){  
503 - if(_whiteboard_ape){  
504 - _whiteboard_ape.sendUpdaterAnnotaion(_param);  
505 - }  
506 - } 465 +
507 //删除标注,发送信息 466 //删除标注,发送信息
508 _sendDeleteAnnotaion(_param){ 467 _sendDeleteAnnotaion(_param){
509 if(_whiteboard_ape){ 468 if(_whiteboard_ape){
510 _whiteboard_ape.sendDeleteAnnotaion(_param); 469 _whiteboard_ape.sendDeleteAnnotaion(_param);
511 } 470 }
512 } 471 }
513 -//删除所有标注 472 + //删除所有标注
514 _sendDeleteAllAnnotation(_param){ 473 _sendDeleteAllAnnotation(_param){
515 if(_whiteboard_ape){ 474 if(_whiteboard_ape){
516 _whiteboard_ape.sendDeleteAllAnnotation(_param); 475 _whiteboard_ape.sendDeleteAllAnnotation(_param);
@@ -550,16 +509,16 @@ export default class MessageEntrance extends Emiter { @@ -550,16 +509,16 @@ export default class MessageEntrance extends Emiter {
550 } 509 }
551 } 510 }
552 511
553 - // 白板笔记更新(svg) 512 +/* // 白板笔记更新(svg)
554 annoUpdateHandler(annoInfo) { 513 annoUpdateHandler(annoInfo) {
555 const activeDocId = _confer_ape.activeDocId; 514 const activeDocId = _confer_ape.activeDocId;
556 const docItem = _doc_ape.docList[activeDocId]; 515 const docItem = _doc_ape.docList[activeDocId];
557 if (docItem && annoInfo.id == docItem.wbid) { 516 if (docItem && annoInfo.id == docItem.wbid) {
558 this._emit(MessageTypes.DOC_ANNOTATION, annoInfo); 517 this._emit(MessageTypes.DOC_ANNOTATION, annoInfo);
559 } 518 }
560 - } 519 + }*/
561 520
562 - // 文档变更-笔记处理 521 +/* // 文档变更-笔记处理
563 docShowHandler(docItem) { 522 docShowHandler(docItem) {
564 loger.log('Doc Show ->' + docItem.id + '|' + docItem.curPageNo); 523 loger.log('Doc Show ->' + docItem.id + '|' + docItem.curPageNo);
565 const annoInfo = _whiteboard_ape.annoInfos[docItem.wbid]; 524 const annoInfo = _whiteboard_ape.annoInfos[docItem.wbid];
@@ -569,9 +528,9 @@ export default class MessageEntrance extends Emiter { @@ -569,9 +528,9 @@ export default class MessageEntrance extends Emiter {
569 this._emit(MessageTypes.DOC_ANNOTATION); 528 this._emit(MessageTypes.DOC_ANNOTATION);
570 529
571 } 530 }
572 - } 531 + }*/
573 532
574 - // 文档切换 533 +/* // 文档切换
575 docSwitchHandler() { 534 docSwitchHandler() {
576 const activeDocId = _confer_ape.activeDocId; 535 const activeDocId = _confer_ape.activeDocId;
577 loger.log('Switch Doc Active -> ' + activeDocId); 536 loger.log('Switch Doc Active -> ' + activeDocId);
@@ -579,7 +538,7 @@ export default class MessageEntrance extends Emiter { @@ -579,7 +538,7 @@ export default class MessageEntrance extends Emiter {
579 if (docItem) { 538 if (docItem) {
580 this._emit(MessageTypes.DOC_SHOW, docItem); 539 this._emit(MessageTypes.DOC_SHOW, docItem);
581 } 540 }
582 - } 541 + }*/
583 542
584 //// 文档变更,白板也需要做处理 543 //// 文档变更,白板也需要做处理
585 docUpdateHandler(_data) { 544 docUpdateHandler(_data) {
@@ -170,11 +170,6 @@ export default class Ape extends Emiter { @@ -170,11 +170,6 @@ export default class Ape extends Emiter {
170 this.tableDeleteHandler(object_id, tableDeleteData); 170 this.tableDeleteHandler(object_id, tableDeleteData);
171 break; 171 break;
172 case pdu.RCPDU_REG_TABLE_UPDATE_PDU: 172 case pdu.RCPDU_REG_TABLE_UPDATE_PDU:
173 - /* let tableUpdateData1 = pdu['RCRegistryWBUpdateItemPdu'].decode(user_data);  
174 - let rosterUpdateItems1 = tableUpdateData1.items;  
175 - let rosterUpdateItemsLen1 = rosterUpdateItems1.length;  
176 - console.log("RCRegistryWBUpdateItemPdu "+rosterUpdateItemsLen1);  
177 - console.log(rosterUpdateItems1);*/  
178 let tableUpdateData = pdu['RCRegistryTableUpdateItemPdu'].decode(user_data); 173 let tableUpdateData = pdu['RCRegistryTableUpdateItemPdu'].decode(user_data);
179 let tableUpdateItems = tableUpdateData.items; 174 let tableUpdateItems = tableUpdateData.items;
180 let tableUpdateItemsLen= tableUpdateItems.length; 175 let tableUpdateItemsLen= tableUpdateItems.length;
@@ -145,8 +145,10 @@ class ConferApe extends Ape { @@ -145,8 +145,10 @@ class ConferApe extends Ape {
145 } 145 }
146 //开始上课 146 //开始上课
147 startClass(_param){ 147 startClass(_param){
  148 + if(GlobalConfig.classStatus==ApeConsts.CLASS_STATUS_WAIT){
  149 + GlobalConfig.classStartTime=EngineUtils.creatTimestampStr();
  150 + }
148 GlobalConfig.classStatus=ApeConsts.CLASS_STATUS_STARTED; 151 GlobalConfig.classStatus=ApeConsts.CLASS_STATUS_STARTED;
149 - GlobalConfig.classStartTime=EngineUtils.creatTimestampStr();  
150 _param.actionType=ACTION_TYPE_1; 152 _param.actionType=ACTION_TYPE_1;
151 this.sendUpdaterClassStatusInfo(_param); 153 this.sendUpdaterClassStatusInfo(_param);
152 } 154 }
@@ -159,7 +161,8 @@ class ConferApe extends Ape { @@ -159,7 +161,8 @@ class ConferApe extends Ape {
159 } 161 }
160 //关闭课堂 162 //关闭课堂
161 closeClass(_param){ 163 closeClass(_param){
162 - GlobalConfig.classStatus=ApeConsts.CLASS_STATUS_CLOSE; 164 + //把所有人都踢出课堂,然后把状态值还原为1
  165 + GlobalConfig.classStatus=ApeConsts.CLASS_STATUS_WAIT;//
163 GlobalConfig.classStopTime=EngineUtils.creatTimestampStr(); 166 GlobalConfig.classStopTime=EngineUtils.creatTimestampStr();
164 _param.actionType=ACTION_TYPE_3; 167 _param.actionType=ACTION_TYPE_3;
165 this.sendUpdaterClassStatusInfo(_param); 168 this.sendUpdaterClassStatusInfo(_param);