李勇

1.添加MCUClient API文档

2.修改文件夹命名
<!DOCTYPE html>
<html>
<head>
<title>McuClient API</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css">
/* GitHub stylesheet for MarkdownPad (http://markdownpad.com) */
/* Author: Nicolas Hery - http://nicolashery.com */
/* Version: b13fe65ca28d2e568c6ed5d7f06581183df8f2ff */
/* Source: https://github.com/nicolahery/markdownpad-github */
/* RESET
=============================================================================*/
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
}
/* BODY
=============================================================================*/
body {
font-family: Helvetica, arial, freesans, clean, sans-serif;
font-size: 14px;
line-height: 1.6;
color: #333;
background-color: #fff;
padding: 20px;
max-width: 960px;
margin: 0 auto;
}
body>*:first-child {
margin-top: 0 !important;
}
body>*:last-child {
margin-bottom: 0 !important;
}
/* BLOCKS
=============================================================================*/
p, blockquote, ul, ol, dl, table, pre {
margin: 15px 0;
}
/* HEADERS
=============================================================================*/
h1, h2, h3, h4, h5, h6 {
margin: 20px 0 10px;
padding: 0;
font-weight: bold;
-webkit-font-smoothing: antialiased;
}
h1 tt, h1 code, h2 tt, h2 code, h3 tt, h3 code, h4 tt, h4 code, h5 tt, h5 code, h6 tt, h6 code {
font-size: inherit;
}
h1 {
font-size: 28px;
color: #000;
}
h2 {
font-size: 24px;
border-bottom: 1px solid #ccc;
color: #000;
}
h3 {
font-size: 18px;
}
h4 {
font-size: 16px;
}
h5 {
font-size: 14px;
}
h6 {
color: #777;
font-size: 14px;
}
body>h2:first-child, body>h1:first-child, body>h1:first-child+h2, body>h3:first-child, body>h4:first-child, body>h5:first-child, body>h6:first-child {
margin-top: 0;
padding-top: 0;
}
a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 {
margin-top: 0;
padding-top: 0;
}
h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
margin-top: 10px;
}
/* LINKS
=============================================================================*/
a {
color: #4183C4;
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
/* LISTS
=============================================================================*/
ul, ol {
padding-left: 30px;
}
ul li > :first-child,
ol li > :first-child,
ul li ul:first-of-type,
ol li ol:first-of-type,
ul li ol:first-of-type,
ol li ul:first-of-type {
margin-top: 0px;
}
ul ul, ul ol, ol ol, ol ul {
margin-bottom: 0;
}
dl {
padding: 0;
}
dl dt {
font-size: 14px;
font-weight: bold;
font-style: italic;
padding: 0;
margin: 15px 0 5px;
}
dl dt:first-child {
padding: 0;
}
dl dt>:first-child {
margin-top: 0px;
}
dl dt>:last-child {
margin-bottom: 0px;
}
dl dd {
margin: 0 0 15px;
padding: 0 15px;
}
dl dd>:first-child {
margin-top: 0px;
}
dl dd>:last-child {
margin-bottom: 0px;
}
/* CODE
=============================================================================*/
pre, code, tt {
font-size: 12px;
font-family: Consolas, "Liberation Mono", Courier, monospace;
}
code, tt {
margin: 0 0px;
padding: 0px 0px;
white-space: nowrap;
border: 1px solid #eaeaea;
background-color: #f8f8f8;
border-radius: 3px;
}
pre>code {
margin: 0;
padding: 0;
white-space: pre;
border: none;
background: transparent;
}
pre {
background-color: #f8f8f8;
border: 1px solid #ccc;
font-size: 13px;
line-height: 19px;
overflow: auto;
padding: 6px 10px;
border-radius: 3px;
}
pre code, pre tt {
background-color: transparent;
border: none;
}
kbd {
-moz-border-bottom-colors: none;
-moz-border-left-colors: none;
-moz-border-right-colors: none;
-moz-border-top-colors: none;
background-color: #DDDDDD;
background-image: linear-gradient(#F1F1F1, #DDDDDD);
background-repeat: repeat-x;
border-color: #DDDDDD #CCCCCC #CCCCCC #DDDDDD;
border-image: none;
border-radius: 2px 2px 2px 2px;
border-style: solid;
border-width: 1px;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
line-height: 10px;
padding: 1px 4px;
}
/* QUOTES
=============================================================================*/
blockquote {
border-left: 4px solid #DDD;
padding: 0 15px;
color: #777;
}
blockquote>:first-child {
margin-top: 0px;
}
blockquote>:last-child {
margin-bottom: 0px;
}
/* HORIZONTAL RULES
=============================================================================*/
hr {
clear: both;
margin: 15px 0;
height: 0px;
overflow: hidden;
border: none;
background: transparent;
border-bottom: 4px solid #ddd;
padding: 0;
}
/* TABLES
=============================================================================*/
table th {
font-weight: bold;
}
table th, table td {
border: 1px solid #ccc;
padding: 6px 13px;
}
table tr {
border-top: 1px solid #ccc;
background-color: #fff;
}
table tr:nth-child(2n) {
background-color: #f8f8f8;
}
/* IMAGES
=============================================================================*/
img {
max-width: 100%
}
</style>
</head>
<body>
<h1>McuClient API参考说明</h1>
<p></p></p>
<hr />
<h2>创建McuClient对象</h2>
<p>只创建一次</p>
<p>示例代码</p>
<pre><code>window.onload=function(){
//创建client
const client=MCUClientEngine.createMcuClient();
//获取事件监听消息定义
const MessageTypes=MCUClientEngine.MessageTypes;
}
</code></pre>
<hr />
<h2>McuClient方法</h2>
<h3>初始化</h3>
<h4>client.init(configInfo)</h4>
<p>client创建完成之后第一步需要初始化。</p>
<p>示例代码</p>
<pre><code>var paramInfo={
"meetingNumber":123456,
"portal":"127.0.0.1:80",
"usertRole":"normal",
"userID":0,
};
//初始化
client.init(paramInfo,onSuccess,onFailure);
function onSuccess(callbackData){
//初始化成功回调
//{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
};
function onFailure(callbackData){
//初始化失败回调
};
</code></pre>
<div class="wy-table-responsive"><table border="1" class="docutils">
<colgroup>
<col width="10%">
<col width="10%">
<col width="80%">
</colgroup>
<tbody valign="mid">
<tr class="row-odd">
<td><p class="first last">参数名称</p></td>
<td><p class="first last">类型</p></td>
<td><p class="first last">该对象包含以下属性</p></td>
</tr>
<tr class="row-even">
<td rowspan="5">paramInfo</td>
<td rowspan="5"><p class="first last">对象</p></td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>meetingNumber:(必选)Number </p>课堂号</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>portal:(必选)String </p>IP地址</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>usertRole:(可选) String </p>
用户的身份,5种类型,默认是normal
;host(主持人/老师)、presenter(主讲人)、assistant(助教)、normal(普通角色/学生),record(暂时没用)</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>userId:(可选) String </p>
第三方用户id,默认是0
</ul>
</td>
</tr>
<tr class="row-odd">
<td><p class="first last">onSuccess</p></td>
<td><p class="first last">Function</p></td>
<td><p class="first last"><li>(必选) Function </p>初始化成功回调函数,返回值:</p>{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
</td>
</tr>
<tr class="row-odd">
<td><p class="first last">onFailure</p></td>
<td><p class="first last">Function</p></td>
<td><p class="first last"><li>(必选) Function </p>初始化失败回调函数</p></td>
</tr>
</tbody>
</table></div>
<h3>加入会议</h3>
<h4>client.joinClass(paramInfo)</h4>
<p>client初始化成功之后,加入会议。</p>
<p>示例代码</p>
<pre><code>var paramInfo={
"userName":"大名",//自己的名字,在列表中显示
"password":"123321",//课堂密码,如果设置了密码需要验证
};
//加入会议
client.joinClass(paramInfo,onSuccess,onFailure);
function onSuccess(callbackData){
//加入会议成功回调
//{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
};
function onFailure(callbackData){
//加入会议失败回调
//MessageTypes.ERROR_PARAM 传入的参数错误
//MessageTypes.ERROR_CLASS_PASSWORD_WRONG 传入的参数错误
//MessageTypes.ERROR_CLASS_JOIN_FULL 课堂人数已满
//MessageTypes.ERROR_CLASS_PROTOCOL_WRONG 协议异常
//MessageTypes.ERROR_CLASS_MD5_WRONG MD5验证失败
};
</code></pre>
<div class="wy-table-responsive"><table border="1" class="docutils">
<colgroup>
<col width="10%">
<col width="10%">
<col width="80%">
</colgroup>
<tbody valign="m">
<tr class="row-odd">
<td><p class="first last">参数名称</p></td>
<td><p class="first last">类型</p></td>
<td><p class="first last">该对象包含以下属性</p></td>
</tr>
<tr class="row-even">
<td rowspan="3">paramInfo</td>
<td rowspan="3"><p class="first last">对象</p></td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>userName:(必选)String </p>进入课堂的名字</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>password:(可选)String </p>进入课堂的密码,如果课堂不设置密码就不需要,设置了密码的情况下,进入课堂需要输入密码,根据初始化回调的参数passwordRequired来判断</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td><p class="first last">onSuccess</p></td>
<td><p class="first last">Function</p></td>
<td><p class="first last"><li>(必选) Function </p>成功回调函数</p>
</td>
</tr>
<tr class="row-odd">
<td><p class="first last">onFailure</p></td>
<td><p class="first last">Function</p></td>
<td><p class="first last"><li>(必选) Function </p>失败回调函数,返回值:</p>
//MessageTypes.ERROR_PARAM 传入的参数错误
//MessageTypes.ERROR_CLASS_PASSWORD_WRONG 传入的参数错误
//MessageTypes.ERROR_CLASS_JOIN_FULL 课堂人数已满
//MessageTypes.ERROR_CLASS_PROTOCOL_WRONG 协议异常
//MessageTypes.ERROR_CLASS_MD5_WRONG MD5验证失败
</td>
</tr>
</tbody>
</table></div>
<h3>离开会议</h3>
<h4>client.leaveClass()</h4>
<p>离开会议</p>
<h3>发送消息</h3>
<h4>client.sendChatMsg(paramInfo)</h4>
<p>发送聊天消息</p>
<p>示例代码</p>
<pre><code>var paramInfo={
"message":"需要发送的内容",
"to":0
};
client.sendChatMsg(paramInfo);
</code></pre>
<div class="wy-table-responsive"><table border="1" class="docutils">
<colgroup>
<col width="10%">
<col width="10%">
<col width="80%">
</colgroup>
<tbody valign="top">
<tr class="row-odd">
<td><p class="first last">参数名称</p></td>
<td><p class="first last">类型</p></td>
<td><p class="first last">该对象包含以下属性</p></td>
</tr>
<tr class="row-even">
<td rowspan="11">paramInfo</td>
<td rowspan="11"><p class="first last">对象</p></td>
</tr>
<tr class="row-odd">
<tr class="row-odd">
<td>
<ul>
<li>message:(必选)String </p>消息内容</li>
</ul>
</td>
</tr>
<td>
<ul>
<li>to:(可选) Number </p>
接收消息的人的ID,默认值是0(所有人都)</li>
</ul>
</td>
</tr>
</tbody>
</table></div>
<hr />
<h2>client回调事件</h2>
<h3>显示日志信息 事件回调</h3>
<p>示例代码</p>
<pre><code>client.on(MessageTypes.CLASS_SHOW_DETAIL, function(callbackData){
//.....
});
</code></pre>
<h3>会议人数查询 事件回调</h3>
<p>示例代码</p>
<pre><code> client.on(MessageTypes.CLASS_SHOW_ROSTER_NUM,function(callbackData){
//.....
});
</code></pre>
<h3>关闭会议 事件回调</h3>
<p>示例代码</p>
<pre><code>client.on(MessageTypes.CLASS_EXIT, function(callbackData){
//.....
});
</code></pre>
<h3>收到聊天消息 事件回调</h3>
<p>示例代码</p>
<pre><code>client.on(MessageTypes.CHAT_RECEIVE, function(callbackData){
//{"fromNodeID":1484207995,"toNodeID":0,"message":"消息内容","fromName":"发送消息人的名字","fromRole":0}
});
</code></pre>
<h3>视频显示 事件回调</h3>
<p>示例代码</p>
<pre><code>client.on(MessageTypes.VIDEO_SHOW, function(callbackData){
//.....
});
</code></pre>
<h3>文档 事件回调</h3>
<p>示例代码</p>
<pre><code>client.on(MessageTypes.DOC_SHOW, function(callbackData){
//.....
});
</code></pre>
<h3>文档笔记 事件回调</h3>
<p>示例代码</p>
<pre><code>client.on(MessageTypes.DOC_ANNO,function(callbackData){
//.....
});
</code></pre>
<h3>删除文档 事件回调</h3>
<p>示例代码</p>
<pre><code> client.on(MessageTypes.DOC_DEL,function(callbackData){
//.....
});
</code></pre>
<h3>网络错误 事件回调</h3>
<p>示例代码</p>
<pre><code>client.on(MessageTypes.NET_ERROR,function(callbackData){
//.....
});
</code></pre>
</body>
</html>
<!-- This document was created with MarkdownPad, the Markdown editor for Windows (http://markdownpad.com) -->
... ...
# McuClient API参考说明 #
</p>
----------
##创建McuClient对象 ##
只创建一次
示例代码
window.onload=function(){
//创建client
const client=MCUClientEngine.createMcuClient();
//获取事件监听消息定义
const MessageTypes=MCUClientEngine.MessageTypes;
}
----------
## McuClient方法 ##
### 初始化 ###
#### client.init(configInfo) ####
client创建完成之后第一步需要初始化。
示例代码
var paramInfo={
"meetingNumber":123456,
"portal":"127.0.0.1:80",
"usertRole":"normal",
"userID":0,
};
//初始化
client.init(paramInfo,onSuccess,onFailure);
function onSuccess(callbackData){
//初始化成功回调
//{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
};
function onFailure(callbackData){
//初始化失败回调
};
<div class="wy-table-responsive"><table border="1" class="docutils">
<colgroup>
<col width="10%">
<col width="10%">
<col width="80%">
</colgroup>
<tbody valign="mid">
<tr class="row-odd">
<td><p class="first last">参数名称</p></td>
<td><p class="first last">类型</p></td>
<td><p class="first last">该对象包含以下属性</p></td>
</tr>
<tr class="row-even">
<td rowspan="5">paramInfo</td>
<td rowspan="5"><p class="first last">对象</p></td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>meetingNumber:(必选)Number </p>课堂号</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>portal:(必选)String </p>IP地址</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>usertRole:(可选) String </p>
用户的身份,5种类型,默认是normal
;host(主持人/老师)、presenter(主讲人)、assistant(助教)、normal(普通角色/学生),record(暂时没用)</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>userId:(可选) String </p>
第三方用户id,默认是0
</ul>
</td>
</tr>
<tr class="row-odd">
<td><p class="first last">onSuccess</p></td>
<td><p class="first last">Function</p></td>
<td><p class="first last"><li>(必选) Function </p>初始化成功回调函数,返回值:</p>{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
</td>
</tr>
<tr class="row-odd">
<td><p class="first last">onFailure</p></td>
<td><p class="first last">Function</p></td>
<td><p class="first last"><li>(必选) Function </p>初始化失败回调函数</p></td>
</tr>
</tbody>
</table></div>
### 加入会议 ###
#### client.joinClass(paramInfo) ####
client初始化成功之后,加入会议。
示例代码
var paramInfo={
"userName":"大名",//自己的名字,在列表中显示
"password":"123321",//课堂密码,如果设置了密码需要验证
};
//加入会议
client.joinClass(paramInfo,onSuccess,onFailure);
function onSuccess(callbackData){
//加入会议成功回调
//{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
};
function onFailure(callbackData){
//加入会议失败回调
//MessageTypes.ERROR_PARAM 传入的参数错误
//MessageTypes.ERROR_CLASS_PASSWORD_WRONG 传入的参数错误
//MessageTypes.ERROR_CLASS_JOIN_FULL 课堂人数已满
//MessageTypes.ERROR_CLASS_PROTOCOL_WRONG 协议异常
//MessageTypes.ERROR_CLASS_MD5_WRONG MD5验证失败
};
<div class="wy-table-responsive"><table border="1" class="docutils">
<colgroup>
<col width="10%">
<col width="10%">
<col width="80%">
</colgroup>
<tbody valign="m">
<tr class="row-odd">
<td><p class="first last">参数名称</p></td>
<td><p class="first last">类型</p></td>
<td><p class="first last">该对象包含以下属性</p></td>
</tr>
<tr class="row-even">
<td rowspan="3">paramInfo</td>
<td rowspan="3"><p class="first last">对象</p></td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>userName:(必选)String </p>进入课堂的名字</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td>
<ul>
<li>password:(可选)String </p>进入课堂的密码,如果课堂不设置密码就不需要,设置了密码的情况下,进入课堂需要输入密码,根据初始化回调的参数passwordRequired来判断</li>
</ul>
</td>
</tr>
<tr class="row-odd">
<td><p class="first last">onSuccess</p></td>
<td><p class="first last">Function</p></td>
<td><p class="first last"><li>(必选) Function </p>成功回调函数</p>
</td>
</tr>
<tr class="row-odd">
<td><p class="first last">onFailure</p></td>
<td><p class="first last">Function</p></td>
<td><p class="first last"><li>(必选) Function </p>失败回调函数,返回值:</p>
//MessageTypes.ERROR_PARAM 传入的参数错误
//MessageTypes.ERROR_CLASS_PASSWORD_WRONG 传入的参数错误
//MessageTypes.ERROR_CLASS_JOIN_FULL 课堂人数已满
//MessageTypes.ERROR_CLASS_PROTOCOL_WRONG 协议异常
//MessageTypes.ERROR_CLASS_MD5_WRONG MD5验证失败
</td>
</tr>
</tbody>
</table></div>
### 离开会议 ###
#### client.leaveClass() ####
离开会议
### 发送消息 ###
#### client.sendChatMsg(paramInfo) ####
发送聊天消息
示例代码
var paramInfo={
"message":"需要发送的内容",
"to":0
};
client.sendChatMsg(paramInfo);
<div class="wy-table-responsive"><table border="1" class="docutils">
<colgroup>
<col width="10%">
<col width="10%">
<col width="80%">
</colgroup>
<tbody valign="top">
<tr class="row-odd">
<td><p class="first last">参数名称</p></td>
<td><p class="first last">类型</p></td>
<td><p class="first last">该对象包含以下属性</p></td>
</tr>
<tr class="row-even">
<td rowspan="11">paramInfo</td>
<td rowspan="11"><p class="first last">对象</p></td>
</tr>
<tr class="row-odd">
<tr class="row-odd">
<td>
<ul>
<li>message:(必选)String </p>消息内容</li>
</ul>
</td>
</tr>
<td>
<ul>
<li>to:(可选) Number </p>
接收消息的人的ID,默认值是0(所有人都)</li>
</ul>
</td>
</tr>
</tbody>
</table></div>
----------
## client回调事件 ##
### 显示日志信息 事件回调 ###
示例代码
client.on(MessageTypes.CLASS_SHOW_DETAIL, function(callbackData){
//.....
});
### 会议人数查询 事件回调 ###
示例代码
client.on(MessageTypes.CLASS_SHOW_ROSTER_NUM,function(callbackData){
//.....
});
### 关闭会议 事件回调 ###
示例代码
client.on(MessageTypes.CLASS_EXIT, function(callbackData){
//.....
});
### 收到聊天消息 事件回调 ###
示例代码
client.on(MessageTypes.CHAT_RECEIVE, function(callbackData){
//{"fromNodeID":1484207995,"toNodeID":0,"message":"消息内容","fromName":"发送消息人的名字","fromRole":0}
});
### 视频显示 事件回调 ###
示例代码
client.on(MessageTypes.VIDEO_SHOW, function(callbackData){
//.....
});
### 文档 事件回调 ###
示例代码
client.on(MessageTypes.DOC_SHOW, function(callbackData){
//.....
});
### 文档笔记 事件回调 ###
示例代码
client.on(MessageTypes.DOC_ANNO,function(callbackData){
//.....
});
### 删除文档 事件回调 ###
示例代码
client.on(MessageTypes.DOC_DEL,function(callbackData){
//.....
});
### 网络错误 事件回调 ###
示例代码
client.on(MessageTypes.NET_ERROR,function(callbackData){
//.....
});
\ No newline at end of file
... ...
{
"name": "",
"version": "1.0.1",
"description": "McuClient on H5",
"main": "dist/main.js",
"description": "McuClient",
"McuClient": "dist/McuClient.js",
"directories": {
"doc": "docs",
"test": "test"
... ... @@ -11,7 +11,7 @@
"test": "test/index.js"
},
"keywords": [
"LiveClass"
"McuClient"
],
"author": "www.3mang.com",
"license": "MIT",
... ... @@ -31,7 +31,7 @@
"wbp": {
"project": "umd",
"entries": {
"main": "./McuClientEngine.js"
"McuClient": "./McuClientEngine.js"
},
"source": "src/",
"build": "dist/"
... ...
... ... @@ -12,8 +12,9 @@ import EngineUtils from "EngineUtils";
import GlobalConfig from 'GlobalConfig';
let loger = Loger.getLoger('MessageEntrance');
let _sdkInfo={"version":"v1.0.0","author":"www.3mang.com"};
let _sdkInfo={"version":"v.1.0.1","author":"www.3mang.com"};
//APE
let _sass;
let _mcu ;
let _confer_ape;
... ... @@ -22,12 +23,15 @@ let _video_ape;
let _doc_ape;
let _wb_ape;
//init callBack function
let _initSuccessCallBackFun;
let _initFailureCallBackFun;
//join callBack function
let _joinClassSuccessCallBackFun;
let _joinClassFailureCallBackFun;
//MCUClient 外部实例化主类
export default class MessageEntrance extends Emiter {
constructor() {
super();
... ...
... ... @@ -13,14 +13,14 @@
//
// //////////////////////////////////////////////////////////////////////////////
import pdu from 'pdu';
import pdu from 'pdus';
import Emiter from 'Emiter';
import mcu from 'mcu';
import Loger from 'Loger';
import MessageTypes from 'MessageTypes';
import ApeConsts from './ApeConsts';
import ArrayBufferUtil from 'libs/ArrayBufferUtil';
import PduConsts from 'pdu/PduConsts';
import PduConsts from 'pdus/PduConsts';
// 日志对象
const loger = Loger.getLoger('Ape');
... ... @@ -244,7 +244,7 @@ export default class Ape extends Emiter {
let adapterItemPdu = new pdu['RCAdapterItemPdu'];
adapterItemPdu.type = pdu.RCPDU_REG_REGISTER_KEY;
// pack register key pdu
// pack register key pdus
let registerKeyPdu = new pdu['RCRegistryRegisterKeyPdu'];
registerKeyPdu.id = id;
registerKeyPdu.name = name;
... ...
... ... @@ -15,7 +15,7 @@
import Ape from './Ape';
import ApeConsts from './ApeConsts';
import pdu from 'pdu';
import pdu from 'pdus';
import Loger from 'Loger';
import MessageTypes from 'MessageTypes';
import EngineUtils from "EngineUtils";
... ... @@ -38,7 +38,7 @@ class ChatApe extends Ape {
this.on(pdu.RCPDU_CHAT_SEND_DATA_REQUEST, this.chatMsgIncomingHandler.bind(this));
}
//chatMsgIncomingHandler(pdu) {
//chatMsgIncomingHandler(pdus) {
//
//}
... ...
... ... @@ -16,7 +16,7 @@
import Ape from './Ape';
import ApeConsts from './ApeConsts';
import MessageTypes from 'MessageTypes';
import pdu from 'pdu';
import pdu from 'pdus';
import { Zlib } from 'zlibjs/bin/zlib.min';
import UTF8 from 'utf-8';
import Loger from 'Loger';
... ...
... ... @@ -15,7 +15,7 @@
import Ape from './Ape';
import ApeConsts from './ApeConsts';
import pdu from 'pdu';
import pdu from 'pdus';
import Loger from 'Loger';
import MessageTypes from 'MessageTypes';
... ...
... ... @@ -15,7 +15,7 @@
import Ape from './Ape';
import ApeConsts from './ApeConsts';
import pdu from 'pdu';
import pdu from 'pdus';
import Loger from 'Loger';
import MessageTypes from 'MessageTypes';
... ... @@ -90,10 +90,7 @@ class VideoChat extends Ape {
this.activeChannelId = videoChannelInfo.channelId;
// AMS
if (this._confInfo.msType === '1') {
this.activeURL = `http://dazhi.3mang.com/live/${this._confInfo.confId}/${this._confInfo.confId}_${videoChannelInfo.channelId}_flash_cam_mic_aac/playlist.m3u8`;
}else {
this.activeURL = `http://hls.3mang.com/live/${this._confInfo.confId}_${videoChannelInfo.channelId}_flash_cam_mic_aac/playlist.m3u8`;
}
... ...
... ... @@ -15,7 +15,7 @@
import Ape from './Ape';
import ApeConsts from './ApeConsts';
import pdu from 'pdu';
import pdu from 'pdus';
import Loger from 'Loger';
import MessageTypes from 'MessageTypes';
import { Zlib } from 'zlibjs/bin/zlib.min';
... ...
... ... @@ -4,9 +4,9 @@ import Emiter from 'Emiter';
import MessageTypes from 'MessageTypes';
import Loger from 'Loger';
import everSocket from 'everSocket';
import pdu from 'pdu/index';
import PduType from 'pdu/PduType';
import PduConsts from 'pdu/PduConsts';
import pdu from 'pdus/index';
import PduType from 'pdus/PduType';
import PduConsts from 'pdus/PduConsts';
import ApeConsts from 'apes/ApeConsts';
import ConferApe from 'apes/ConferApe';
import ArrayBufferUtil from 'libs/ArrayBufferUtil';
... ... @@ -54,7 +54,7 @@ class MCU extends Emiter {
descriptorPdu.capacity = 1;
joinRequestPdu.confDesc = descriptorPdu;
let pduMsg = pdu.create_connect_provider_request_pdu(
let pduMsg = pdu.create_join_class_request_pdu(
joinRequestPdu.type,
confInfo.nodeId,
confInfo.confId,
... ... @@ -103,12 +103,13 @@ class MCU extends Emiter {
}
break;
case PduType.RCPDU_SEND_DATA_REQUEST:
//先判断当前消息属于哪个APE 根据 sessionId来判断
let ape = this._apes[pduMsg.sessionId];
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("ape._emit("+pduMsg.subType+", "+pduMsg.data+")---------------------------");
//ape广播事件,只要ape中监听就能收到
ape._emit(pduMsg.subType, pduMsg.data);
} else {
loger.warn(sessionLabel + '尚未注册');
... ...
... ... @@ -34,7 +34,6 @@ RCPduPackage.RCPDU_CHANNEL_LEAVE_REQUEST = 105;
RCPduPackage.RCPDU_CHANNEL_RELEASE_REQUEST = 106;
RCPduPackage.RCPDU_CHANNEL_RELEASE_INDICATION = 107;
RCPduPackage.RCPDU_SEND_DATA_REQUEST = 120;
RCPduPackage.RCPDU_SEND_DATA_REQUEST = 120;
RCPduPackage.RCPDU_SEND_DATA_INDICATION = 121;
RCPduPackage.RCPDU_UNIFORM_SEND_DATA_REQUEST = 125;
RCPduPackage.RCPDU_UNIFORM_SEND_DATA_INDICATION = 126;
... ...
... ... @@ -32,7 +32,7 @@ pdu.decode_pdu = function (buffer) {
return pdu['RCSendDataPdu'].decode(buffer);
};
pdu.create_connect_provider_request_pdu = function (
pdu.create_join_class_request_pdu = function (
sub_type,
initiator,
conference_id,
... ...