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-07-06 20:06:58 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
465f338e14c17dd025a8b5ff7690cebf3f677a70
465f338e
1 parent
e9a1c3d8
增加禁言
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
17 行增加
和
14 行删除
dist/McuClient.js
src/GlobalConfig.js
src/apes/ConferApe.js
src/pdus/pro.js
dist/McuClient.js
查看文件 @
465f338
此 diff 太大无法显示。
src/GlobalConfig.js
查看文件 @
465f338
...
...
@@ -58,7 +58,7 @@ class GlobalConfig {
classInfo
.
videoQuality
=
this
.
videoQuality
;
classInfo
.
ssTunnelAppURL
=
this
.
ssTunnelAppURL
;
classInfo
.
currentSceneTableId
=
this
.
currentSceneTableId
;
//文档区域的模块显示
classInfo
.
serverAndLoacTimeDistanc
=
this
.
serverAndLoacTimeDistanc
;
classInfo
.
serverAndLoacTimeDistanc
=
this
.
serverAndLoacTimeDistanc
;
return
classInfo
;
}
...
...
@@ -83,6 +83,7 @@ class GlobalConfig {
classStatusInfo
.
recordStatus
=
this
.
recordStatus
;
//当前录制状态
classStatusInfo
.
silence
=
this
.
silence
;
//当前课堂禁言状态
classStatusInfo
.
silenceUsers
=
this
.
silenceUsers
;
//当前课堂禁言状态
classStatusInfo
.
selfSilence
=
this
.
selfSilence
;
//当前自由禁言状态
classStatusInfo
.
recordTimestamp
=
this
.
recordTimestamp
;
//相对于首次开始录制的时间戳
classStatusInfo
.
recordFileName
=
this
.
recordFileName
;
//录制的文件名
...
...
@@ -93,7 +94,7 @@ class GlobalConfig {
classStatusInfo
.
activeDocCurPage
=
this
.
activeDocCurPage
;
//当前激活的文档的当前页
classStatusInfo
.
currentSceneTableId
=
this
.
currentSceneTableId
;
//文档区域的模块显示
classStatusInfo
.
serverAndLoacTimeDistanc
=
this
.
serverAndLoacTimeDistanc
;
classStatusInfo
.
serverAndLoacTimeDistanc
=
this
.
serverAndLoacTimeDistanc
;
return
classStatusInfo
;
}
//设置当前的课堂状态的信息
...
...
@@ -134,6 +135,7 @@ class GlobalConfig {
// 全局禁言状态
this
.
silence
=
data
.
silence
||
false
;
this
.
silenceUsers
=
JSON
.
parse
(
data
.
silenceUsers
||
'{}'
);
this
.
recordStatus
=
data
.
recordStatus
||
this
.
recordStatus
;
//当前录制状态
this
.
recordTimestamp
=
data
.
recordTimestamp
||
this
.
recordTimestamp
;
//相对于首次开始录制的时间戳
...
...
@@ -413,6 +415,7 @@ GlobalConfig.classJoinSuccess = false; //是否已经加入课堂
GlobalConfig
.
recordPlaybackMaxTime
=
0
;
//录制回放的总时间
GlobalConfig
.
recordStatus
=
false
;
//当前录制状态
GlobalConfig
.
silence
=
false
;
//当前课堂禁言状态
GlobalConfig
.
silenceUsers
=
{};
//当前课堂用户禁言状态
GlobalConfig
.
selfSilence
=
{};
//当前课堂禁言状态
GlobalConfig
.
recordTimestamp
=
0
;
//相对于首次开始录制的进行时间
GlobalConfig
.
recordFileName
=
""
;
//录制的文件名,如 果为空就创建一个
...
...
@@ -422,7 +425,7 @@ GlobalConfig.recordReplaytickValues = {}; // 滚动条关键点,用于快进
GlobalConfig
.
isAutoStartClass
=
0
;
//是否自动开始上课 0-否 ;1 是
GlobalConfig
.
updateClassInfoDelay
=
30
;
//(秒),每隔30秒同步一次课堂状态的并保存到Sass
GlobalConfig
.
msDynamicChooseIpDelay
=
60
*
3
;
//(秒)MS动态选点的间隔
GlobalConfig
.
msDynamicChooseIpDelay
=
60
*
3
;
//(秒)MS动态选点的间隔
//GlobalConfig.serverTimestamp=0;//当前的系统时间戳 用get set 获取
GlobalConfig
.
activeDocId
=
0
;
//当前激活的文档ID
...
...
@@ -473,6 +476,6 @@ GlobalConfig.ssTunnelAppURL = ''; //屏幕共享插件的地址
GlobalConfig
.
serverTime
=
0
;
//服务器当前时间戳
GlobalConfig
.
serverAndLoacTimeDistanc
=
0
;
//本地时间和服务器时间错的差值;
GlobalConfig
.
isMobile
=
false
;
//是否是移动端
GlobalConfig
.
isMobile
=
false
;
//是否是移动端
export
default
GlobalConfig
;
...
...
src/apes/ConferApe.js
查看文件 @
465f338
...
...
@@ -141,7 +141,7 @@ class ConferApe extends Ape {
}
}
//用户当前选择的MS
nodeInfoRecordPdu
.
msIpPort
=
GlobalConfig
.
MS_PUBLISH_IP
+
":"
+
GlobalConfig
.
MS_PUBLISH_PORT
;
nodeInfoRecordPdu
.
msIpPort
=
GlobalConfig
.
MS_PUBLISH_IP
+
":"
+
GlobalConfig
.
MS_PUBLISH_PORT
;
return
nodeInfoRecordPdu
;
}
...
...
@@ -338,10 +338,10 @@ class ConferApe extends Ape {
silenceClass
(
params
)
{
if
(
!
GlobalConfig
.
isNormal
)
{
//同步禁言状态
if
(
params
&&
params
.
silence
==
true
){
GlobalConfig
.
silence
=
true
;
}
else
{
GlobalConfig
.
silence
=
false
;
if
(
params
&&
params
.
silence
==
true
)
{
GlobalConfig
.
silence
=
true
;
}
else
{
GlobalConfig
.
silence
=
false
;
}
this
.
sendUpdaterClassStatusInfo
(
params
);
}
else
{
...
...
@@ -421,10 +421,8 @@ class ConferApe extends Ape {
loger
.
log
(
'控制禁言状态->失败->参数错误'
,
_param
);
return
;
}
let
msgObj
=
{};
msgObj
.
nodeId
=
_param
.
nodeId
;
msgObj
.
silence
=
_param
.
silence
||
{};
this
.
sendConferMsg
({
"to"
:
_param
.
nodeId
,
"message"
:
JSON
.
stringify
(
msgObj
),
"actionType"
:
ApeConsts
.
USER_ACTION_SILENCE_STATUS_CHANGE
});
GlobalConfig
.
silenceUsers
[
_param
.
userId
||
_param
.
nodeId
]
=
_param
;
this
.
sendUpdaterClassStatusInfo
({
silenceUsers
:
GlobalConfig
.
silenceUsers
});
}
changeSilenceStatus
(
_param
)
{
...
...
@@ -975,7 +973,8 @@ class ConferApe extends Ape {
classStatusInfo
.
activeDocCurPage
=
GlobalConfig
.
activeDocCurPage
;
//当前激活的文档的当前页
classStatusInfo
.
isStopAllPublishMedia
=
_param
.
isStopAllPublishMedia
||
false
;
classStatusInfo
.
currentSceneTableId
=
GlobalConfig
.
currentSceneTableId
;
classStatusInfo
.
silence
=
GlobalConfig
.
silence
;
classStatusInfo
.
silence
=
GlobalConfig
.
silence
;
classStatusInfo
.
silenceUsers
=
JSON
.
stringify
(
GlobalConfig
.
silenceUsers
);
//loger.log("classStatusInfo--->", classStatusInfo);
/*
...
...
src/pdus/pro.js
查看文件 @
465f338
...
...
@@ -1026,6 +1026,7 @@ message RCClassStatusInfoPdu {
optional
bool
isStopAllPublishMedia
=
22
;
//是否停止推流
optional
uint32
currentSceneTableId
=
23
;
//文档区域的当前模块id
optional
bool
silence
=
24
;
//课堂禁言
optional
string
silenceUsers
=
25
;
//课堂用户禁言状态列表
}
message
RCConferenceRecordRequestPdu
{
...
...
请
注册
或
登录
后发表评论