Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
李勇
/
McuClient
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
李勇
2017-05-03 16:35:42 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
49c126f9f78907d23507c7b9ceebaadcc0350770
49c126f9
1 parent
744ecc2c
人员信息中增加 音视频质量的字段和ip字段
显示空白字符变更
内嵌
并排对比
正在显示
7 个修改的文件
包含
10 行增加
和
5 行删除
dist/McuClient.js
src/EngineEntrance.js
src/GlobalConfig.js
src/MessageTypes.js
src/apes/ConferApe.js
src/mcu.js
src/pdus/pro.js
dist/McuClient.js
查看文件 @
49c126f
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
49c126f
...
...
@@ -27,7 +27,7 @@ import Server from "config/Server";
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.10.
3
.20170503"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.10.
5
.20170503"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
src/GlobalConfig.js
查看文件 @
49c126f
...
...
@@ -397,7 +397,6 @@ GlobalConfig.siteId_letv='shchuanbao';//乐视,MS不需要动态选点的站
GlobalConfig
.
fps
=
15
;
//帧频
GlobalConfig
.
gop
=
3
;
//关键帧间隔(秒)
GlobalConfig
.
videoQuality
=
2
;
//画面质量 0-低;1-中;2-高;
GlobalConfig
.
cameras
=
[];
//摄像头列表
GlobalConfig
.
microphones
=
[];
//麦克风列表
GlobalConfig
.
curCamera
=
""
;
//当前选择的摄像头
...
...
src/MessageTypes.js
查看文件 @
49c126f
...
...
@@ -18,6 +18,8 @@ MessageTypes.CLASS_JOIN_MCU_SUCCESS ="class_join_mcu_success"// 'join.mcu.succes
MessageTypes
.
CLASS_JOIN_SUCCESS
=
"class_join_success"
// 'join.class.success';
MessageTypes
.
CLASS_UPDATE_ROSTER_NUM
=
"class_update_roster_num"
;
// 'roster_num.message';
MessageTypes
.
CLASS_INSERT_ROSTER
=
"class_insert_roster"
;
// 'roster.insert.message';
MessageTypes
.
CLASS_UPDATE_ROSTER
=
"class_update_roster"
;
// 'roster.insert.message';
MessageTypes
.
CLASS_DELETE_ROSTER
=
"class_delete_roster"
// 'roster.delete.message';
MessageTypes
.
CLASS_NONENTITY_ROSTER
=
"class_nonenetity_roster"
;
// 'roster.nonentity.message';
...
...
src/apes/ConferApe.js
查看文件 @
49c126f
...
...
@@ -575,7 +575,6 @@ class ConferApe extends Ape {
let
rosterExists
=
this
.
rosters
[
nodeId
];
this
.
rosters
[
nodeId
]
=
nodeData
;
let
userDataObj
=
null
;
if
(
!
rosterExists
)
{
try
{
userDataObj
=
pdu
[
'RCNodeInfoUserDataPdu'
].
decode
(
nodeData
.
userData
);
}
catch
(
err
)
{
...
...
@@ -584,19 +583,20 @@ class ConferApe extends Ape {
let
newNodeData
=
nodeData
;
newNodeData
.
userData
=
userDataObj
;
//如果是监课,不告诉其他人
if
(
nodeData
.
role
==
ApeConsts
.
NR_INVISIBLE
)
{
loger
.
log
(
"NR_INVISIBLE"
);
return
;
}
if
(
!
rosterExists
)
{
this
.
_emit
(
MessageTypes
.
CLASS_INSERT_ROSTER
,
{
"nodeId"
:
nodeId
,
"nodeData"
:
newNodeData
});
this
.
emitRosterChange
();
}
else
{
//loger.log("更新人员列表数据,rosterExists已经存在",rosterExists);
this
.
_emit
(
MessageTypes
.
CLASS_UPDATE_ROSTER
,
{
"nodeId"
:
nodeId
,
"nodeData"
:
newNodeData
});
}
}
//踢出用户
...
...
src/mcu.js
查看文件 @
49c126f
...
...
@@ -214,6 +214,8 @@ class MCU extends Emiter {
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
;
...
...
src/pdus/pro.js
查看文件 @
49c126f
...
...
@@ -851,6 +851,8 @@ message RCNodeInfoRecordPdu {
repeated
string
cameras
=
14
;
optional
uint32
openCamera
=
15
;
optional
uint32
openMicrophones
=
16
;
optional
uint32
videoQuality
=
17
;
//设置分辨率的
optional
string
userIp
=
18
;
}
message
RCVotingPollSettingsPdu
{
...
...
请
注册
或
登录
后发表评论