From 0cd3d8b370eb4c36c6f3d91849059db0bf176ef8 Mon Sep 17 00:00:00 2001
From: madixin <madixin@huawei.com>
Date: Thu, 9 May 2024 08:39:40 +0800
Subject: [PATCH] =?UTF-8?q?placeholderSrc=EF=BC=8CerrorholderSrc=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5string=EF=BC=8C=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E7=BD=91=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: madixin <madixin@huawei.com>
---
 library/src/main/ets/ImageKnifeDispatcher.ets | 2 +-
 library/src/main/ets/ImageKnifeOption.ets     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/src/main/ets/ImageKnifeDispatcher.ets b/library/src/main/ets/ImageKnifeDispatcher.ets
index 0eb75ba..a6f5cae 100644
--- a/library/src/main/ets/ImageKnifeDispatcher.ets
+++ b/library/src/main/ets/ImageKnifeDispatcher.ets
@@ -277,7 +277,7 @@ async function requestJob(request: RequestJobRequest): Promise<RequestJobResult
       if (request.src.indexOf("http://") == 0 || request.src.indexOf("https://") == 0) { //从网络下载
         // 先从文件缓存获取
         resBuf = FileCache.getFileCacheByFile(request.context, fileKey)
-        if (resBuf === undefined && request.onlyRetrieveFromCache != true && request.requestSource === ImageKnifeRequestSource.SRC) {
+        if (resBuf === undefined && request.onlyRetrieveFromCache != true) {
           let httpRequest = http.createHttp();
           let progress: number = 0
           const headerObj: Record<string, object> = {}
diff --git a/library/src/main/ets/ImageKnifeOption.ets b/library/src/main/ets/ImageKnifeOption.ets
index 19883b0..1be7bc8 100644
--- a/library/src/main/ets/ImageKnifeOption.ets
+++ b/library/src/main/ets/ImageKnifeOption.ets
@@ -26,9 +26,9 @@ export class ImageKnifeOption {
   // 主图资源
   loadSrc: string | PixelMap | Resource = "";
   // 占位图
-  placeholderSrc?: PixelMap | Resource;
+  placeholderSrc?: string | PixelMap | Resource;
   // 失败占位图
-  errorholderSrc?: PixelMap | Resource;
+  errorholderSrc?: string | PixelMap | Resource;
 
   headerOption?: Array<HeaderOptions>;