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
de77e6f28428304dcb481ecceb9fea98a0d45fc6
de77e6f2
1 parent
72f01359
修复个人禁用状态的数据类型,接口的类型为object对象,在MCU传递过程中为JSON 字符串
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
5 行增加
和
7 行删除
dist/McuClient.js
src/EngineEntrance.js
src/GlobalConfig.js
src/apes/ConferApe.js
dist/McuClient.js
查看文件 @
de77e6f
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
de77e6f
...
...
@@ -33,7 +33,7 @@ import QuestionApe from 'apes/QuestionApe';
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.37.
2
.20170622"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.37.
4
.20170622"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
src/GlobalConfig.js
查看文件 @
de77e6f
...
...
@@ -133,8 +133,6 @@ class GlobalConfig {
// 全局禁言状态
this
.
silence
=
data
.
silence
||
false
;
// 自有禁言状态
this
.
selfSilence
=
data
.
selfSilence
||
''
;
this
.
recordStatus
=
data
.
recordStatus
||
this
.
recordStatus
;
//当前录制状态
this
.
recordTimestamp
=
data
.
recordTimestamp
||
this
.
recordTimestamp
;
//相对于首次开始录制的时间戳
this
.
recordFileName
=
data
.
recordFileName
||
this
.
recordFileName
;
//录制的文件名
...
...
@@ -404,7 +402,7 @@ GlobalConfig.classJoinSuccess = false; //是否已经加入课堂
GlobalConfig
.
recordPlaybackMaxTime
=
0
;
//录制回放的总时间
GlobalConfig
.
recordStatus
=
false
;
//当前录制状态
GlobalConfig
.
silence
=
false
;
//当前课堂禁言状态
GlobalConfig
.
selfSilence
=
''
;
//当前课堂禁言状态
GlobalConfig
.
selfSilence
=
{}
;
//当前课堂禁言状态
GlobalConfig
.
recordTimestamp
=
0
;
//相对于首次开始录制的进行时间
GlobalConfig
.
recordFileName
=
""
;
//录制的文件名,如 果为空就创建一个
GlobalConfig
.
recordDownloadUrl
=
""
;
//下载地址
...
...
src/apes/ConferApe.js
查看文件 @
de77e6f
...
...
@@ -95,7 +95,7 @@ class ConferApe extends Ape {
getNodeInfo
()
{
let
nodeInfoRecordPdu
=
new
pdu
[
'RCNodeInfoRecordPdu'
];
nodeInfoRecordPdu
.
nodeId
=
GlobalConfig
.
nodeId
;
nodeInfoRecordPdu
.
selfSilence
=
JSON
.
stringify
(
GlobalConfig
.
selfSilence
);
nodeInfoRecordPdu
.
selfSilence
=
JSON
.
stringify
(
GlobalConfig
.
selfSilence
)
||
""
;
nodeInfoRecordPdu
.
name
=
GlobalConfig
.
userName
;
nodeInfoRecordPdu
.
role
=
ApeConsts
.
userTypesToId
[
GlobalConfig
.
userRole
]
||
1
;
//NR_NORMAL用户的身份,根据用户登录时的身份设置;
nodeInfoRecordPdu
.
level
=
GlobalConfig
.
level
;
...
...
@@ -415,13 +415,13 @@ class ConferApe extends Ape {
}
let
msgObj
=
{};
msgObj
.
nodeId
=
_param
.
nodeId
;
msgObj
.
silence
=
_param
.
silence
||
''
;
msgObj
.
silence
=
_param
.
silence
||
{}
;
this
.
sendConferMsg
({
"to"
:
_param
.
nodeId
,
"message"
:
JSON
.
stringify
(
msgObj
),
"actionType"
:
ApeConsts
.
USER_ACTION_SILENCE_STATUS_CHANGE
});
}
changeSilenceStatus
(
_param
)
{
loger
.
log
(
'切换禁言状态->'
,
_param
);
GlobalConfig
.
selfSilence
=
_param
.
silence
;
GlobalConfig
.
selfSilence
=
_param
.
silence
||
{}
;
this
.
updateUserInfo
();
}
...
...
请
注册
或
登录
后发表评论