From 136c3e509a6094afc12d702e3fb3ec8d73cfe303 Mon Sep 17 00:00:00 2001 From: zgf Date: Thu, 18 Jul 2024 10:55:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=BC=98=E5=85=88=E7=BA=A7Pr?= =?UTF-8?q?iority=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BAtaskpool.Priority?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zgf --- CHANGELOG.md | 3 + .../main/ets/pages/testPriorityComponent.ets | 64 ++++++++++--------- library/index.ets | 2 +- library/oh-package.json5 | 2 +- .../imageknife/ImageKnifeOption.ets | 5 +- .../components/imageknife/RequestOption.ets | 11 ++-- .../ets/components/imageknife/TaskParams.ets | 5 +- sharedlibrary/src/main/ets/Index.ets | 2 +- 8 files changed, 49 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0f778c..1a2d845 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.3.0-rc.2 +- 加载优先级Priority类型改为taskpool.Priority类型 + ## 2.3.0-rc.1 - 修复file://格式图片无法显示 - 修改uuid的生成方式，使用资源loadSrc，宽高以及转换效果的拼接字符串作为入参， 修复同资源图形转换错乱的问题 diff --git a/entry/src/main/ets/pages/testPriorityComponent.ets b/entry/src/main/ets/pages/testPriorityComponent.ets index e496e8c..277c462 100644 --- a/entry/src/main/ets/pages/testPriorityComponent.ets +++ b/entry/src/main/ets/pages/testPriorityComponent.ets @@ -12,67 +12,69 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ImageKnifeComponent, ImageKnifeOption, Priority, NONE, ImageKnifeGlobal } from '@ohos/libraryimageknife'; +import { ImageKnifeComponent, ImageKnifeOption, NONE, ImageKnifeGlobal } from '@ohos/libraryimageknife'; +import { taskpool } from '@kit.ArkTS'; + const dataBak: ImageKnifeOption[] = [ { loadSrc: "http://b.hiphotos.baidu.com/image/pic/item/9d82d158ccbf6c81b94575cfb93eb13533fa40a2.jpg", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "http://e.hiphotos.baidu.com/image/pic/item/4bed2e738bd4b31c1badd5a685d6277f9e2ff81e.jpg", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "http://g.hiphotos.baidu.com/image/pic/item/0d338744ebf81a4c87a3add4d52a6059252da61e.jpg", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "http://a.hiphotos.baidu.com/image/pic/item/f2deb48f8c5494ee5080c8142ff5e0fe99257e19.jpg", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "http://f.hiphotos.baidu.com/image/pic/item/4034970a304e251f503521f5a586c9177e3e53f9.jpg", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "http://h.hiphotos.baidu.com/image/pic/item/7c1ed21b0ef41bd5f2c2a9e953da81cb39db3d1d.jpg", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "http://a.hiphotos.baidu.com/image/pic/item/8d5494eef01f3a292d2472199d25bc315d607c7c.jpg", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "https://img-blog.csdn.net/20140514114029140", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "http://g.hiphotos.baidu.com/image/pic/item/6d81800a19d8bc3e770bd00d868ba61ea9d345f2.jpg", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "http://b.hiphotos.baidu.com/image/pic/item/e824b899a9014c08878b2c4c0e7b02087af4f4a3.jpg", - priority: Priority.LOW + priority: taskpool.Priority.LOW }, { loadSrc: "http://b.hiphotos.baidu.com/image/pic/item/359b033b5bb5c9ea5c0e3c23d139b6003bf3b374.jpg", - priority: Priority.LOW + priority: taskpool.Priority.LOW }, { loadSrc: "http://h.hiphotos.baidu.com/image/pic/item/902397dda144ad340668b847d4a20cf430ad851e.jpg", - priority: Priority.LOW + priority: taskpool.Priority.LOW }, { loadSrc: "http://d.hiphotos.baidu.com/image/pic/item/b58f8c5494eef01f119945cbe2fe9925bc317d2a.jpg", - priority: Priority.LOW + priority: taskpool.Priority.LOW }, { loadSrc:"http://img2.xkhouse.com/bbs/hfhouse/data/attachment/forum/corebbs/2009-11/2009113011534566298.jpg", - priority: Priority.LOW + priority: taskpool.Priority.LOW } ]; @@ -82,63 +84,63 @@ struct TestPriorityComponent { @State data: ImageKnifeOption[] = [ { loadSrc: "https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "http://c.hiphotos.baidu.com/image/pic/item/30adcbef76094b36de8a2fe5a1cc7cd98d109d99.jpg", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "http://h.hiphotos.baidu.com/image/pic/item/7c1ed21b0ef41bd5f2c2a9e953da81cb39db3d1d.jpg", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "http://g.hiphotos.baidu.com/image/pic/item/55e736d12f2eb938d5277fd5d0628535e5dd6f4a.jpg", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "http://e.hiphotos.baidu.com/image/pic/item/4e4a20a4462309f7e41f5cfe760e0cf3d6cad6ee.jpg", - priority: Priority.HIGH + priority: taskpool.Priority.HIGH }, { loadSrc: "http://b.hiphotos.baidu.com/image/pic/item/279759ee3d6d55fbb3586c0168224f4a20a4dd7e.jpg", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "http://img2.xkhouse.com/bbs/hfhouse/data/attachment/forum/corebbs/2009-11/2009113011534566298.jpg", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "http://a.hiphotos.baidu.com/image/pic/item/e824b899a9014c087eb617650e7b02087af4f464.jpg", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "http://c.hiphotos.baidu.com/image/pic/item/9c16fdfaaf51f3de1e296fa390eef01f3b29795a.jpg", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "http://d.hiphotos.baidu.com/image/pic/item/b58f8c5494eef01f119945cbe2fe9925bc317d2a.jpg", - priority: Priority.MEDIUM + priority: taskpool.Priority.MEDIUM }, { loadSrc: "https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB", - priority: Priority.LOW + priority: taskpool.Priority.LOW }, { loadSrc: "https://img-blog.csdnimg.cn/20191215043500229.png", - priority: Priority.LOW + priority: taskpool.Priority.LOW }, { loadSrc: "https://img-blog.csdn.net/20140514114029140", - priority: Priority.LOW + priority: taskpool.Priority.LOW }, { loadSrc: "https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp", - priority: Priority.LOW + priority: taskpool.Priority.LOW }, { loadSrc: "http://g.hiphotos.baidu.com/image/pic/item/6d81800a19d8bc3e770bd00d868ba61ea9d345f2.jpg", - priority: Priority.LOW + priority: taskpool.Priority.LOW } ]; @State maxRequests: number | undefined = ImageKnifeGlobal?.getInstance()?.getImageKnife()?.maxRequests; diff --git a/library/index.ets b/library/index.ets index a4ed680..ca65555 100644 --- a/library/index.ets +++ b/library/index.ets @@ -99,7 +99,7 @@ export { UPNG } from './src/main/ets/components/3rd_party/upng/UPNG' export { ImageKnife } from './src/main/ets/components/imageknife/ImageKnife' export { ImageKnifeGlobal } from './src/main/ets/components/imageknife/ImageKnifeGlobal' export { ObjectKey } from './src/main/ets/components/imageknife/ObjectKey' -export {RequestOption,Size,DetachFromLayout,Priority,CacheType} from './src/main/ets/components/imageknife/RequestOption' +export {RequestOption,Size,DetachFromLayout,CacheType} from './src/main/ets/components/imageknife/RequestOption' export { ImageKnifeComponent, ScaleType, ScaleTypeHelper, AntiAliasing} from './src/main/ets/components/imageknife/ImageKnifeComponent' export { ImageKnifeDrawFactory } from './src/main/ets/components/imageknife/ImageKnifeDrawFactory' export {ImageKnifeOption,CropCircleWithBorder,Crop,GifOptions,TransformOptions,HeaderOptions} from './src/main/ets/components/imageknife/ImageKnifeOption' diff --git a/library/oh-package.json5 b/library/oh-package.json5 index 1a7a4ec..dce5ea3 100644 --- a/library/oh-package.json5 +++ b/library/oh-package.json5 @@ -14,7 +14,7 @@ "main": "index.ets", "repository": "https://gitee.com/openharmony-tpc/ImageKnife", "type": "module", - "version": "2.3.0-rc.1", + "version": "2.3.0-rc.2", "dependencies": { "pako": "^2.1.0", "@ohos/gpu_transform": "^1.0.0" diff --git a/library/src/main/ets/components/imageknife/ImageKnifeOption.ets b/library/src/main/ets/components/imageknife/ImageKnifeOption.ets index f7a45b2..fc6a209 100644 --- a/library/src/main/ets/components/imageknife/ImageKnifeOption.ets +++ b/library/src/main/ets/components/imageknife/ImageKnifeOption.ets @@ -26,10 +26,11 @@ import { rgbColor } from './transform/CropCircleWithBorderTransformation' import { RoundCorner } from './transform/RoundedCornersTransformation' import { ObjectKey } from './ObjectKey' import common from '@ohos.app.ability.common' -import { Priority } from './RequestOption' import { DataFetchResult } from './networkmanage/DataFetchResult' import { BaseDownsampling } from './downsampling/BaseDownsampling'; import { DownsampleNone } from './downsampling/DownsampleStartegy'; +import { taskpool } from '@kit.ArkTS' + export interface CropCircleWithBorder{ border: number, obj: rgbColor @@ -83,7 +84,7 @@ export class ImageKnifeOption { loadSrc: string | PixelMap | Resource = ''; mainScaleType?: ScaleType = ScaleType.FIT_CENTER // 优先级 - priority?: Priority = Priority.MEDIUM + priority?: taskpool.Priority = taskpool.Priority.MEDIUM enableGpu?:boolean = true; // 磁盘缓存策略 diff --git a/library/src/main/ets/components/imageknife/RequestOption.ets b/library/src/main/ets/components/imageknife/RequestOption.ets index 54632fb..38c54d9 100644 --- a/library/src/main/ets/components/imageknife/RequestOption.ets +++ b/library/src/main/ets/components/imageknife/RequestOption.ets @@ -62,6 +62,8 @@ import util from '@ohos.util' import { DataFetchResult } from './networkmanage/DataFetchResult' import { BaseDownsampling } from './downsampling/BaseDownsampling' import { DownsampleNone } from './downsampling/DownsampleStartegy' +import { taskpool } from '@kit.ArkTS' + export interface Size { width: number, height: number @@ -86,11 +88,6 @@ export interface DetachFromLayout { detach: () => void } -export enum Priority { - HIGH = 0, - MEDIUM = 1, - LOW = 2 -} export class RequestOption { // 遍历添加图片http请求头 headers: Map = new Map(); @@ -110,7 +107,7 @@ export class RequestOption { } // 优先级 - priority: Priority = Priority.MEDIUM; + priority: taskpool.Priority = taskpool.Priority.MEDIUM; uuid: string = '' // 唯一标识 loadSrc: string | PixelMap | Resource = ''; strategy: DiskStrategy = new AUTOMATIC(); @@ -201,7 +198,7 @@ export class RequestOption { this.moduleContext = ctx; } } - setPriority(priority: Priority) { + setPriority(priority: taskpool.Priority) { this.priority = priority } setTransformations( array:Array>){ diff --git a/library/src/main/ets/components/imageknife/TaskParams.ets b/library/src/main/ets/components/imageknife/TaskParams.ets index 51aaa2b..dcd7959 100644 --- a/library/src/main/ets/components/imageknife/TaskParams.ets +++ b/library/src/main/ets/components/imageknife/TaskParams.ets @@ -13,15 +13,16 @@ * limitations under the License. */ import { ObjectKey } from './ObjectKey'; -import { Priority, Size } from '../imageknife/RequestOption' +import { Size } from '../imageknife/RequestOption' import common from '@ohos.app.ability.common' import { MResource } from './utils/MResource'; import { DataFetchResult } from './networkmanage/DataFetchResult'; +import { taskpool } from '@kit.ArkTS'; export class TaskParams { headers: Map = new Map(); moduleContext?: common.UIAbilityContext = undefined; - priority: Priority = Priority.MEDIUM // 优先级 + priority: taskpool.Priority = taskpool.Priority.MEDIUM // 优先级 size: Size = { width: -1, height: -1 }; loadSrc: string | PixelMap | MResource = ""; placeholderSrc: string | PixelMap | MResource | undefined = undefined; diff --git a/sharedlibrary/src/main/ets/Index.ets b/sharedlibrary/src/main/ets/Index.ets index 30f935f..7f50407 100644 --- a/sharedlibrary/src/main/ets/Index.ets +++ b/sharedlibrary/src/main/ets/Index.ets @@ -100,7 +100,7 @@ export { ImageKnife } from '@ohos/imageknife' export { ImageKnifeGlobal } from '@ohos/imageknife' export {RequestOption,Size,CacheType} from '@ohos/imageknife' export {ObjectKey} from '@ohos/imageknife' -export { ImageKnifeComponent, ScaleType, ScaleTypeHelper, AntiAliasing, Priority} from '@ohos/imageknife' +export { ImageKnifeComponent, ScaleType, ScaleTypeHelper, AntiAliasing} from '@ohos/imageknife' export { ImageKnifeDrawFactory } from '@ohos/imageknife' export {ImageKnifeOption,CropCircleWithBorder,Crop,GifOptions,TransformOptions,HeaderOptions} from '@ohos/imageknife' export { ImageKnifeData } from '@ohos/imageknife'