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-03-31 17:48:13 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
682b0913a0ab46274cd710ee46cb7999fd169be8
682b0913
1 parent
54815f50
1.增加消息延迟设置接口
2.白板标注增加 线条粗细字段
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
15 行增加
和
6 行删除
dist/McuClient.js
src/EngineEntrance.js
src/apes/WhiteBoardApe.js
dist/McuClient.js
查看文件 @
682b091
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
682b091
...
...
@@ -26,7 +26,7 @@ import ArrayBufferUtil from 'libs/ArrayBufferUtil';
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'MessageEntrance'
);
let
_sdkInfo
=
{
"version"
:
"v.1.8.
3.20170329-4
"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v.1.8.
4.20170330-1
"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
@@ -175,11 +175,19 @@ export default class MessageEntrance extends Emiter {
this
.
getDocPDFFullPath
=
this
.
_getDocPDFFullPath
.
bind
(
this
);
//获取文档的完整路径
this
.
setDebuger
=
this
.
_setDebuger
.
bind
(
this
);
//debug
this
.
setMessageDelay
=
this
.
_setMessageDelay
.
bind
(
this
);
//设置是否延迟消息
}
_setDebuger
(
_data
){
GlobalConfig
.
isDebuger
=
_data
.
isDebuger
||
true
;
}
_setMessageDelay
(
_data
){
loger
.
warn
(
"延迟消息-->"
,
_data
);
if
(
_data
){
GlobalConfig
.
messageDelay
=
Boolean
(
_data
.
messageDelay
);
}
}
//mcu异常监听
_mcuErrorHandler
(
_data
,
_option
)
{
let
option
=
_option
||
""
;
...
...
src/apes/WhiteBoardApe.js
查看文件 @
682b091
...
...
@@ -322,16 +322,16 @@ class WhiteBoardApe extends Ape {
let
item
=
this
.
annoInfos
[
key
];
if
(
item
&&
item
.
parentId
==
GlobalConfig
.
activeDocId
&&
item
.
curPageNo
==
GlobalConfig
.
activeDocCurPage
)
{
annotaionItems
.
push
(
item
);
loger
.
log
(
"显示和文档对应的白板数据docUpdateHandler itemIdx:"
,
item
.
itemIdx
,
"doc
itemIdx:"
,
GlobalConfig
.
activeDocId
,
"curPageNo:"
,
GlobalConfig
.
activeDocCurPage
);
//loger.log("显示和文档对应的白板数据->:", item.itemIdx, "doc->
itemIdx:", GlobalConfig.activeDocId, "curPageNo:", GlobalConfig.activeDocCurPage);
}
else
{
loger
.
log
(
"不显示白板数据docUpdateHandler"
,
item
);
//loger.log("不显示白板数据docUpdateHandler->",item.itemIdx
);
}
}
var
updateObj
=
{
"isFresh"
:
true
,
"annotaionItems"
:
annotaionItems
"isFresh"
:
true
,
//清除现有显示的数据
"annotaionItems"
:
annotaionItems
//最新需要显示的数据
};
loger
.
log
(
"
WHITEBOARD_ANNOTATION_UPDATE"
,
annotaionItems
.
length
);
loger
.
log
(
"
清除标注---->重绘标注数量--->"
,
annotaionItems
.
length
,
"当前文档信息--->DocId->"
,
GlobalConfig
.
activeDocId
,
"curPageNo->"
,
GlobalConfig
.
activeDocCurPage
);
this
.
_emit
(
MessageTypes
.
WHITEBOARD_ANNOTATION_UPDATE
,
updateObj
);
}
...
...
@@ -377,6 +377,7 @@ class WhiteBoardApe extends Ape {
whiteBoardModelPdu
.
pointGroup
=
EngineUtils
.
arrayToJsonString
(
_param
.
pointGroup
);
whiteBoardModelPdu
.
color
=
_param
.
color
||
"#000000"
;
whiteBoardModelPdu
.
thickness
=
_param
.
thickness
||
1
;
return
whiteBoardModelPdu
;
}
...
...
请
注册
或
登录
后发表评论