ImageKnife3.x分支合并master

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

build-profile.json5

@@ -7,9 +7,9 @@
       {
         "name": "default",
         "signingConfig": "default",
-        "compileSdkVersion": "5.0.0(12)",
-        "compatibleSdkVersion": "5.0.0(12)",
-        "runtimeOS": "HarmonyOS",
+        "compileSdkVersion": 12,
+        "compatibleSdkVersion": 12,
+        "runtimeOS": "OpenHarmony",
       }
     ],
     "buildModeSet": [

entry/src/ohosTest/ets/test/imageknifeOption.test.ets

@@ -1,64 +1,69 @@
 /*
  * Copyright (C) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the 'License');
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an 'AS IS' BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-import { ImageKnifeOption } from '@ohos/imageknife'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
+import { ImageKnifeOption,ImageKnifeData } from "@ohos/imageknife"
 
 export default function ImageKnifeOptionTest() {
-  describe('ImageKnifeOptionTest',  ()=> {
+  describe('ImageKnifeOptionTest',() => {
     // Defines a test suite. Two parameters are supported: test suite name and test suite function.
-    beforeAll( ()=> {
+    beforeAll(() => {
       // Presets an action, which is performed only once before all test cases of the test suite start.
       // This API supports only one parameter: preset action function.
-    })
-    beforeEach( ()=> {
+    });
+    beforeEach(() => {
       // Presets an action, which is performed before each unit test case starts.
       // The number of execution times is the same as the number of test cases defined by **it**.
       // This API supports only one parameter: preset action function.
-    })
-    afterEach( ()=> {
+    });
+    afterEach(() => {
       // Presets a clear action, which is performed after each unit test case ends.
       // The number of execution times is the same as the number of test cases defined by **it**.
       // This API supports only one parameter: clear action function.
-    })
-    afterAll( ()=> {
+    });
+    afterAll(() => {
       // Presets a clear action, which is performed after all test cases of the test suite end.
       // This API supports only one parameter: clear action function.
-    })
-
-    it('onLoadListener',0,  ()=> {
+    });
+    it('onLoadListener', 0, () => {
       let a = 'abc';
       let b: string = '';
-      let imageKnifeOption: ImageKnifeOption = {
-        loadSrc: 'https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658',
+      let imageData:ImageKnifeData = {
+        source: "",
+        imageWidth: 0,
+        imageHeight: 0,
+      }
+      let ImageKnifeOption: ImageKnifeOption = {
+        loadSrc: $r("app.media.rabbit"),
         onLoadListener: {
-          onLoadSuccess: (data) => {
-            if (typeof data == 'string') {
-              b = data;
+          onLoadFailed: (err) => {
+            console.error("Load Failed Reason: " + err);
+          },
+          onLoadSuccess: (data,imageknifeData) => {
+            if(typeof data == 'string') {
+              return b = data;
             }
+            imageData = imageknifeData
             return data;
           },
-          onLoadFailed: (err) => {
-            console.log('Load Failed Reason: '+err);
-          }
-        }
+        },
       }
-      if(imageKnifeOption.onLoadListener && imageKnifeOption.onLoadListener.onLoadSuccess && imageKnifeOption.onLoadListener.onLoadFailed) {
-        imageKnifeOption.onLoadListener.onLoadSuccess(a);
-        imageKnifeOption.onLoadListener.onLoadFailed(a);
+      if (ImageKnifeOption.onLoadListener && ImageKnifeOption.onLoadListener.onLoadSuccess && ImageKnifeOption.onLoadListener.onLoadFailed) {
+        ImageKnifeOption.onLoadListener.onLoadSuccess(a,imageData);
+        ImageKnifeOption.onLoadListener.onLoadFailed(a);
       }
       expect(a).assertEqual(b);
-    })
-  })
+    });
+  });
 }

hvigor/hvigor-config.json5

@@ -1,9 +1,10 @@
 {
-  "modelVersion": "5.0.0",
+  "hvigorVersion": "4.3.0",
   "dependencies": {
+    "@ohos/hvigor-ohos-plugin": "4.3.0"
   },
   "execution": {
-    // "analyze": "default",                    /* Define the build analyze mode. Value: [ "default" | "verbose" | false ]. Default: "default" */
+    // "analyze": "normal",                     /* Define the build analyze mode. Value: [ "normal" | "advanced" | false ]. Default: "normal" */
     // "daemon": true,                          /* Enable daemon compilation. Value: [ true | false ]. Default: true */
     // "incremental": true,                     /* Enable incremental compilation. Value: [ true | false ]. Default: true */
     // "parallel": true,                        /* Enable parallel compilation. Value: [ true | false ]. Default: true */
@@ -18,4 +19,4 @@
   "nodeOptions": {
     // "maxOldSpaceSize": 4096                  /* Enable nodeOptions maxOldSpaceSize compilation. Unit M. Used for the daemon process */
   }
-}
+}