李勇

修改录制和录制回放的时间戳,不使用课堂时间,录制时间戳是累积的,不会被清除

@@ -623,6 +623,7 @@ export default class MessageEntrance extends Emiter { @@ -623,6 +623,7 @@ export default class MessageEntrance extends Emiter {
623 joinClassSuccessCallBackData.isp = GlobalConfig.isp;//服务商 623 joinClassSuccessCallBackData.isp = GlobalConfig.isp;//服务商
624 624
625 joinClassSuccessCallBackData.classTimestamp=GlobalConfig.classTimestamp;//课堂进行的累积时间 625 joinClassSuccessCallBackData.classTimestamp=GlobalConfig.classTimestamp;//课堂进行的累积时间
  626 + joinClassSuccessCallBackData.recordTimestamp=GlobalConfig.recordTimestamp;//课堂录制的累积时间
626 joinClassSuccessCallBackData.recordPlaybackMaxTime=GlobalConfig.recordPlaybackMaxTime;//录制回放的总时间 627 joinClassSuccessCallBackData.recordPlaybackMaxTime=GlobalConfig.recordPlaybackMaxTime;//录制回放的总时间
627 628
628 joinClassSuccessCallBackData.fps=GlobalConfig.fps; 629 joinClassSuccessCallBackData.fps=GlobalConfig.fps;
@@ -1177,6 +1178,7 @@ export default class MessageEntrance extends Emiter { @@ -1177,6 +1178,7 @@ export default class MessageEntrance extends Emiter {
1177 joinClassSuccessCallBackData.isp = GlobalConfig.isp;//服务商 1178 joinClassSuccessCallBackData.isp = GlobalConfig.isp;//服务商
1178 1179
1179 joinClassSuccessCallBackData.classTimestamp=GlobalConfig.classTimestamp;//课堂进行的累积时间 1180 joinClassSuccessCallBackData.classTimestamp=GlobalConfig.classTimestamp;//课堂进行的累积时间
  1181 + joinClassSuccessCallBackData.recordTimestamp=GlobalConfig.recordTimestamp;//录制累积的总时间
1180 joinClassSuccessCallBackData.recordPlaybackMaxTime=GlobalConfig.recordPlaybackMaxTime;//录制回放的总时间 1182 joinClassSuccessCallBackData.recordPlaybackMaxTime=GlobalConfig.recordPlaybackMaxTime;//录制回放的总时间
1181 1183
1182 joinClassSuccessCallBackData.fps=GlobalConfig.fps; 1184 joinClassSuccessCallBackData.fps=GlobalConfig.fps;
@@ -215,6 +215,9 @@ class RecordPlayBackParse extends Emiter { @@ -215,6 +215,9 @@ class RecordPlayBackParse extends Emiter {
215 215
216 _timerCounterUptate() { 216 _timerCounterUptate() {
217 this._recordPlaybackTimestamp = this._recordPlaybackTimestamp + 1;//计时 217 this._recordPlaybackTimestamp = this._recordPlaybackTimestamp + 1;//计时
  218 + loger.log("录制回放中...", this._recordPlaybackTimestamp);
  219 + this._emit(MessageTypes.CLASS_UPDATE_TIMER, {"classTimestamp": this._recordPlaybackTimestamp});
  220 +
218 if (this._recordPlaybackTimestamp >= this._recordPlaybackMaxTime) { 221 if (this._recordPlaybackTimestamp >= this._recordPlaybackMaxTime) {
219 loger.log("录制回放结束...当前时间->", this._recordPlaybackTimestamp, " 总时间->", this._recordPlaybackMaxTime); 222 loger.log("录制回放结束...当前时间->", this._recordPlaybackTimestamp, " 总时间->", this._recordPlaybackMaxTime);
220 //this._stopTimerCounter(); 223 //this._stopTimerCounter();
@@ -222,9 +225,6 @@ class RecordPlayBackParse extends Emiter { @@ -222,9 +225,6 @@ class RecordPlayBackParse extends Emiter {
222 return; 225 return;
223 } 226 }
224 227
225 - loger.log("录制回放中...", this._recordPlaybackTimestamp);  
226 - this._emit(MessageTypes.CLASS_UPDATE_TIMER, {"classTimestamp": this._recordPlaybackTimestamp});  
227 -  
228 //各个APE模块根据时间查找消息数据 228 //各个APE模块根据时间查找消息数据
229 this._searchMessageFromTime(this._recordPlaybackTimestamp, this._conferApeMssages,"conferApe"); 229 this._searchMessageFromTime(this._recordPlaybackTimestamp, this._conferApeMssages,"conferApe");
230 this._searchMessageFromTime(this._recordPlaybackTimestamp, this._chatApeMssages,"chatApe"); 230 this._searchMessageFromTime(this._recordPlaybackTimestamp, this._chatApeMssages,"chatApe");
@@ -303,9 +303,11 @@ class RecordPlayBackParse extends Emiter { @@ -303,9 +303,11 @@ class RecordPlayBackParse extends Emiter {
303 this._stopTimerCounter(); 303 this._stopTimerCounter();
304 304
305 //录制回放的总时间长度按课堂最长时间计算,不能按最后一个消息的时间计算 305 //录制回放的总时间长度按课堂最长时间计算,不能按最后一个消息的时间计算
306 - if(this._recordPlaybackMaxTime<GlobalConfig.classTimestamp){ 306 + /*if(this._recordPlaybackMaxTime<GlobalConfig.classTimestamp){
307 this._recordPlaybackMaxTime=GlobalConfig.classTimestamp; 307 this._recordPlaybackMaxTime=GlobalConfig.classTimestamp;
308 - 308 + }*/
  309 + if(this._recordPlaybackMaxTime<GlobalConfig.recordTimestamp){
  310 + this._recordPlaybackMaxTime=GlobalConfig.recordTimestamp;
309 } 311 }
310 312
311 GlobalConfig.recordPlaybackMaxTime = this._recordPlaybackMaxTime; 313 GlobalConfig.recordPlaybackMaxTime = this._recordPlaybackMaxTime;
@@ -166,7 +166,8 @@ class ConferApe extends Ape { @@ -166,7 +166,8 @@ class ConferApe extends Ape {
166 166
167 conferRecordSendPdu.initiator = this._classInfo.nodeId;//发起人 167 conferRecordSendPdu.initiator = this._classInfo.nodeId;//发起人
168 conferRecordSendPdu.record = GlobalConfig.recordStatus; 168 conferRecordSendPdu.record = GlobalConfig.recordStatus;
169 - conferRecordSendPdu.classTime = GlobalConfig.classTimestamp; 169 + //conferRecordSendPdu.classTime = GlobalConfig.classTimestamp;//不能使用课堂进行时间,这个时间结束课堂的时候会被清除
  170 + conferRecordSendPdu.classTime = GlobalConfig.recordTimestamp;//课堂录制的累积时间,不会被清除
170 conferRecordSendPdu.filename = GlobalConfig.recordFileName || GlobalConfig.classId + "_" + EngineUtils.creatTimestampYMD() + ".rec"; 171 conferRecordSendPdu.filename = GlobalConfig.recordFileName || GlobalConfig.classId + "_" + EngineUtils.creatTimestampYMD() + ".rec";
171 this.sendChatUniform(conferRecordSendPdu); 172 this.sendChatUniform(conferRecordSendPdu);
172 // to, message 173 // to, message
@@ -176,9 +177,14 @@ class ConferApe extends Ape { @@ -176,9 +177,14 @@ class ConferApe extends Ape {
176 //开启录制 177 //开启录制
177 startRecord() { 178 startRecord() {
178 //如果录制的时间长超出设定的最大录制时间就不再录制 179 //如果录制的时间长超出设定的最大录制时间就不再录制
179 - if(GlobalConfig.classTimestamp>=GlobalConfig.allowRecordMaxTime){ 180 + /* if(GlobalConfig.classTimestamp>=GlobalConfig.allowRecordMaxTime){
180 loger.warn('不能再录制,录制时间已经达到最大限制',GlobalConfig.classTimestamp); 181 loger.warn('不能再录制,录制时间已经达到最大限制',GlobalConfig.classTimestamp);
181 return; 182 return;
  183 + }*/
  184 +
  185 + if(GlobalConfig.recordTimestamp>=GlobalConfig.allowRecordMaxTime){
  186 + loger.warn('不能再录制,录制时间已经达到最大限制',GlobalConfig.recordTimestamp);
  187 + return;
182 } 188 }
183 189
184 loger.log('startRecord', "isHost", GlobalConfig.isHost, "recordStatus", GlobalConfig.recordStatus); 190 loger.log('startRecord', "isHost", GlobalConfig.isHost, "recordStatus", GlobalConfig.recordStatus);
@@ -415,6 +421,11 @@ class ConferApe extends Ape { @@ -415,6 +421,11 @@ class ConferApe extends Ape {
415 return; 421 return;
416 } 422 }
417 GlobalConfig.classTimestamp = GlobalConfig.classTimestamp + 1;//计时 423 GlobalConfig.classTimestamp = GlobalConfig.classTimestamp + 1;//计时
  424 +
  425 + //老师身份的时候要记录录制的时间
  426 + if(GlobalConfig.isHost){
  427 + GlobalConfig.recordTimestamp=GlobalConfig.recordTimestamp+1;
  428 + }
418 //loger.log('课堂进行时间',GlobalConfig.classTimestamp); 429 //loger.log('课堂进行时间',GlobalConfig.classTimestamp);
419 this._emit(MessageTypes.CLASS_UPDATE_TIMER, {"classTimestamp": GlobalConfig.classTimestamp}); 430 this._emit(MessageTypes.CLASS_UPDATE_TIMER, {"classTimestamp": GlobalConfig.classTimestamp});
420 431
@@ -657,7 +668,7 @@ class ConferApe extends Ape { @@ -657,7 +668,7 @@ class ConferApe extends Ape {
657 classStatusInfo.activeDocId = GlobalConfig.activeDocId;//当前激活的文档id 668 classStatusInfo.activeDocId = GlobalConfig.activeDocId;//当前激活的文档id
658 classStatusInfo.activeDocCurPage = GlobalConfig.activeDocCurPage;//当前激活的文档的当前页 669 classStatusInfo.activeDocCurPage = GlobalConfig.activeDocCurPage;//当前激活的文档的当前页
659 670
660 - loger.log("classStatusInfo-------------", classStatusInfo); 671 + loger.log("classStatusInfo--->", classStatusInfo);
661 672
662 /* 673 /*
663 optional uint32 item_idx=1; 674 optional uint32 item_idx=1;