1.修改Sass方法名

2.APE，MCU添加代码备注

1.修改Sass方法名
2.APE，MCU添加代码备注
李勇
Commit d38fdeb89ca89dc57bd7a180876425d63a8e6b97 d38fdeb8 1 parent 402fece0
dist/main.js
src/EngineEntrance.js
src/Sass.js
src/apes/ChatApe.js
src/apes/ConferApe.js
src/apes/VideoApe.js
src/mcu.js
src/pdu/index.js
--- a/dist/main.js
查看文件 @d38fdeb
+++ b/dist/main.js
查看文件 @d38fdeb
--- a/src/EngineEntrance.js
查看文件 @d38fdeb
+++ b/src/EngineEntrance.js
查看文件 @d38fdeb
@@ -106,7 +106,7 @@ export default class MessageEntrance extends Emiter {
     //获取课堂校验信息
     if(_sass){
-      _sass.sassGetJoinParams(GlobalConfig.getConfInfo());
+      _sass.getJoinParams(GlobalConfig.getConfInfo());
     }
   }
@@ -131,7 +131,7 @@ export default class MessageEntrance extends Emiter {
     //开始校验
     if(_sass){
-      _sass.sassChecking(GlobalConfig.getConfInfo());
+      _sass.passwordAndMd5Checking(GlobalConfig.getConfInfo());
     }
   }
   // 离开会议
--- a/src/Sass.js
查看文件 @d38fdeb
+++ b/src/Sass.js
查看文件 @d38fdeb
@@ -7,7 +7,6 @@ import MD5 from "md5";
 const loger = Loger.getLoger('Sass');
 let confInfo = {};
