修改冲突信息

Signed-off-by: 明月清风 <qiufeihu1@h-partners.com>

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## 2.1.2-rc.5
 - moduleContext新增缓存策略，缓存上限5，缓存策略Lru
+- 适配DevEco Studio 4.1（4.1.3.415）--SDK:API11（ 4.1.0.56）
+
 
 ## 2.1.2-rc.4
 - canvas新增抗锯齿

README.md

@@ -430,6 +430,7 @@ export default class EntryAbility extends UIAbility {
 ## 约束与限制
 
 在下述版本验证通过：
+DevEco Studio 4.1（4.1.3.418）--SDK:API11（ 4.1.0.56）
 DevEco Studio 4.1（4.1.3.322）--SDK:API11（ 4.1.0.36）
 DevEco Studio 4.0（4.0.3.700）--SDK:API10（ 4.0.10.15）
 

entry/oh-package.json5

@@ -4,7 +4,7 @@
   "name": "entry",
   "description": "example description",
   "repository": {},
-  "version": "2.1.2-rc.4",
+  "version": "2.1.2-rc.5",
   "dependencies": {
     "@ohos/libraryimageknife": "file:../sharedlibrary",
     "@ohos/sharedlibrary2": "file:../sharedlibrary2",

library/src/main/ets/components/imageknife/utils/ParseImageUtil.ets

@@ -82,9 +82,9 @@ function taskPoolExecutePixelMap(arrayBuffer: ArrayBuffer, scale: number, onComp
   LogUtil.log("ceshi321 : arrayBuffer长度" + arrayBuffer.byteLength)
   let task = new taskpool.Task(taskParseImage, arrayBuffer, scale)
   task.setTransferList([])
-  taskpool.execute(task).then((pixelmap: image.PixelMap) => {
-    LogUtil.log('ceshi321 : Succeeded in creating pixelmap Ui .' + pixelmap.getPixelBytesNumber())
-    onCompleteFunction(pixelmap);
+  taskpool.execute(task).then((pixelmap: Object) => {
+    LogUtil.log('ceshi321 : Succeeded in creating pixelmap Ui .' + (pixelmap as image.PixelMap).getPixelBytesNumber())
+    onCompleteFunction(pixelmap as image.PixelMap);
   }).catch((err: string) => {
     LogUtil.log("ceshi321 :  test occur error: " + err)
     onErrorFunction(err);

library/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets

@@ -113,9 +113,9 @@ function taskPoolExecutePixelMapList(arrayBuffer: ArrayBuffer, callback: (data?:
   LogUtil.log("ceshi321 : arrayBuffer长度" + arrayBuffer.byteLength)
   let task = new taskpool.Task(taskParseGif, arrayBuffer)
   task.setTransferList([])
-  taskpool.execute(task).then((imageFrames: GIFFrame[]) => {
+  taskpool.execute(task).then((imageFrames: Object) => {
     // LogUtil.log('ceshi321 : Succeeded in creating pixelmap Ui .' + imageFrames.getPixelBytesNumber())
-    callback(imageFrames,undefined)
+    callback(imageFrames as GIFFrame[],undefined)
   }).catch((err: string) => {
     LogUtil.log("ceshi321 :  test occur error: " + err)
     callback(undefined,err);

oh-package.json5

@@ -6,6 +6,6 @@
   "name": "imageknife",
   "description": "example description",
   "repository": {},
-  "version": "2.1.2-rc.4",
+  "version": "2.1.2-rc.5",
   "dependencies": {}
 }