open/PainterCore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化下代码

Browse Source
This commit is contained in:
CPPAlien 2018-07-18 18:26:58 +08:00
parent e455e7c6b9
commit 6a53cfb444
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
painter.js
View File

@ -89,7 +89,7 @@ Component({
const ctx = wx.createCanvasContext('k-canvas', this); const ctx = wx.createCanvasContext('k-canvas', this);
const pen = new Pen(ctx, palette); const pen = new Pen(ctx, palette);
pen.paint(() => { pen.paint(() => {
this.saveImg(); this.saveImgToLocal();
}); });
}); });
}, },
@ -140,34 +140,13 @@ Component({
}); });
}, },
saveImg() { saveImgToLocal() {
const that = this; const that = this;
setTimeout(() => { setTimeout(() => {
wx.canvasToTempFilePath({ wx.canvasToTempFilePath({
canvasId: 'k-canvas', canvasId: 'k-canvas',
success: function (res) { success: function (res) {
wx.getImageInfo({ that.getImageInfo(res.tempFilePath);
src: res.tempFilePath,
success: (infoRes) => {
if (that.paintCount > MAX_PAINT_COUNT) {
const error = `The result is always fault, even we tried ${MAX_PAINT_COUNT} times`;
console.error(error);
that.triggerEvent('imgErr', { error: error });
return;
}
// 比例相符时才证明绘制成功，否则进行强制重绘制
if (Math.abs((infoRes.width * that.canvasHeightInPx - that.canvasWidthInPx * infoRes.height) / (infoRes.height * that.canvasHeightInPx)) < 0.01) {
that.triggerEvent('imgOK', { path: res.tempFilePath });
} else {
that.startPaint();
}
that.paintCount++;
},
fail: (error) => {
console.error(`getImageInfo failed, ${JSON.stringify(error)}`);
that.triggerEvent('imgErr', { error: error });
},
});
}, },
fail: function (error) { fail: function (error) {
console.error(`canvasToTempFilePath failed, ${JSON.stringify(error)}`); console.error(`canvasToTempFilePath failed, ${JSON.stringify(error)}`);
@ -176,6 +155,32 @@ Component({
}, this); }, this);
}, 300); }, 300);
}, },
getImageInfo(filePath) {
const that = this;
wx.getImageInfo({
src: filePath,
success: (infoRes) => {
if (that.paintCount > MAX_PAINT_COUNT) {
const error = `The result is always fault, even we tried ${MAX_PAINT_COUNT} times`;
console.error(error);
that.triggerEvent('imgErr', { error: error });
return;
}
// 比例相符时才证明绘制成功，否则进行强制重绘制
if (Math.abs((infoRes.width * that.canvasHeightInPx - that.canvasWidthInPx * infoRes.height) / (infoRes.height * that.canvasHeightInPx)) < 0.01) {
that.triggerEvent('imgOK', { path: filePath });
} else {
that.startPaint();
}
that.paintCount++;
},
fail: (error) => {
console.error(`getImageInfo failed, ${JSON.stringify(error)}`);
that.triggerEvent('imgErr', { error: error });
},
});
},
}, },
}); });