-let initInfo={};
 class Sass extends Emiter {
   constructor() {
     super();
@@ -15,7 +14,7 @@ class Sass extends Emiter {
   //Sass 接口
   //----1.校验之前的接口-----
-  //sassGetJoinParams 获取课堂校验信息     let url = `http://${_initInfo.portal}/3m/api/meeting/joinParams.do?meetingNumber=${_initInfo.confId}&userID=${_initInfo.userId}`;
+  //getJoinParams 获取课堂校验信息     let url = `http://${_initInfo.portal}/3m/api/meeting/joinParams.do?meetingNumber=${_initInfo.confId}&userID=${_initInfo.userId}`;
   //-----2.开始校验，如果有密码先校验密码，否则直接开始MD5验证-----
   //sendPWDChecking入会密码校验                let url = `http://${confInfo.portal}/3m/getCheckMeetinig.do?siteId=${confInfo.siteId}&classId=${confInfo.confId}&password=${confInfo.password}`;
@@ -27,7 +26,7 @@ class Sass extends Emiter {
   //Sass获取课堂校验信息
-  sassGetJoinParams(_initInfo) {
+  getJoinParams(_initInfo) {
     loger.log('Sass获取课堂校验信息', _initInfo);
    /* 获取用于加入课堂的参数
     /3m/api/meeting/joinParams.do
@@ -78,7 +77,7 @@ class Sass extends Emiter {
   }
   // Sass校验开始
-  sassChecking(_param) {
+  passwordAndMd5Checking(_param) {
     loger.log('发起Sass校验', _param);
     confInfo = _param;
     // 密码校验
--- a/src/apes/ChatApe.js
查看文件 @d38fdeb
+++ b/src/apes/ChatApe.js
查看文件 @d38fdeb
@@ -62,8 +62,10 @@ class ChatApe extends Ape {
     chatSendPdu.fromRole = this._confInfo.classRole;
     if (!(chatSendPdu.isPublic || 0 === chatSendPdu.peer)) {
+      //发送给制定的人
       this.send(chatSendPdu);
     } else {
+      //发送给所有人
       this.sendUniform(chatSendPdu);
     }
   }
--- a/src/apes/ConferApe.js
查看文件 @d38fdeb
+++ b/src/apes/ConferApe.js
查看文件 @d38fdeb
@@ -110,6 +110,7 @@ class ConferApe extends Ape {
     this.rosterUpdateHandler(nodeId, nodeData);
   }
+  //更新人员列表数据
   rosterUpdateHandler(nodeId, nodeData) {
     if (nodeData.role === ApeConsts.NR_MASTER ||
       nodeData.role === ApeConsts.NR_SLAVE) {
--- a/src/apes/VideoApe.js
查看文件 @d38fdeb
+++ b/src/apes/VideoApe.js
查看文件 @d38fdeb
@@ -59,18 +59,21 @@ class VideoChat extends Ape {
     // this._notify(RCApeEvent.E_VIDEO_DATA, videoReceivePdu.sessionId, videoReceivePdu.channelId, video_data);
-    loger.log('接受视频消息.', video_data);
+    loger.log('视频消息处理 videoIncomingHandler.', video_data);
     this._emit(MessageTypes.VIDEO_SHOW, video_data);
   }
   tableUpdateHandler(ownerId, channelId, channelInfo) {
+
    // debugger;
     let videoChannelInfo = pdu['RCVideoChannelInfoRecordPdu'].decode(channelInfo);
     videoChannelInfo.owner = ownerId;
     videoChannelInfo.channelId = channelId;
     videoChannelInfo.status = ownerId === 0 ? ApeConsts.CGS_RELEASED : videoChannelInfo.status;
+    loger.log('视频消息处理 tableUpdateHandler.',videoChannelInfo);
+
     this.videoChannels[channelId] = videoChannelInfo;
     switch (videoChannelInfo.status) {
     case ApeConsts.CGS_RELEASED:
@@ -101,6 +104,7 @@ class VideoChat extends Ape {
   }
   emitVideoChange() {
+
     this._emit(MessageTypes.VIDEO_SHOW, {
       activeChannelId: this.activeChannelId,
       HLSURL: this.activeURL,
--- a/src/mcu.js
查看文件 @d38fdeb
+++ b/src/mcu.js
查看文件 @d38fdeb
@@ -31,6 +31,11 @@ class MCU extends Emiter {
   // EverSocket建立通道完毕
   _everSocketOpenHandler() {
+    this._sendJoinClassRequest();
+  }
+
+  //MCU-发送加入会议请求
+  _sendJoinClassRequest(){
     loger.log('MCU-发送加入会议请求.');
     const confInfo = this.confInfo;
@@ -50,15 +55,15 @@ class MCU extends Emiter {
     joinRequestPdu.confDesc = descriptorPdu;
     let pduMsg = pdu.create_connect_provider_request_pdu(
-      joinRequestPdu.type,
+        joinRequestPdu.type,
         confInfo.nodeId,
         confInfo.confId,
-      0,
-      ApeConsts.BROADCAST_CHANNEL_ID,
-      true,
-      PduConsts.DP_TOP,
+        0,
+        ApeConsts.BROADCAST_CHANNEL_ID,
+        true,
+        PduConsts.DP_TOP,
         confInfo.topNodeID,
-      PduConsts.SEG_ONCE
+        PduConsts.SEG_ONCE
     );
     pduMsg.set("site", confInfo.siteId);
@@ -78,22 +83,24 @@ class MCU extends Emiter {
     let pduData = pduMsg.get("data");
     loger.log('MCU-FirstLayer封装消息', 'type', pdu.id2type(pduMsg.type), pduMsg.type, 'sessionId', ApeConsts(pduMsg.sessionId), pduMsg.sessionId);
     switch (pduType) {
-    case PduType.RCPDU_CONNECT_PROVIDER_RESPONSE:
-      let joinConfPdu = pdu['RCConferenceJoinResponsePdu'].decode(pduData);
-      let pduResultCode = joinConfPdu.get("result");
-      switch (pduResultCode) {
-      case PduConsts.RET_SUCCESS:
-        this._updateMCUConfInfoDesc(joinConfPdu.get("confDesc"));
-        this._emit(MessageTypes.CLASS_JOIN_SUCCESS, this.confInfo);
-        break;
-      case PduConsts.RET_FULL_CAPACITY:
-        this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_CLASS_JOIN_FULL);
-        //this._emit(MessageTypes.CLASS_JOIN_FULL);
-        break;
-
-      default:
-        loger.warn('JoinConfPdu-未知类型-等待处理.', pduResultCode);
-      }
+      case PduType.RCPDU_CONNECT_PROVIDER_RESPONSE:
+          //加入会议请求返回数据处理
+        let joinConfPdu = pdu['RCConferenceJoinResponsePdu'].decode(pduData);
+        let pduResultCode = joinConfPdu.get("result");
+        switch (pduResultCode) {
+          case PduConsts.RET_SUCCESS:
+              //加入成功
+            this._updateMCUConfInfoDesc(joinConfPdu.get("confDesc"));
+            this._emit(MessageTypes.CLASS_JOIN_SUCCESS, this.confInfo);
+            break;
+          case PduConsts.RET_FULL_CAPACITY:
+            this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_CLASS_JOIN_FULL);
+            //this._emit(MessageTypes.CLASS_JOIN_FULL);
+            break;
+          default:
+              loger.arn('JoinConfPdu-未知类型-等待处理.', pduResultCode);
+              break
+        }
       break;
     case PduType.RCPDU_SEND_DATA_REQUEST:
       let ape = this._apes[pduMsg.sessionId];
@@ -101,6 +108,7 @@ class MCU extends Emiter {
       if (ape) {
         let subTypeLabel = pdu.id2type(pduMsg.subType);
         loger.log('MCU-SecondLayer封装消息', 'sessionId', sessionLabel, pduMsg.sessionId, 'subtype', subTypeLabel, pduMsg.subType);
+        loger.log("ape._emit("+pduMsg.subType+", "+pduMsg.data+")---------------------------");
         ape._emit(pduMsg.subType, pduMsg.data);
       } else {
         loger.warn(sessionLabel + '尚未注册');
--- a/src/pdu/index.js
查看文件 @d38fdeb
+++ b/src/pdu/index.js
查看文件 @d38fdeb
@@ -48,6 +48,7 @@ pdu.create_connect_provider_request_pdu = function (
     reliability, priority, peer, seg);
 };
+  //upward 是否向顶层抛  create_uniform_pdu默认为true
 pdu.create_uniform_pdu = function (
   sub_type,
   initiator,
@@ -64,6 +65,7 @@ pdu.create_uniform_pdu = function (
     reliability, priority, peer, seg);
 };
+//upward 是否向顶层抛  create_normal_pdu 中由外部定义
 pdu.create_normal_pdu = function (
   sub_type,
   initiator,