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
李勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
77841ec3eed0c1e78c7912e65cdde856c03b3582
77841ec3
1 parent
17085f07
修改角色身份的关联,MCU用的是数字,Sass用的是字符串,客户端做转换
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
22 行增加
和
16 行删除
src/apes/ApeConsts.js
src/apes/ConferApe.js
src/mcu.js
src/apes/ApeConsts.js
查看文件 @
77841ec
...
...
@@ -45,8 +45,8 @@ public static const NR_INVISIBLE:uint = 32; // 隐身用户
//ApeConsts.NR_GUEST = 0; // 客人
ApeConsts
.
NR_NORMAL
=
1
;
// 普通与会者
ApeConsts
.
NR_ADMIN
=
2
;
// 管理员
ApeConsts
.
NR_MASTER
=
4
;
// 主持人
ApeConsts
.
NR_SLAVE
=
8
;
// 主讲人
ApeConsts
.
NR_HOST
=
4
;
// 主持人
ApeConsts
.
NR_PRESENTER
=
8
;
// 主讲人
ApeConsts
.
NR_ASSISTANT
=
16
;
// 助教
ApeConsts
.
NR_INVISIBLE
=
32
;
// 隐身用户
...
...
@@ -58,17 +58,22 @@ ApeConsts.normal="normal";//(普通角色/学生)
ApeConsts
.
record
=
"record"
;
//(暂时没用.
ApeConsts
.
invisible
=
"invisible"
;
//隐身用户
////最新定义的角色身份 20170220
//ApeConsts.USER_TYPE_HOST=1;//(主持人/老师)
//ApeConsts.USER_TYPE_ASSISTANT=2;//(助教)
//ApeConsts.USER_TYPE_NORMAL=8;//(普通角色/学生)
//ApeConsts.USER_TYPE_MONITOR_INVISIBLE=32;//(监课/隐身)
//
////
//ApeConsts.USER_TYPE_HOST_STRING="host";//(主持人/老师)
//ApeConsts.USER_TYPE_ASSISTANT_STRING="assistant";//(助教)
//ApeConsts.USER_TYPE_NORMAL_STRING="normal";//(普通角色/学生)
//ApeConsts.USER_TYPE_MONITOR_INVISIBLE_STRING="invisible";//(监课/隐身)
//下面做身份的数字和字符串对应关系
ApeConsts
.
userTypes
=
{};
ApeConsts
.
userTypes
[
ApeConsts
.
NR_NORMAL
]
=
ApeConsts
.
normal
;
ApeConsts
.
userTypes
[
ApeConsts
.
NR_ADMIN
]
=
ApeConsts
.
record
;
ApeConsts
.
userTypes
[
ApeConsts
.
NR_HOST
]
=
ApeConsts
.
host
;
ApeConsts
.
userTypes
[
ApeConsts
.
NR_PRESENTER
]
=
ApeConsts
.
presenter
;
ApeConsts
.
userTypes
[
ApeConsts
.
NR_ASSISTANT
]
=
ApeConsts
.
assistant
;
ApeConsts
.
userTypes
[
ApeConsts
.
NR_INVISIBLE
]
=
ApeConsts
.
invisible
;
ApeConsts
.
userTypesToId
=
{};
ApeConsts
.
userTypesToId
[
ApeConsts
.
normal
]
=
ApeConsts
.
NR_NORMAL
;
ApeConsts
.
userTypesToId
[
ApeConsts
.
record
]
=
ApeConsts
.
NR_ADMIN
;
ApeConsts
.
userTypesToId
[
ApeConsts
.
host
]
=
ApeConsts
.
NR_HOST
;
ApeConsts
.
userTypesToId
[
ApeConsts
.
presenter
]
=
ApeConsts
.
NR_PRESENTER
;
ApeConsts
.
userTypesToId
[
ApeConsts
.
assistant
]
=
ApeConsts
.
NR_ASSISTANT
;
ApeConsts
.
userTypesToId
[
ApeConsts
.
invisible
]
=
ApeConsts
.
NR_INVISIBLE
;
/*msType type*/
...
...
src/apes/ConferApe.js
查看文件 @
77841ec
...
...
@@ -483,8 +483,8 @@ class ConferApe extends Ape {
//更新人员列表数据
rosterUpdateHandler
(
nodeId
,
nodeData
)
{
if
(
nodeData
.
role
===
ApeConsts
.
NR_MASTER
||
nodeData
.
role
===
ApeConsts
.
NR_SLAVE
)
{
if
(
nodeData
.
role
===
ApeConsts
.
NR_HOST
||
nodeData
.
role
===
ApeConsts
.
NR_PRESENTER
)
{
this
.
hostNodeId
=
nodeData
.
nodeId
;
this
.
hostUserId
=
nodeData
.
userId
;
}
...
...
src/mcu.js
查看文件 @
77841ec
...
...
@@ -181,7 +181,8 @@ class MCU extends Emiter {
nodeInfoRecordPdu
.
name
=
this
.
classInfo
.
userName
;
nodeInfoRecordPdu
.
nodeId
=
this
.
classInfo
.
nodeId
;
nodeInfoRecordPdu
.
userId
=
this
.
classInfo
.
userId
;
nodeInfoRecordPdu
.
role
=
1
;
//NR_NORMAL
//nodeInfoRecordPdu.role = 1; //NR_NORMAL
nodeInfoRecordPdu
.
role
=
ApeConsts
.
userTypesToId
[
this
.
classInfo
.
userRole
]
||
1
;
//NR_NORMAL用户的身份,根据用户登录时的身份设置
nodeInfoRecordPdu
.
level
=
0
;
let
conferenceRecord
=
{};
//RCConferenceRecord_T
...
...
请
注册
或
登录
后发表评论