李勇 / McuClient

转到一个项目
Toggle navigation Toggle navigation pinning
李勇
ef2e9095 1 parent aae6d846

1.修改定义的变量名称

内嵌 并排对比
正在显示 7 个修改的文件 包含 85 行增加 和 83 行删除
... ... @@ -73,7 +73,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ }
/******/ var hotApplyOnUpdate = true;
/******/ var hotCurrentHash = "d635f2d355b4ed7cd341"; // eslint-disable-line no-unused-vars
/******/ var hotCurrentHash = "d1158ed9d42edee54f15"; // eslint-disable-line no-unused-vars
/******/ var hotCurrentModuleData = {};
/******/ var hotCurrentParents = []; // eslint-disable-line no-unused-vars
... ... @@ -762,7 +762,7 @@ return /******/ (function(modules) { // webpackBootstrap
_sass.on(_sass.SUCCESS, _this._sassVerifySuccessHandler.bind(_this));
_sass.on(_sass.CLASS_INIT_SUCCESS, _this._sassInitSuccessHandler.bind(_this));
_sass.on(_sass.CLASS_GET_CLASS_DETAIL, _this._h5SassGetClassDetailSuccessHandler.bind(_this));
_sass.on(_sass.CLASS_GET_MEETING_PARAM, _this._h5SassGetMeetingParaSuccessHandler);
_sass.on(_sass.CLASS_GET_CLASS_PARAM, _this._h5SassGetClassParaSuccessHandler);
// 底层MCU消息层
_mcu = _mcu3.default;
... ... @@ -1053,11 +1053,11 @@ return /******/ (function(modules) { // webpackBootstrap
_GlobalConfig2.default.setClassDetail = _data;
}
//获取会议所有参数 api/meeting/detail.do? flash中的接口文件是 getMeetingParam.do
//获取会议所有参数 api/meeting/detail.do? flash中的接口文件是 getClassParam.do
}, {
key: '_h5SassGetMeetingParaSuccessHandler',
value: function _h5SassGetMeetingParaSuccessHandler(_data) {
key: '_h5SassGetClassParaSuccessHandler',
value: function _h5SassGetClassParaSuccessHandler(_data) {
loger.log('获取api/meeting/detail.do完成.');
//console.log(_data.docListPrepare);
//console.log(_data.mcuList);
... ... @@ -1083,7 +1083,7 @@ return /******/ (function(modules) { // webpackBootstrap
_GlobalConfig2.default.setCurrentStatus(_GlobalConfig2.default.statusCode_2);
if (_sass) {
_sass.getClassDetail(); //会议信息
_sass.getMeetingParam(); //会议参数大全
_sass.getClassParam(); //会议参数大全
}
//储存数据
... ... @@ -1124,6 +1124,7 @@ return /******/ (function(modules) { // webpackBootstrap
initSuccessCallBackData.doc = _GlobalConfig2.default.doc; //文档服务器地址
//initSuccessCallBackData.classRole=GlobalConfig.classRole;
initSuccessCallBackData.classId = _GlobalConfig2.default.classId;
initSuccessCallBackData.className = _GlobalConfig2.default.className;
initSuccessCallBackData.h5Module = _GlobalConfig2.default.h5Module;
initSuccessCallBackData.isHost = _GlobalConfig2.default.isHost;
initSuccessCallBackData.maxAudioChannels = _GlobalConfig2.default.maxAudioChannels;
... ... @@ -1658,7 +1659,7 @@ return /******/ (function(modules) { // webpackBootstrap
//----3.验证完成后获取------
//getClassDetail 获取会议详情 let url = `http://${classInfo.portal}/3m/meeting/getClassH5.do?classNumber=${classInfo.classId}`;
//getMeetingParam 获取会议最全参数集合 let url = `http://${classInfo.portal}/3m/api/meeting/detail.do?meetingNumber=${classInfo.classId}&timestamp=${timestamp}&authId=${authId}`;
//getClassParam 获取会议最全参数集合 let url = `http://${classInfo.portal}/3m/api/meeting/detail.do?meetingNumber=${classInfo.classId}&timestamp=${timestamp}&authId=${authId}`;
//Sass获取课堂校验信息
... ... @@ -1669,7 +1670,7 @@ return /******/ (function(modules) { // webpackBootstrap
value: function getJoinParams(_initInfo) {
var _this2 = this;
loger.log('Sass获取课堂校验信息', _initInfo);
loger.log('初始化init获取课堂校验信息', _initInfo);
/* 获取用于加入课堂的参数
/3m/api/meeting/joinParams.do
参数 (application/x-www-form-urlencoded):
... ... @@ -1689,14 +1690,14 @@ return /******/ (function(modules) { // webpackBootstrap
msType int 媒体服务器类型
*/
var url = 'http://' + _initInfo.portal + '/3m/api/meeting/joinParams.do?meetingNumber=' + _initInfo.classId + '&userID=' + _initInfo.userId;
loger.log('Sass获取课堂校验信息.', url);
loger.log('初始化init获取课堂校验信息.', url);
fetch(url, {
timeout: 5000
}).then(function (ret) {
if (ret.ok) {
return ret.json();
} else {
loger.error('Sass\u83B7\u53D6\u8BFE\u5802\u6821\u9A8C\u4FE1\u606F-\u7F51\u7EDC\u5F02\u5E38.\u72B6\u6001\u7801:' + ret.status);
loger.error('\u521D\u59CB\u5316init\u83B7\u53D6\u8BFE\u5802\u6821\u9A8C\u4FE1\u606F-\u7F51\u7EDC\u5F02\u5E38.\u72B6\u6001\u7801:' + ret.status);
_this2._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_CLASS_INIT_NETWORK);
throw '';
}
... ... @@ -1707,7 +1708,7 @@ return /******/ (function(modules) { // webpackBootstrap
//3 没有对应的站点
//4 站点已过期
if (ret.code === 0) {
loger.log('Sass获取课堂校验信息完成');
loger.log('初始化init获取课堂校验信息-完成');
_this2._emit(Sass.CLASS_INIT_SUCCESS, ret);
} else if (ret.code === 1) {
//loger.warn('Sass获取课堂校验信息失败.');
... ... @@ -1725,7 +1726,7 @@ return /******/ (function(modules) { // webpackBootstrap
_this2._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_CLASS_INIT_FAILED, ret);
}
}).catch(function (err) {
loger.error('Sass\u83B7\u53D6\u8BFE\u5802\u6821\u9A8C\u4FE1\u606F\u5F02\u5E38.\u72B6\u6001\u7801:' + err);
loger.error('\u521D\u59CB\u5316init\u83B7\u53D6\u8BFE\u5802\u6821\u9A8C\u4FE1\u606F-\u5F02\u5E38.\u72B6\u6001\u7801:' + err);
_this2._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_CLASS_INIT_PROTOCOL, err);
});
}
... ... @@ -1735,7 +1736,7 @@ return /******/ (function(modules) { // webpackBootstrap
}, {
key: 'passwordAndMd5Checking',
value: function passwordAndMd5Checking(_param) {
loger.log('发起Sass校验', _param);
loger.log('开始Sass校验', _param);
confInfo = _param;
// 密码校验
if (confInfo.passwordRequired === 'true' || confInfo.passwordRequired === true) {
... ... @@ -1809,19 +1810,19 @@ return /******/ (function(modules) { // webpackBootstrap
var _this4 = this;
var url = 'http://' + confInfo.portal + '/3m/meeting/md5CheckMeeting.do?siteId=' + confInfo.siteId + '&meetingNumber=' + confInfo.classId + '&userId=' + confInfo.userId + '&userName=' + confInfo.userName + '&userType=' + confInfo.userType + '&nopassword=' + confInfo.passwordRequired + '&md5=' + confInfo.md5;
loger.log('H5SassMD5校验', url);
loger.log('MD5校验', url);
fetch(url, {
timeout: 5000
}).then(function (ret) {
if (ret.status === 200) {
return ret.json();
} else {
loger.error('H5SassMD5\u6821\u9A8C-\u7F51\u7EDC\u5F02\u5E38.\u72B6\u6001\u7801:' + ret.status);
loger.error('MD5\u6821\u9A8C-\u7F51\u7EDC\u5F02\u5E38.\u72B6\u6001\u7801:' + ret.status);
_this4._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_CLASS_JOIN_NETWORK);
throw '';
}
}).then(function (ret) {
if (ret.flag == "true") {
if (ret.flag == "true" || ret.flag == true) {
if (ret.h5_mcu_list) {
var server = ret.h5_mcu_list.split(";")[0];
confInfo.MCUServerIP = server.split(":")[0];
... ... @@ -1837,14 +1838,14 @@ return /******/ (function(modules) { // webpackBootstrap
_GlobalConfig2.default.maxVideoChannels = confInfo.maxVideoChannels;
_GlobalConfig2.default.maxAudioChannels = confInfo.maxAudioChannels;
_GlobalConfig2.default.maxMediaChannels = confInfo.maxMediaChannels;
loger.log('H5Sass校验完成', ret);
loger.log('校验完成', ret);
_this4._emit(Sass.SUCCESS, ret);
} else {
loger.log('H5SassMD5校验-失败.');
loger.log('MD5校验-失败.');
_this4._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_CLASS_MD5_WRONG);
}
}).catch(function (err) {
loger.error('H5SassMD5\u6821\u9A8C-\u5F02\u5E38.\u72B6\u6001\u7801:' + err);
loger.error('MD5\u6821\u9A8C-\u5F02\u5E38.\u72B6\u6001\u7801:' + err);
_this4._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_CLASS_JOIN_FAILED);
});
}
... ... @@ -1857,33 +1858,33 @@ return /******/ (function(modules) { // webpackBootstrap
var _this5 = this;
var url = 'http://' + confInfo.portal + '/3m/meeting/getClassH5.do?classNumber=' + confInfo.classId;
loger.log('Sass获取Class详情.', url);
loger.log('获取Class详情.', url);
fetch(url, {
timeout: 5000
}).then(function (ret) {
if (ret.ok) {
return ret.json();
} else {
loger.error('Sass\u83B7\u53D6Class\u8BE6\u60C5-\u7F51\u7EDC\u5F02\u5E38.\u72B6\u6001\u7801:' + ret.status);
loger.error('\u83B7\u53D6Class\u8BE6\u60C5-\u7F51\u7EDC\u5F02\u5E38.\u72B6\u6001\u7801:' + ret.status);
_this5._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_GET_CLASS_DETAIL);
throw '';
}
}).then(function (ret) {
if (ret.errorCode === 0) {
loger.log('Sass获取Class详情完成');
loger.log('获取Class详情完成');
_this5._emit(Sass.CLASS_GET_CLASS_DETAIL, ret);
} else {
loger.warn('Sass获取Class详情失败.');
loger.warn('获取Class详情失败.');
_this5._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_GET_CLASS_DETAIL);
}
}).catch(function (err) {
loger.error('H5Sass\u83B7\u53D6Class\u8BE6\u60C5\u5F02\u5E38.\u72B6\u6001\u7801:' + err);
loger.error('\u83B7\u53D6Class\u8BE6\u60C5\u5F02\u5E38.\u72B6\u6001\u7801:' + err);
_this5._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_GET_CLASS_DETAIL);
});
}
}, {
key: 'getMeetingParam',
value: function getMeetingParam() {
key: 'getClassParam',
value: function getClassParam() {
var _this6 = this;
/*
... ... @@ -1905,29 +1906,29 @@ return /******/ (function(modules) { // webpackBootstrap
var timestamp = new Date().getTime();
var authId = (0, _md2.default)(confInfo.classId + "" + timestamp); //课堂号+时间戳 的字符串，转成MD5
var url = 'http://' + confInfo.portal + '/3m/api/meeting/detail.do?meetingNumber=' + confInfo.classId + '&timestamp=' + timestamp + '&authId=' + authId;
loger.log('H5Sass获取getMeetingParam ', url);
loger.log('Sass getClassParam ', url);
fetch(url, {
timeout: 5000
}).then(function (ret) {
if (ret.ok) {
return ret.json();
} else {
loger.error('H5Sass\u83B7\u53D6getMeetingParam-\u7F51\u7EDC\u5F02\u5E38.\u72B6\u6001\u7801:' + ret.status);
_this6._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_GET_MEETING_PARAML);
loger.error('getClassParam-\u7F51\u7EDC\u5F02\u5E38.\u72B6\u6001\u7801:' + ret.status);
_this6._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_GET_CLASS_PARAML);
throw '';
}
}).then(function (ret) {
if (ret.code === 0) {
loger.log('Sass获取getMeetingParam完成');
_this6._emit(Sass.CLASS_GET_MEETING_PARAM, ret);
loger.log('getClassParam 完成');
_this6._emit(Sass.CLASS_GET_CLASS_PARAM, ret);
} else {
loger.warn('H5Sass获取getMeetingParam失败.');
_this6._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_GET_MEETING_PARAML);
loger.warn('getClassParam 失败.');
_this6._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_GET_CLASS_PARAML);
}
}).catch(function (err) {
loger.error('H5Sass\u83B7\u53D6getMeetingParam\u5F02\u5E38.\u72B6\u6001\u7801:' + err);
_this6._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_GET_MEETING_PARAML);
loger.error('getClassParam\u5F02\u5E38.\u72B6\u6001\u7801:' + err);
_this6._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_GET_CLASS_PARAML);
});
}
}]);
... ... @@ -1935,10 +1936,10 @@ return /******/ (function(modules) { // webpackBootstrap
return Sass;
}(_Emiter3.default);
Sass.prototype.SUCCESS = Sass.SUCCESS = 'h5sass.success';
Sass.prototype.SUCCESS = Sass.SUCCESS = 'Sass.success';
Sass.prototype.CLASS_INIT_SUCCESS = Sass.CLASS_INIT_SUCCESS = 'sass.class.init.success';
Sass.prototype.CLASS_GET_MEETING_PARAM = Sass.CLASS_GET_MEETING_PARAM = 'class_getMeetingParam.message';
Sass.prototype.CLASS_GET_CLASS_DETAIL = Sass.CLASS_GET_CLASS_DETAIL = 'class_getClassDetail.message';
Sass.prototype.CLASS_GET_CLASS_PARAM = Sass.CLASS_GET_CLASS_PARAM = 'class.getClassParam.message';
Sass.prototype.CLASS_GET_CLASS_DETAIL = Sass.CLASS_GET_CLASS_DETAIL = 'class.getClassDetail.message';
var _default = new Sass();
... ... @@ -2201,7 +2202,7 @@ return /******/ (function(modules) { // webpackBootstrap
MessageTypes.ERR_GET_CLASS_DETAIL = 300; //获取classDetail失败
MessageTypes.ERR_GET_MEETING_PARAML = 301; //获取MeetingParam失败
MessageTypes.ERR_GET_CLASS_PARAML = 301; //获取ClassParam失败
//APE
MessageTypes.ERR_APE_SEND_FAILED_NO_JOIN = 500; //APE在sdk为初始化或未加入会议之前调用发送数据接口
... ... @@ -2235,7 +2236,7 @@ return /******/ (function(modules) { // webpackBootstrap
MessageTypes.ErrorReson[MessageTypes.ERR_CLASS_JOIN_CONFILICT] = "已经在其它地方登陆";
MessageTypes.ErrorReson[MessageTypes.ERR_GET_CLASS_DETAIL = 300] = "获取classDetail失败";
MessageTypes.ErrorReson[MessageTypes.ERR_GET_MEETING_PARAML] = "获取MeetingParam失败";
MessageTypes.ErrorReson[MessageTypes.ERR_GET_CLASS_PARAML] = "获取ClassParam失败";
//APE
MessageTypes.ErrorReson[MessageTypes.ERR_APE_SEND_FAILED_NO_JOIN] = "APE在sdk为初始化或未加入会议之前调用发送数据接口";
... ... @@ -2653,7 +2654,7 @@ return /******/ (function(modules) { // webpackBootstrap
GlobalConfig.tickValues = {}; // 滚动条关键点，用于快进快退
GlobalConfig.meetingParam = {}; //Sass直接返回的所有会议信息(最全)
GlobalConfig.classAllParam = {}; //Sass直接返回的所有会议信息(最全)
GlobalConfig.classDetail = {}; //Sass直接返回的当前课堂基本信息
GlobalConfig.docListPrepare = []; // 已经提前上传的文档，进入课堂后需要自动加载
... ... @@ -3433,7 +3434,7 @@ return /******/ (function(modules) { // webpackBootstrap
key: '_updateMCUConfInfoDescription',
value: function _updateMCUConfInfoDescription(_data) {
// let _mcuConfDesc=new pdu['RCConferenceDescriptorPdu'].decode(mcuConfDesc);
loger.log('_updateMCUConfInfoDescription. _mcuConfDesc', _data);
loger.log('_updateMCUConfInfoDescription.', _data);
//let classDescription=new pdu['RCConferenceDescriptorPdu'].decode(_data);
console.log(_data);
//let info = this.mcuClassInfo.info;
... ... @@ -15072,7 +15073,7 @@ return /******/ (function(modules) { // webpackBootstrap
value: function _pduMessageHandler(regBuffer) {
var _this2 = this;
loger.log("RCPDU_REG_ADAPTER==============================");
//loger.log("RCPDU_REG_ADAPTER==============================");
if (this._apeDelayed) {
// this._apeDelayedMsgs.push(regBuffer);
// this._apeDelayedStart();
... ...
... ... @@ -59,7 +59,7 @@ export default class MessageEntrance extends Emiter {
_sass.on(_sass.SUCCESS, this._sassVerifySuccessHandler.bind(this));
_sass.on(_sass.CLASS_INIT_SUCCESS, this._sassInitSuccessHandler.bind(this));
_sass.on(_sass.CLASS_GET_CLASS_DETAIL, this._h5SassGetClassDetailSuccessHandler.bind(this));
_sass.on(_sass.CLASS_GET_MEETING_PARAM,this._h5SassGetMeetingParaSuccessHandler);
_sass.on(_sass.CLASS_GET_CLASS_PARAM,this._h5SassGetClassParaSuccessHandler);
// 底层MCU消息层
_mcu = Mcu;
... ... @@ -313,8 +313,8 @@ export default class MessageEntrance extends Emiter {
}
//获取会议所有参数 api/meeting/detail.do? flash中的接口文件是 getMeetingParam.do
_h5SassGetMeetingParaSuccessHandler(_data){
//获取会议所有参数 api/meeting/detail.do? flash中的接口文件是 getClassParam.do
_h5SassGetClassParaSuccessHandler(_data){
loger.log('获取api/meeting/detail.do完成.');
//console.log(_data.docListPrepare);
//console.log(_data.mcuList);
... ... @@ -338,7 +338,7 @@ export default class MessageEntrance extends Emiter {
GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_2);
if(_sass){
_sass.getClassDetail();//会议信息
_sass.getMeetingParam();//会议参数大全
_sass.getClassParam();//会议参数大全
}
//储存数据
... ... @@ -379,6 +379,7 @@ export default class MessageEntrance extends Emiter {
initSuccessCallBackData.doc=GlobalConfig.doc;//文档服务器地址
//initSuccessCallBackData.classRole=GlobalConfig.classRole;
initSuccessCallBackData.classId=GlobalConfig.classId;
initSuccessCallBackData.className=GlobalConfig.className;
initSuccessCallBackData.h5Module=GlobalConfig.h5Module;
initSuccessCallBackData.isHost=GlobalConfig.isHost;
initSuccessCallBackData.maxAudioChannels=GlobalConfig.maxAudioChannels;
... ...
... ... @@ -301,7 +301,7 @@ GlobalConfig.tickValues={}; // 滚动条关键点，用于快进快退
GlobalConfig.meetingParam={};//Sass直接返回的所有会议信息(最全)
GlobalConfig.classAllParam={};//Sass直接返回的所有会议信息(最全)
GlobalConfig.classDetail={};//Sass直接返回的当前课堂基本信息
GlobalConfig.docListPrepare=[]; // 已经提前上传的文档，进入课堂后需要自动加载
... ...
... ... @@ -87,7 +87,7 @@ MessageTypes.ERR_CLASS_JOIN_CONFILICT=207;//已经在其它地方登陆
MessageTypes.ERR_GET_CLASS_DETAIL=300;//获取classDetail失败
MessageTypes.ERR_GET_MEETING_PARAML=301;//获取MeetingParam失败
MessageTypes.ERR_GET_CLASS_PARAML=301;//获取ClassParam失败
//APE
MessageTypes.ERR_APE_SEND_FAILED_NO_JOIN=500;//APE在sdk为初始化或未加入会议之前调用发送数据接口
... ... @@ -123,7 +123,7 @@ MessageTypes.ErrorReson[MessageTypes.ERR_CLASS_JOIN_CONFILICT]="已经在其它
MessageTypes.ErrorReson[MessageTypes.ERR_GET_CLASS_DETAIL=300]="获取classDetail失败";
MessageTypes.ErrorReson[MessageTypes.ERR_GET_MEETING_PARAML]="获取MeetingParam失败";
MessageTypes.ErrorReson[MessageTypes.ERR_GET_CLASS_PARAML]="获取ClassParam失败";
//APE
MessageTypes.ErrorReson[MessageTypes.ERR_APE_SEND_FAILED_NO_JOIN]="APE在sdk为初始化或未加入会议之前调用发送数据接口";
... ...
... ... @@ -22,12 +22,12 @@ class Sass extends Emiter {
//----3.验证完成后获取------
//getClassDetail 获取会议详情 let url = `http://${classInfo.portal}/3m/meeting/getClassH5.do?classNumber=${classInfo.classId}`;
//getMeetingParam 获取会议最全参数集合 let url = `http://${classInfo.portal}/3m/api/meeting/detail.do?meetingNumber=${classInfo.classId}&timestamp=${timestamp}&authId=${authId}`;
//getClassParam 获取会议最全参数集合 let url = `http://${classInfo.portal}/3m/api/meeting/detail.do?meetingNumber=${classInfo.classId}&timestamp=${timestamp}&authId=${authId}`;
//Sass获取课堂校验信息
getJoinParams(_initInfo) {
loger.log('Sass获取课堂校验信息', _initInfo);
loger.log('初始化init获取课堂校验信息', _initInfo);
/* 获取用于加入课堂的参数
/3m/api/meeting/joinParams.do
参数 (application/x-www-form-urlencoded):
... ... @@ -48,7 +48,7 @@ class Sass extends Emiter {
msType int 媒体服务器类型
*/
let url = `http://${_initInfo.portal}/3m/api/meeting/joinParams.do?meetingNumber=${_initInfo.classId}&userID=${_initInfo.userId}`;
loger.log('Sass获取课堂校验信息.', url);
loger.log('初始化init获取课堂校验信息.', url);
fetch(url, {
timeout: 5000
})
... ... @@ -56,7 +56,7 @@ class Sass extends Emiter {
if (ret.ok) {
return ret.json();
} else {
loger.error(`Sass获取课堂校验信息-网络异常.状态码:${ret.status}`);
loger.error(`初始化init获取课堂校验信息-网络异常.状态码:${ret.status}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_CLASS_INIT_NETWORK);
throw '';
}
... ... @@ -68,7 +68,7 @@ class Sass extends Emiter {
//3 没有对应的站点
//4 站点已过期
if (ret.code === 0) {
loger.log('Sass获取课堂校验信息完成');
loger.log('初始化init获取课堂校验信息-完成');
this._emit(Sass.CLASS_INIT_SUCCESS,ret);
} else if(ret.code === 1) {
//loger.warn('Sass获取课堂校验信息失败.');
... ... @@ -87,14 +87,14 @@ class Sass extends Emiter {
}
})
.catch(err => {
loger.error(`Sass获取课堂校验信息异常.状态码:${err}`);
loger.error(`初始化init获取课堂校验信息-异常.状态码:${err}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_CLASS_INIT_PROTOCOL,err);
});
}
// Sass校验开始
passwordAndMd5Checking(_param) {
loger.log('发起Sass校验', _param);
loger.log('开始Sass校验', _param);
confInfo = _param;
// 密码校验
if (confInfo.passwordRequired === 'true'||confInfo.passwordRequired === true) {
... ... @@ -161,7 +161,7 @@ class Sass extends Emiter {
// 发起入会
sendMD5Checking() {
let url = `http://${confInfo.portal}/3m/meeting/md5CheckMeeting.do?siteId=${confInfo.siteId}&meetingNumber=${confInfo.classId}&userId=${confInfo.userId}&userName=${confInfo.userName}&userType=${confInfo.userType}&nopassword=${confInfo.passwordRequired}&md5=${confInfo.md5}`;
loger.log('H5SassMD5校验', url);
loger.log('MD5校验', url);
fetch(url, {
timeout: 5000
})
... ... @@ -169,13 +169,13 @@ class Sass extends Emiter {
if (ret.status === 200) {
return ret.json();
} else {
loger.error(`H5SassMD5校验-网络异常.状态码:${ret.status}`);
loger.error(`MD5校验-网络异常.状态码:${ret.status}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_CLASS_JOIN_NETWORK);
throw '';
}
})
.then(ret => {
if (ret.flag == "true") {
if (ret.flag == "true"||ret.flag == true) {
if (ret.h5_mcu_list) {
let server = ret.h5_mcu_list.split(";")[0];
confInfo.MCUServerIP = server.split(":")[0];
... ... @@ -191,16 +191,16 @@ class Sass extends Emiter {
GlobalConfig.maxVideoChannels=confInfo.maxVideoChannels;
GlobalConfig.maxAudioChannels=confInfo.maxAudioChannels;
GlobalConfig.maxMediaChannels=confInfo.maxMediaChannels;
loger.log('H5Sass校验完成',ret);
loger.log('校验完成',ret);
this._emit(Sass.SUCCESS,ret);
} else {
loger.log('H5SassMD5校验-失败.');
loger.log('MD5校验-失败.');
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_CLASS_MD5_WRONG);
}
})
.catch(err => {
loger.error(`H5SassMD5校验-异常.状态码:${err}`);
loger.error(`MD5校验-异常.状态码:${err}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_CLASS_JOIN_FAILED);
});
}
... ... @@ -208,7 +208,7 @@ class Sass extends Emiter {
// 获取会议详情
getClassDetail() {
let url = `http://${confInfo.portal}/3m/meeting/getClassH5.do?classNumber=${confInfo.classId}`;
loger.log('Sass获取Class详情.', url);
loger.log('获取Class详情.', url);
fetch(url, {
timeout: 5000
})
... ... @@ -216,27 +216,27 @@ class Sass extends Emiter {
if (ret.ok) {
return ret.json();
} else {
loger.error(`Sass获取Class详情-网络异常.状态码:${ret.status}`);
loger.error(`获取Class详情-网络异常.状态码:${ret.status}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_GET_CLASS_DETAIL);
throw '';
}
})
.then(ret => {
if (ret.errorCode === 0) {
loger.log('Sass获取Class详情完成');
loger.log('获取Class详情完成');
this._emit(Sass.CLASS_GET_CLASS_DETAIL, ret);
} else {
loger.warn('Sass获取Class详情失败.');
loger.warn('获取Class详情失败.');
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_GET_CLASS_DETAIL);
}
})
.catch(err => {
loger.error(`H5Sass获取Class详情异常.状态码:${err}`);
loger.error(`获取Class详情异常.状态码:${err}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_GET_CLASS_DETAIL);
});
}
getMeetingParam(){
getClassParam(){
/*
参数 (application/x-www-form-urlencoded):
名称 类型 可选 默认值 说明
... ... @@ -257,7 +257,7 @@ class Sass extends Emiter {
var timestamp=new Date().getTime();
var authId=MD5(confInfo.classId+""+timestamp);//课堂号+时间戳 的字符串，转成MD5
let url = `http://${confInfo.portal}/3m/api/meeting/detail.do?meetingNumber=${confInfo.classId}&timestamp=${timestamp}&authId=${authId}`;
loger.log('H5Sass获取getMeetingParam ', url);
loger.log('Sass getClassParam ', url);
fetch(url, {
timeout: 5000
})
... ... @@ -265,31 +265,31 @@ class Sass extends Emiter {
if (ret.ok) {
return ret.json();
} else {
loger.error(`H5Sass获取getMeetingParam-网络异常.状态码:${ret.status}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_GET_MEETING_PARAML);
loger.error(`getClassParam-网络异常.状态码:${ret.status}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_GET_CLASS_PARAML);
throw '';
}
})
.then(ret => {
if (ret.code === 0) {
loger.log('Sass获取getMeetingParam完成');
this._emit(Sass.CLASS_GET_MEETING_PARAM, ret);
loger.log('getClassParam 完成');
this._emit(Sass.CLASS_GET_CLASS_PARAM, ret);
} else {
loger.warn('H5Sass获取getMeetingParam失败.');
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_GET_MEETING_PARAML);
loger.warn('getClassParam 失败.');
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_GET_CLASS_PARAML);
}
})
.catch(err => {
loger.error(`H5Sass获取getMeetingParam异常.状态码:${err}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_GET_MEETING_PARAML);
loger.error(`getClassParam异常.状态码:${err}`);
this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_GET_CLASS_PARAML);
});
}
}
Sass.prototype.SUCCESS = Sass.SUCCESS = 'h5sass.success';
Sass.prototype.SUCCESS = Sass.SUCCESS = 'Sass.success';
Sass.prototype.CLASS_INIT_SUCCESS = Sass.CLASS_INIT_SUCCESS = 'sass.class.init.success';
Sass.prototype.CLASS_GET_MEETING_PARAM= Sass.CLASS_GET_MEETING_PARAM = 'class_getMeetingParam.message';
Sass.prototype.CLASS_GET_CLASS_DETAIL= Sass.CLASS_GET_CLASS_DETAIL = 'class_getClassDetail.message';
Sass.prototype.CLASS_GET_CLASS_PARAM= Sass.CLASS_GET_CLASS_PARAM = 'class.getClassParam.message';
Sass.prototype.CLASS_GET_CLASS_DETAIL= Sass.CLASS_GET_CLASS_DETAIL = 'class.getClassDetail.message';
export default new Sass;
... ...
... ... @@ -64,7 +64,7 @@ export default class Ape extends Emiter {
// 消息处理
_pduMessageHandler(regBuffer) {
loger.log("RCPDU_REG_ADAPTER==============================");
//loger.log("RCPDU_REG_ADAPTER==============================");
if (this._apeDelayed) {
// this._apeDelayedMsgs.push(regBuffer);
// this._apeDelayedStart();
... ...
... ... @@ -123,7 +123,7 @@ class MCU extends Emiter {
_updateMCUConfInfoDescription(_data) {
// let _mcuConfDesc=new pdu['RCConferenceDescriptorPdu'].decode(mcuConfDesc);
loger.log('_updateMCUConfInfoDescription. _mcuConfDesc', _data);
loger.log('_updateMCUConfInfoDescription.', _data);
//let classDescription=new pdu['RCConferenceDescriptorPdu'].decode(_data);
console.log(_data);
//let info = this.mcuClassInfo.info;
... ...