李勇 / McuClient

转到一个项目
Toggle navigation Toggle navigation pinning
李勇
0075bb26 1 parent 87c85e73

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

内嵌 并排对比
正在显示 4 个修改的文件 包含 58 行增加 和 160 行删除
... ... @@ -73,7 +73,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ }
/******/ var hotApplyOnUpdate = true;
/******/ var hotCurrentHash = "3960713dc1161612a7cd"; // eslint-disable-line no-unused-vars
/******/ var hotCurrentHash = "7b3b06343680209ac38c"; // eslint-disable-line no-unused-vars
/******/ var hotCurrentModuleData = {};
/******/ var hotCurrentParents = []; // eslint-disable-line no-unused-vars
... ... @@ -814,6 +814,7 @@ return /******/ (function(modules) { // webpackBootstrap
_this.sendStartClass = _this._sendStartClass;
_this.sendPauseClass = _this._sendPauseClass;
_this.sendCloseClass = _this._sendCloseClass;
//chatApe
_this.sendChatMsg = _this._sendChatMsg;
... ... @@ -825,7 +826,6 @@ return /******/ (function(modules) { // webpackBootstrap
//whiteBoradApe
_this.sendInsertAnnotaion = _this._sendInsertAnnotaion;
//this.sendUpdaterAnnotaion=this._sendUpdaterAnnotaion;//暂时关闭更新接口
_this.sendDeleteAnnotaion = _this._sendDeleteAnnotaion;
_this.sendDeleteAllAnnotation = _this._sendDeleteAllAnnotation;
... ... @@ -835,6 +835,7 @@ return /******/ (function(modules) { // webpackBootstrap
_this.sendDocumentDelete = _this._sendDocumentDelete; //删除文档
_this.sendDocumentDeleteAll = _this._documentDeleteAll; //删除所有文档
_this.sendDocumentCommand = _this._sendDocumentCommand; //操作文档(翻页、缩放、滚动...)
return _this;
}
... ... @@ -947,7 +948,6 @@ return /******/ (function(modules) { // webpackBootstrap
key: '_sassInitSuccessHandler',
value: function _sassInitSuccessHandler(_data) {
//{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
//储存数据
_GlobalConfig2.default.md5 = _data.md5 || ""; //这个暂时用假数据，后台接口写完就有数据了
_GlobalConfig2.default.msType = _data.msType || 1;
... ... @@ -960,10 +960,7 @@ return /******/ (function(modules) { // webpackBootstrap
} else {
_GlobalConfig2.default.passwordRequired = _data.passwordRequired || false;
}
loger.log('向SASS平台获取入会验证信息成功.');
//this._emit(MessageTypes.CLASS_INIT_SUCCESS,initSuccessCallBackData);
loger.log('SASS平台获取入会验证信息成功.');
//设置当前的会议状态
_GlobalConfig2.default.setCurrentStatus(_GlobalConfig2.default.statusCode_1);
... ... @@ -982,21 +979,11 @@ return /******/ (function(modules) { // webpackBootstrap
}
}
//使用固定的假数据
}, {
key: '_setDebugData',
value: function _setDebugData(_data) {}
//loger.log("setDebugData "+_data);
//GlobalConfig.setDebugData(_data);
// 通过SASS平台验证
}, {
key: '_sassVerifySuccessHandler',
value: function _sassVerifySuccessHandler(_data) {
//返回值
/* flag 数值型 无 True:成功
Flag：失败
... ... @@ -1061,8 +1048,7 @@ return /******/ (function(modules) { // webpackBootstrap
key: '_h5SassGetClassParaSuccessHandler',
value: function _h5SassGetClassParaSuccessHandler(_data) {
loger.log('获取api/meeting/detail.do完成.');
//console.log(_data.docListPrepare);
//console.log(_data.mcuList);
//包含整个会议最全的信息,储存数据
if (_data) {
_GlobalConfig2.default.setDocListPrepare(_data.docListPrepare); //提前上传的文档列表
... ... @@ -1092,10 +1078,8 @@ return /******/ (function(modules) { // webpackBootstrap
_GlobalConfig2.default.MCUServerIP = _data.MCUServerIP;
_GlobalConfig2.default.MCUServerPort = _data.MCUServerPort;
//GlobalConfig.classRole=_data.classRole;
_GlobalConfig2.default.classId = _data.classId;
_GlobalConfig2.default.h5Module = _data.h5Module;
//GlobalConfig.isHost=_data.isHost;
_GlobalConfig2.default.maxAudioChannels = _data.maxAudioChannels;
_GlobalConfig2.default.maxVideoChannels = _data.maxVideoChannels;
_GlobalConfig2.default.maxMediaChannels = _data.maxMediaChannels;
... ... @@ -1105,7 +1089,6 @@ return /******/ (function(modules) { // webpackBootstrap
_GlobalConfig2.default.msType = _data.msType;
_GlobalConfig2.default.nodeId = _data.nodeId;
_GlobalConfig2.default.password = _data.password;
//GlobalConfig.passwordRequired 老师的默认是true
_GlobalConfig2.default.portal = _data.portal;
_GlobalConfig2.default.role = _data.role;
_GlobalConfig2.default.siteId = _data.siteId;
... ... @@ -1124,7 +1107,6 @@ return /******/ (function(modules) { // webpackBootstrap
// GlobalConfig.MCUServerPort=_data.MCUServerPort;
initSuccessCallBackData.doc = _GlobalConfig2.default.doc; //文档服务器地址
//initSuccessCallBackData.classRole=GlobalConfig.classRole;
initSuccessCallBackData.classId = _GlobalConfig2.default.classId;
initSuccessCallBackData.className = _GlobalConfig2.default.className;
initSuccessCallBackData.h5Module = _GlobalConfig2.default.h5Module;
... ... @@ -1132,9 +1114,8 @@ return /******/ (function(modules) { // webpackBootstrap
initSuccessCallBackData.maxAudioChannels = _GlobalConfig2.default.maxAudioChannels;
initSuccessCallBackData.maxVideoChannels = _GlobalConfig2.default.maxVideoChannels;
initSuccessCallBackData.maxMediaChannels = _GlobalConfig2.default.maxMediaChannels;
// GlobalConfig.mcuClassInfo=_data.mcuClassInfo;
initSuccessCallBackData.mcuDelay = _GlobalConfig2.default.mcuDelay;
//GlobalConfig.md5=_data.md5;
initSuccessCallBackData.msType = _GlobalConfig2.default.msType;
initSuccessCallBackData.nodeId = _GlobalConfig2.default.nodeId;
initSuccessCallBackData.password = _GlobalConfig2.default.password;
... ... @@ -1159,30 +1140,8 @@ return /******/ (function(modules) { // webpackBootstrap
_joinClassSuccessCallBackFun(initSuccessCallBackData);
}
}
//// MCU 会议失败
//_joinClassFailureHandler(_data){
// GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_1);
// loger.log("_joinClassFailureHandler",_data);
// if(_joinClassFailureCallBackFun){
// let callBackObj={"code":_data,"message":""};
// _joinClassFailureCallBackFun(callBackObj);
// }
//}
//ConferApe
// 参会处理
}, {
key: 'conferenceHandler',
value: function conferenceHandler(msg_type) {
var msg = {
type: msg_type,
data: null
};
this._emit(msg.type, msg);
}
//开始上课
}, {
... ... @@ -1267,15 +1226,7 @@ return /******/ (function(modules) { // webpackBootstrap
_whiteboard_ape.sendInsetAnnotaion(_param);
}
}
//更新标注，发送信息
}, {
key: '_sendUpdaterAnnotaion',
value: function _sendUpdaterAnnotaion(_param) {
if (_whiteboard_ape) {
_whiteboard_ape.sendUpdaterAnnotaion(_param);
}
}
//删除标注，发送信息
}, {
... ... @@ -1343,44 +1294,36 @@ return /******/ (function(modules) { // webpackBootstrap
}
}
// 白板笔记更新(svg)
}, {
key: 'annoUpdateHandler',
value: function annoUpdateHandler(annoInfo) {
var activeDocId = _confer_ape.activeDocId;
var docItem = _doc_ape.docList[activeDocId];
if (docItem && annoInfo.id == docItem.wbid) {
this._emit(_MessageTypes2.default.DOC_ANNOTATION, annoInfo);
}
}
// 文档变更-笔记处理
}, {
key: 'docShowHandler',
value: function docShowHandler(docItem) {
loger.log('Doc Show ->' + docItem.id + '|' + docItem.curPageNo);
var annoInfo = _whiteboard_ape.annoInfos[docItem.wbid];
if (annoInfo) {
this._emit(_MessageTypes2.default.DOC_ANNOTATION, annoInfo);
} else {
this._emit(_MessageTypes2.default.DOC_ANNOTATION);
}
}
/* // 白板笔记更新(svg)
annoUpdateHandler(annoInfo) {
const activeDocId = _confer_ape.activeDocId;
const docItem = _doc_ape.docList[activeDocId];
if (docItem && annoInfo.id == docItem.wbid) {
this._emit(MessageTypes.DOC_ANNOTATION, annoInfo);
}
}*/
// 文档切换
/* // 文档变更-笔记处理
docShowHandler(docItem) {
loger.log('Doc Show ->' + docItem.id + '|' + docItem.curPageNo);
const annoInfo = _whiteboard_ape.annoInfos[docItem.wbid];
if (annoInfo) {
this._emit(MessageTypes.DOC_ANNOTATION, annoInfo);
} else {
this._emit(MessageTypes.DOC_ANNOTATION);
}
}*/
}, {
key: 'docSwitchHandler',
value: function docSwitchHandler() {
var activeDocId = _confer_ape.activeDocId;
loger.log('Switch Doc Active -> ' + activeDocId);
var docItem = _doc_ape.docList[activeDocId];
if (docItem) {
this._emit(_MessageTypes2.default.DOC_SHOW, docItem);
}
}
/* // 文档切换
docSwitchHandler() {
const activeDocId = _confer_ape.activeDocId;
loger.log('Switch Doc Active -> ' + activeDocId);
const docItem = _doc_ape.docList[activeDocId];
if (docItem) {
this._emit(MessageTypes.DOC_SHOW, docItem);
}
}*/
//// 文档变更，白板也需要做处理
... ... @@ -2750,7 +2693,7 @@ return /******/ (function(modules) { // webpackBootstrap
ApeConsts.CLASS_STATUS_WAIT = 0; //课堂还未开始
ApeConsts.CLASS_STATUS_STARTED = 1; //直播中
ApeConsts.CLASS_STATUS_PAUSE = 2; //暂停
ApeConsts.CLASS_STATUS_CLOSE = 3; //结束
ApeConsts.CLASS_STATUS_CLOSE = 3; //结束//这个是点击结束会议，把所有人踢出课堂，然后把状态值还原为0*************
ApeConsts.CLASS_STATUS_UPTATE = 4; //更新课堂状态信息
ApeConsts.CLASS_WAIT_START = "class.wait.start"; //课堂还未开始
... ... @@ -14826,8 +14769,10 @@ return /******/ (function(modules) { // webpackBootstrap
}, {
key: 'startClass',
value: function startClass(_param) {
if (_GlobalConfig2.default.classStatus == _ApeConsts2.default.CLASS_STATUS_WAIT) {
_GlobalConfig2.default.classStartTime = _EngineUtils2.default.creatTimestampStr();
}
_GlobalConfig2.default.classStatus = _ApeConsts2.default.CLASS_STATUS_STARTED;
_GlobalConfig2.default.classStartTime = _EngineUtils2.default.creatTimestampStr();
_param.actionType = ACTION_TYPE_1;
this.sendUpdaterClassStatusInfo(_param);
}
... ... @@ -14846,7 +14791,8 @@ return /******/ (function(modules) { // webpackBootstrap
}, {
key: 'closeClass',
value: function closeClass(_param) {
_GlobalConfig2.default.classStatus = _ApeConsts2.default.CLASS_STATUS_CLOSE;
//把所有人都踢出课堂，然后把状态值还原为1
_GlobalConfig2.default.classStatus = _ApeConsts2.default.CLASS_STATUS_WAIT; //
_GlobalConfig2.default.classStopTime = _EngineUtils2.default.creatTimestampStr();
_param.actionType = ACTION_TYPE_3;
this.sendUpdaterClassStatusInfo(_param);
... ... @@ -15409,11 +15355,6 @@ return /******/ (function(modules) { // webpackBootstrap
this.tableDeleteHandler(object_id, tableDeleteData);
break;
case _pdus2.default.RCPDU_REG_TABLE_UPDATE_PDU:
/* let tableUpdateData1 = pdu['RCRegistryWBUpdateItemPdu'].decode(user_data);
let rosterUpdateItems1 = tableUpdateData1.items;
let rosterUpdateItemsLen1 = rosterUpdateItems1.length;
console.log("RCRegistryWBUpdateItemPdu "+rosterUpdateItemsLen1);
console.log(rosterUpdateItems1);*/
var tableUpdateData = _pdus2.default['RCRegistryTableUpdateItemPdu'].decode(user_data);
var tableUpdateItems = tableUpdateData.items;
var tableUpdateItemsLen = tableUpdateItems.length;
... ...
... ... @@ -101,6 +101,7 @@ export default class MessageEntrance extends Emiter {
this.sendStartClass=this._sendStartClass;
this.sendPauseClass=this._sendPauseClass;
this.sendCloseClass=this._sendCloseClass;
//chatApe
this.sendChatMsg=this._sendChatMsg;
... ... @@ -110,10 +111,8 @@ export default class MessageEntrance extends Emiter {
this.publishVideo=this._publishVideo;
this.stopPublishVideo=this._stopPublishVideo;
//whiteBoradApe
this.sendInsertAnnotaion=this._sendInsertAnnotaion;
//this.sendUpdaterAnnotaion=this._sendUpdaterAnnotaion;//暂时关闭更新接口
this.sendDeleteAnnotaion=this._sendDeleteAnnotaion;
this.sendDeleteAllAnnotation=this._sendDeleteAllAnnotation;
... ... @@ -123,6 +122,7 @@ export default class MessageEntrance extends Emiter {
this.sendDocumentDelete= this. _sendDocumentDelete;//删除文档
this.sendDocumentDeleteAll= this._documentDeleteAll;//删除所有文档
this.sendDocumentCommand= this._sendDocumentCommand;//操作文档(翻页、缩放、滚动...)
}
... ... @@ -213,7 +213,6 @@ export default class MessageEntrance extends Emiter {
// 用classId向SASS平台获取入会验证信息成功
_sassInitSuccessHandler(_data) {
//{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
//储存数据
GlobalConfig.md5=_data.md5||"";//这个暂时用假数据，后台接口写完就有数据了
GlobalConfig.msType=_data.msType||1;
... ... @@ -226,10 +225,7 @@ export default class MessageEntrance extends Emiter {
}else {
GlobalConfig.passwordRequired=_data.passwordRequired||false;
}
loger.log('向SASS平台获取入会验证信息成功.');
//this._emit(MessageTypes.CLASS_INIT_SUCCESS,initSuccessCallBackData);
loger.log('SASS平台获取入会验证信息成功.');
//设置当前的会议状态
GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_1);
... ... @@ -248,15 +244,8 @@ export default class MessageEntrance extends Emiter {
}
}
//使用固定的假数据
_setDebugData(_data){
//loger.log("setDebugData "+_data);
//GlobalConfig.setDebugData(_data);
}
// 通过SASS平台验证
_sassVerifySuccessHandler(_data) {
//返回值
/* flag 数值型 无 True:成功
Flag：失败
... ... @@ -317,8 +306,7 @@ export default class MessageEntrance extends Emiter {
//获取会议所有参数 api/meeting/detail.do? flash中的接口文件是 getClassParam.do
_h5SassGetClassParaSuccessHandler(_data){
loger.log('获取api/meeting/detail.do完成.');
//console.log(_data.docListPrepare);
//console.log(_data.mcuList);
//包含整个会议最全的信息,储存数据
if(_data){
GlobalConfig.setDocListPrepare(_data.docListPrepare); //提前上传的文档列表
... ... @@ -346,10 +334,8 @@ export default class MessageEntrance extends Emiter {
GlobalConfig.MCUServerIP=_data.MCUServerIP;
GlobalConfig.MCUServerPort=_data.MCUServerPort;
//GlobalConfig.classRole=_data.classRole;
GlobalConfig.classId=_data.classId;
GlobalConfig.h5Module=_data.h5Module;
//GlobalConfig.isHost=_data.isHost;
GlobalConfig.maxAudioChannels=_data.maxAudioChannels;
GlobalConfig.maxVideoChannels=_data.maxVideoChannels;
GlobalConfig.maxMediaChannels=_data.maxMediaChannels;
... ... @@ -359,7 +345,6 @@ export default class MessageEntrance extends Emiter {
GlobalConfig.msType=_data.msType;
GlobalConfig.nodeId=_data.nodeId;
GlobalConfig.password=_data.password;
//GlobalConfig.passwordRequired 老师的默认是true
GlobalConfig.portal=_data.portal;
GlobalConfig.role=_data.role;
GlobalConfig.siteId=_data.siteId;
... ... @@ -378,7 +363,6 @@ export default class MessageEntrance extends Emiter {
// GlobalConfig.MCUServerPort=_data.MCUServerPort;
initSuccessCallBackData.doc=GlobalConfig.doc;//文档服务器地址
//initSuccessCallBackData.classRole=GlobalConfig.classRole;
initSuccessCallBackData.classId=GlobalConfig.classId;
initSuccessCallBackData.className=GlobalConfig.className;
initSuccessCallBackData.h5Module=GlobalConfig.h5Module;
... ... @@ -386,9 +370,8 @@ export default class MessageEntrance extends Emiter {
initSuccessCallBackData.maxAudioChannels=GlobalConfig.maxAudioChannels;
initSuccessCallBackData.maxVideoChannels=GlobalConfig.maxVideoChannels;
initSuccessCallBackData.maxMediaChannels=GlobalConfig.maxMediaChannels;
// GlobalConfig.mcuClassInfo=_data.mcuClassInfo;
initSuccessCallBackData.mcuDelay=GlobalConfig.mcuDelay;
//GlobalConfig.md5=_data.md5;
initSuccessCallBackData.msType=GlobalConfig.msType;
initSuccessCallBackData.nodeId=GlobalConfig.nodeId;
initSuccessCallBackData.password=GlobalConfig.password;
... ... @@ -413,27 +396,8 @@ export default class MessageEntrance extends Emiter {
_joinClassSuccessCallBackFun(initSuccessCallBackData);
}
}
//// MCU 会议失败
//_joinClassFailureHandler(_data){
// GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_1);
// loger.log("_joinClassFailureHandler",_data);
// if(_joinClassFailureCallBackFun){
// let callBackObj={"code":_data,"message":""};
// _joinClassFailureCallBackFun(callBackObj);
// }
//}
//ConferApe
// 参会处理
conferenceHandler(msg_type) {
var msg = {
type: msg_type,
data: null
};
this._emit(msg.type, msg);
}
//开始上课
_sendStartClass(_param){
if(_confer_ape){
... ... @@ -498,19 +462,14 @@ export default class MessageEntrance extends Emiter {
_whiteboard_ape.sendInsetAnnotaion(_param);
}
}
//更新标注，发送信息
_sendUpdaterAnnotaion(_param){
if(_whiteboard_ape){
_whiteboard_ape.sendUpdaterAnnotaion(_param);
}
}
//删除标注，发送信息
_sendDeleteAnnotaion(_param){
if(_whiteboard_ape){
_whiteboard_ape.sendDeleteAnnotaion(_param);
}
}
//删除所有标注
//删除所有标注
_sendDeleteAllAnnotation(_param){
if(_whiteboard_ape){
_whiteboard_ape.sendDeleteAllAnnotation(_param);
... ... @@ -550,16 +509,16 @@ export default class MessageEntrance extends Emiter {
}
}
// 白板笔记更新(svg)
/* // 白板笔记更新(svg)
annoUpdateHandler(annoInfo) {
const activeDocId = _confer_ape.activeDocId;
const docItem = _doc_ape.docList[activeDocId];
if (docItem && annoInfo.id == docItem.wbid) {
this._emit(MessageTypes.DOC_ANNOTATION, annoInfo);
}
}
}*/
// 文档变更-笔记处理
/* // 文档变更-笔记处理
docShowHandler(docItem) {
loger.log('Doc Show ->' + docItem.id + '|' + docItem.curPageNo);
const annoInfo = _whiteboard_ape.annoInfos[docItem.wbid];
... ... @@ -569,9 +528,9 @@ export default class MessageEntrance extends Emiter {
this._emit(MessageTypes.DOC_ANNOTATION);
}
}
}*/
// 文档切换
/* // 文档切换
docSwitchHandler() {
const activeDocId = _confer_ape.activeDocId;
loger.log('Switch Doc Active -> ' + activeDocId);
... ... @@ -579,7 +538,7 @@ export default class MessageEntrance extends Emiter {
if (docItem) {
this._emit(MessageTypes.DOC_SHOW, docItem);
}
}
}*/
//// 文档变更，白板也需要做处理
docUpdateHandler(_data) {
... ...
... ... @@ -170,11 +170,6 @@ export default class Ape extends Emiter {
this.tableDeleteHandler(object_id, tableDeleteData);
break;
case pdu.RCPDU_REG_TABLE_UPDATE_PDU:
/* let tableUpdateData1 = pdu['RCRegistryWBUpdateItemPdu'].decode(user_data);
let rosterUpdateItems1 = tableUpdateData1.items;
let rosterUpdateItemsLen1 = rosterUpdateItems1.length;
console.log("RCRegistryWBUpdateItemPdu "+rosterUpdateItemsLen1);
console.log(rosterUpdateItems1);*/
let tableUpdateData = pdu['RCRegistryTableUpdateItemPdu'].decode(user_data);
let tableUpdateItems = tableUpdateData.items;
let tableUpdateItemsLen= tableUpdateItems.length;
... ...
... ... @@ -145,8 +145,10 @@ class ConferApe extends Ape {
}
//开始上课
startClass(_param){
if(GlobalConfig.classStatus==ApeConsts.CLASS_STATUS_WAIT){
GlobalConfig.classStartTime=EngineUtils.creatTimestampStr();
}
GlobalConfig.classStatus=ApeConsts.CLASS_STATUS_STARTED;
GlobalConfig.classStartTime=EngineUtils.creatTimestampStr();
_param.actionType=ACTION_TYPE_1;
this.sendUpdaterClassStatusInfo(_param);
}
... ... @@ -159,7 +161,8 @@ class ConferApe extends Ape {
}
//关闭课堂
closeClass(_param){
GlobalConfig.classStatus=ApeConsts.CLASS_STATUS_CLOSE;
//把所有人都踢出课堂，然后把状态值还原为1
GlobalConfig.classStatus=ApeConsts.CLASS_STATUS_WAIT;//
GlobalConfig.classStopTime=EngineUtils.creatTimestampStr();
_param.actionType=ACTION_TYPE_3;
this.sendUpdaterClassStatusInfo(_param);
... ...