自定义下载改为仅支持主图和修改requestInSteam配置

Signed-off-by: zgf <zenggaofeng2@h-partners.com>

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## 3.0.0-rc.10
 - 修复图形变换的闪退问题
+- 自定义下载customGetImage改为仅主图支持
+- 修改网络请求requestInStream配置
 
 ## 3.0.0-rc.9
 - 修复Resource类型$r(变量无法)加载

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) {