From 301d7d4a1500361033217629720e7474308a1d37 Mon Sep 17 00:00:00 2001
From: 0JARVIS0 <709406687@qq.com>
Date: Thu, 16 Jul 2020 11:26:45 +0800
Subject: [PATCH] fix

---
 lib/pen.js |  2 +-
 painter.js | 31 +++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/lib/pen.js b/lib/pen.js
index bef8897..96043c8 100644
--- a/lib/pen.js
+++ b/lib/pen.js
@@ -216,7 +216,7 @@ export default class Painter {
         if (!view.css.fontSize) {
           view.css.fontSize = '20rpx';
         }
-        this.ctx.font = `${textStyle} ${fontWeight} ${view.css.fontSize.toPx()}px ${view.css.fontFamily ? view.css.fontFamily : 'sans-serif'}`;
+        this.ctx.font = `${textStyle} ${fontWeight} ${view.css.fontSize.toPx()}px "${view.css.fontFamily || 'sans-serif'}"`;
         // 计算行数
         let lines = 0;
         const linesArray = [];
diff --git a/painter.js b/painter.js
index ec594fc..f78a300 100644
--- a/painter.js
+++ b/painter.js
@@ -13,6 +13,7 @@ const ACTION_OFFSET = '2rpx';
 Component({
   canvasWidthInPx: 0,
   canvasHeightInPx: 0,
+  canvasNode: null,
   paintCount: 0,
   currentPalette: {},
   movingCache: {},
@@ -637,10 +638,10 @@ Component({
         this.setData({
           painterStyle: `width:${width.toPx()}px;height:${height.toPx()}px;`,
         });
-        this.frontContext || (this.frontContext = await this.getCanvasContext(this.properties.use2D, 'front', width.toPx(), height.toPx()));
-        this.bottomContext || (this.bottomContext = await this.getCanvasContext(this.properties.use2D, 'bottom', width.toPx(), height.toPx()));
-        this.topContext || (this.topContext = await this.getCanvasContext(this.properties.use2D, 'top', width.toPx(), height.toPx()));
-        this.globalContext || (this.globalContext = await this.getCanvasContext(this.properties.use2D, 'k-canvas', width.toPx(), height.toPx()));
+        this.frontContext || (this.frontContext = await this.getCanvasContext(this.properties.use2D, 'front'));
+        this.bottomContext || (this.bottomContext = await this.getCanvasContext(this.properties.use2D, 'bottom'));
+        this.topContext || (this.topContext = await this.getCanvasContext(this.properties.use2D, 'top'));
+        this.globalContext || (this.globalContext = await this.getCanvasContext(this.properties.use2D, 'k-canvas'));
         new Pen(this.bottomContext, palette, this.properties.use2D).paint(() => {
           this.isDisabled = false;
           this.isDisabled = this.outterDisabled;
@@ -678,7 +679,7 @@ Component({
         this.setData({
           photoStyle: `width:${this.canvasWidthInPx}px;height:${this.canvasHeightInPx}px;`,
         });
-        this.photoContext || (this.photoContext = await this.getCanvasContext(this.properties.use2D, 'photo', width.toPx(), height.toPx()));
+        this.photoContext || (this.photoContext = await this.getCanvasContext(this.properties.use2D, 'photo'));
 
         new Pen(this.photoContext, palette).paint(() => {
           this.saveImgToLocal();
@@ -754,8 +755,9 @@ Component({
       setTimeout(() => {
         wx.canvasToTempFilePath({
           canvasId: 'photo',
-          destWidth: that.canvasWidthInPx,
-          destHeight: that.canvasHeightInPx,
+          canvas: that.properties.use2D ? that.canvasNode : null,
+          destWidth: that.canvasWidthInPx * getApp().systemInfo.pixelRatio,
+          destHeight: that.canvasHeightInPx * getApp().systemInfo.pixelRatio,
           success: function (res) {
             that.getImageInfo(res.tempFilePath);
           },
@@ -770,25 +772,26 @@ Component({
     },
 
 
-    getCanvasContext(use2D, id, width, height) {
+    getCanvasContext(use2D, id) {
+      const that = this;
       return new Promise(resolve => {
         if (use2D) {
-          const query = wx.createSelectorQuery().in(this);
+          const query = wx.createSelectorQuery().in(that);
           const selectId = `#${id}`;
           query.select(selectId)
           .fields({ node: true, size: true })
           .exec((res) => {
-            const canvasNode = res[0].node;
-            const ctx = canvasNode.getContext('2d');
-            const wxCanvas = new WxCanvas('2d', ctx, id, true, canvasNode);
-            const dpr = wx.getSystemInfoSync().pixelRatio
+            that.canvasNode = res[0].node;
+            const ctx = that.canvasNode.getContext('2d');
+            const wxCanvas = new WxCanvas('2d', ctx, id, true, that.canvasNode);
+            const dpr = Math.min(2, getApp().systemInfo.pixelRatio)
             wxCanvas.width = res[0].width * dpr
             wxCanvas.height = res[0].height * dpr
             wxCanvas.scale(dpr, dpr)
             resolve(wxCanvas);
           });
         } else {
-          const temp = wx.createCanvasContext(id, this);
+          const temp = wx.createCanvasContext(id, that);
           resolve(new WxCanvas('mina', temp, id, true));
         }
       })