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
2391ec45e94f2db3b24f595e3bb9970f4f2cdbf8
2391ec45
1 parent
2e8b5b11
修改设备信息和音视频质量设置保存接口
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
18 行增加
和
6 行删除
dist/McuClient.js
src/EngineEntrance.js
src/GlobalConfig.js
src/apes/Ape.js
src/mcu.js
dist/McuClient.js
查看文件 @
2391ec4
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
2391ec4
...
...
@@ -28,7 +28,7 @@ import MediaModule from 'apes/MediaModule';
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.21.
2
.201705017"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.21.
5
.201705017"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
@@ -762,7 +762,7 @@ export default class MessageEntrance extends Emiter {
_mcuJoinMCUClassSuccessHandler
(
_data
)
{
//loger.log('MCU 课堂成功.');
GlobalConfig
.
setCurrentStatus
(
GlobalConfig
.
statusCode_2
);
GlobalConfig
.
classJoinSuccess
=
true
;
//返回给客户端初始化成功的数据
let
joinClassSuccessCallBackData
=
{};
...
...
@@ -990,9 +990,12 @@ export default class MessageEntrance extends Emiter {
//更新设备信息
_updateDeviceInfo
(
_param
){
if
(
!
_mcu
.
connected
)
{
loger
.
warn
(
GlobalConfig
.
getCurrentStatus
());
loger
.
warn
(
'更新设备信息->失败'
,
GlobalConfig
.
getCurrentStatus
());
return
{
"code"
:
ApeConsts
.
RETURN_FAILED
,
"data"
:
""
};
}
if
(
!
GlobalConfig
.
classJoinSuccess
){
loger
.
warn
(
'更新设备信息->失败->还没有加入课堂成功'
,
GlobalConfig
.
getCurrentStatus
());
}
if
(
_confer_ape
)
{
_confer_ape
.
updateDeviceInfo
(
_param
);
}
...
...
src/GlobalConfig.js
查看文件 @
2391ec4
...
...
@@ -326,12 +326,12 @@ GlobalConfig.openMicrophones=0;
GlobalConfig
.
fps
=
15
;
//帧频
GlobalConfig
.
gop
=
3
;
//关键帧间隔(秒)
GlobalConfig
.
videoQuality
=
2
;
//画面质量 0-低;1-中;2-高;
GlobalConfig
.
curVideoQuality
=
2
;
//当前分辨率
GlobalConfig
.
cameras
=
[];
//摄像头列表
GlobalConfig
.
microphones
=
[];
//麦克风列表
GlobalConfig
.
curCamera
=
""
;
//当前选择的摄像头
GlobalConfig
.
curMicrophone
=
''
;
//当前选择的麦克风
GlobalConfig
.
curVideoQuality
=
2
;
//当前分辨率
GlobalConfig
.
micGain
=
50
;
//音量(0-80)
GlobalConfig
.
speakerVolume
=
50
;
//扬声器音量(0-80)
GlobalConfig
.
micCode
=
0
;
//麦克风模式
...
...
@@ -363,7 +363,7 @@ GlobalConfig.classStopTime="";//最后一次停止的时间(点暂停或结束)
GlobalConfig
.
classBeginTime
=
""
;
//课堂创建的时间,这个是Sass返回的
GlobalConfig
.
classEndTime
=
""
;
//课堂结束的时间,这个是Sass返回的
GlobalConfig
.
classTimestamp
=
0
;
//从课堂开始到现在的时
GlobalConfig
.
classJoinSuccess
=
false
;
//是否已经加入课堂
GlobalConfig
.
recordPlaybackMaxTime
=
0
;
//录制回放的总时间
GlobalConfig
.
recordStatus
=
false
;
//当前录制状态
GlobalConfig
.
recordTimestamp
=
0
;
//相对于首次开始录制的进行时间
...
...
src/apes/Ape.js
查看文件 @
2391ec4
...
...
@@ -333,6 +333,10 @@ export default class Ape extends Emiter {
this
.
_emit
(
MessageTypes
.
MCU_ERROR
,
MessageTypes
.
ERR_APE_SEND_FAILED_NO_JOIN
);
return
;
}
if
(
!
this
.
_classInfo
){
loger
.
warn
(
'Ape发送数据NORMAL PDU->失败->ape课堂数据无效->'
,
this
.
_classInfo
);
return
;
}
let
normalPdu
=
pdu
.
create_normal_pdu
(
appPdu
.
type
,
this
.
_classInfo
.
nodeId
,
...
...
@@ -359,7 +363,10 @@ export default class Ape extends Emiter {
this
.
_emit
(
MessageTypes
.
MCU_ERROR
,
MessageTypes
.
ERR_APE_SEND_FAILED_NO_JOIN
);
return
;
}
if
(
!
this
.
_classInfo
){
loger
.
warn
(
'Ape发送数据UNIFORM PDU->失败->ape课堂数据无效->'
,
this
.
_classInfo
);
return
;
}
let
uniformPdu
=
pdu
.
create_uniform_pdu
(
appPdu
.
type
,
this
.
_classInfo
.
nodeId
,
...
...
src/mcu.js
查看文件 @
2391ec4
...
...
@@ -190,12 +190,14 @@ class MCU extends Emiter {
}
loger
.
log
(
'leaveMCU'
);
GlobalConfig
.
setCurrentStatus
(
GlobalConfig
.
statusCode_3
);
GlobalConfig
.
classJoinSuccess
=
false
;
this
.
_everSocket
.
end
();
}
// 主动建立MCU连接
joinMCU
(
_classInfo
)
{
loger
.
log
(
'开始建立EverSocket通道.'
);
GlobalConfig
.
classJoinSuccess
=
false
;
loger
.
log
(
_classInfo
);
_classInfo
.
classId
=
parseInt
(
_classInfo
.
classId
);
// classId 必须整形
this
.
classInfo
=
_classInfo
;
...
...
请
注册
或
登录
后发表评论