From e6c468bd21c967f35006dcc3de7dc61f9a76140b Mon Sep 17 00:00:00 2001
From: zgf <zenggaofeng2@h-partners.com>
Date: Wed, 10 Jul 2024 11:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BB=85=E6=94=AF=E6=8C=81=E4=B8=BB=E5=9B=BE?=
 =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9requestInSteam=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zgf <zenggaofeng2@h-partners.com>
---
 CHANGELOG.md                                  |  2 ++
 library/src/main/ets/ImageKnifeDispatcher.ets | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03d1df1..c2583ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## 3.0.0-rc.10
 - 修复图形变换的闪退问题
+- 自定义下载customGetImage改为仅主图支持
+- 修改网络请求requestInStream配置
 
 ## 3.0.0-rc.9
 - 修复Resource类型$r(变量无法)加载
diff --git a/library/src/main/ets/ImageKnifeDispatcher.ets b/library/src/main/ets/ImageKnifeDispatcher.ets
index 279706d..5cde439 100644
--- a/library/src/main/ets/ImageKnifeDispatcher.ets
+++ b/library/src/main/ets/ImageKnifeDispatcher.ets
@@ -383,7 +383,7 @@ async function requestJob(request: RequestJobRequest, requestList?: List<ImageKn
   let fileKey = request.engineKey.generateFileKey(request.src, request.signature)
 
   // 判断自定义下载
-  if (request.customGetImage !== undefined && typeof request.src === 'string' && (request.src.indexOf("http://") == 0 || request.src.indexOf("https://") == 0)) {
+  if (request.customGetImage !== undefined && request.requestSource == ImageKnifeRequestSource.SRC) {
     // 先从文件缓存获取
     resBuf = FileCache.getFileCacheByFile(request.context, fileKey , request.fileCacheFolder)
     if (resBuf === undefined) {
@@ -417,14 +417,6 @@ async function requestJob(request: RequestJobRequest, requestList?: List<ImageKn
               headerObj[key] = value
             })
           }
-          let promise = httpRequest.requestInStream(request.src, {
-            header: headerObj,
-            method: http.RequestMethod.GET,
-            connectTimeout: 6000,
-            readTimeout: 6000,
-            // header: new Header('application/json')
-          });
-
           httpRequest.on("dataReceive", (data: ArrayBuffer) => {
             arrayBuffers.push(data)
           });
@@ -451,6 +443,15 @@ async function requestJob(request: RequestJobRequest, requestList?: List<ImageKn
               }
             })
           }
+          let promise = httpRequest.requestInStream(request.src, {
+            header: headerObj,
+            method: http.RequestMethod.GET,
+            expectDataType: http.HttpDataType.ARRAY_BUFFER,
+            connectTimeout: 6000,
+            readTimeout: 6000,
+            usingProtocol:http.HttpProtocol.HTTP1_1
+            // header: new Header('application/json')
+          });
 
           await promise.then((data: number) => {
             if (data == 200) {