zgf 0509fa8eee Merge remote-tracking branch 'origin/3.x' ... # Conflicts: # CHANGELOG.md # README.md # README_zh.md # entry/src/main/ets/common/CustomEngineKeyImpl.ets # entry/src/main/ets/pages/DownSamplePage.ets # entry/src/main/ets/pages/ImageAnimatorPage.ets # entry/src/main/ets/pages/Index.ets # entry/src/main/ets/pages/LoadStatePage.ets # entry/src/main/ets/pages/ObjectFitPage.ets # entry/src/main/ets/pages/SingleImage.ets # entry/src/main/ets/pages/TestCacheDataPage.ets # entry/src/main/ets/pages/TestChangeColorPage.ets # entry/src/main/ets/pages/TestLoadCancelListenerPage.ets # entry/src/main/ets/pages/TestSetCustomImagePage.ets # entry/src/main/ets/pages/TestTaskResourcePage.ets # entry/src/main/ets/pages/TestWriteCacheStage.ets # entry/src/main/ets/pages/UserPage.ets # entry/src/main/resources/base/element/string.json # entry/src/main/resources/base/profile/main_pages.json # entry/src/main/resources/zh_CN/element/string.json # entry/src/ohosTest/ets/test/List.test.ets # entry/src/ohosTest/ets/test/SamplingTest.test.ets # entry/src/ohosTest/ets/test/imageFormatAndSize.test.ets # library/oh-package.json5 # library/src/main/ets/ImageKnife.ets # library/src/main/ets/ImageKnifeDispatcher.ets # library/src/main/ets/ImageKnifeLoader.ets # library/src/main/ets/components/ImageKnifeAnimatorComponent.ets # library/src/main/ets/components/ImageKnifeComponent.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/key/DefaultEngineKey.ets # library/src/main/ets/model/ImageKnifeData.ets # library/src/main/ets/model/ImageKnifeOption.ets # library/src/main/ets/model/ImageKnifeRequest.ets # sharedlibrary/src/main/ets/pages/Index.ets		2024-11-04 16:39:03 +08:00
..
src	Merge remote-tracking branch 'origin/3.x'	2024-11-04 16:39:03 +08:00
.gitignore	## 3.0.0-rc.0	2024-03-31 15:55:44 +08:00
BuildProfile.ets	占位图从内存获取提前到判断队列前面以及样例增加版权头	2024-06-20 18:39:18 +08:00
build-profile.json5	## 3.0.0-rc.0	2024-03-31 15:55:44 +08:00
consumer-rules.txt	## 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
index.ets	Merge remote-tracking branch 'origin/3.x'	2024-11-04 16:39:03 +08:00
obfuscation-rules.txt	## 3.0.0-rc.0	2024-03-31 15:55:44 +08:00
oh-package-lock.json5	3.x分支新增降采样功能	2024-11-04 16:18:47 +08:00
oh-package.json5	修改CHANGELOG版本号	2024-11-01 16:38:49 +08:00