李勇 / McuClient

转到一个项目
Toggle navigation Toggle navigation pinning
李勇
5b0172d1 1 parent cdd80639

去除多余的注释信息

内嵌 并排对比
正在显示 4 个修改的文件 包含 5 行增加 和 92 行删除
... ... @@ -31,7 +31,7 @@ import MediaSharedApe from 'apes/MediaSharedApe';
import UTF8 from 'utf-8';
let loger = Loger.getLoger('McuClient');
let _sdkInfo = {"version": "v1.30.20.20170607", "author": "www.3mang.com"};
let _sdkInfo = {"version": "v1.31.0.20170607", "author": "www.3mang.com"};
//APE
let _sass;
... ... @@ -178,10 +178,10 @@ export default class MessageEntrance extends Emiter {
this.sendAudioBroadcastMsg = this.sendAudioCommandMsg.bind(this);
//whiteBoradApe
this.sendInsertAnnotaion = this._sendInsertAnnotaion.bind(this);
this.sendDeleteAllAnnotation = this._sendDeleteAllAnnotation.bind(this);
this.sendDeleteCurPageAnnotation = this._sendDeleteCurPageAnnotation.bind(this);
this.sendGotoPrev = this._sendGotoPrev.bind(this);
this.sendInsertAnnotaion = this._sendInsertAnnotaion.bind(this);//添加标注
this.sendDeleteAllAnnotation = this._sendDeleteAllAnnotation.bind(this);//删除所有标注
this.sendDeleteCurPageAnnotation = this._sendDeleteCurPageAnnotation.bind(this);//删除当前页的所有标注
this.sendGotoPrev = this._sendGotoPrev.bind(this);//当前页撤销上一步
//DocApe
this.sendDocumentUpload = this._sendDocumentUpload.bind(this);//上传文档
... ...
... ... @@ -169,21 +169,6 @@ class Sass extends Emiter {
})
.then(ret => {
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];
confInfo.MCUServerPort = server.split(":")[1];
GlobalConfig.MCUServerIP=confInfo.MCUServerIP;
GlobalConfig.MCUServerPort=confInfo.MCUServerPort;
}
confInfo.maxVideoChannels = ret.maxVideoChannels;
confInfo.maxAudioChannels = ret.maxAudioChannels;
confInfo.maxMediaChannels = confInfo.maxVideoChannels + confInfo.maxAudioChannels;
GlobalConfig.maxVideoChannels=confInfo.maxVideoChannels;
GlobalConfig.maxAudioChannels=confInfo.maxAudioChannels;
GlobalConfig.maxMediaChannels=confInfo.maxMediaChannels;*/
loger.log('MD5校验完成');
loger.log(ret);
this._emit(Sass.SUCCESS, ret);
... ... @@ -489,55 +474,6 @@ class Sass extends Emiter {
loger.error(`保存开始录制信息异常.状态码:${err}`);
});
}
/* saveClassRecordContrlInfo(_param) {
if(GlobalConfig.isRecordPlayBack){
loger.log('录制回放中，不需要保存');
return;
}
loger.log('保存开始录制信息');
let key = "3mang123A";
let siteID = GlobalConfig.siteId;
let meetingID = GlobalConfig.classId;
let userID = GlobalConfig.userId;
let userName = GlobalConfig.userName;
let meetingName = GlobalConfig.className;
let startTime = GlobalConfig.classBeginTime;
let endTime = GlobalConfig.classEndTime;
let playUrl = "";
let streamName = GlobalConfig.recordFileName;
let confRecordFileName = GlobalConfig.recordFileName;
let downloadUrl = "";
let recordStatus = GlobalConfig.classStatus;
let recordTimestamp = GlobalConfig.classTimestamp;
let timestamp = new Date().getTime();
let authId = MD5(key + siteID + meetingID + timestamp);
let url = `http://${GlobalConfig.portal}/3m/recordingMeeting/insertRecordingMeeting.do?siteID=${siteID}&meetingID=${meetingID}&userID=${userID}&userName=${userName}&meetingName=${meetingName}&startTime=${startTime}&endTime=${endTime}&playUrl=${playUrl}&streamName=${streamName}&downloadUrl=${downloadUrl}&configFile=${confRecordFileName}&timestamp=${timestamp}&recordTimestamp=${recordTimestamp}&authId=${authId}`;
loger.log('saveClassRecordContrlInfo', url);
fetch( encodeURI(url), {
timeout: 5000
})
.then(ret => {
if (ret.ok) {
return ret.json();
} else {
loger.error(`保存开始录制信息-网络异常.状态码:${ret.status}`);
throw '';
}
})
.then(ret => {
if (ret.errorCode === 0) {
loger.log('保存开始录制信息 完成');
this._emit(Sass.CLASS_SAVE_RECORD_INFO_SUCCESS, _param);
} else {
loger.warn('保存开始录制信息 失败.', ret);
}
})
.catch(err => {
loger.error(`保存开始录制信息异常.状态码:${err}`);
});
}*/
}
Sass.prototype.SUCCESS = Sass.SUCCESS = 'Sass_success';
... ...
... ... @@ -190,14 +190,6 @@ class ConferApe extends Ape {
// to, message
loger.log('发送课堂控制消息.', _messageInfo);
/* message RCConferenceSendDataRequestPdu {
optional uint32 initiator = 1;
optional uint32 peer = 2;
required bool is_public = 3;
required bytes user_data = 4;
}
*/
let conferSendPdu = new pdu['RCConferenceSendDataRequestPdu'];
conferSendPdu.type = pdu.RCPDU_SEND_CONFERENCE_DATA_REQUEST;
conferSendPdu.initiator = this._classInfo.nodeId;//发起人
... ... @@ -258,11 +250,6 @@ class ConferApe extends Ape {
//开启录制
startRecord() {
//如果录制的时间长超出设定的最大录制时间就不再录制
/* if(GlobalConfig.classTimestamp>=GlobalConfig.allowRecordMaxTime){
loger.warn('不能再录制，录制时间已经达到最大限制',GlobalConfig.classTimestamp);
return;
}*/
if(GlobalConfig.recordTimestamp>=GlobalConfig.allowRecordMaxTime){
loger.warn('不能再录制，录制时间已经达到最大限制',GlobalConfig.recordTimestamp);
return;
... ...
... ... @@ -152,16 +152,6 @@ class MediaSharedApe extends Ape {
if(itemDataInfo.seek==null){
itemDataInfo.seek=1;
}
/*let getDocAddress=this.getMediaSharedAddress(_itemDataInfo);
if(getDocAddress.code==ApeConsts.RETURN_SUCCESS){
itemDataInfo.images=getDocAddress.docFullAddress.images||[];
itemDataInfo.pdf=getDocAddress.docFullAddress.pdf||"";
itemDataInfo.html=getDocAddress.docFullAddress.html||"";
}else {
itemDataInfo.images=[];
itemDataInfo.pdf='';
itemDataInfo.html='';
}*/
loger.log('mediaPackFullInfo->', itemDataInfo);
return itemDataInfo;
}
... ...