From 0854025779bd54b4d42e68809088f5e71549bfab Mon Sep 17 00:00:00 2001
From: zenggaofeng <zenggaofeng2@h-partners.com>
Date: Mon, 22 Jan 2024 14:34:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=B8=BF=E8=92=99=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E8=B0=83=E8=8A=82=E6=98=BE=E7=A4=BA=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E5=9B=BE=E7=89=87=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zenggaofeng <zenggaofeng2@h-partners.com>
---
 CHANGELOG.md                                                  | 3 +++
 entry/oh-package.json5                                        | 2 +-
 library/oh-package.json5                                      | 2 +-
 .../main/ets/components/imageknife/ImageKnifeComponent.ets    | 4 ++--
 oh-package.json5                                              | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f132572..3e4d6c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.1.2-rc.6
+- 修复手机调节显示大小时图片消失
+
 ## 2.1.2-rc.5
 - moduleContext新增缓存策略，缓存上限5，缓存策略Lru
 - 适配DevEco Studio 4.1（4.1.3.415）--SDK:API11（ 4.1.0.56）
diff --git a/entry/oh-package.json5 b/entry/oh-package.json5
index 01beac8..bec89dd 100644
--- a/entry/oh-package.json5
+++ b/entry/oh-package.json5
@@ -4,7 +4,7 @@
   "name": "entry",
   "description": "example description",
   "repository": {},
-  "version": "2.1.2-rc.5",
+  "version": "2.1.2-rc.6",
   "dependencies": {
     "@ohos/libraryimageknife": "file:../sharedlibrary",
     "@ohos/sharedlibrary2": "file:../sharedlibrary2",
diff --git a/library/oh-package.json5 b/library/oh-package.json5
index ad41c10..ebc85ba 100644
--- a/library/oh-package.json5
+++ b/library/oh-package.json5
@@ -14,7 +14,7 @@
   "main": "index.ets",
   "repository": "https://gitee.com/openharmony-tpc/ImageKnife",
   "type": "module",
-  "version": "2.1.2-rc.5",
+  "version": "2.1.2-rc.6",
   "dependencies": {
     "pako": "^2.1.0",
     "@ohos/disklrucache": "^2.0.2-rc.0",
diff --git a/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets b/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets
index cdf4302..b265792 100644
--- a/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets
+++ b/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets
@@ -102,6 +102,8 @@ export struct ImageKnifeComponent {
         if(newValue != undefined && newValue.width != undefined && newValue.height != undefined) {
           this.currentWidth = newValue.width as number
           this.currentHeight = newValue.height as number
+          this.lastWidth = oldValue.width as number
+          this.lastHeight = oldValue.height as number
           if (this.currentWidth <= 0 || this.currentHeight <= 0) {
             // 存在宽或者高为0,此次重回无意义,无需进行request请求
           } else {
@@ -109,8 +111,6 @@ export struct ImageKnifeComponent {
             if ((this.currentHeight != this.lastHeight || this.currentWidth != this.lastWidth) || this.firstDrawFlag) {
               this.firstDrawFlag = false;
               LogUtil.log('ImageKnifeComponent onAreaChange And Next To Execute. Canvas currentWidth =' + this.currentWidth + '  currentHeight=' + this.currentHeight)
-              this.lastWidth = this.currentWidth
-              this.lastHeight = this.currentHeight
               this.imageKnifeExecute()
             }
           }
diff --git a/oh-package.json5 b/oh-package.json5
index b52c7c4..b7dbed9 100644
--- a/oh-package.json5
+++ b/oh-package.json5
@@ -6,6 +6,6 @@
   "name": "imageknife",
   "description": "example description",
   "repository": {},
-  "version": "2.1.2-rc.5",
+  "version": "2.1.2-rc.6",
   "dependencies": {}
 }