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
AlexWang
2017-06-20 12:21:05 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f4d772e7c08eb5180b482a74e68ed37989a07b24
f4d772e7
1 parent
649a0052
更改用户禁言状态常量USER_ACTION_SILENCE_STATUS_CHANGE
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
65 行增加
和
74 行删除
src/apes/ApeConsts.js
src/apes/ApeConsts.js
查看文件 @
f4d772e
...
...
@@ -8,61 +8,61 @@ export default function ApeConsts(id) {
//0
//课堂状态
ApeConsts
.
CLASS_STATUS_WAIT
=
0
;
//课堂还未开始
ApeConsts
.
CLASS_STATUS_STARTED
=
1
;
//直播中
ApeConsts
.
CLASS_STATUS_PAUSE
=
2
;
//暂停
ApeConsts
.
CLASS_STATUS_CLOSE
=
3
;
//结束//这个是点击结束课堂,把所有人踢出课堂,然后把状态值还原为0*************
ApeConsts
.
CLASS_STATUS_UPTATE
=
4
;
//更新课堂状态信息
ApeConsts
.
CLASS_WAIT_START
=
"class.wait.start"
;
//课堂还未开始
ApeConsts
.
CLASS_STARTING
=
"class.started"
;
//直播中
ApeConsts
.
CLASS_PAUSING
=
"class.pause"
;
//暂停
ApeConsts
.
CLASS_PAUSING
=
"class.closed"
;
//关闭
ApeConsts
.
CLASS_PAUSING
=
"class.update"
;
//更新当前的状态信息
ApeConsts
.
CLASS_STATUS_WAIT
=
0
;
//课堂还未开始
ApeConsts
.
CLASS_STATUS_STARTED
=
1
;
//直播中
ApeConsts
.
CLASS_STATUS_PAUSE
=
2
;
//暂停
ApeConsts
.
CLASS_STATUS_CLOSE
=
3
;
//结束//这个是点击结束课堂,把所有人踢出课堂,然后把状态值还原为0*************
ApeConsts
.
CLASS_STATUS_UPTATE
=
4
;
//更新课堂状态信息
ApeConsts
.
CLASS_WAIT_START
=
"class.wait.start"
;
//课堂还未开始
ApeConsts
.
CLASS_STARTING
=
"class.started"
;
//直播中
ApeConsts
.
CLASS_PAUSING
=
"class.pause"
;
//暂停
ApeConsts
.
CLASS_PAUSING
=
"class.closed"
;
//关闭
ApeConsts
.
CLASS_PAUSING
=
"class.update"
;
//更新当前的状态信息
//课堂控制
ApeConsts
.
CLASS_ACTION_CLOSE_ALL
=
1
;
//所有人关闭课堂
ApeConsts
.
CLASS_ACTION_HANDUP_STATUS_CHANGE
=
2
;
//更改用户的举手状态
ApeConsts
.
CLASS_ACTION_CLOSE_ALL
=
1
;
//所有人关闭课堂
ApeConsts
.
CLASS_ACTION_HANDUP_STATUS_CHANGE
=
2
;
//更改用户的举手状态
ApeConsts
.
USER_ACTION_SILENCE_STATUS_CHANGE
=
3
;
//更改用户的禁言状态
//课堂类型 1:1v1(2路流) 2:直播(1路流) 3:小班课(可以多路流)
ApeConsts
.
CLASS_TYPE_1
=
1
;
// 互动课堂,通过MS转发音视频,不能进行H5观看 1v1(2路流)
ApeConsts
.
CLASS_TYPE_2
=
2
;
// 直播课堂,通过CDN转发音视频,不能进行音视频互动 :直播(1路流)
ApeConsts
.
CLASS_TYPE_3
=
2
;
// 直播课堂,通过CDN转发音视频,不能进行音视频互动 ::小班课(可以多路流)
ApeConsts
.
CLASS_TYPE_1
=
1
;
// 互动课堂,通过MS转发音视频,不能进行H5观看 1v1(2路流)
ApeConsts
.
CLASS_TYPE_2
=
2
;
// 直播课堂,通过CDN转发音视频,不能进行音视频互动 :直播(1路流)
ApeConsts
.
CLASS_TYPE_3
=
2
;
// 直播课堂,通过CDN转发音视频,不能进行音视频互动 ::小班课(可以多路流)
//角色身份
//ApeConsts.NR_GUEST = 0; // 客人
ApeConsts
.
NR_NORMAL
=
1
;
// 普通与会者
ApeConsts
.
NR_ADMIN
=
2
;
// 管理员
ApeConsts
.
NR_NORMAL
=
1
;
// 普通与会者
ApeConsts
.
NR_ADMIN
=
2
;
// 管理员
ApeConsts
.
NR_HOST
=
4
;
// 主持人
ApeConsts
.
NR_PRESENTER
=
8
;
// 主讲人
ApeConsts
.
NR_ASSISTANT
=
16
;
// 助教
ApeConsts
.
NR_INVISIBLE
=
32
;
// 隐身用户
//用户的身份,5种类型:
ApeConsts
.
host
=
"host"
;
//(主持人/老师)
ApeConsts
.
presenter
=
"presenter"
;
//(主讲人)
ApeConsts
.
assistant
=
"assistant"
;
//(助教)
ApeConsts
.
normal
=
"normal"
;
//(普通角色/学生)
ApeConsts
.
record
=
"record"
;
//(暂时没用.
ApeConsts
.
invisible
=
"invisible"
;
//隐身用户
ApeConsts
.
host
=
"host"
;
//(主持人/老师)
ApeConsts
.
presenter
=
"presenter"
;
//(主讲人)
ApeConsts
.
assistant
=
"assistant"
;
//(助教)
ApeConsts
.
normal
=
"normal"
;
//(普通角色/学生)
ApeConsts
.
record
=
"record"
;
//(暂时没用.
ApeConsts
.
invisible
=
"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
;
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
;
////最新定义的角色身份 20170220
//ApeConsts.USER_TYPE_HOST=1;//(主持人/老师)
...
...
@@ -76,44 +76,39 @@ ApeConsts.userTypesToId[ApeConsts.invisible]=ApeConsts.NR_INVISIBLE;
//ApeConsts.USER_TYPE_NORMAL_STRING="normal";//(普通角色/学生)
//ApeConsts.USER_TYPE_MONITOR_INVISIBLE_STRING="invisible";//(监课/隐身)
/*msType type*/
ApeConsts
.
MS_TYPE_DEFAULT
=
0
;
//默认MS,(废弃)
ApeConsts
.
MS_TYPE_FMS
=
1
;
//第三方FMS,目前一直用这个
ApeConsts
.
MS_TYPE_DEFAULT
=
0
;
//默认MS,(废弃)
ApeConsts
.
MS_TYPE_FMS
=
1
;
//第三方FMS,目前一直用这个
//用户状态
ApeConsts
.
USER_HAND_UP
=
0x0020
;
// 举手
ApeConsts
.
USER_MIC_OPEN
=
0x0040
;
// 麦克风开启
ApeConsts
.
USER_CAMERA_OPEN
=
0x0080
;
// 音视频开启
ApeConsts
.
USER_HAND_UP
=
0x0020
;
// 举手
ApeConsts
.
USER_MIC_OPEN
=
0x0040
;
// 麦克风开启
ApeConsts
.
USER_CAMERA_OPEN
=
0x0080
;
// 音视频开启
//VIDEO MIC 流媒体消息操作控制类型
ApeConsts
.
MEDIA_ACTION_DEFAULT
=
0
;
ApeConsts
.
MEDIA_ACTION_OPEN_CAMERA
=
1
;
// "打开摄像头推流;
ApeConsts
.
MEDIA_ACTION_CLOSE_CAMERA
=
2
;
// "关闭停止推流";
ApeConsts
.
MEDIA_ACTION_DEFAULT
=
0
;
ApeConsts
.
MEDIA_ACTION_OPEN_MIC
=
21
;
//"打开音频推流";
ApeConsts
.
MEDIA_ACTION_CLOSE_MIC
=
22
;
//"停止音频推流";
ApeConsts
.
MEDIA_ACTION_OPEN_CAMERA
=
1
;
// "打开摄像头推流;
ApeConsts
.
MEDIA_ACTION_CLOSE_CAMERA
=
2
;
// "关闭停止推流";
ApeConsts
.
MEDIA_ACTION_SETING
=
31
;
//"音视频设置设置";
ApeConsts
.
MEDIA_ACTION_OPEN_MIC
=
21
;
//"打开音频推流";
ApeConsts
.
MEDIA_ACTION_CLOSE_MIC
=
22
;
//"停止音频推流";
ApeConsts
.
MEDIA_ACTION_SETING
=
31
;
//"音视频设置设置";
// VIDEO AUDIO CHANNEL使用状态
ApeConsts
.
CHANNEL_STATUS_RELEASED
=
0
;
///< 无人占用状态
ApeConsts
.
CHANNEL_STATUS_OPENING
=
1
;
///< 已经占用成功
ApeConsts
.
CHANNEL_STATUS_RELEASED
=
0
;
///< 无人占用状态
ApeConsts
.
CHANNEL_STATUS_OPENING
=
1
;
///< 已经占用成功
//媒体类型
ApeConsts
.
MEDIA_TYPE_DEFAULT
=
0
;
//没有类型
ApeConsts
.
MEDIA_TYPE_VIDEO
=
1
;
//视频流(包含音频)
ApeConsts
.
MEDIA_TYPE_AUDIO
=
2
;
//音频流
ApeConsts
.
MEDIA_TYPE_SHARE
=
3
;
//屏幕共享
ApeConsts
.
MEDIA_TYPE_DEFAULT
=
0
;
//没有类型
ApeConsts
.
MEDIA_TYPE_VIDEO
=
1
;
//视频流(包含音频)
ApeConsts
.
MEDIA_TYPE_AUDIO
=
2
;
//音频流
ApeConsts
.
MEDIA_TYPE_SHARE
=
3
;
//屏幕共享
//return返回值状态
ApeConsts
.
RETURN_SUCCESS
=
0
;
//成功
ApeConsts
.
RETURN_FAILED
=
1
;
//失败
ApeConsts
.
RETURN_SUCCESS
=
0
;
//成功
ApeConsts
.
RETURN_FAILED
=
1
;
//失败
////FLASH中使用下面4个
//ApeConsts.CGS_RELEASED = 0;///< 无人占用状态
...
...
@@ -122,16 +117,15 @@ ApeConsts.RETURN_FAILED=1;//失败
//ApeConsts.CGS_GRABBING = 3; ///< 准备占用中, 属于本地状态机需要用的状态,在多点数据库中不存在。
//
ApeConsts
.
INVALIDATE_CHANNEL_ID
=
-
1
;
ApeConsts
.
INVALIDATE_NODE_ID
=
-
1
;
// doc update status
ApeConsts
.
DOC_ACTION_NORMAL
=
0
;
//无操作
ApeConsts
.
DOC_ACTION_SWITCH_DOC
=
1
;
//切换文档
ApeConsts
.
DOC_ACTION_SWITCH_PAGE
=
2
;
//文档翻页
ApeConsts
.
DOC_ACTION_COMMAND
=
3
;
//文档操作:滚动、缩放
ApeConsts
.
DOC_ACTION_SWITCH_ANIMATION
=
4
;
//文档页面上的动画切换
ApeConsts
.
DOC_ACTION_NORMAL
=
0
;
//无操作
ApeConsts
.
DOC_ACTION_SWITCH_DOC
=
1
;
//切换文档
ApeConsts
.
DOC_ACTION_SWITCH_PAGE
=
2
;
//文档翻页
ApeConsts
.
DOC_ACTION_COMMAND
=
3
;
//文档操作:滚动、缩放
ApeConsts
.
DOC_ACTION_SWITCH_ANIMATION
=
4
;
//文档页面上的动画切换
// defs for common session id
ApeConsts
.
CONFERENCE_SESSION_ID
=
11
;
...
...
@@ -159,7 +153,6 @@ ApeConsts.SCREENSHARING_CHANNEL_ID = ApeConsts.SCREENSHARING_SESSION_ID;
ApeConsts
.
QUESTION_CHANNEL_ID
=
ApeConsts
.
QUESTION_SESSION_ID
;
// defs for common session name
ApeConsts
.
CONFERENCE_SESSION_NAME
=
"conference app"
;
ApeConsts
.
CHAT_SESSION_NAME
=
"chat app"
;
...
...
@@ -173,7 +166,6 @@ ApeConsts.MEDIA_SESSION_NAME = "media sharing app";
ApeConsts
.
SCREENSHARING_SESSION_NAME
=
"screen sharing app"
;
ApeConsts
.
QUESTION_SESSION_NAME
=
"question app"
;
// def for common session tag
ApeConsts
.
CONFERENCE_SESSION_TAG
=
"con-tag"
;
ApeConsts
.
CHAT_SESSION_TAG
=
"cha-tag"
;
...
...
@@ -187,7 +179,6 @@ ApeConsts.MEDIA_SESSION_TAG = "med-tag";
ApeConsts
.
SCREENSHARING_SESSION_TAG
=
"scr-tag"
;
ApeConsts
.
QUESTION_SESSION_TAG
=
"qst-tag"
;
ApeConsts
.
CONFERENCE_OBJ_ROSTER_ID
=
((
ApeConsts
.
CONFERENCE_SESSION_ID
<<
16
)
+
1
);
ApeConsts
.
CONFERENCE_OBJ_ROSTER_NAME
=
"node list"
;
ApeConsts
.
CONFERENCE_OBJ_ROSTER_TAG
=
"node list tag"
;
...
...
@@ -211,7 +202,6 @@ ApeConsts.CONFERENCE_OBJ_QUESTION_ID = ((ApeConsts.QUESTION_SESSION_ID << 16) +
ApeConsts
.
CONFERENCE_OBJ_QUESTION_NAME
=
"question list"
;
ApeConsts
.
CONFERENCE_OBJ_QUESTION_TAG
=
"question list tag"
;
// web sharing objects
ApeConsts
.
WEBSHARING_OBJ_TABLE_ID
=
((
ApeConsts
.
WEBSHARING_SESSION_ID
<<
16
)
+
1
);
ApeConsts
.
WEBSHARING_OBJ_TABLE_NAME
=
"web list"
;
...
...
@@ -278,3 +268,4 @@ ApeConsts.WBA_CHANGE = 2;
ApeConsts
.
WBA_OPEN
=
3
;
ApeConsts
.
WBA_DOC_ANNOTATION
=
4
;
ApeConsts
.
WBA_LASER_PEN
=
5
;
...
...
请
注册
或
登录
后发表评论