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
李勇
2017-04-05 18:31:39 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e82d72c23a7509ab7bb679ea5cd1318487b27edd
e82d72c2
1 parent
76393ca5
修改录制和录制回放的时间戳,不使用课堂时间,录制时间戳是累积的,不会被清除
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
23 行增加
和
8 行删除
src/EngineEntrance.js
src/RecordPlayBackParse.js
src/apes/ConferApe.js
src/EngineEntrance.js
查看文件 @
e82d72c
...
...
@@ -623,6 +623,7 @@ export default class MessageEntrance extends Emiter {
joinClassSuccessCallBackData
.
isp
=
GlobalConfig
.
isp
;
//服务商
joinClassSuccessCallBackData
.
classTimestamp
=
GlobalConfig
.
classTimestamp
;
//课堂进行的累积时间
joinClassSuccessCallBackData
.
recordTimestamp
=
GlobalConfig
.
recordTimestamp
;
//课堂录制的累积时间
joinClassSuccessCallBackData
.
recordPlaybackMaxTime
=
GlobalConfig
.
recordPlaybackMaxTime
;
//录制回放的总时间
joinClassSuccessCallBackData
.
fps
=
GlobalConfig
.
fps
;
...
...
@@ -1177,6 +1178,7 @@ export default class MessageEntrance extends Emiter {
joinClassSuccessCallBackData
.
isp
=
GlobalConfig
.
isp
;
//服务商
joinClassSuccessCallBackData
.
classTimestamp
=
GlobalConfig
.
classTimestamp
;
//课堂进行的累积时间
joinClassSuccessCallBackData
.
recordTimestamp
=
GlobalConfig
.
recordTimestamp
;
//录制累积的总时间
joinClassSuccessCallBackData
.
recordPlaybackMaxTime
=
GlobalConfig
.
recordPlaybackMaxTime
;
//录制回放的总时间
joinClassSuccessCallBackData
.
fps
=
GlobalConfig
.
fps
;
...
...
src/RecordPlayBackParse.js
查看文件 @
e82d72c
...
...
@@ -215,6 +215,9 @@ class RecordPlayBackParse extends Emiter {
_timerCounterUptate
()
{
this
.
_recordPlaybackTimestamp
=
this
.
_recordPlaybackTimestamp
+
1
;
//计时
loger
.
log
(
"录制回放中..."
,
this
.
_recordPlaybackTimestamp
);
this
.
_emit
(
MessageTypes
.
CLASS_UPDATE_TIMER
,
{
"classTimestamp"
:
this
.
_recordPlaybackTimestamp
});
if
(
this
.
_recordPlaybackTimestamp
>=
this
.
_recordPlaybackMaxTime
)
{
loger
.
log
(
"录制回放结束...当前时间->"
,
this
.
_recordPlaybackTimestamp
,
" 总时间->"
,
this
.
_recordPlaybackMaxTime
);
//this._stopTimerCounter();
...
...
@@ -222,9 +225,6 @@ class RecordPlayBackParse extends Emiter {
return
;
}
loger
.
log
(
"录制回放中..."
,
this
.
_recordPlaybackTimestamp
);
this
.
_emit
(
MessageTypes
.
CLASS_UPDATE_TIMER
,
{
"classTimestamp"
:
this
.
_recordPlaybackTimestamp
});
//各个APE模块根据时间查找消息数据
this
.
_searchMessageFromTime
(
this
.
_recordPlaybackTimestamp
,
this
.
_conferApeMssages
,
"conferApe"
);
this
.
_searchMessageFromTime
(
this
.
_recordPlaybackTimestamp
,
this
.
_chatApeMssages
,
"chatApe"
);
...
...
@@ -303,9 +303,11 @@ class RecordPlayBackParse extends Emiter {
this
.
_stopTimerCounter
();
//录制回放的总时间长度按课堂最长时间计算,不能按最后一个消息的时间计算
if
(
this
.
_recordPlaybackMaxTime
<
GlobalConfig
.
classTimestamp
){
/*
if(this._recordPlaybackMaxTime<GlobalConfig.classTimestamp){
this._recordPlaybackMaxTime=GlobalConfig.classTimestamp;
}*/
if
(
this
.
_recordPlaybackMaxTime
<
GlobalConfig
.
recordTimestamp
){
this
.
_recordPlaybackMaxTime
=
GlobalConfig
.
recordTimestamp
;
}
GlobalConfig
.
recordPlaybackMaxTime
=
this
.
_recordPlaybackMaxTime
;
...
...
src/apes/ConferApe.js
查看文件 @
e82d72c
...
...
@@ -166,7 +166,8 @@ class ConferApe extends Ape {
conferRecordSendPdu
.
initiator
=
this
.
_classInfo
.
nodeId
;
//发起人
conferRecordSendPdu
.
record
=
GlobalConfig
.
recordStatus
;
conferRecordSendPdu
.
classTime
=
GlobalConfig
.
classTimestamp
;
//conferRecordSendPdu.classTime = GlobalConfig.classTimestamp;//不能使用课堂进行时间,这个时间结束课堂的时候会被清除
conferRecordSendPdu
.
classTime
=
GlobalConfig
.
recordTimestamp
;
//课堂录制的累积时间,不会被清除
conferRecordSendPdu
.
filename
=
GlobalConfig
.
recordFileName
||
GlobalConfig
.
classId
+
"_"
+
EngineUtils
.
creatTimestampYMD
()
+
".rec"
;
this
.
sendChatUniform
(
conferRecordSendPdu
);
// to, message
...
...
@@ -176,9 +177,14 @@ class ConferApe extends Ape {
//开启录制
startRecord
()
{
//如果录制的时间长超出设定的最大录制时间就不再录制
if
(
GlobalConfig
.
classTimestamp
>=
GlobalConfig
.
allowRecordMaxTime
){
/*
if(GlobalConfig.classTimestamp>=GlobalConfig.allowRecordMaxTime){
loger.warn('不能再录制,录制时间已经达到最大限制',GlobalConfig.classTimestamp);
return;
}*/
if
(
GlobalConfig
.
recordTimestamp
>=
GlobalConfig
.
allowRecordMaxTime
){
loger
.
warn
(
'不能再录制,录制时间已经达到最大限制'
,
GlobalConfig
.
recordTimestamp
);
return
;
}
loger
.
log
(
'startRecord'
,
"isHost"
,
GlobalConfig
.
isHost
,
"recordStatus"
,
GlobalConfig
.
recordStatus
);
...
...
@@ -415,6 +421,11 @@ class ConferApe extends Ape {
return
;
}
GlobalConfig
.
classTimestamp
=
GlobalConfig
.
classTimestamp
+
1
;
//计时
//老师身份的时候要记录录制的时间
if
(
GlobalConfig
.
isHost
){
GlobalConfig
.
recordTimestamp
=
GlobalConfig
.
recordTimestamp
+
1
;
}
//loger.log('课堂进行时间',GlobalConfig.classTimestamp);
this
.
_emit
(
MessageTypes
.
CLASS_UPDATE_TIMER
,
{
"classTimestamp"
:
GlobalConfig
.
classTimestamp
});
...
...
@@ -657,7 +668,7 @@ class ConferApe extends Ape {
classStatusInfo
.
activeDocId
=
GlobalConfig
.
activeDocId
;
//当前激活的文档id
classStatusInfo
.
activeDocCurPage
=
GlobalConfig
.
activeDocCurPage
;
//当前激活的文档的当前页
loger
.
log
(
"classStatusInfo---
----------
"
,
classStatusInfo
);
loger
.
log
(
"classStatusInfo---
>
"
,
classStatusInfo
);
/*
optional uint32 item_idx=1;
...
...
请
注册
或
登录
后发表评论