Pre Merge pull request !409 from jinzhao/master

library/src/main/ets/ImageKnifeLoader.ets

@@ -290,26 +290,48 @@ export class ImageKnifeLoader {
               })
             }
 
-            let promise = httpRequest.requestInStream(request.src, {
-              header: headerObj,
-              method: http.RequestMethod.GET,
-              expectDataType: http.HttpDataType.ARRAY_BUFFER,
-              connectTimeout: 60000,
-              readTimeout: 0,
-              // usingProtocol:http.HttpProtocol.HTTP1_1
-              // header: new Header('application/json')
-              caPath: request.caPath === undefined ? undefined : request.caPath,
-            });
-            await promise.then((data: number) => {
-              if (data == 200 || data == 206 || data == 204) {
-                resBuf = combineArrayBuffers(arrayBuffers)
-              } else {
-                throw new Error("HttpDownloadClient has error, http code =" + JSON.stringify(data))
-              }
-            }).catch((err: Error) => {
-              throw new Error("HttpDownloadClient download ERROR : err = " + JSON.stringify(err))
-            });
-            LogUtil.log("HttpDownloadClient.end:" + request.src)
+            if(request.caPath === undefined) {  //采用默认证书
+              let promise = httpRequest.requestInStream(request.src, {
+                header: headerObj,
+                method: http.RequestMethod.GET,
+                expectDataType: http.HttpDataType.ARRAY_BUFFER,
+                connectTimeout: 60000,
+                readTimeout: 0,
+                // usingProtocol:http.HttpProtocol.HTTP1_1
+                // header: new Header('application/json')
+              });
+              await promise.then((data: number) => {
+                if (data == 200 || data == 206 || data == 204) {
+                  resBuf = combineArrayBuffers(arrayBuffers)
+                } else {
+                  throw new Error("HttpDownloadClient has error, http code =" + JSON.stringify(data))
+                }
+              }).catch((err: Error) => {
+                throw new Error("HttpDownloadClient download ERROR : err = " + JSON.stringify(err))
+              });
+              LogUtil.log("HttpDownloadClient.end:" + request.src)
+            } else {  //采用自定义证书
+              let promise = httpRequest.requestInStream(request.src, {
+                header: headerObj,
+                method: http.RequestMethod.GET,
+                expectDataType: http.HttpDataType.ARRAY_BUFFER,
+                connectTimeout: 60000,
+                readTimeout: 0,
+                // usingProtocol:http.HttpProtocol.HTTP1_1
+                // header: new Header('application/json')
+                caPath: request.caPath,
+              });
+              await promise.then((data: number) => {
+                if (data == 200 || data == 206 || data == 204) {
+                  resBuf = combineArrayBuffers(arrayBuffers)
+                } else {
+                  throw new Error("HttpDownloadClient has error, http code =" + JSON.stringify(data))
+                }
+              }).catch((err: Error) => {
+                throw new Error("HttpDownloadClient download ERROR : err = " + JSON.stringify(err))
+              });
+              LogUtil.log("HttpDownloadClient.end:" + request.src)
+            }
 
             // 保存文件缓存
             if (resBuf !== undefined && request.writeCacheStrategy !== CacheStrategy.Memory) {