local_dev_commit

AlexWang
Commit 158aa3dfd16c0aa1447e4f6f2ffb6ab4d08449a2 158aa3df 1 parent 2496a703
dist/McuClient.js
package.json
src/mcu.js
webpack.config.umd.js
--- a/dist/McuClient.js
查看文件 @158aa3d
+++ b/dist/McuClient.js
查看文件 @158aa3d
--- a/package.json
查看文件 @158aa3d
+++ b/package.json
查看文件 @158aa3d
@@ -21,6 +21,7 @@
     "iscroll": "^5.2.0",
     "jquery": "^3.1.0",
     "jquery-touchswipe": "^1.6.15",
+    "mdetect": "^1.2.3",
     "protobufjs": "^5.0.1",
     "string.fromcodepoint": "^0.2.1",
     "url-parse": "^1.1.1",
@@ -31,7 +32,7 @@
   "wbp": {
     "project": "umd",
     "entries": {
-      "McuClient": "./McuClientEngine.js"
+      "McuClient": "./src/McuClientEngine.js"
     },
     "source": "src/",
     "build": "dist/"
--- a/src/mcu.js
查看文件 @158aa3d
+++ b/src/mcu.js
查看文件 @158aa3d
-/*eslint-disable*/
+/*eslint-disable*/ ;
 import Emiter from 'Emiter';
 import MessageTypes from 'MessageTypes';
@@ -72,7 +72,7 @@ class MCU extends Emiter {
     joinRequestPdu.type = 2;
     joinRequestPdu.initiator = this.classInfo.nodeId;
     joinRequestPdu.nodeType = PduConsts.NT_TERMINAL; //normal
-        joinRequestPdu.classDescription = descriptorPdu;//  classDescription
+    joinRequestPdu.classDescription = descriptorPdu; //  classDescription
     let pduMsg = pdu.create_join_class_request_pdu(
       joinRequestPdu.type,
@@ -86,7 +86,7 @@ class MCU extends Emiter {
       PduConsts.SEG_ONCE
     );
-        pduMsg.set("site", this.classInfo.siteId);//课堂号对应的名称
+    pduMsg.set("site", this.classInfo.siteId); //课堂号对应的名称
     pduMsg.set("userId", this.classInfo.userId);
     pduMsg.set("userName", Base64.fromByteArray(ArrayBufferUtil.strToUint8Array(this.classInfo.userName)));
     pduMsg.set("userRole", this.classInfo.userRole);
@@ -131,16 +131,23 @@ class MCU extends Emiter {
       let sessionLabel = ApeConsts(pduMsg.sessionId);
       if (ape) {
         let subTypeLabel = pdu.id2type(pduMsg.subType);
-                    //loger.log('MCU-SecondLayer封装消息', 'sessionId', sessionLabel, pduMsg.sessionId, 'subtype', subTypeLabel, pduMsg.subType);
+        loger.log('MCU-SecondLayer封装消息',
+          'sessionId',
+          sessionLabel,
+          pduMsg.sessionId,
+          'subtype',
+          subTypeLabel,
+          pduMsg.subType,
+          GlobalConfig.mcuDelay,
+          GlobalConfig.messageDelay);
-                    loger.warn('接收服务端消息----------------->subType->', pduMsg.subType, GlobalConfig.mcuDelay, GlobalConfig.messageDelay);
         //延迟处理消息(3个条件--->ape允许延迟&&客户端设置需要延迟&&Sass设置的延迟时间大于0)
-                    if (ape._apeDelayed && GlobalConfig.messageDelay && GlobalConfig.mcuDelay > 0) {
+        if (GlobalConfig.messageDelay && GlobalConfig.messageDelay.indexOf(sessionLabel) !== -1 && GlobalConfig.mcuDelay > 0) {
           loger.warn('延迟处理消息->', GlobalConfig.mcuDelay);
           setTimeout(() => {
             //this._pduRegAdapterHandler(regBuffer, seekTime);
             ape._emit(pduMsg.subType, pduMsg.data);
-                        }, GlobalConfig.mcuDelay * 1000);//mcuDelay单位是秒,
+          }, GlobalConfig.mcuDelay * 1000); //mcuDelay单位是秒,
           // 这里需要换算为毫秒
           return;
         }
@@ -190,20 +197,20 @@ class MCU extends Emiter {
     }
     loger.log('leaveMCU');
     GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_3);
-        GlobalConfig.classJoinSuccess=false;
+    GlobalConfig.classJoinSuccess = false;
     this._everSocket.end();
   }
   // 主动建立MCU连接
   joinMCU(_classInfo) {
     loger.log('开始建立EverSocket通道.');
-        GlobalConfig.classJoinSuccess=false;
+    GlobalConfig.classJoinSuccess = false;
     loger.log(_classInfo);
     _classInfo.classId = parseInt(_classInfo.classId); // classId 必须整形
     this.classInfo = _classInfo;
     // 创建刷新nodeId
     this.classInfo.nodeId = EngineUtils.creatSoleNumberFromTimestamp();
-        GlobalConfig.nodeId = this.classInfo.nodeId;//这是标识自己身份的id
+    GlobalConfig.nodeId = this.classInfo.nodeId; //这是标识自己身份的id
     let nodeInfoRecordPdu = new pdu['RCNodeInfoRecordPdu'];
     nodeInfoRecordPdu.name = this.classInfo.userName;
@@ -211,13 +218,13 @@ class MCU extends Emiter {
     nodeInfoRecordPdu.userId = this.classInfo.userId;
     nodeInfoRecordPdu.role = ApeConsts.userTypesToId[this.classInfo.userRole] || 1; //NR_NORMAL用户的身份，根据用户登录时的身份设置
     nodeInfoRecordPdu.level = 0;
-        nodeInfoRecordPdu.handUpTime=0;
-        nodeInfoRecordPdu.openCamera=0;
-        nodeInfoRecordPdu.openMicrophones=0;
-        nodeInfoRecordPdu.microphones=GlobalConfig.microphones;
-        nodeInfoRecordPdu.cameras=GlobalConfig.cameras;
-        nodeInfoRecordPdu.videoQuality=GlobalConfig.videoQuality;//设置分辨率的
-        nodeInfoRecordPdu.userIp=GlobalConfig.userIp;
+    nodeInfoRecordPdu.handUpTime = 0;
+    nodeInfoRecordPdu.openCamera = 0;
+    nodeInfoRecordPdu.openMicrophones = 0;
+    nodeInfoRecordPdu.microphones = GlobalConfig.microphones;
+    nodeInfoRecordPdu.cameras = GlobalConfig.cameras;
+    nodeInfoRecordPdu.videoQuality = GlobalConfig.videoQuality; //设置分辨率的
+    nodeInfoRecordPdu.userIp = GlobalConfig.userIp;
     let conferenceRecord = {}; //RCConferenceRecord_T
     conferenceRecord._conference_id = this.classInfo.classId;
--- a/webpack.config.umd.js
查看文件 @158aa3d
+++ b/webpack.config.umd.js
查看文件 @158aa3d
 module.exports = function (umdConf) {
   umdConf.devServer.host = '0.0.0.0';
-  //umdConf.webpackFeatures.enableEntryHTML();//生成
+  umdConf.devServer.port = '8282';
+  umdConf.webpackFeatures.enableEntryHTML('McuClient');
   umdConf.output.publicPath = '';
   umdConf.output.library = 'MCUClientEngine';