wangyingjun01 7d39ff5129 Merge remote-tracking branch 'origin/3.x' ... # Conflicts: # CHANGELOG.md # OAT.xml # README.md # build-profile.json5 # entry/oh-package.json5 # entry/src/main/ets/entryability/EntryAbility.ets # entry/src/main/ets/pages/UserPage.ets # entry/src/main/ets/pages/dataShareUriLoadPage.ets # entry/src/main/ets/pages/imageknifeTestCaseIndex.ets # entry/src/main/ets/pages/index.ets # entry/src/main/ets/pages/testImageKnifeHttpRequestHeader.ets # entry/src/main/ets/pages/testImageKnifeOptionChangedPage5.ets # entry/src/main/ets/pages/testManyNetImageLoadWithPage2.ets # entry/src/main/module.json5 # entry/src/main/resources/base/element/string.json # entry/src/main/resources/base/profile/main_pages.json # entry/src/ohosTest/ets/test/DefaultJobQueueTest.test.ets # entry/src/ohosTest/ets/test/List.test.ets # entry/src/ohosTest/ets/test/diskLruCache.test.ets # entry/src/ohosTest/ets/test/imageknife.test.ets # entry/src/ohosTest/ets/test/requestoption.test.ets # entry/src/ohosTest/module.json5 # gpu_transform/CHANGELOG.md # gpu_transform/oh-package.json5 # library/index.ets # library/oh-package.json5 # library/src/main/ets/SendableData.ets # library/src/main/ets/components/cache/DiskCacheEntry.ets # library/src/main/ets/components/cache/DiskLruCache.ets # library/src/main/ets/components/cache/FileUtils.ets # library/src/main/ets/components/cache/LruCache.ets # library/src/main/ets/components/imageknife/ImageKnife.ets # library/src/main/ets/components/imageknife/ImageKnifeComponent.ets # library/src/main/ets/components/imageknife/ImageKnifeData.ets # library/src/main/ets/components/imageknife/ImageKnifeDrawFactory.ets # library/src/main/ets/components/imageknife/ImageKnifeOption.ets # library/src/main/ets/components/imageknife/RequestOption.ets # library/src/main/ets/components/imageknife/TaskParams.ets # library/src/main/ets/components/imageknife/constants/Constants.ets # library/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets # library/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets # library/src/main/ets/components/imageknife/holder/RetryHolderManager.ets # library/src/main/ets/components/imageknife/interface/IParseImage.ets # library/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets # library/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets # library/src/main/ets/components/imageknife/networkmanage/IDataFetch.ets # library/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets # library/src/main/ets/components/imageknife/networkmanage/LoadLocalFileClient.ets # library/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets # library/src/main/ets/components/imageknife/requestmanage/MemoryCacheProxy.ets # library/src/main/ets/components/imageknife/requestmanage/RequestManager.ets # library/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets # library/src/main/ets/components/imageknife/transform/TransformUtils.ets # library/src/main/ets/components/imageknife/utils/ParseImageUtil.ets # library/src/main/ets/components/imageknife/utils/gif/GIFFrame.ts # library/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets # library/src/main/ets/components/imageknife/utils/gif/IParseGif.ets # library/src/main/ets/components/imageknife/utils/svg/SVGParseImpl.ets # library/src/main/ets/downsampling/BaseDownsampling.ets # library/src/main/ets/downsampling/DownsampleStartegy.ets # library/src/main/ets/downsampling/Downsampler.ets # library/src/main/ets/networkmanage/CustomDataFetchClient.ets # library/src/main/ets/networkmanage/DataFetchResult.ets # library/src/main/ets/networkmanage/RequestData.ets # library/src/main/ets/utils/CalculatePixelUtils.ets # library/src/main/ets/utils/DefaultJobQueue.ets # library/src/main/ets/utils/IJobQueue.ets # library/src/main/ets/utils/MResource.ets # library/src/main/ets/utils/base/AsyncLock.ts # oh-package.json5 # sharedlibrary/src/main/ets/Index.ets # sharedlibrary/src/main/ets/pages/Index.ets # sharedlibrary/src/test/List.test.ets		2024-07-31 11:02:46 +08:00
..
src	Merge remote-tracking branch 'origin/3.x'	2024-07-31 11:02:46 +08:00
.gitignore	## 3.0.0-rc.0	2024-03-31 15:55:44 +08:00
build-profile.json5	## 3.0.0-rc.0	2024-03-31 15:55:44 +08:00
hvigorfile.ts	## 3.0.0-rc.0	2024-03-31 15:55:44 +08:00
obfuscation-rules.txt	## 3.0.0-rc.0	2024-03-31 15:55:44 +08:00
oh-package.json5	修改packjson	2024-05-24 17:14:55 +08:00