, onErrorFunction: (reason?: BusinessError | string) => void) {
+ taskPoolExecutePixelMap(imageinfo,scale,onCompleteFunction,onErrorFunction);
}
}
@@ -87,6 +56,7 @@ async function taskParseImage(arrayBuffer: ArrayBuffer,scale: number): Promise void | PromiseLike, onErrorFunction: (reason?: BusinessError | string) => void) {
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);
diff --git a/imageknife/src/main/ets/components/imageknife/utils/PixelUtils.ets b/library/src/main/ets/components/imageknife/utils/PixelUtils.ets
similarity index 100%
rename from imageknife/src/main/ets/components/imageknife/utils/PixelUtils.ets
rename to library/src/main/ets/components/imageknife/utils/PixelUtils.ets
diff --git a/imageknife/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets b/library/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets
similarity index 100%
rename from imageknife/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets
rename to library/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets
diff --git a/imageknife/src/main/ets/components/imageknife/utils/base/MethodMutex.ets b/library/src/main/ets/components/imageknife/utils/base/MethodMutex.ets
similarity index 100%
rename from imageknife/src/main/ets/components/imageknife/utils/base/MethodMutex.ets
rename to library/src/main/ets/components/imageknife/utils/base/MethodMutex.ets
diff --git a/imageknife/src/main/ets/components/imageknife/utils/gif/GIFFrame.ts b/library/src/main/ets/components/imageknife/utils/gif/GIFFrame.ts
similarity index 100%
rename from imageknife/src/main/ets/components/imageknife/utils/gif/GIFFrame.ts
rename to library/src/main/ets/components/imageknife/utils/gif/GIFFrame.ts
diff --git a/imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets b/library/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets
similarity index 64%
rename from imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets
rename to library/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets
index 266f4e1..49fdbb2 100644
--- a/imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets
+++ b/library/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets
@@ -35,47 +35,7 @@ export interface gifBackData {
export class GIFParseImpl implements IParseGif {
parseGifs(imageinfo: ArrayBuffer, callback: (data?: GIFFrame[], err?: BusinessError | string) => void) {
- // taskPoolExecutePixelMapList(imageinfo,callback);
- // oh解码流程
- let imageSource = image.createImageSource(imageinfo);
- let decodeOpts: image.DecodingOptions = {
- sampleSize: 1,
- editable: true,
- rotate: 0
- }
- let data:GIFFrame[] = [];
- imageSource.createPixelMapList(decodeOpts).then((pixelList: Array) => {
- // sdk的api接口发生变更：从.getDelayTime() 变为.getDelayTimeList()
- imageSource.getDelayTimeList().then(delayTimes => {
- if (pixelList.length > 0) {
- let pixelmap = pixelList[0];
- pixelmap.getImageInfo().then(imageInfo => {
- for (let i = 0; i < pixelList.length; i++) {
- let frame = new GIFFrame();
- frame.drawPixelMap = pixelList[i];
- frame.dims = { width: imageInfo.size.width, height: imageInfo.size.height, top: 0, left: 0 }
- if (i < delayTimes.length) {
- frame.delay = delayTimes[i];
- } else {
- frame.delay = delayTimes[delayTimes.length - 1]
- }
- data.push(frame)
- }
- callback(data,undefined)
- imageSource.release();
- }).catch((err: string) => {
- imageSource.release();
- callback(undefined,err)
- })
- }
- }).catch((err: string) => {
- imageSource.release();
- callback(undefined,err)
- })
- }).catch((err: string) => {
- imageSource.release();
- callback(undefined,err)
- })
+ taskPoolExecutePixelMapList(imageinfo,callback);
}
}
@@ -111,8 +71,9 @@ async function taskParseGif(arrayBuffer: ArrayBuffer): Promise {
function taskPoolExecutePixelMapList(arrayBuffer: ArrayBuffer, callback: (data?: GIFFrame[], err?: BusinessError | string) => void) {
LogUtil.log("ceshi321 : arrayBuffer长度" + arrayBuffer.byteLength)
let task = new taskpool.Task(taskParseGif, arrayBuffer)
+ task.setTransferList([])
taskpool.execute(task).then((imageFrames: GIFFrame[]) => {
-
+ // LogUtil.log('ceshi321 : Succeeded in creating pixelmap Ui .' + imageFrames.getPixelBytesNumber())
callback(imageFrames,undefined)
}).catch((err: string) => {
LogUtil.log("ceshi321 : test occur error: " + err)
diff --git a/imageknife/src/main/ets/components/imageknife/utils/gif/IParseGif.ets b/library/src/main/ets/components/imageknife/utils/gif/IParseGif.ets
similarity index 100%
rename from imageknife/src/main/ets/components/imageknife/utils/gif/IParseGif.ets
rename to library/src/main/ets/components/imageknife/utils/gif/IParseGif.ets
diff --git a/imageknife/src/main/ets/components/imageknife/utils/svg/IParseSvg.ets b/library/src/main/ets/components/imageknife/utils/svg/IParseSvg.ets
similarity index 100%
rename from imageknife/src/main/ets/components/imageknife/utils/svg/IParseSvg.ets
rename to library/src/main/ets/components/imageknife/utils/svg/IParseSvg.ets
diff --git a/imageknife/src/main/ets/components/imageknife/utils/svg/SVGParseImpl.ets b/library/src/main/ets/components/imageknife/utils/svg/SVGParseImpl.ets
similarity index 100%
rename from imageknife/src/main/ets/components/imageknife/utils/svg/SVGParseImpl.ets
rename to library/src/main/ets/components/imageknife/utils/svg/SVGParseImpl.ets
diff --git a/imageknife/src/main/module.json5 b/library/src/main/module.json5
similarity index 81%
rename from imageknife/src/main/module.json5
rename to library/src/main/module.json5
index 1fe0fbe..7274415 100644
--- a/imageknife/src/main/module.json5
+++ b/library/src/main/module.json5
@@ -1,6 +1,6 @@
{
"module": {
- "name": "imageknife",
+ "name": "library",
"type": "har",
"deviceTypes": [
"default",
@@ -8,4 +8,4 @@
],
"uiSyntax": "ets"
}
-}
+}
\ No newline at end of file
diff --git a/imageknife/src/main/resources/base/element/string.json b/library/src/main/resources/base/element/string.json
similarity index 100%
rename from imageknife/src/main/resources/base/element/string.json
rename to library/src/main/resources/base/element/string.json
diff --git a/sharedlibrary/oh-package.json5 b/sharedlibrary/oh-package.json5
index e0cfa8a..1d879aa 100644
--- a/sharedlibrary/oh-package.json5
+++ b/sharedlibrary/oh-package.json5
@@ -1,11 +1,12 @@
{
+ "license": "Apache-2.0",
+ "devDependencies": {},
+ "author": "",
"name": "sharedlibrary",
- "version": "1.0.0",
"description": "Please describe the basic information.",
"main": "./src/main/ets/Index.ets",
- "author": "",
- "license": "Apache-2.0",
+ "version": "1.0.0",
"dependencies": {
- "@ohos/imageknife": "file:../imageknife"
+ "@ohos/imageknife": "file:../library"
}
-}
\ No newline at end of file
+}