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..a64b25f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ - 部分release释放放在异步 - 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/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 99% rename from imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets rename to library/src/main/ets/components/imageknife/ImageKnifeComponent.ets index e1d0394..5a55812 100644 --- a/imageknife/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 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 +}