From 4217186ff501132b174f4714c5ae6b54aa7ee503 Mon Sep 17 00:00:00 2001
From: liyong <liyong@3mang.com>
Date: Tue, 19 Sep 2017 11:50:58 +0800
Subject: [PATCH] 1.文档模块增加了是否全屏的字段；2.MCU端口之后清除当前课堂内的一些数据
---
src/EngineEntrance.js | 5 +++--
src/SystemConfig.js | 2 +-
src/apes/ConferApe.js | 1 +
src/apes/DocApe.js | 2 ++
src/pdus/pro.js | 1 +
5 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/EngineEntrance.js b/src/EngineEntrance.js
index 82085f6..048d473 100644
--- a/src/EngineEntrance.js
+++ b/src/EngineEntrance.js
@@ -62,7 +62,7 @@ export default class MessageEntrance extends Emiter {
constructor() {
super();
//sdk 信息
- GlobalConfig.sdkVersion = "v2.9.0.20170918";
+ GlobalConfig.sdkVersion = "v2.9.3.20170919";
loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
//设置
@@ -1093,7 +1093,8 @@ export default class MessageEntrance extends Emiter {
// MCU 课堂成功
_mcuJoinMCUClassSuccessHandler(_data) {
//loger.log('MCU 课堂成功.');
- loger.warn('=====================STEP9=======================');;
+ loger.warn('=====================STEP9=======================');
+ //console.log("当前课堂人员列表",GlobalConfig.rosterNumber,GlobalConfig.rosters)
GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_2);
GlobalConfig.classJoinSuccess = true;
diff --git a/src/SystemConfig.js b/src/SystemConfig.js
index 6fa0150..2f69a91 100644
--- a/src/SystemConfig.js
+++ b/src/SystemConfig.js
@@ -216,7 +216,7 @@ class SystemConfig {
if (ua.match(/safari/i) == "safari") {
Sys.explorer = "safari"
loger.log("safari", Sys);
- alert(JSON.stringify(Sys));
+ loger.log(JSON.stringify(Sys));
}
}
}
diff --git a/src/apes/ConferApe.js b/src/apes/ConferApe.js
index f295c6e..969de87 100644
--- a/src/apes/ConferApe.js
+++ b/src/apes/ConferApe.js
@@ -626,6 +626,7 @@ class ConferApe extends Ape {
loger.log('课堂模块初始完成->当前课堂状态:'+ GlobalConfig.classStatus,"recordStatus:"+GlobalConfig.recordStatus);
this.rosters={};
this.rosterLen=0;
+ GlobalConfig.rosterNumber=this.rosterLen;
GlobalConfig.rosters=this.rosters;
this.timerCounter.addTimerCallBack(this.timerCounterUptate.bind(this), 1);
diff --git a/src/apes/DocApe.js b/src/apes/DocApe.js
index daf5a08..7bae4d0 100644
--- a/src/apes/DocApe.js
+++ b/src/apes/DocApe.js
@@ -498,6 +498,7 @@ class DocApe extends Ape {
docDataModel.curV = parseInt(paramInfo.curV) || 0;//垂直方向的滚动条进度百分比 0-100
docDataModel.curH = parseInt(paramInfo.curH) || 0;//水平方向的滚动条进度百分比 0-100
docDataModel.scale = parseInt(paramInfo.scale) || 100;//文档缩放百分比 0-100
+ docDataModel.isFullScreen=Boolean(paramInfo.isFullScreen)||false;//是否全屏显示文档区域
this.updaterDoc(docDataModel, docDataModel.itemIdx);
}
@@ -744,6 +745,7 @@ class DocApe extends Ape {
docModelPdu.curV = parseInt(_param.curV) || 0;
docModelPdu.curH = parseInt(_param.curH) || 0;
docModelPdu.scale = _param.scale || 100;//按百分比
+ docModelPdu.isFullScreen=Boolean(_param.isFullScreen)||false;//是否全屏显示文档区域
docModelPdu.visible = _param.visible || false;
docModelPdu.action = _param.action || ApeConsts.DOC_ACTION_NORMAL;//0，无操作， 1翻页、2.显示/隐藏, 3缩放/滚动
docModelPdu.docId = _param.docId || "";//文档在服务器数据库中的唯一id,必须有
diff --git a/src/pdus/pro.js b/src/pdus/pro.js
index 7e40ccb..d2e1048 100644
--- a/src/pdus/pro.js
+++ b/src/pdus/pro.js
@@ -742,6 +742,7 @@ message RCDocSendDataModelPdu {
optional string md5=18;//md5
optional uint32 show_type=19;//文档显示模式
optional uint32 animation_step=20 [default =1];//当前页码的动画步数
+ optional bool isFullScreen=21 ;//是否全屏显示
}
--
libgit2 0.24.0