修改ChatApe方法的参数为对象

@@ -27,7 +27,6 @@ export default class Emiter {
     if (eid) {
     if (eid) {
       //eid=* broadcast
       //eid=* broadcast
       let asteriskStub =this.MAPS['*'];
       let asteriskStub =this.MAPS['*'];
-      console.log("asteriskStub");
       if (asteriskStub && asteriskStub.length) {
       if (asteriskStub && asteriskStub.length) {
         asteriskStub.forEach(function (elistener) {
         asteriskStub.forEach(function (elistener) {
           elistener(eid, data);
           elistener(eid, data);

@@ -97,7 +97,8 @@ export default class MessageEntrance extends Emiter {
   // MCU 会议成功
   // MCU 会议成功
   _conferenceJoinSuccessHandler() {
   _conferenceJoinSuccessHandler() {
     if(sass){
     if(sass){
-      sass.getClassDetail();
+      sass.getClassDetail();//会议信息
+      sass.getMeetingParm();//会议参数大全
     }
     }
   }
   }
   // 参会处理
   // 参会处理
@@ -109,11 +110,22 @@ export default class MessageEntrance extends Emiter {
     this._emit(msg.type, msg);
     this._emit(msg.type, msg);
   }
   }
   // 发送聊天消息
   // 发送聊天消息
-  _sendChatMsg(to, msg) {
+  /* _sendChatMsg(to, msg) {
     if (chat_ape) {
     if (chat_ape) {
       chat_ape.sendChatMsg(to, msg);
       chat_ape.sendChatMsg(to, msg);
     }
     }
+  }*/
+  _sendChatMsg(_messageInfo) {
+    if(_messageInfo===null||EngineUtils.isEmptyObject(_messageInfo)){
+      loger.log('sendChatMsg 传递的参数不对',_messageInfo);
+      return ;
+    }
+
+    if (chat_ape) {
+      chat_ape.sendChatMsg(_messageInfo);
+    }
   }
   }
+
   // 白板笔记更新
   // 白板笔记更新
   annoUpdateHandler(annoInfo) {
   annoUpdateHandler(annoInfo) {
     const activeDocId = confer_ape.activeDocId;
     const activeDocId = confer_ape.activeDocId;

@@ -100,7 +100,6 @@ class Sass extends Emiter {
       .catch(err => {
       .catch(err => {
         loger.error(`H5SassMD5校验-异常.状态码:${err}`);
         loger.error(`H5SassMD5校验-异常.状态码:${err}`);
         this._emit(MessageTypes.NET_ERROR);
         this._emit(MessageTypes.NET_ERROR);
-        console.log("aaaaaaaaaaaaaaaaaaa");
       });
       });
   }
   }
 
 
@@ -136,6 +135,41 @@ class Sass extends Emiter {
         this._emit(MessageTypes.NET_ERROR);
         this._emit(MessageTypes.NET_ERROR);
       });
       });
   }
   }
+
+  getMeetingParm(){
+    console.log("getMeetingParm------------------------");
+    //http://112.126.80.182/3m/meeting/getMeetingParam.do?meetingNumber=1653304953
+    //let url = `http://${confInfo.portal}/3m/meeting/getClassH5.do?classNumber=${confInfo.confId}`;
+    let url = `http://${confInfo.portal}/3m/meeting/getMeetingParam.do?meetingNumber=${confInfo.confId}&device=flashplayer`;
+    loger.log('H5Sass获取MeetingParam.', url);
+
+    fetch(url, {
+      timeout: 5000,
+      mode: 'no-cors'
+    })
+        .then(ret => {
+          if (ret.ok) {
+            return ret.json();
+          } else {
+            loger.error(`H5Sass获取MeetingParam-网络异常.状态码:${ret.status}`);
+            this._emit(MessageTypes.NET_ERROR);
+            throw '';
+          }
+        })
+        .then(ret => {
+          if (ret.errorCode === 0) {
+            loger.log('H5Sass获取MeetingParam完成');
+            this._emit(MessageTypes.CONFERENCE_SHOW_DETAIL, ret);
+          } else {
+            loger.warn('H5Sass获取MeetingParam失败.');
+            this._emit(MessageTypes.NET_ERROR);
+          }
+        })
+        .catch(err => {
+          loger.error(`H5Sass获取MeetingParam异常.状态码:${err}`);
+          this._emit(MessageTypes.NET_ERROR);
+        });
+  }
 }
 }
 
 
 Sass.prototype.SUCCESS = Sass.SUCCESS = 'h5sass.success';
 Sass.prototype.SUCCESS = Sass.SUCCESS = 'h5sass.success';

@@ -42,19 +42,21 @@ class ChatApe extends Ape {
 
 
   }
   }
 
 
-  sendChatMsg(to, message) {
+  sendChatMsg(_messageInfo) {
     if(this._confInfo===null||EngineUtils.isEmptyObject(this._confInfo)){
     if(this._confInfo===null||EngineUtils.isEmptyObject(this._confInfo)){
-      loger.log('发送聊天消息.', to, message,"Engine 还未初始化数据!");
+      loger.log('不能发送聊天消息.McuClient还未初始化数据!');
       return ;
       return ;
     }
     }
 
 
-    loger.log('发送聊天消息.', to, message);
+
+   // to, message
+    loger.log('发送聊天消息.', _messageInfo.to, _messageInfo.message);
     let chatSendPdu = new pdu['RCChatSendDataRequestPdu'];
     let chatSendPdu = new pdu['RCChatSendDataRequestPdu'];
     chatSendPdu.type = pdu.RCPDU_CHAT_SEND_DATA_REQUEST;
     chatSendPdu.type = pdu.RCPDU_CHAT_SEND_DATA_REQUEST;
     chatSendPdu.initiator = this._confInfo.nodeId;//发起人
     chatSendPdu.initiator = this._confInfo.nodeId;//发起人
-    chatSendPdu.peer = to;//发送给谁
+    chatSendPdu.peer = _messageInfo.to;//发送给谁,公聊的时候是0，私聊的时候是指定的用户id
     chatSendPdu.isPublic = true;
     chatSendPdu.isPublic = true;
-    chatSendPdu.userData = this._rCArrayBufferUtil.strToUint8Array("h5" + message);
+    chatSendPdu.userData = this._rCArrayBufferUtil.strToUint8Array("h5" + _messageInfo.message);
     chatSendPdu.fromName = this._rCArrayBufferUtil.strToUint8Array("h5" + this._confInfo.userName);
     chatSendPdu.fromName = this._rCArrayBufferUtil.strToUint8Array("h5" + this._confInfo.userName);
     chatSendPdu.fromRole = this._confInfo.classRole;
     chatSendPdu.fromRole = this._confInfo.classRole;
     if (!(chatSendPdu.isPublic || 0 === chatSendPdu.peer)) {
     if (!(chatSendPdu.isPublic || 0 === chatSendPdu.peer)) {