ImageKnife3.x分支代码合并master分支

Signed-off-by: wangyingjun01 <wangyingjun5@h-partners.com>

entry/src/main/ets/pages/ImageAnimatorPage.ets

@@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ * 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,
+ * 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 { AnimatorOption, ImageKnifeAnimatorComponent } from "@ohos/libraryimageknife"
 
 @Entry

sharedlibrary/src/main/ets/Index.ets

@@ -16,7 +16,7 @@ export { add } from './utils/Calc'
 
 export { InitImageKnife } from "./pages/InitImageKnife"
 
-export { IndexComponent } from "./pages/Index"
+export { IndexComponent } from "./pages/IndexPage"
 
 export { ImageKnifeComponent,ImageKnifeAnimatorComponent } from '@ohos/imageknife/index'
 

sharedlibrary/src/main/ets/pages/Index.ets

@@ -12,28 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnife , ImageKnifeComponent ,ImageKnifeOption } from "@ohos/imageknife"
 
+@Entry
 @Component
-export struct IndexComponent {
-  @State imageKnifeOption: ImageKnifeOption = {
-    loadSrc: $r('app.media.startIcon')
-  }
+export struct Index {
+  @State message: string = "Index"
   build() {
     Column() {
-      Button("预加载").onClick((event: ClickEvent) => {
-        ImageKnife.getInstance()
-          .preLoadCache('https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp')
-          .then((data) => {
-            console.log("preLoadImage_FileCache:" + data)
-            this.imageKnifeOption.loadSrc = data
-          })
-      })
-      ImageKnifeComponent({
-        imageKnifeOption:this.imageKnifeOption
-      }).width(300).height(300)
+      Text(this.message)
     }
-    .width('100%')
-    .height('100%')
   }
 }

sharedlibrary/src/main/ets/pages/IndexPage.ets

@@ -13,9 +13,28 @@
  * limitations under the License.
  */
 
-@Entry
+import { ImageKnife , ImageKnifeComponent ,ImageKnifeOption } from "@ohos/imageknife"
+
 @Component
-export struct IndexPage {
+export struct IndexComponent {
+  @State imageKnifeOption: ImageKnifeOption = {
+    loadSrc: $r('app.media.icon')
+  }
   build() {
+    Column() {
+      Button("预加载").onClick((event: ClickEvent) => {
+        ImageKnife.getInstance()
+          .preLoadCache('https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp')
+          .then((data) => {
+            console.log("preLoadImage_FileCache:" + data)
+            this.imageKnifeOption.loadSrc = data
+          })
+      })
+      ImageKnifeComponent({
+        imageKnifeOption:this.imageKnifeOption
+      }).width(300).height(300)
+    }
+    .width('100%')
+    .height('100%')
   }
 }