正在显示
4 个修改的文件
包含
5 行增加
和
92 行删除
| @@ -31,7 +31,7 @@ import MediaSharedApe from 'apes/MediaSharedApe'; | @@ -31,7 +31,7 @@ import MediaSharedApe from 'apes/MediaSharedApe'; | ||
| 31 | import UTF8 from 'utf-8'; | 31 | import UTF8 from 'utf-8'; |
| 32 | 32 | ||
| 33 | let loger = Loger.getLoger('McuClient'); | 33 | let loger = Loger.getLoger('McuClient'); |
| 34 | -let _sdkInfo = {"version": "v1.30.20.20170607", "author": "www.3mang.com"}; | 34 | +let _sdkInfo = {"version": "v1.31.0.20170607", "author": "www.3mang.com"}; |
| 35 | 35 | ||
| 36 | //APE | 36 | //APE |
| 37 | let _sass; | 37 | let _sass; |
| @@ -178,10 +178,10 @@ export default class MessageEntrance extends Emiter { | @@ -178,10 +178,10 @@ export default class MessageEntrance extends Emiter { | ||
| 178 | this.sendAudioBroadcastMsg = this.sendAudioCommandMsg.bind(this); | 178 | this.sendAudioBroadcastMsg = this.sendAudioCommandMsg.bind(this); |
| 179 | 179 | ||
| 180 | //whiteBoradApe | 180 | //whiteBoradApe |
| 181 | - this.sendInsertAnnotaion = this._sendInsertAnnotaion.bind(this); | ||
| 182 | - this.sendDeleteAllAnnotation = this._sendDeleteAllAnnotation.bind(this); | ||
| 183 | - this.sendDeleteCurPageAnnotation = this._sendDeleteCurPageAnnotation.bind(this); | ||
| 184 | - this.sendGotoPrev = this._sendGotoPrev.bind(this); | 181 | + this.sendInsertAnnotaion = this._sendInsertAnnotaion.bind(this);//添加标注 |
| 182 | + this.sendDeleteAllAnnotation = this._sendDeleteAllAnnotation.bind(this);//删除所有标注 | ||
| 183 | + this.sendDeleteCurPageAnnotation = this._sendDeleteCurPageAnnotation.bind(this);//删除当前页的所有标注 | ||
| 184 | + this.sendGotoPrev = this._sendGotoPrev.bind(this);//当前页撤销上一步 | ||
| 185 | 185 | ||
| 186 | //DocApe | 186 | //DocApe |
| 187 | this.sendDocumentUpload = this._sendDocumentUpload.bind(this);//上传文档 | 187 | this.sendDocumentUpload = this._sendDocumentUpload.bind(this);//上传文档 |
| @@ -169,21 +169,6 @@ class Sass extends Emiter { | @@ -169,21 +169,6 @@ class Sass extends Emiter { | ||
| 169 | }) | 169 | }) |
| 170 | .then(ret => { | 170 | .then(ret => { |
| 171 | if (ret.flag == "true" || ret.flag == true) { | 171 | if (ret.flag == "true" || ret.flag == true) { |
| 172 | - /* if (ret.h5_mcu_list) { | ||
| 173 | - let server = ret.h5_mcu_list.split(";")[0]; | ||
| 174 | - confInfo.MCUServerIP = server.split(":")[0]; | ||
| 175 | - confInfo.MCUServerPort = server.split(":")[1]; | ||
| 176 | - | ||
| 177 | - GlobalConfig.MCUServerIP=confInfo.MCUServerIP; | ||
| 178 | - GlobalConfig.MCUServerPort=confInfo.MCUServerPort; | ||
| 179 | - } | ||
| 180 | - confInfo.maxVideoChannels = ret.maxVideoChannels; | ||
| 181 | - confInfo.maxAudioChannels = ret.maxAudioChannels; | ||
| 182 | - confInfo.maxMediaChannels = confInfo.maxVideoChannels + confInfo.maxAudioChannels; | ||
| 183 | - | ||
| 184 | - GlobalConfig.maxVideoChannels=confInfo.maxVideoChannels; | ||
| 185 | - GlobalConfig.maxAudioChannels=confInfo.maxAudioChannels; | ||
| 186 | - GlobalConfig.maxMediaChannels=confInfo.maxMediaChannels;*/ | ||
| 187 | loger.log('MD5校验完成'); | 172 | loger.log('MD5校验完成'); |
| 188 | loger.log(ret); | 173 | loger.log(ret); |
| 189 | this._emit(Sass.SUCCESS, ret); | 174 | this._emit(Sass.SUCCESS, ret); |
| @@ -489,55 +474,6 @@ class Sass extends Emiter { | @@ -489,55 +474,6 @@ class Sass extends Emiter { | ||
| 489 | loger.error(`保存开始录制信息异常.状态码:${err}`); | 474 | loger.error(`保存开始录制信息异常.状态码:${err}`); |
| 490 | }); | 475 | }); |
| 491 | } | 476 | } |
| 492 | - /* saveClassRecordContrlInfo(_param) { | ||
| 493 | - if(GlobalConfig.isRecordPlayBack){ | ||
| 494 | - loger.log('录制回放中,不需要保存'); | ||
| 495 | - return; | ||
| 496 | - } | ||
| 497 | - loger.log('保存开始录制信息'); | ||
| 498 | - let key = "3mang123A"; | ||
| 499 | - let siteID = GlobalConfig.siteId; | ||
| 500 | - let meetingID = GlobalConfig.classId; | ||
| 501 | - let userID = GlobalConfig.userId; | ||
| 502 | - let userName = GlobalConfig.userName; | ||
| 503 | - let meetingName = GlobalConfig.className; | ||
| 504 | - let startTime = GlobalConfig.classBeginTime; | ||
| 505 | - let endTime = GlobalConfig.classEndTime; | ||
| 506 | - let playUrl = ""; | ||
| 507 | - let streamName = GlobalConfig.recordFileName; | ||
| 508 | - let confRecordFileName = GlobalConfig.recordFileName; | ||
| 509 | - let downloadUrl = ""; | ||
| 510 | - let recordStatus = GlobalConfig.classStatus; | ||
| 511 | - let recordTimestamp = GlobalConfig.classTimestamp; | ||
| 512 | - | ||
| 513 | - let timestamp = new Date().getTime(); | ||
| 514 | - let authId = MD5(key + siteID + meetingID + timestamp); | ||
| 515 | - 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}×tamp=${timestamp}&recordTimestamp=${recordTimestamp}&authId=${authId}`; | ||
| 516 | - loger.log('saveClassRecordContrlInfo', url); | ||
| 517 | - | ||
| 518 | - fetch( encodeURI(url), { | ||
| 519 | - timeout: 5000 | ||
| 520 | - }) | ||
| 521 | - .then(ret => { | ||
| 522 | - if (ret.ok) { | ||
| 523 | - return ret.json(); | ||
| 524 | - } else { | ||
| 525 | - loger.error(`保存开始录制信息-网络异常.状态码:${ret.status}`); | ||
| 526 | - throw ''; | ||
| 527 | - } | ||
| 528 | - }) | ||
| 529 | - .then(ret => { | ||
| 530 | - if (ret.errorCode === 0) { | ||
| 531 | - loger.log('保存开始录制信息 完成'); | ||
| 532 | - this._emit(Sass.CLASS_SAVE_RECORD_INFO_SUCCESS, _param); | ||
| 533 | - } else { | ||
| 534 | - loger.warn('保存开始录制信息 失败.', ret); | ||
| 535 | - } | ||
| 536 | - }) | ||
| 537 | - .catch(err => { | ||
| 538 | - loger.error(`保存开始录制信息异常.状态码:${err}`); | ||
| 539 | - }); | ||
| 540 | - }*/ | ||
| 541 | } | 477 | } |
| 542 | 478 | ||
| 543 | Sass.prototype.SUCCESS = Sass.SUCCESS = 'Sass_success'; | 479 | Sass.prototype.SUCCESS = Sass.SUCCESS = 'Sass_success'; |
| @@ -190,14 +190,6 @@ class ConferApe extends Ape { | @@ -190,14 +190,6 @@ class ConferApe extends Ape { | ||
| 190 | // to, message | 190 | // to, message |
| 191 | loger.log('发送课堂控制消息.', _messageInfo); | 191 | loger.log('发送课堂控制消息.', _messageInfo); |
| 192 | 192 | ||
| 193 | - /* message RCConferenceSendDataRequestPdu { | ||
| 194 | - optional uint32 initiator = 1; | ||
| 195 | - optional uint32 peer = 2; | ||
| 196 | - required bool is_public = 3; | ||
| 197 | - required bytes user_data = 4; | ||
| 198 | - } | ||
| 199 | - */ | ||
| 200 | - | ||
| 201 | let conferSendPdu = new pdu['RCConferenceSendDataRequestPdu']; | 193 | let conferSendPdu = new pdu['RCConferenceSendDataRequestPdu']; |
| 202 | conferSendPdu.type = pdu.RCPDU_SEND_CONFERENCE_DATA_REQUEST; | 194 | conferSendPdu.type = pdu.RCPDU_SEND_CONFERENCE_DATA_REQUEST; |
| 203 | conferSendPdu.initiator = this._classInfo.nodeId;//发起人 | 195 | conferSendPdu.initiator = this._classInfo.nodeId;//发起人 |
| @@ -258,11 +250,6 @@ class ConferApe extends Ape { | @@ -258,11 +250,6 @@ class ConferApe extends Ape { | ||
| 258 | //开启录制 | 250 | //开启录制 |
| 259 | startRecord() { | 251 | startRecord() { |
| 260 | //如果录制的时间长超出设定的最大录制时间就不再录制 | 252 | //如果录制的时间长超出设定的最大录制时间就不再录制 |
| 261 | - /* if(GlobalConfig.classTimestamp>=GlobalConfig.allowRecordMaxTime){ | ||
| 262 | - loger.warn('不能再录制,录制时间已经达到最大限制',GlobalConfig.classTimestamp); | ||
| 263 | - return; | ||
| 264 | - }*/ | ||
| 265 | - | ||
| 266 | if(GlobalConfig.recordTimestamp>=GlobalConfig.allowRecordMaxTime){ | 253 | if(GlobalConfig.recordTimestamp>=GlobalConfig.allowRecordMaxTime){ |
| 267 | loger.warn('不能再录制,录制时间已经达到最大限制',GlobalConfig.recordTimestamp); | 254 | loger.warn('不能再录制,录制时间已经达到最大限制',GlobalConfig.recordTimestamp); |
| 268 | return; | 255 | return; |
| @@ -152,16 +152,6 @@ class MediaSharedApe extends Ape { | @@ -152,16 +152,6 @@ class MediaSharedApe extends Ape { | ||
| 152 | if(itemDataInfo.seek==null){ | 152 | if(itemDataInfo.seek==null){ |
| 153 | itemDataInfo.seek=1; | 153 | itemDataInfo.seek=1; |
| 154 | } | 154 | } |
| 155 | - /*let getDocAddress=this.getMediaSharedAddress(_itemDataInfo); | ||
| 156 | - if(getDocAddress.code==ApeConsts.RETURN_SUCCESS){ | ||
| 157 | - itemDataInfo.images=getDocAddress.docFullAddress.images||[]; | ||
| 158 | - itemDataInfo.pdf=getDocAddress.docFullAddress.pdf||""; | ||
| 159 | - itemDataInfo.html=getDocAddress.docFullAddress.html||""; | ||
| 160 | - }else { | ||
| 161 | - itemDataInfo.images=[]; | ||
| 162 | - itemDataInfo.pdf=''; | ||
| 163 | - itemDataInfo.html=''; | ||
| 164 | - }*/ | ||
| 165 | loger.log('mediaPackFullInfo->', itemDataInfo); | 155 | loger.log('mediaPackFullInfo->', itemDataInfo); |
| 166 | return itemDataInfo; | 156 | return itemDataInfo; |
| 167 | } | 157 | } |
-
请 注册 或 登录 后发表评论