李勇

1.增加消息延迟设置接口

2.白板标注增加 线条粗细字段
此 diff 太大无法显示。
@@ -26,7 +26,7 @@ import ArrayBufferUtil from 'libs/ArrayBufferUtil'; @@ -26,7 +26,7 @@ import ArrayBufferUtil from 'libs/ArrayBufferUtil';
26 import UTF8 from 'utf-8'; 26 import UTF8 from 'utf-8';
27 27
28 let loger = Loger.getLoger('MessageEntrance'); 28 let loger = Loger.getLoger('MessageEntrance');
29 -let _sdkInfo = {"version": "v.1.8.3.20170329-4", "author": "www.3mang.com"}; 29 +let _sdkInfo = {"version": "v.1.8.4.20170330-1", "author": "www.3mang.com"};
30 30
31 //APE 31 //APE
32 let _sass; 32 let _sass;
@@ -175,11 +175,19 @@ export default class MessageEntrance extends Emiter { @@ -175,11 +175,19 @@ export default class MessageEntrance extends Emiter {
175 this.getDocPDFFullPath = this._getDocPDFFullPath.bind(this);//获取文档的完整路径 175 this.getDocPDFFullPath = this._getDocPDFFullPath.bind(this);//获取文档的完整路径
176 176
177 this.setDebuger = this._setDebuger.bind(this);//debug 177 this.setDebuger = this._setDebuger.bind(this);//debug
  178 +
  179 + this.setMessageDelay=this._setMessageDelay.bind(this);//设置是否延迟消息
178 } 180 }
179 181
180 _setDebuger(_data){ 182 _setDebuger(_data){
181 GlobalConfig.isDebuger=_data.isDebuger||true; 183 GlobalConfig.isDebuger=_data.isDebuger||true;
182 } 184 }
  185 + _setMessageDelay(_data){
  186 + loger.warn("延迟消息-->", _data);
  187 + if(_data){
  188 + GlobalConfig.messageDelay=Boolean(_data.messageDelay);
  189 + }
  190 + }
183 //mcu异常监听 191 //mcu异常监听
184 _mcuErrorHandler(_data, _option) { 192 _mcuErrorHandler(_data, _option) {
185 let option = _option || ""; 193 let option = _option || "";
@@ -322,16 +322,16 @@ class WhiteBoardApe extends Ape { @@ -322,16 +322,16 @@ class WhiteBoardApe extends Ape {
322 let item = this.annoInfos[key]; 322 let item = this.annoInfos[key];
323 if (item && item.parentId == GlobalConfig.activeDocId && item.curPageNo == GlobalConfig.activeDocCurPage) { 323 if (item && item.parentId == GlobalConfig.activeDocId && item.curPageNo == GlobalConfig.activeDocCurPage) {
324 annotaionItems.push(item); 324 annotaionItems.push(item);
325 - loger.log("显示和文档对应的白板数据docUpdateHandler itemIdx:", item.itemIdx, "doc itemIdx:", GlobalConfig.activeDocId, "curPageNo:", GlobalConfig.activeDocCurPage); 325 + //loger.log("显示和文档对应的白板数据->:", item.itemIdx, "doc->itemIdx:", GlobalConfig.activeDocId, "curPageNo:", GlobalConfig.activeDocCurPage);
326 } else { 326 } else {
327 - loger.log("不显示白板数据docUpdateHandler",item); 327 + //loger.log("不显示白板数据docUpdateHandler->",item.itemIdx);
328 } 328 }
329 } 329 }
330 var updateObj = { 330 var updateObj = {
331 - "isFresh": true,  
332 - "annotaionItems": annotaionItems 331 + "isFresh": true,//清除现有显示的数据
  332 + "annotaionItems": annotaionItems //最新需要显示的数据
333 }; 333 };
334 - loger.log("WHITEBOARD_ANNOTATION_UPDATE", annotaionItems.length); 334 + loger.log("清除标注---->重绘标注数量--->", annotaionItems.length,"当前文档信息--->DocId->",GlobalConfig.activeDocId,"curPageNo->",GlobalConfig.activeDocCurPage);
335 this._emit(MessageTypes.WHITEBOARD_ANNOTATION_UPDATE, updateObj); 335 this._emit(MessageTypes.WHITEBOARD_ANNOTATION_UPDATE, updateObj);
336 } 336 }
337 337
@@ -377,6 +377,7 @@ class WhiteBoardApe extends Ape { @@ -377,6 +377,7 @@ class WhiteBoardApe extends Ape {
377 377
378 whiteBoardModelPdu.pointGroup = EngineUtils.arrayToJsonString(_param.pointGroup); 378 whiteBoardModelPdu.pointGroup = EngineUtils.arrayToJsonString(_param.pointGroup);
379 whiteBoardModelPdu.color = _param.color || "#000000"; 379 whiteBoardModelPdu.color = _param.color || "#000000";
  380 + whiteBoardModelPdu.thickness = _param.thickness ||1;
380 381
381 return whiteBoardModelPdu; 382 return whiteBoardModelPdu;
382 } 383 }