From e41a959025229898250d6b4199ebfd82b76a09e3 Mon Sep 17 00:00:00 2001 From: Daniel Kofanov Date: Fri, 1 Aug 2025 04:18:28 +0300 Subject: [PATCH] [ArkTS] Fixup constants type Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICHUG8 Signed-off-by: Daniel Kofanov Change-Id: I5837af58b8bd2910e03529c9819faa81b2c9a48c --- .../@ohos.arkui.advanced.ComposeListItem.ets | 2 +- .../@ohos.arkui.advanced.ComposeTitleBar.ets | 4 ++-- .../@ohos.arkui.advanced.SelectTitleBar.ets | 4 ++-- .../subheader/@ohos.arkui.advanced.SubHeader.ets | 8 ++++---- .../tabtitlebar/@ohos.arkui.advanced.TabTitleBar.ets | 2 +- .../arkui-ohos/src/handwritten/component/canvas.ts | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/advanced_ui_component_static/composeListItem/@ohos.arkui.advanced.ComposeListItem.ets b/advanced_ui_component_static/composeListItem/@ohos.arkui.advanced.ComposeListItem.ets index afe94537c11..99252075a31 100644 --- a/advanced_ui_component_static/composeListItem/@ohos.arkui.advanced.ComposeListItem.ets +++ b/advanced_ui_component_static/composeListItem/@ohos.arkui.advanced.ComposeListItem.ets @@ -149,7 +149,7 @@ const RIGHT_ONLY_SWITCH_WIDTH = '44vp'; const ACCESSIBILITY_LEVEL_AUTO = 'auto'; const ACCESSIBILITY_LEVEL_YES = 'yes'; const ACCESSIBILITY_LEVEL_NO = 'no'; -const RESOURCE_TYPE_SYMBOL: number = 40000; +const RESOURCE_TYPE_SYMBOL: int = 40000; const ICON_SIZE_MAP: Map = new Map([ [IconType.BADGE, BADGE_SIZE], diff --git a/advanced_ui_component_static/composetitlebar/@ohos.arkui.advanced.ComposeTitleBar.ets b/advanced_ui_component_static/composetitlebar/@ohos.arkui.advanced.ComposeTitleBar.ets index 8cd3563d80b..7acac2de046 100644 --- a/advanced_ui_component_static/composetitlebar/@ohos.arkui.advanced.ComposeTitleBar.ets +++ b/advanced_ui_component_static/composetitlebar/@ohos.arkui.advanced.ComposeTitleBar.ets @@ -49,8 +49,8 @@ const TEXT_EDITABLE_DIALOG = '18.3fp'; const IMAGE_SIZE = '64vp'; const MAX_DIALOG_SIZE = '256vp'; const MIN_DIALOG_SIZE = '216vp'; -const RESOURCE_TYPE_SYMBOL: number = 40000; -const ERROR_CODE: number = 0x3900; +const RESOURCE_TYPE_SYMBOL: int = 40000; +const ERROR_CODE: int = 0x3900; class Util { public static isSymbolResource(resourceStr: ResourceStr | undefined | null): boolean { diff --git a/advanced_ui_component_static/selecttitlebar/@ohos.arkui.advanced.SelectTitleBar.ets b/advanced_ui_component_static/selecttitlebar/@ohos.arkui.advanced.SelectTitleBar.ets index 39299b08ad6..809b53979f4 100644 --- a/advanced_ui_component_static/selecttitlebar/@ohos.arkui.advanced.SelectTitleBar.ets +++ b/advanced_ui_component_static/selecttitlebar/@ohos.arkui.advanced.SelectTitleBar.ets @@ -49,10 +49,10 @@ const IMAGE_SIZE = '64vp' const MAX_DIALOG_SIZE = '256vp' const MIN_DIALOG_SIZE = '216vp' const ERROR_CODE = 0x3900 +const LONG_PRESS_TIME: number = 500; @Observed class ButtonGestureModifier implements GestureModifier { - public static readonly longPressTime: number = 500; public static readonly minFontSize: number = 1.75; public fontSize: number = 1; public controller: CustomDialogController | null = null; @@ -64,7 +64,7 @@ class ButtonGestureModifier implements GestureModifier { applyGesture(event: UIGestureEvent): void { if (this.fontSize >= ButtonGestureModifier.minFontSize) { event.addGesture( - new LongPressGestureHandler({ repeat: false, duration: ButtonGestureModifier.longPressTime }) + new LongPressGestureHandler({ repeat: false, duration: LONG_PRESS_TIME }) .onAction(() => { if (event) { this.controller?.open(); diff --git a/advanced_ui_component_static/subheader/@ohos.arkui.advanced.SubHeader.ets b/advanced_ui_component_static/subheader/@ohos.arkui.advanced.SubHeader.ets index a5242ba93ce..a04bdd18839 100644 --- a/advanced_ui_component_static/subheader/@ohos.arkui.advanced.SubHeader.ets +++ b/advanced_ui_component_static/subheader/@ohos.arkui.advanced.SubHeader.ets @@ -33,16 +33,16 @@ import common from '@ohos.app.ability.common'; import HashMap from '@ohos.util.HashMap'; import { KeyCode } from '@ohos.multimodalInput.keyCode'; -const INDEX_ZERO: number = 0; -const INDEX_ONE: number = 1; -const INDEX_TWO: number = 2; +const INDEX_ZERO: int = 0; +const INDEX_ONE: int = 1; +const INDEX_TWO: int = 2; // 字体字重缩放等数值 const DEFAULT_FONT_SCALE: number = 1; // 行数及整体高度 const SINGLE_LINE_NUM: number = 1; const DOUBLE_LINE_NUM: number = 2; // 资源数值 -const RESOURCE_TYPE_SYMBOL: number = 40000; +const RESOURCE_TYPE_SYMBOL: int = 40000; // 左边尺寸常量 const LEFT_ICON_SIZE: ResourceStr = '16vp'; const LEFT_ICON_SIZE_NUMBER: number = 16; diff --git a/advanced_ui_component_static/tabtitlebar/@ohos.arkui.advanced.TabTitleBar.ets b/advanced_ui_component_static/tabtitlebar/@ohos.arkui.advanced.TabTitleBar.ets index 0f649fa11a6..b1668c5e50f 100644 --- a/advanced_ui_component_static/tabtitlebar/@ohos.arkui.advanced.TabTitleBar.ets +++ b/advanced_ui_component_static/tabtitlebar/@ohos.arkui.advanced.TabTitleBar.ets @@ -55,7 +55,7 @@ const TEXT_EDITABLE_DIALOG = '18.3fp'; const IMAGE_SIZE = '64vp'; const MAX_DIALOG = '256vp'; const MIN_DIALOG = '216vp'; -const RESOURCE_TYPE_SYMBOL: number = 40000; +const RESOURCE_TYPE_SYMBOL = 40000; class ButtonGestureModifier implements GestureModifier { public static readonly longPressTime: number = 500; public static readonly minFontSize: number = 1.75; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/canvas.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/canvas.ts index ba974b8d283..95c3d8a8ab6 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/canvas.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/canvas.ts @@ -21,7 +21,7 @@ import { UIContextUtil } from "../handwritten/UIContextUtil" const DIFF: number = 1e-10 const INT32_MAX: number = 2147483647 -const PIXEL_SIZE: number = 4 +const PIXEL_SIZE: int = 4 export function getCanvasDensity(peerPtr: CanvasRenderer): number { return ArkUIAniModule._CanvasRenderer_GetCanvasDensity(peerPtr.peer!.ptr) } -- Gitee