floraachy
/
ImageKnife
mirror of https://gitee.com/openharmony-tpc/ImageKnife.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

!84 开放.jpg .png .gif taskpool解码能力 

Merge pull request !84 from 明月清风/master
This commit is contained in:
openharmony_ci 2023-12-14 09:10:53 +00:00 committed by Gitee
parent e53aace169 2408483211
commit 7299aebf1b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AppScope/app.json5
View File

@ -3,7 +3,7 @@
"bundleName": "com.openharmony.imageknife",
"vendor": "example",
"versionCode": 1000000,
"versionName": "2.1.1",
"versionName": "2.1.2-rc.0",
"icon": "$media:app_icon",
"label": "$string:app_name",
"distributedNotificationEnabled": true

6
CHANGELOG.md
View File

@ -1,6 +1,10 @@
## 2.1.2-rc.0
- 开放.jpg .png .gif解码能力
## 2.1.1
- 屏蔽了taskpool解码能力
- 2.1.1正式版本发步
- 2.1.1正式版本发布
## 2.1.1-rc.5
- .jpg .png .gif解码功能使用taskpool实现

2
entry/oh-package.json5
View File

@ -4,7 +4,7 @@
"name": "entry",
"description": "example description",
"repository": {},
"version": "2.1.1",
"version": "2.1.2-rc.0",
"dependencies": {
"@ohos/libraryimageknife": "file:../sharedlibrary",
"@ohos/disklrucache": "^2.0.2-rc.0",

2
library/oh-package.json5
View File

@ -14,7 +14,7 @@
"main": "index.ets",
"repository": "https://gitee.com/openharmony-tpc/ImageKnife",
"type": "module",
"version": "2.1.1",
"version": "2.1.2-rc.0",
"dependencies": {
"pako": "^2.1.0",
"@ohos/disklrucache": "^2.0.2-rc.0",

52
library/src/main/ets/components/imageknife/utils/ParseImageUtil.ets
View File

@ -27,33 +27,33 @@ export class ParseImageUtil implements IParseImage<PixelMap> {
// scale(0,1)
parseImageThumbnail(scale: number, imageinfo: ArrayBuffer, onCompleteFunction: (value: PixelMap) => void | PromiseLike<PixelMap>, onErrorFunction: (reason?: BusinessError | string) => void) {
let imageSource: image.ImageSource = image.createImageSource(imageinfo); // 步骤一：文件转为pixelMap 然后变换 给Image组件
imageSource.getImageInfo().then((value) => {
let hValue = Math.round(value.size.height * scale);
let wValue = Math.round(value.size.width * scale);
let defaultSize: image.Size = {
height: hValue,
width: wValue
};
let opts: image.DecodingOptions = {
editable: true,
desiredSize: defaultSize
};
// let imageSource: image.ImageSource = image.createImageSource(imageinfo); // 步骤一：文件转为pixelMap 然后变换 给Image组件
// imageSource.getImageInfo().then((value) => {
// let hValue = Math.round(value.size.height * scale);
// let wValue = Math.round(value.size.width * scale);
// let defaultSize: image.Size = {
// height: hValue,
// width: wValue
// };
// let opts: image.DecodingOptions = {
// editable: true,
// desiredSize: defaultSize
// };
//
// imageSource.createPixelMap(opts).then((pixelMap: image.PixelMap) => {
// onCompleteFunction(pixelMap);
// imageSource.release()
// }).catch((err: string) => {
// onErrorFunction(err);
// imageSource.release()
// })
//
// }).catch((err: string) => {
// onErrorFunction(err);
// imageSource.release()
// })
imageSource.createPixelMap(opts).then((pixelMap: image.PixelMap) => {
onCompleteFunction(pixelMap);
imageSource.release()
}).catch((err: string) => {
onErrorFunction(err);
imageSource.release()
})
}).catch((err: string) => {
onErrorFunction(err);
imageSource.release()
})
// taskPoolExecutePixelMap(imageinfo,scale,onCompleteFunction,onErrorFunction); //多线程接口
taskPoolExecutePixelMap(imageinfo,scale,onCompleteFunction,onErrorFunction); //多线程接口
}
}

80
library/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets
View File

@ -36,46 +36,46 @@ export interface gifBackData {
export class GIFParseImpl implements IParseGif {
parseGifs(imageinfo: ArrayBuffer, callback: (data?: GIFFrame[], err?: BusinessError | string) => void) {
// 硬解码流程
let imageSource = image.createImageSource(imageinfo);
let decodeOpts: image.DecodingOptions = {
sampleSize: 1,
editable: true,
rotate: 0
}
let data:GIFFrame[] = [];
imageSource.createPixelMapList(decodeOpts).then((pixelList: Array<PixelMap>) => {
//sdk的api接口发生变更：从.getDelayTime() 变为.getDelayTimeList()
imageSource.getDelayTimeList().then(delayTimes => {
if (pixelList.length > 0) {
let pixelmap1 = pixelList[0];
pixelmap1.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); //多线程接口
// let imageSource = image.createImageSource(imageinfo);
// let decodeOpts: image.DecodingOptions = {
// sampleSize: 1,
// editable: true,
// rotate: 0
// }
// let data:GIFFrame[] = [];
// imageSource.createPixelMapList(decodeOpts).then((pixelList: Array<PixelMap>) => {
// //sdk的api接口发生变更：从.getDelayTime() 变为.getDelayTimeList()
// imageSource.getDelayTimeList().then(delayTimes => {
// if (pixelList.length > 0) {
// let pixelmap1 = pixelList[0];
// pixelmap1.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); //多线程接口
}
}

2
oh-package.json5
View File

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