From 23705575766dc1e0c2bfb61b4ef68109046a3f4b Mon Sep 17 00:00:00 2001 From: zenggaofeng Date: Thu, 7 Dec 2023 15:07:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A3=81=E7=9B=98=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=90=8C=E6=AD=A5=E4=BB=A5=E5=8F=8A=E9=83=A8?= =?UTF-8?q?=E5=88=86release=E9=87=8A=E6=94=BE=E6=94=BE=E5=9C=A8=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=EF=BC=8CrequestInstream=E7=9A=84=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=BC=82=E6=AD=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zenggaofeng --- CHANGELOG.md | 5 ++- entry/oh-package.json5 | 2 +- .../components/imageknife/ImageKnifeData.ets | 28 +++++++++++----- .../networkmanage/HttpDownloadClient.ets | 15 ++++----- .../requestmanage/DiskCacheProxy.ets | 4 +-- .../requestmanage/RequestManager.ets | 12 +++---- .../imageknife/utils/ParseImageUtil.ets | 33 ++----------------- 7 files changed, 41 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6717a1d..25ce890 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ - .jpg .png .gif解码功能使用taskpool实现 - 修复了内存缓存张数设置为1时gif图片消失的问题 - 新增内存缓存策略，新增缓存张数，缓存大小设置接口 - +- 磁盘存缓存setAsync改成同步 +- 部分release释放放在异步 +- requestInStream的回调改成异步 +- 修复tasktool出现crash问题 ## 2.1.1-rc.4 diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index f371f22..af3459d 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -4,7 +4,7 @@ "name": "entry", "description": "example description", "repository": {}, - "version": "2.1.1-rc.4", + "version": "2.1.1-rc.5", "dependencies": { "@ohos/libraryimageknife": "file:../library", "@ohos/disklrucache": "^2.0.2-rc.0", diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets b/imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets index 6cd4753..13b1170 100644 --- a/imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets +++ b/imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets @@ -138,18 +138,24 @@ export class ImageKnifeData { } release() { + let promise = new Promise((resolve) => { + resolve() + }) if (this.isPixelMap()) { if (this.drawPixelMap != undefined && this.drawPixelMap.imagePixelMap != undefined) { this.drawPixelMap.isLruCacheRelease = true; - if (this.drawPixelMap.isShowOnComponent){ + if (this.drawPixelMap.isShowOnComponent) { return; - }else { - this.drawPixelMap.imagePixelMap.release() - .then(() => { - if (this.drawPixelMap != undefined && this.drawPixelMap.imagePixelMap != undefined) { - this.drawPixelMap.imagePixelMap = undefined; - } - }) + } else { + promise.then(() => { + if (this.drawPixelMap != undefined && this.drawPixelMap.imagePixelMap != undefined) { + this.drawPixelMap.imagePixelMap.release(() => { + if (this.drawPixelMap != undefined && this.drawPixelMap.imagePixelMap != undefined) { + this.drawPixelMap.imagePixelMap = undefined + } + }) + } + }) } LogUtil.info("MemoryLruCache removeMemorySize---- end 释放普通图片：") } @@ -166,7 +172,11 @@ export class ImageKnifeData { for (let i = 0; i < gifFrames.length; i++) { let tempFrame = gifFrames[i]; if (tempFrame.drawPixelMap != undefined) { - tempFrame.drawPixelMap.release() + promise.then(() => { + if (tempFrame.drawPixelMap != undefined) { + tempFrame.drawPixelMap.release() + } + }) } } LogUtil.info("MemoryLruCache removeMemorySize---- end 释放GIF图片：") diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets b/imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets index e9be823..fbdf359 100644 --- a/imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets +++ b/imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets @@ -70,15 +70,14 @@ export class HttpDownloadClient implements IDataFetch { connectTimeout: 60000, // 可选 默认60000ms readTimeout: 0, //可选, 默认为60000ms usingProtocol: http.HttpProtocol.HTTP1_1, // 可选,协议类型默认值由系统自动指定 - }, - (err: BusinessError, data: number) => { - if (!err && data == 200) { - - } else { - onError(`HttpDownloadClient has error, http code = ${data}`) - } } - ) + ).then((data)=>{ + if(data == 200) { + + } else { + onError(`HttpDownloadClient has error, http code = ${data}`) + } + }) } catch (err) { onError('HttpDownloadClient catch err request uuid ='+request.uuid) } diff --git a/imageknife/src/main/ets/components/imageknife/requestmanage/DiskCacheProxy.ets b/imageknife/src/main/ets/components/imageknife/requestmanage/DiskCacheProxy.ets index e02f161..62816df 100644 --- a/imageknife/src/main/ets/components/imageknife/requestmanage/DiskCacheProxy.ets +++ b/imageknife/src/main/ets/components/imageknife/requestmanage/DiskCacheProxy.ets @@ -41,8 +41,8 @@ export class DiskCacheProxy implements ICache { return this.mDiskLruCache.get(key); } - async putValue(key: string, value: ArrayBuffer) { - await this.mDiskLruCache.setAsync(key, value) + putValue(key: string, value: ArrayBuffer) { + this.mDiskLruCache.set(key, value) } removeValue(key: string): ArrayBuffer{ diff --git a/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets b/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets index 4e605f3..e4a2b3f 100644 --- a/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets +++ b/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets @@ -466,8 +466,8 @@ export class RequestManager { // 保存二级磁盘缓存 Promise.resolve(source) - .then(async (arraybuffer: ArrayBuffer)=>{ - await this.mDiskCacheProxy.putValue(this.options.generateDataKey, arraybuffer) + .then((arraybuffer: ArrayBuffer)=>{ + this.mDiskCacheProxy.putValue(this.options.generateDataKey, arraybuffer) }) .catch( (err:BusinessError)=>{ LogUtil.log('download file is ='+ImageKnifeData.GIF+'and save diskLruCache error ='+ (err as BusinessError)) @@ -480,8 +480,8 @@ export class RequestManager { // 保存二级磁盘缓存 Promise.resolve(source) - .then(async (arraybuffer: ArrayBuffer)=>{ - await this.mDiskCacheProxy.putValue(this.options.generateDataKey, arraybuffer) + .then((arraybuffer: ArrayBuffer)=>{ + this.mDiskCacheProxy.putValue(this.options.generateDataKey, arraybuffer) }) .catch((err:BusinessError)=>{ LogUtil.log('download file is ='+ImageKnifeData.SVG+'and save diskLruCache error ='+ (err as BusinessError)) @@ -548,8 +548,8 @@ export class RequestManager { private saveCacheAndDisk(value: PixelMap, filetype:string, onComplete:(value:ImageKnifeData)=>void|PromiseLike, source:ArrayBuffer) { let imageKnifeData = this.createImagePixelMap(ImageKnifeType.PIXELMAP, value); this.mMemoryCacheProxy.putValue(this.options.generateCacheKey, imageKnifeData); - let save2DiskCache = async (arraybuffer:ArrayBuffer) => { - await this.mDiskCacheProxy.putValue(this.options.generateDataKey, arraybuffer) + let save2DiskCache = (arraybuffer:ArrayBuffer) => { + this.mDiskCacheProxy.putValue(this.options.generateDataKey, arraybuffer) // 落盘之后需要主动移除当前request并且调用下一个加载 let removeCurrentAndSearchNextRun = this.options.removeCurrentAndSearchNext removeCurrentAndSearchNextRun(); diff --git a/imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets b/imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets index 5fc0ea4..e16ceca 100644 --- a/imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets +++ b/imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets @@ -26,37 +26,7 @@ export class ParseImageUtil implements IParseImage { // scale(0,1) parseImageThumbnail(scale: number, imageinfo: ArrayBuffer, onCompleteFunction: (value: PixelMap) => void | PromiseLike, onErrorFunction: (reason?: BusinessError | string) => void) { - // taskPoolExecutePixelMap(imageinfo,scale,onCompleteFunction,onErrorFunction); - - let imageSource:image.ImageSource = image.createImageSource(imageinfo); // 步骤一：文件转为pixelMap 然后变换 给Image组件 - imageSource.getImageInfo((err, value) => { - if (err) { - onErrorFunction(err); - return; - } - 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, (err, pixelmap) => { - if (err) { - onErrorFunction(err); - } else { - onCompleteFunction(pixelmap); - } - imageSource.release() - }) - - }) - - + taskPoolExecutePixelMap(imageinfo,scale,onCompleteFunction,onErrorFunction); } } @@ -86,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); From e6771c4a1c1365421753c9a2143ec9e3e0713216 Mon Sep 17 00:00:00 2001 From: zenggaofeng Date: Mon, 11 Dec 2023 17:08:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E4=BE=8B?= =?UTF-8?q?=E7=9A=84=E7=BD=91=E7=BB=9C=E5=9B=BE=E7=89=87=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zenggaofeng --- .../ets/pages/testManyGifLoadWithPage.ets | 36 +++------------- .../pages/testManyNetImageLoadWithPage.ets | 34 +++++++++------ .../imageknife/utils/gif/GIFParseImpl.ets | 43 +------------------ 3 files changed, 29 insertions(+), 84 deletions(-) diff --git a/entry/src/main/ets/pages/testManyGifLoadWithPage.ets b/entry/src/main/ets/pages/testManyGifLoadWithPage.ets index 39d354b..11f9819 100644 --- a/entry/src/main/ets/pages/testManyGifLoadWithPage.ets +++ b/entry/src/main/ets/pages/testManyGifLoadWithPage.ets @@ -15,15 +15,15 @@ import { ImageKnife, ImageKnifeComponent, ImageKnifeGlobal, ImageKnifeOption } from "@ohos/libraryimageknife" import worker from '@ohos.worker'; -let gifUrl = "https://gw.alicdn.com/tfs/TB1E3H5t8Bh1e4jSZFhXXcC9VXa-198-198.gif" +let gifUrl = "https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658" let data: string[] = [ - 'https://media.giphy.com/media/hVgagDPf1IRFK/giphy.gif', - 'https://placehold.co/600x400/000000/FFFFFF/png', - 'https://s1.aigei.com/src/img/gif/92/922f58ca46c34b3e9947ddd4dc17ec32.gif?imageMogr2/auto-orient/thumbnail/!282x282r/gravity/Center/crop/282x282/quality/85/&e=1735488000&token=P7S2Xpzfz11vAkASLTkfHN7Fw-oOZBecqeJaxypL:YRYJJynbOC0Z_Nl7HunjuRr4-Vk=', - 'https://placehold.co/600x400/000000/orange/png', - 'https://s1.aigei.com/src/img/gif/6c/6c907924ef1546d3a593fae3e78b97f6.gif?imageMogr2/auto-orient/thumbnail/!282x282r/gravity/Center/crop/282x282/quality/85/&e=1735488000&token=P7S2Xpzfz11vAkASLTkfHN7Fw-oOZBecqeJaxypL:PozGIimx0mj5m69DQ0Z6qWn7mA0=', - 'https://placehold.co/600x400/000000/orange/png?text=Hello+World' + 'https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658', + 'https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB', + 'https://pic.ibaotu.com/gif/18/17/16/51u888piCtqj.gif!fwpaa70/fw/700', + 'https://img-blog.csdnimg.cn/20191215043500229.png', + 'https://res.vmallres.com/cmscdn/CN/2023-03/7052a601ac3e428c84c9415ad9734735.gif', + 'https://img-blog.csdn.net/20140514114029140' ] @Entry @@ -56,28 +56,6 @@ struct TestManyGifLoadWithPage { }.width('50%').backgroundColor(Color.Blue) } - Row() { - Column() { - Button('use Worker').align(Alignment.Center).fontSize(10).margin(2) - .onClick(() => { - this.workerOption = { - loadSrc: gifUrl, - placeholderSrc: $r('app.media.icon_loading'), - errorholderSrc: $r('app.media.icon_failed') - } - }) - ImageKnifeComponent({ imageKnifeOption: this.workerOption }) - .width('100%') - .height(100) - .backgroundColor(Color.Blue) - }.width('50%').backgroundColor(Color.Orange) - - Column() { - Button('logs').align(Alignment.Center).fontSize(10).margin(2) - Text('logs').width('100%').height(100).backgroundColor(Color.Orange) - }.width('50%').backgroundColor(Color.Blue) - } - Grid() { ForEach(data, (url: string) => { GridItem(){ diff --git a/entry/src/main/ets/pages/testManyNetImageLoadWithPage.ets b/entry/src/main/ets/pages/testManyNetImageLoadWithPage.ets index b917aec..e90357a 100644 --- a/entry/src/main/ets/pages/testManyNetImageLoadWithPage.ets +++ b/entry/src/main/ets/pages/testManyNetImageLoadWithPage.ets @@ -60,20 +60,26 @@ class CommonDataSource implements IDataSource { struct TestManyNetImageLoadWithPage { @State hotCommendList:CommonDataSource = new CommonDataSource([]) private data:Array = [ - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/11/2159934215_1248_702.jpeg', - 'http://s.yingshidq.com.cn/imags/poster/2022/08/02/165937334218556809.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/4350315060_640_360.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/3835072893_1248_702.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/2821936016_1248_702.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/11/1311714870_1248_702.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/4421772097_1248_702.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/09/05/5898334347_400_225.png', - 'http://s.yingshidq.com.cn/imags/poster/2022/12/06/167031399911862707.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/11/1405851829_1248_702.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/3796501624_1248_702.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/4202181519_1248_702.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/11/1449894622_1248_702.jpeg', - 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/3756558151_1248_702.jpeg' + "http://e.hiphotos.baidu.com/image/pic/item/a1ec08fa513d2697e542494057fbb2fb4316d81e.jpg", + "http://c.hiphotos.baidu.com/image/pic/item/30adcbef76094b36de8a2fe5a1cc7cd98d109d99.jpg", + "http://h.hiphotos.baidu.com/image/pic/item/7c1ed21b0ef41bd5f2c2a9e953da81cb39db3d1d.jpg", + "http://g.hiphotos.baidu.com/image/pic/item/55e736d12f2eb938d5277fd5d0628535e5dd6f4a.jpg", + "http://e.hiphotos.baidu.com/image/pic/item/4e4a20a4462309f7e41f5cfe760e0cf3d6cad6ee.jpg", + "http://b.hiphotos.baidu.com/image/pic/item/9d82d158ccbf6c81b94575cfb93eb13533fa40a2.jpg", + "http://e.hiphotos.baidu.com/image/pic/item/4bed2e738bd4b31c1badd5a685d6277f9e2ff81e.jpg", + "http://g.hiphotos.baidu.com/image/pic/item/0d338744ebf81a4c87a3add4d52a6059252da61e.jpg", + "http://a.hiphotos.baidu.com/image/pic/item/f2deb48f8c5494ee5080c8142ff5e0fe99257e19.jpg", + "http://f.hiphotos.baidu.com/image/pic/item/4034970a304e251f503521f5a586c9177e3e53f9.jpg", + "http://b.hiphotos.baidu.com/image/pic/item/279759ee3d6d55fbb3586c0168224f4a20a4dd7e.jpg", + "http://img2.xkhouse.com/bbs/hfhouse/data/attachment/forum/corebbs/2009-11/2009113011534566298.jpg", + "http://a.hiphotos.baidu.com/image/pic/item/e824b899a9014c087eb617650e7b02087af4f464.jpg", + "http://c.hiphotos.baidu.com/image/pic/item/9c16fdfaaf51f3de1e296fa390eef01f3b29795a.jpg", + "http://d.hiphotos.baidu.com/image/pic/item/b58f8c5494eef01f119945cbe2fe9925bc317d2a.jpg", + "http://h.hiphotos.baidu.com/image/pic/item/902397dda144ad340668b847d4a20cf430ad851e.jpg", + "http://b.hiphotos.baidu.com/image/pic/item/359b033b5bb5c9ea5c0e3c23d139b6003bf3b374.jpg", + "http://a.hiphotos.baidu.com/image/pic/item/8d5494eef01f3a292d2472199d25bc315d607c7c.jpg", + "http://b.hiphotos.baidu.com/image/pic/item/e824b899a9014c08878b2c4c0e7b02087af4f4a3.jpg", + "http://g.hiphotos.baidu.com/image/pic/item/6d81800a19d8bc3e770bd00d868ba61ea9d345f2.jpg", ] aboutToAppear() { this.hotCommendList.addData(this.hotCommendList.totalCount(),this.data) diff --git a/imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets b/imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets index 83cb55e..49fdbb2 100644 --- a/imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets +++ b/imageknife/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,6 +71,7 @@ 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) From db5c44866f18e62cadefe798d147a36acc48451d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E6=9C=88=E6=B8=85=E9=A3=8E?= Date: Tue, 12 Dec 2023 16:22:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=EF=BC=9A=201=E3=80=81imageKnife=E4=BE=9D=E8=B5=96=E6=9B=B4?= =?UTF-8?q?=E5=90=8D=E4=B8=BAlibrary?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 明月清风 --- AppScope/app.json5 | 2 +- CHANGELOG.md | 1 + README.md | 2 +- build-profile.json5 | 4 ++-- entry/oh-package.json5 | 7 ++----- {imageknife => library}/.gitignore | 0 {imageknife => library}/PngWork.js | 0 {imageknife => library}/build-profile.json5 | 0 {imageknife => library}/hvigorfile.ts | 0 {imageknife => library}/index.ets | 0 {imageknife => library}/oh-package.json5 | 0 .../ets/components/3rd_party/sparkmd5/spark-md5.js | 0 .../src/main/ets/components/3rd_party/upng/UPNG.js | 0 .../src/main/ets/components/cache/Base64.ets | 0 .../src/main/ets/components/cache/CustomMap.ets | 0 .../src/main/ets/components/cache/FileUtils.ets | 0 .../src/main/ets/components/cache/LruCache.ets | 0 .../src/main/ets/components/cache/MemoryLruCache.ets | 0 .../ets/components/cache/diskstrategy/DataSrc.ets | 0 .../components/cache/diskstrategy/DiskStrategy.ets | 0 .../components/cache/diskstrategy/EncodeStrategy.ets | 0 .../ets/components/cache/diskstrategy/enum/ALL.ets | 0 .../components/cache/diskstrategy/enum/AUTOMATIC.ets | 0 .../ets/components/cache/diskstrategy/enum/DATA.ets | 0 .../ets/components/cache/diskstrategy/enum/NONE.ets | 0 .../components/cache/diskstrategy/enum/RESOURCE.ets | 0 .../src/main/ets/components/cache/key/EngineKey.ets | 0 .../ets/components/cache/key/EngineKeyFactories.ets | 0 .../ets/components/cache/key/EngineKeyInterface.ets | 0 .../src/main/ets/components/cache/key/Key.ets | 0 .../src/main/ets/components/imageknife/ImageKnife.ets | 0 .../ets/components/imageknife/ImageKnifeComponent.ets | 0 .../main/ets/components/imageknife/ImageKnifeData.ets | 0 .../components/imageknife/ImageKnifeDrawFactory.ets | 0 .../ets/components/imageknife/ImageKnifeGlobal.ets | 0 .../ets/components/imageknife/ImageKnifeOption.ets | 0 .../src/main/ets/components/imageknife/ObjectKey.ets | 0 .../main/ets/components/imageknife/RequestOption.ets | 0 .../imageknife/compress/CompressBuilder.ets | 0 .../ets/components/imageknife/compress/Engine.ets | 0 .../compress/listener/CompressDataListener.ets | 0 .../compress/listener/CompressionPredicate.ets | 0 .../compress/listener/OnCompressListener.ets | 0 .../imageknife/compress/listener/OnRenameListener.ets | 0 .../imageknife/compress/provider/CompressAdapter.ets | 0 .../imageknife/compress/provider/CompressProvider.ets | 0 .../compress/provider/DataStringPathProvider.ets | 0 .../imageknife/compress/provider/RecourseProvider.ets | 0 .../ets/components/imageknife/constants/Constants.ets | 0 .../imageknife/constants/ResourceTypeEts.ets | 0 .../src/main/ets/components/imageknife/crop/Crop.ets | 0 .../ets/components/imageknife/crop/CropCallback.ets | 0 .../main/ets/components/imageknife/crop/CropImage.ets | 0 .../ets/components/imageknife/crop/CropOptions.ets | 0 .../ets/components/imageknife/crop/PixelMapCrop.ets | 0 .../main/ets/components/imageknife/entry/ArcPoint.ets | 0 .../ets/components/imageknife/entry/PixelEntry.ets | 0 .../imageknife/holder/ErrorHolderManager.ets | 0 .../imageknife/holder/PlaceHolderManager.ets | 0 .../imageknife/holder/RetryHolderManager.ets | 0 .../components/imageknife/interface/AsyncCallback.ets | 0 .../components/imageknife/interface/AsyncSuccess.ets | 0 .../components/imageknife/interface/DataCallBack.ets | 0 .../imageknife/interface/IAllCacheInfoCallback.ets | 0 .../imageknife/interface/IDrawLifeCycle.ets | 0 .../components/imageknife/interface/IParseImage.ets | 0 .../imageknife/networkmanage/DownloadClient.ets | 0 .../imageknife/networkmanage/HttpDownloadClient.ets | 0 .../imageknife/networkmanage/IDataFetch.ets | 0 .../networkmanage/LoadDataShareFileClient.ets | 0 .../imageknife/networkmanage/LoadLocalFileClient.ets | 0 .../networkmanage/NetworkDownloadClient.ets | 0 .../ets/components/imageknife/pngj/PngCallback.ts | 0 .../main/ets/components/imageknife/pngj/PngReader.ets | 0 .../src/main/ets/components/imageknife/pngj/Pngj.ts | 0 .../ets/components/imageknife/pngj/PngjException.ets | 0 .../components/imageknife/pngj/entry/ImageInfo.ets | 0 .../imageknife/pngj/interface/IBytesConsumer.ets | 0 .../ets/components/imageknife/pngj/io/Closeable.ets | 0 .../ets/components/imageknife/pngj/misc/Sandbox.ets | 0 .../imageknife/requestmanage/DiskCacheProxy.ets | 0 .../components/imageknife/requestmanage/ICache.ets | 0 .../imageknife/requestmanage/MemoryCacheProxy.ets | 0 .../imageknife/requestmanage/RequestManager.ets | 0 .../imageknife/resourcemanage/IResourceFetch.ets | 0 .../imageknife/resourcemanage/ParseResClient.ets | 0 .../resourcemanage/ParseResClientBase64.ets | 0 .../imageknife/transform/AsyncTransform.ets | 0 .../components/imageknife/transform/BaseTransform.ets | 0 .../imageknife/transform/BlurTransformation.ets | 0 .../transform/BrightnessFilterTransformation.ets | 0 .../transform/ContrastFilterTransformation.ets | 0 .../imageknife/transform/CropCircleTransformation.ets | 0 .../transform/CropCircleWithBorderTransformation.ets | 0 .../imageknife/transform/CropSquareTransformation.ets | 0 .../imageknife/transform/CropTransformation.ets | 0 .../imageknife/transform/GrayscaleTransformation.ets | 0 .../transform/InvertFilterTransformation.ets | 0 .../imageknife/transform/KuwaharaFilterTransform.ets | 0 .../imageknife/transform/MaskTransformation.ets | 0 .../transform/PixelationFilterTransformation.ets | 0 .../transform/RotateImageTransformation.ets | 0 .../transform/RoundedCornersTransformation.ets | 0 .../transform/SepiaFilterTransformation.ets | 0 .../transform/SketchFilterTransformation.ets | 0 .../transform/SwirlFilterTransformation.ets | 0 .../imageknife/transform/ToonFilterTransform.ets | 0 .../components/imageknife/transform/TransformType.ets | 0 .../imageknife/transform/TransformUtils.ets | 0 .../imageknife/transform/VignetteFilterTransform.ets | 0 .../imageknife/transform/pixelmap/CenterCrop.ets | 0 .../imageknife/transform/pixelmap/CenterInside.ets | 0 .../imageknife/transform/pixelmap/FitCenter.ets | 0 .../imageknife/utils/CalculatePixelUtils.ets | 0 .../ets/components/imageknife/utils/ColorUtils.ets | 0 .../main/ets/components/imageknife/utils/FastBlur.ets | 0 .../ets/components/imageknife/utils/FileTypeUtil.ets | 0 .../main/ets/components/imageknife/utils/K2DArray.ets | 0 .../main/ets/components/imageknife/utils/LogUtil.ets | 0 .../ets/components/imageknife/utils/MaskUtils.ets | 0 .../components/imageknife/utils/ParseImageUtil.ets | 0 .../ets/components/imageknife/utils/PixelUtils.ets | 0 .../imageknife/utils/base/EasyLinkedHashMap.ets | 0 .../components/imageknife/utils/base/MethodMutex.ets | 0 .../ets/components/imageknife/utils/gif/GIFFrame.ts | 0 .../components/imageknife/utils/gif/GIFParseImpl.ets | 0 .../ets/components/imageknife/utils/gif/IParseGif.ets | 0 .../ets/components/imageknife/utils/svg/IParseSvg.ets | 0 .../components/imageknife/utils/svg/SVGParseImpl.ets | 0 {imageknife => library}/src/main/module.json5 | 4 ++-- .../src/main/resources/base/element/string.json | 0 sharedlibrary/oh-package.json5 | 11 ++++++----- 132 files changed, 15 insertions(+), 16 deletions(-) rename {imageknife => library}/.gitignore (100%) rename {imageknife => library}/PngWork.js (100%) rename {imageknife => library}/build-profile.json5 (100%) rename {imageknife => library}/hvigorfile.ts (100%) rename {imageknife => library}/index.ets (100%) rename {imageknife => library}/oh-package.json5 (100%) rename {imageknife => library}/src/main/ets/components/3rd_party/sparkmd5/spark-md5.js (100%) rename {imageknife => library}/src/main/ets/components/3rd_party/upng/UPNG.js (100%) rename {imageknife => library}/src/main/ets/components/cache/Base64.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/CustomMap.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/FileUtils.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/LruCache.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/MemoryLruCache.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/diskstrategy/DataSrc.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/diskstrategy/DiskStrategy.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/diskstrategy/EncodeStrategy.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/diskstrategy/enum/ALL.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/diskstrategy/enum/AUTOMATIC.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/diskstrategy/enum/DATA.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/diskstrategy/enum/NONE.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/diskstrategy/enum/RESOURCE.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/key/EngineKey.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/key/EngineKeyFactories.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/key/EngineKeyInterface.ets (100%) rename {imageknife => library}/src/main/ets/components/cache/key/Key.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/ImageKnife.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/ImageKnifeComponent.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/ImageKnifeData.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/ImageKnifeDrawFactory.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/ImageKnifeGlobal.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/ImageKnifeOption.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/ObjectKey.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/RequestOption.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/CompressBuilder.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/Engine.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/listener/CompressDataListener.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/listener/CompressionPredicate.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/listener/OnCompressListener.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/listener/OnRenameListener.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/provider/CompressAdapter.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/provider/CompressProvider.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/provider/DataStringPathProvider.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/constants/Constants.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/constants/ResourceTypeEts.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/crop/Crop.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/crop/CropCallback.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/crop/CropImage.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/crop/CropOptions.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/crop/PixelMapCrop.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/entry/ArcPoint.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/entry/PixelEntry.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/holder/RetryHolderManager.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/interface/AsyncCallback.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/interface/AsyncSuccess.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/interface/DataCallBack.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/interface/IAllCacheInfoCallback.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/interface/IDrawLifeCycle.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/interface/IParseImage.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/networkmanage/IDataFetch.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/networkmanage/LoadLocalFileClient.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/pngj/PngCallback.ts (100%) rename {imageknife => library}/src/main/ets/components/imageknife/pngj/PngReader.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/pngj/Pngj.ts (100%) rename {imageknife => library}/src/main/ets/components/imageknife/pngj/PngjException.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/pngj/entry/ImageInfo.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/pngj/interface/IBytesConsumer.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/pngj/io/Closeable.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/pngj/misc/Sandbox.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/requestmanage/DiskCacheProxy.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/requestmanage/ICache.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/requestmanage/MemoryCacheProxy.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/requestmanage/RequestManager.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/AsyncTransform.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/BaseTransform.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/BlurTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/BrightnessFilterTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/CropSquareTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/CropTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/InvertFilterTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/KuwaharaFilterTransform.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/MaskTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/PixelationFilterTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/RotateImageTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/RoundedCornersTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/SepiaFilterTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/SketchFilterTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/SwirlFilterTransformation.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/ToonFilterTransform.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/TransformType.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/TransformUtils.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/VignetteFilterTransform.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/pixelmap/CenterCrop.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/pixelmap/CenterInside.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/transform/pixelmap/FitCenter.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/CalculatePixelUtils.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/ColorUtils.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/FastBlur.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/FileTypeUtil.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/K2DArray.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/LogUtil.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/MaskUtils.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/ParseImageUtil.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/PixelUtils.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/base/MethodMutex.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/gif/GIFFrame.ts (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/gif/IParseGif.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/svg/IParseSvg.ets (100%) rename {imageknife => library}/src/main/ets/components/imageknife/utils/svg/SVGParseImpl.ets (100%) rename {imageknife => library}/src/main/module.json5 (81%) rename {imageknife => library}/src/main/resources/base/element/string.json (100%) diff --git a/AppScope/app.json5 b/AppScope/app.json5 index 6651a56..c7499e5 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -3,7 +3,7 @@ "bundleName": "com.openharmony.imageknife", "vendor": "example", "versionCode": 1000000, - "versionName": "2.1.1-rc.4", + "versionName": "2.1.1-rc.5", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true diff --git a/CHANGELOG.md b/CHANGELOG.md index 25ce890..6829ded 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - 部分release释放放在异步 - requestInStream的回调改成异步 - 修复tasktool出现crash问题 +- imageKnife依赖更名为library ## 2.1.1-rc.4 diff --git a/README.md b/README.md index 21e1e27..76e2f86 100644 --- a/README.md +++ b/README.md @@ -428,7 +428,7 @@ DevEco Studio 4.0（4.0.3.700）--SDK:API10（ 4.0.10.15） ## 目录结构 ``` -/imageknife/src/ +/library/src/ - main/ets/components - cache # 缓存相关内容 - diskstrategy # 缓存策略 diff --git a/build-profile.json5 b/build-profile.json5 index 7ec08ca..92ec1aa 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -31,8 +31,8 @@ ] }, { - "name": "imageknife", - "srcPath": "./imageknife" + "name": "library", + "srcPath": "./library" }, { "name": "gpu_transform", diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 62d62ec..6d361e9 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -6,11 +6,8 @@ "repository": {}, "version": "2.1.1-rc.5", "dependencies": { - // 如果测试entry的demo需要开启以下2个依赖, 然后点击entry勾选 Edit Configurations->点击Deploy Multi Hap->勾选Deploy Multi Hap Packages - // 然后点击module栏目 把library也勾选上,这样就可以在HSP场景下测试Entry里面的HSP场景 "@ohos/libraryimageknife": "file:../sharedlibrary", "@ohos/disklrucache": "^2.0.2-rc.0", - // 下面这个依赖是为了跑XTS用例的，需要跑XTS时,需要注释上面2个依赖单独使用imageknife依赖 - "@ohos/imageknife": "file:../imageknife" + "@ohos/imageknife": "file:../library" } -} \ No newline at end of file +} diff --git a/imageknife/.gitignore b/library/.gitignore similarity index 100% rename from imageknife/.gitignore rename to library/.gitignore diff --git a/imageknife/PngWork.js b/library/PngWork.js similarity index 100% rename from imageknife/PngWork.js rename to library/PngWork.js diff --git a/imageknife/build-profile.json5 b/library/build-profile.json5 similarity index 100% rename from imageknife/build-profile.json5 rename to library/build-profile.json5 diff --git a/imageknife/hvigorfile.ts b/library/hvigorfile.ts similarity index 100% rename from imageknife/hvigorfile.ts rename to library/hvigorfile.ts diff --git a/imageknife/index.ets b/library/index.ets similarity index 100% rename from imageknife/index.ets rename to library/index.ets diff --git a/imageknife/oh-package.json5 b/library/oh-package.json5 similarity index 100% rename from imageknife/oh-package.json5 rename to library/oh-package.json5 diff --git a/imageknife/src/main/ets/components/3rd_party/sparkmd5/spark-md5.js b/library/src/main/ets/components/3rd_party/sparkmd5/spark-md5.js similarity index 100% rename from imageknife/src/main/ets/components/3rd_party/sparkmd5/spark-md5.js rename to library/src/main/ets/components/3rd_party/sparkmd5/spark-md5.js diff --git a/imageknife/src/main/ets/components/3rd_party/upng/UPNG.js b/library/src/main/ets/components/3rd_party/upng/UPNG.js similarity index 100% rename from imageknife/src/main/ets/components/3rd_party/upng/UPNG.js rename to library/src/main/ets/components/3rd_party/upng/UPNG.js diff --git a/imageknife/src/main/ets/components/cache/Base64.ets b/library/src/main/ets/components/cache/Base64.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/Base64.ets rename to library/src/main/ets/components/cache/Base64.ets diff --git a/imageknife/src/main/ets/components/cache/CustomMap.ets b/library/src/main/ets/components/cache/CustomMap.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/CustomMap.ets rename to library/src/main/ets/components/cache/CustomMap.ets diff --git a/imageknife/src/main/ets/components/cache/FileUtils.ets b/library/src/main/ets/components/cache/FileUtils.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/FileUtils.ets rename to library/src/main/ets/components/cache/FileUtils.ets diff --git a/imageknife/src/main/ets/components/cache/LruCache.ets b/library/src/main/ets/components/cache/LruCache.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/LruCache.ets rename to library/src/main/ets/components/cache/LruCache.ets diff --git a/imageknife/src/main/ets/components/cache/MemoryLruCache.ets b/library/src/main/ets/components/cache/MemoryLruCache.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/MemoryLruCache.ets rename to library/src/main/ets/components/cache/MemoryLruCache.ets diff --git a/imageknife/src/main/ets/components/cache/diskstrategy/DataSrc.ets b/library/src/main/ets/components/cache/diskstrategy/DataSrc.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/diskstrategy/DataSrc.ets rename to library/src/main/ets/components/cache/diskstrategy/DataSrc.ets diff --git a/imageknife/src/main/ets/components/cache/diskstrategy/DiskStrategy.ets b/library/src/main/ets/components/cache/diskstrategy/DiskStrategy.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/diskstrategy/DiskStrategy.ets rename to library/src/main/ets/components/cache/diskstrategy/DiskStrategy.ets diff --git a/imageknife/src/main/ets/components/cache/diskstrategy/EncodeStrategy.ets b/library/src/main/ets/components/cache/diskstrategy/EncodeStrategy.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/diskstrategy/EncodeStrategy.ets rename to library/src/main/ets/components/cache/diskstrategy/EncodeStrategy.ets diff --git a/imageknife/src/main/ets/components/cache/diskstrategy/enum/ALL.ets b/library/src/main/ets/components/cache/diskstrategy/enum/ALL.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/diskstrategy/enum/ALL.ets rename to library/src/main/ets/components/cache/diskstrategy/enum/ALL.ets diff --git a/imageknife/src/main/ets/components/cache/diskstrategy/enum/AUTOMATIC.ets b/library/src/main/ets/components/cache/diskstrategy/enum/AUTOMATIC.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/diskstrategy/enum/AUTOMATIC.ets rename to library/src/main/ets/components/cache/diskstrategy/enum/AUTOMATIC.ets diff --git a/imageknife/src/main/ets/components/cache/diskstrategy/enum/DATA.ets b/library/src/main/ets/components/cache/diskstrategy/enum/DATA.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/diskstrategy/enum/DATA.ets rename to library/src/main/ets/components/cache/diskstrategy/enum/DATA.ets diff --git a/imageknife/src/main/ets/components/cache/diskstrategy/enum/NONE.ets b/library/src/main/ets/components/cache/diskstrategy/enum/NONE.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/diskstrategy/enum/NONE.ets rename to library/src/main/ets/components/cache/diskstrategy/enum/NONE.ets diff --git a/imageknife/src/main/ets/components/cache/diskstrategy/enum/RESOURCE.ets b/library/src/main/ets/components/cache/diskstrategy/enum/RESOURCE.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/diskstrategy/enum/RESOURCE.ets rename to library/src/main/ets/components/cache/diskstrategy/enum/RESOURCE.ets diff --git a/imageknife/src/main/ets/components/cache/key/EngineKey.ets b/library/src/main/ets/components/cache/key/EngineKey.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/key/EngineKey.ets rename to library/src/main/ets/components/cache/key/EngineKey.ets diff --git a/imageknife/src/main/ets/components/cache/key/EngineKeyFactories.ets b/library/src/main/ets/components/cache/key/EngineKeyFactories.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/key/EngineKeyFactories.ets rename to library/src/main/ets/components/cache/key/EngineKeyFactories.ets diff --git a/imageknife/src/main/ets/components/cache/key/EngineKeyInterface.ets b/library/src/main/ets/components/cache/key/EngineKeyInterface.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/key/EngineKeyInterface.ets rename to library/src/main/ets/components/cache/key/EngineKeyInterface.ets diff --git a/imageknife/src/main/ets/components/cache/key/Key.ets b/library/src/main/ets/components/cache/key/Key.ets similarity index 100% rename from imageknife/src/main/ets/components/cache/key/Key.ets rename to library/src/main/ets/components/cache/key/Key.ets diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets b/library/src/main/ets/components/imageknife/ImageKnife.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/ImageKnife.ets rename to library/src/main/ets/components/imageknife/ImageKnife.ets diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets b/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets rename to library/src/main/ets/components/imageknife/ImageKnifeComponent.ets diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets b/library/src/main/ets/components/imageknife/ImageKnifeData.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets rename to library/src/main/ets/components/imageknife/ImageKnifeData.ets diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeDrawFactory.ets b/library/src/main/ets/components/imageknife/ImageKnifeDrawFactory.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/ImageKnifeDrawFactory.ets rename to library/src/main/ets/components/imageknife/ImageKnifeDrawFactory.ets diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeGlobal.ets b/library/src/main/ets/components/imageknife/ImageKnifeGlobal.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/ImageKnifeGlobal.ets rename to library/src/main/ets/components/imageknife/ImageKnifeGlobal.ets diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeOption.ets b/library/src/main/ets/components/imageknife/ImageKnifeOption.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/ImageKnifeOption.ets rename to library/src/main/ets/components/imageknife/ImageKnifeOption.ets diff --git a/imageknife/src/main/ets/components/imageknife/ObjectKey.ets b/library/src/main/ets/components/imageknife/ObjectKey.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/ObjectKey.ets rename to library/src/main/ets/components/imageknife/ObjectKey.ets diff --git a/imageknife/src/main/ets/components/imageknife/RequestOption.ets b/library/src/main/ets/components/imageknife/RequestOption.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/RequestOption.ets rename to library/src/main/ets/components/imageknife/RequestOption.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/CompressBuilder.ets b/library/src/main/ets/components/imageknife/compress/CompressBuilder.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/CompressBuilder.ets rename to library/src/main/ets/components/imageknife/compress/CompressBuilder.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/Engine.ets b/library/src/main/ets/components/imageknife/compress/Engine.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/Engine.ets rename to library/src/main/ets/components/imageknife/compress/Engine.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/listener/CompressDataListener.ets b/library/src/main/ets/components/imageknife/compress/listener/CompressDataListener.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/listener/CompressDataListener.ets rename to library/src/main/ets/components/imageknife/compress/listener/CompressDataListener.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/listener/CompressionPredicate.ets b/library/src/main/ets/components/imageknife/compress/listener/CompressionPredicate.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/listener/CompressionPredicate.ets rename to library/src/main/ets/components/imageknife/compress/listener/CompressionPredicate.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/listener/OnCompressListener.ets b/library/src/main/ets/components/imageknife/compress/listener/OnCompressListener.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/listener/OnCompressListener.ets rename to library/src/main/ets/components/imageknife/compress/listener/OnCompressListener.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/listener/OnRenameListener.ets b/library/src/main/ets/components/imageknife/compress/listener/OnRenameListener.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/listener/OnRenameListener.ets rename to library/src/main/ets/components/imageknife/compress/listener/OnRenameListener.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/provider/CompressAdapter.ets b/library/src/main/ets/components/imageknife/compress/provider/CompressAdapter.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/provider/CompressAdapter.ets rename to library/src/main/ets/components/imageknife/compress/provider/CompressAdapter.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/provider/CompressProvider.ets b/library/src/main/ets/components/imageknife/compress/provider/CompressProvider.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/provider/CompressProvider.ets rename to library/src/main/ets/components/imageknife/compress/provider/CompressProvider.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/provider/DataStringPathProvider.ets b/library/src/main/ets/components/imageknife/compress/provider/DataStringPathProvider.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/provider/DataStringPathProvider.ets rename to library/src/main/ets/components/imageknife/compress/provider/DataStringPathProvider.ets diff --git a/imageknife/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets b/library/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets rename to library/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets diff --git a/imageknife/src/main/ets/components/imageknife/constants/Constants.ets b/library/src/main/ets/components/imageknife/constants/Constants.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/constants/Constants.ets rename to library/src/main/ets/components/imageknife/constants/Constants.ets diff --git a/imageknife/src/main/ets/components/imageknife/constants/ResourceTypeEts.ets b/library/src/main/ets/components/imageknife/constants/ResourceTypeEts.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/constants/ResourceTypeEts.ets rename to library/src/main/ets/components/imageknife/constants/ResourceTypeEts.ets diff --git a/imageknife/src/main/ets/components/imageknife/crop/Crop.ets b/library/src/main/ets/components/imageknife/crop/Crop.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/crop/Crop.ets rename to library/src/main/ets/components/imageknife/crop/Crop.ets diff --git a/imageknife/src/main/ets/components/imageknife/crop/CropCallback.ets b/library/src/main/ets/components/imageknife/crop/CropCallback.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/crop/CropCallback.ets rename to library/src/main/ets/components/imageknife/crop/CropCallback.ets diff --git a/imageknife/src/main/ets/components/imageknife/crop/CropImage.ets b/library/src/main/ets/components/imageknife/crop/CropImage.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/crop/CropImage.ets rename to library/src/main/ets/components/imageknife/crop/CropImage.ets diff --git a/imageknife/src/main/ets/components/imageknife/crop/CropOptions.ets b/library/src/main/ets/components/imageknife/crop/CropOptions.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/crop/CropOptions.ets rename to library/src/main/ets/components/imageknife/crop/CropOptions.ets diff --git a/imageknife/src/main/ets/components/imageknife/crop/PixelMapCrop.ets b/library/src/main/ets/components/imageknife/crop/PixelMapCrop.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/crop/PixelMapCrop.ets rename to library/src/main/ets/components/imageknife/crop/PixelMapCrop.ets diff --git a/imageknife/src/main/ets/components/imageknife/entry/ArcPoint.ets b/library/src/main/ets/components/imageknife/entry/ArcPoint.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/entry/ArcPoint.ets rename to library/src/main/ets/components/imageknife/entry/ArcPoint.ets diff --git a/imageknife/src/main/ets/components/imageknife/entry/PixelEntry.ets b/library/src/main/ets/components/imageknife/entry/PixelEntry.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/entry/PixelEntry.ets rename to library/src/main/ets/components/imageknife/entry/PixelEntry.ets diff --git a/imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets b/library/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets rename to library/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets diff --git a/imageknife/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets b/library/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets rename to library/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets diff --git a/imageknife/src/main/ets/components/imageknife/holder/RetryHolderManager.ets b/library/src/main/ets/components/imageknife/holder/RetryHolderManager.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/holder/RetryHolderManager.ets rename to library/src/main/ets/components/imageknife/holder/RetryHolderManager.ets diff --git a/imageknife/src/main/ets/components/imageknife/interface/AsyncCallback.ets b/library/src/main/ets/components/imageknife/interface/AsyncCallback.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/interface/AsyncCallback.ets rename to library/src/main/ets/components/imageknife/interface/AsyncCallback.ets diff --git a/imageknife/src/main/ets/components/imageknife/interface/AsyncSuccess.ets b/library/src/main/ets/components/imageknife/interface/AsyncSuccess.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/interface/AsyncSuccess.ets rename to library/src/main/ets/components/imageknife/interface/AsyncSuccess.ets diff --git a/imageknife/src/main/ets/components/imageknife/interface/DataCallBack.ets b/library/src/main/ets/components/imageknife/interface/DataCallBack.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/interface/DataCallBack.ets rename to library/src/main/ets/components/imageknife/interface/DataCallBack.ets diff --git a/imageknife/src/main/ets/components/imageknife/interface/IAllCacheInfoCallback.ets b/library/src/main/ets/components/imageknife/interface/IAllCacheInfoCallback.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/interface/IAllCacheInfoCallback.ets rename to library/src/main/ets/components/imageknife/interface/IAllCacheInfoCallback.ets diff --git a/imageknife/src/main/ets/components/imageknife/interface/IDrawLifeCycle.ets b/library/src/main/ets/components/imageknife/interface/IDrawLifeCycle.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/interface/IDrawLifeCycle.ets rename to library/src/main/ets/components/imageknife/interface/IDrawLifeCycle.ets diff --git a/imageknife/src/main/ets/components/imageknife/interface/IParseImage.ets b/library/src/main/ets/components/imageknife/interface/IParseImage.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/interface/IParseImage.ets rename to library/src/main/ets/components/imageknife/interface/IParseImage.ets diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets b/library/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets rename to library/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets b/library/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets rename to library/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/IDataFetch.ets b/library/src/main/ets/components/imageknife/networkmanage/IDataFetch.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/networkmanage/IDataFetch.ets rename to library/src/main/ets/components/imageknife/networkmanage/IDataFetch.ets diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets b/library/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets rename to library/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/LoadLocalFileClient.ets b/library/src/main/ets/components/imageknife/networkmanage/LoadLocalFileClient.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/networkmanage/LoadLocalFileClient.ets rename to library/src/main/ets/components/imageknife/networkmanage/LoadLocalFileClient.ets diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets b/library/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets rename to library/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets diff --git a/imageknife/src/main/ets/components/imageknife/pngj/PngCallback.ts b/library/src/main/ets/components/imageknife/pngj/PngCallback.ts similarity index 100% rename from imageknife/src/main/ets/components/imageknife/pngj/PngCallback.ts rename to library/src/main/ets/components/imageknife/pngj/PngCallback.ts diff --git a/imageknife/src/main/ets/components/imageknife/pngj/PngReader.ets b/library/src/main/ets/components/imageknife/pngj/PngReader.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/pngj/PngReader.ets rename to library/src/main/ets/components/imageknife/pngj/PngReader.ets diff --git a/imageknife/src/main/ets/components/imageknife/pngj/Pngj.ts b/library/src/main/ets/components/imageknife/pngj/Pngj.ts similarity index 100% rename from imageknife/src/main/ets/components/imageknife/pngj/Pngj.ts rename to library/src/main/ets/components/imageknife/pngj/Pngj.ts diff --git a/imageknife/src/main/ets/components/imageknife/pngj/PngjException.ets b/library/src/main/ets/components/imageknife/pngj/PngjException.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/pngj/PngjException.ets rename to library/src/main/ets/components/imageknife/pngj/PngjException.ets diff --git a/imageknife/src/main/ets/components/imageknife/pngj/entry/ImageInfo.ets b/library/src/main/ets/components/imageknife/pngj/entry/ImageInfo.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/pngj/entry/ImageInfo.ets rename to library/src/main/ets/components/imageknife/pngj/entry/ImageInfo.ets diff --git a/imageknife/src/main/ets/components/imageknife/pngj/interface/IBytesConsumer.ets b/library/src/main/ets/components/imageknife/pngj/interface/IBytesConsumer.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/pngj/interface/IBytesConsumer.ets rename to library/src/main/ets/components/imageknife/pngj/interface/IBytesConsumer.ets diff --git a/imageknife/src/main/ets/components/imageknife/pngj/io/Closeable.ets b/library/src/main/ets/components/imageknife/pngj/io/Closeable.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/pngj/io/Closeable.ets rename to library/src/main/ets/components/imageknife/pngj/io/Closeable.ets diff --git a/imageknife/src/main/ets/components/imageknife/pngj/misc/Sandbox.ets b/library/src/main/ets/components/imageknife/pngj/misc/Sandbox.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/pngj/misc/Sandbox.ets rename to library/src/main/ets/components/imageknife/pngj/misc/Sandbox.ets diff --git a/imageknife/src/main/ets/components/imageknife/requestmanage/DiskCacheProxy.ets b/library/src/main/ets/components/imageknife/requestmanage/DiskCacheProxy.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/requestmanage/DiskCacheProxy.ets rename to library/src/main/ets/components/imageknife/requestmanage/DiskCacheProxy.ets diff --git a/imageknife/src/main/ets/components/imageknife/requestmanage/ICache.ets b/library/src/main/ets/components/imageknife/requestmanage/ICache.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/requestmanage/ICache.ets rename to library/src/main/ets/components/imageknife/requestmanage/ICache.ets diff --git a/imageknife/src/main/ets/components/imageknife/requestmanage/MemoryCacheProxy.ets b/library/src/main/ets/components/imageknife/requestmanage/MemoryCacheProxy.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/requestmanage/MemoryCacheProxy.ets rename to library/src/main/ets/components/imageknife/requestmanage/MemoryCacheProxy.ets diff --git a/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets b/library/src/main/ets/components/imageknife/requestmanage/RequestManager.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets rename to library/src/main/ets/components/imageknife/requestmanage/RequestManager.ets diff --git a/imageknife/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets b/library/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets rename to library/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets diff --git a/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets b/library/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets rename to library/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets diff --git a/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets b/library/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets rename to library/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/AsyncTransform.ets b/library/src/main/ets/components/imageknife/transform/AsyncTransform.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/AsyncTransform.ets rename to library/src/main/ets/components/imageknife/transform/AsyncTransform.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/BaseTransform.ets b/library/src/main/ets/components/imageknife/transform/BaseTransform.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/BaseTransform.ets rename to library/src/main/ets/components/imageknife/transform/BaseTransform.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/BlurTransformation.ets b/library/src/main/ets/components/imageknife/transform/BlurTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/BlurTransformation.ets rename to library/src/main/ets/components/imageknife/transform/BlurTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/BrightnessFilterTransformation.ets b/library/src/main/ets/components/imageknife/transform/BrightnessFilterTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/BrightnessFilterTransformation.ets rename to library/src/main/ets/components/imageknife/transform/BrightnessFilterTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets b/library/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets rename to library/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets b/library/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets rename to library/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets b/library/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets rename to library/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/CropSquareTransformation.ets b/library/src/main/ets/components/imageknife/transform/CropSquareTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/CropSquareTransformation.ets rename to library/src/main/ets/components/imageknife/transform/CropSquareTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/CropTransformation.ets b/library/src/main/ets/components/imageknife/transform/CropTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/CropTransformation.ets rename to library/src/main/ets/components/imageknife/transform/CropTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets b/library/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets rename to library/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/InvertFilterTransformation.ets b/library/src/main/ets/components/imageknife/transform/InvertFilterTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/InvertFilterTransformation.ets rename to library/src/main/ets/components/imageknife/transform/InvertFilterTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/KuwaharaFilterTransform.ets b/library/src/main/ets/components/imageknife/transform/KuwaharaFilterTransform.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/KuwaharaFilterTransform.ets rename to library/src/main/ets/components/imageknife/transform/KuwaharaFilterTransform.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets b/library/src/main/ets/components/imageknife/transform/MaskTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets rename to library/src/main/ets/components/imageknife/transform/MaskTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/PixelationFilterTransformation.ets b/library/src/main/ets/components/imageknife/transform/PixelationFilterTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/PixelationFilterTransformation.ets rename to library/src/main/ets/components/imageknife/transform/PixelationFilterTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/RotateImageTransformation.ets b/library/src/main/ets/components/imageknife/transform/RotateImageTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/RotateImageTransformation.ets rename to library/src/main/ets/components/imageknife/transform/RotateImageTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/RoundedCornersTransformation.ets b/library/src/main/ets/components/imageknife/transform/RoundedCornersTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/RoundedCornersTransformation.ets rename to library/src/main/ets/components/imageknife/transform/RoundedCornersTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/SepiaFilterTransformation.ets b/library/src/main/ets/components/imageknife/transform/SepiaFilterTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/SepiaFilterTransformation.ets rename to library/src/main/ets/components/imageknife/transform/SepiaFilterTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/SketchFilterTransformation.ets b/library/src/main/ets/components/imageknife/transform/SketchFilterTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/SketchFilterTransformation.ets rename to library/src/main/ets/components/imageknife/transform/SketchFilterTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/SwirlFilterTransformation.ets b/library/src/main/ets/components/imageknife/transform/SwirlFilterTransformation.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/SwirlFilterTransformation.ets rename to library/src/main/ets/components/imageknife/transform/SwirlFilterTransformation.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/ToonFilterTransform.ets b/library/src/main/ets/components/imageknife/transform/ToonFilterTransform.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/ToonFilterTransform.ets rename to library/src/main/ets/components/imageknife/transform/ToonFilterTransform.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/TransformType.ets b/library/src/main/ets/components/imageknife/transform/TransformType.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/TransformType.ets rename to library/src/main/ets/components/imageknife/transform/TransformType.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/TransformUtils.ets b/library/src/main/ets/components/imageknife/transform/TransformUtils.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/TransformUtils.ets rename to library/src/main/ets/components/imageknife/transform/TransformUtils.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/VignetteFilterTransform.ets b/library/src/main/ets/components/imageknife/transform/VignetteFilterTransform.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/VignetteFilterTransform.ets rename to library/src/main/ets/components/imageknife/transform/VignetteFilterTransform.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/pixelmap/CenterCrop.ets b/library/src/main/ets/components/imageknife/transform/pixelmap/CenterCrop.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/pixelmap/CenterCrop.ets rename to library/src/main/ets/components/imageknife/transform/pixelmap/CenterCrop.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/pixelmap/CenterInside.ets b/library/src/main/ets/components/imageknife/transform/pixelmap/CenterInside.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/pixelmap/CenterInside.ets rename to library/src/main/ets/components/imageknife/transform/pixelmap/CenterInside.ets diff --git a/imageknife/src/main/ets/components/imageknife/transform/pixelmap/FitCenter.ets b/library/src/main/ets/components/imageknife/transform/pixelmap/FitCenter.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/transform/pixelmap/FitCenter.ets rename to library/src/main/ets/components/imageknife/transform/pixelmap/FitCenter.ets diff --git a/imageknife/src/main/ets/components/imageknife/utils/CalculatePixelUtils.ets b/library/src/main/ets/components/imageknife/utils/CalculatePixelUtils.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/utils/CalculatePixelUtils.ets rename to library/src/main/ets/components/imageknife/utils/CalculatePixelUtils.ets diff --git a/imageknife/src/main/ets/components/imageknife/utils/ColorUtils.ets b/library/src/main/ets/components/imageknife/utils/ColorUtils.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/utils/ColorUtils.ets rename to library/src/main/ets/components/imageknife/utils/ColorUtils.ets diff --git a/imageknife/src/main/ets/components/imageknife/utils/FastBlur.ets b/library/src/main/ets/components/imageknife/utils/FastBlur.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/utils/FastBlur.ets rename to library/src/main/ets/components/imageknife/utils/FastBlur.ets diff --git a/imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets b/library/src/main/ets/components/imageknife/utils/FileTypeUtil.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets rename to library/src/main/ets/components/imageknife/utils/FileTypeUtil.ets diff --git a/imageknife/src/main/ets/components/imageknife/utils/K2DArray.ets b/library/src/main/ets/components/imageknife/utils/K2DArray.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/utils/K2DArray.ets rename to library/src/main/ets/components/imageknife/utils/K2DArray.ets diff --git a/imageknife/src/main/ets/components/imageknife/utils/LogUtil.ets b/library/src/main/ets/components/imageknife/utils/LogUtil.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/utils/LogUtil.ets rename to library/src/main/ets/components/imageknife/utils/LogUtil.ets diff --git a/imageknife/src/main/ets/components/imageknife/utils/MaskUtils.ets b/library/src/main/ets/components/imageknife/utils/MaskUtils.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/utils/MaskUtils.ets rename to library/src/main/ets/components/imageknife/utils/MaskUtils.ets diff --git a/imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets b/library/src/main/ets/components/imageknife/utils/ParseImageUtil.ets similarity index 100% rename from imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets rename to library/src/main/ets/components/imageknife/utils/ParseImageUtil.ets 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 100% rename from imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets rename to library/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets 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 +} From 59d850d896760a7c8ad1ca302077b6d02afd26d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E6=9C=88=E6=B8=85=E9=A3=8E?= Date: Tue, 12 Dec 2023 17:53:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=EF=BC=9A=201=E3=80=81=E8=A7=A3=E5=86=B3=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 明月清风 --- CHANGELOG.md | 1 + OAT.xml | 6 +++--- .../main/ets/components/imageknife/ImageKnifeComponent.ets | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6829ded..a64b25f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - requestInStream的回调改成异步 - 修复tasktool出现crash问题 - imageKnife依赖更名为library +- 解决外部定时器失效的问题 ## 2.1.1-rc.4 diff --git a/OAT.xml b/OAT.xml index f6e8ede..10e5eb1 100644 --- a/OAT.xml +++ b/OAT.xml @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets b/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets index e1d0394..5a55812 100644 --- a/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets +++ b/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets @@ -36,7 +36,7 @@ export struct ImageKnifeComponent { private currentWidth: number = 0 private currentHeight: number = 0 // 定时器id - private gifTimerId: number = 0 + private gifTimerId: number = -1 // 完整gif播放时间 private gifLoopDuration: number = 0 private startGifLoopTime: number = 0