From d6ba38103a8fc09fd25dd08172a5a44d58cfaf75 Mon Sep 17 00:00:00 2001 From: Utku Enes GURSEL Date: Wed, 10 Sep 2025 11:31:20 +0300 Subject: [PATCH] Change "as" expression to CTE Signed-off-by: lirismankarina --- .../@ohos.arkui.advanced.ComposeListItem.ets | 21 +- .../@ohos.arkui.advanced.EditableTitleBar.ets | 4 +- .../@ohos.arkui.advanced.ExceptionPrompt.ets | 4 +- .../@ohos.arkui.advanced.SelectTitleBar.ets | 4 +- .../arkui/generated/component/canvas.ets | 48 ++-- .../arkui/generated/component/shape.ets | 7 +- .../arkui-ohos/generated/component/units.ets | 2 +- .../arkui-ohos/src/FrameNode.ets | 54 ++-- .../arkui-ohos/src/LazyForEach.ets | 14 +- .../arkui-ohos/src/base/ArkPageTransition.ets | 4 +- .../arkui-ohos/src/component/interop.ets | 4 +- .../arkui-ohos/src/component/resources.ets | 256 +++++++++--------- .../transfer/LengthMetricsTransfer.ets | 2 +- .../handwritten/transfer/ResourceTransfer.ets | 4 +- .../transfer/UIContextTransfer.ets | 2 +- .../base/observeWrappedArray.ts | 2 +- .../incremental/common/src/sha1.ts | 8 +- .../incremental/common/src/uniqueId.ts | 2 +- .../runtime/src/animation/Easing.ts | 2 +- .../runtime/src/animation/EasingSupport.ts | 2 +- .../runtime/src/animation/TimeAnimation.ts | 8 +- .../runtime/src/common/RuntimeProfiler.ts | 2 +- .../incremental/runtime/src/states/State.ts | 3 +- .../incremental/runtime/src/tree/TreeNode.ts | 10 +- .../interop/src/arkts/SerializerBase.ts | 2 +- 25 files changed, 236 insertions(+), 235 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 bd0059f387a..2b1345d676e 100644 --- a/advanced_ui_component_static/composeListItem/@ohos.arkui.advanced.ComposeListItem.ets +++ b/advanced_ui_component_static/composeListItem/@ohos.arkui.advanced.ComposeListItem.ets @@ -170,7 +170,7 @@ const OPERATE_ITEM_RADIUS: number = 50; const DEFUALT_RADIO_CHECKBOX_BORDER_COLOR: ResourceColor = $r('sys.color.ohos_id_color_switch_outline_off'); const TEXT_SUPPORT_MARQUEE: number = 1; const IS_MARQUEE_OR_ELLIPSIS: number = - LengthMetrics.resource($r('sys.float.composeListItem_right_textOverflow')).value as number; + LengthMetrics.resource($r('sys.float.composeListItem_right_textOverflow')).value.toDouble(); const UNUSUAL: number = -1; const FOCUSED_BG_COLOR: ResourceColor = $r('sys.color.composeListItem_container_focus_color'); const NORMAL_BG_COLOR: ResourceColor = $r('sys.color.composeListItem_container_normal_color'); @@ -1184,7 +1184,7 @@ export struct ComposeListItem { @State canTouch: boolean = true; @State canHover: boolean = true; @State isHover: boolean = false; - @State itemHeight: number = ItemHeight.FIRST_HEIGHT as number; + @State itemHeight: number = ItemHeight.FIRST_HEIGHT; @State isActive: boolean = false; @State hoveringColor: ResourceColor = '#0d000000'; @State touchDownColor: ResourceColor = '#1a000000'; @@ -1236,10 +1236,9 @@ export struct ComposeListItem { this.itemHeight = ItemHeight.FIRST_HEIGHT; } else { const systemIconLineHeight = - LengthMetrics.resource($r('sys.float.composeListItem_system_icon_line_height')).value as number; - this.itemHeight = - (this.contentItem?.iconStyle as IconType) <= IconType.HEAD_SCULPTURE ? ItemHeight.SECOND_HEIGHT as number : - systemIconLineHeight as number; + LengthMetrics.resource($r('sys.float.composeListItem_system_icon_line_height')).value.toDouble(); + this.itemHeight = (this.contentItem?.iconStyle as IconType) <= IconType.HEAD_SCULPTURE ? + ItemHeight.SECOND_HEIGHT : systemIconLineHeight.toDouble(); } } else if (this.contentItem?.description === undefined) { let iconStyle: IconType = (this.contentItem?.iconStyle as IconType); @@ -1258,7 +1257,7 @@ export struct ComposeListItem { } const iconStyle = this.contentItem?.iconStyle; if (iconStyle !== undefined) { - const iconSize = ICON_SIZE_MAP.get(iconStyle as number); + const iconSize = ICON_SIZE_MAP.get(iconStyle as IconType); if (iconSize !== undefined && iconSize >= this.itemHeight) { this.itemHeight = iconSize + SAFE_LIST_PADDING; } @@ -1309,7 +1308,7 @@ export struct ComposeListItem { if (this.callbackId) { let context: UIContext = this.getUIContext(); if (context.getHostContext() !== undefined) { - this.applicationContext.off('environment', this.callbackId as Int, + this.applicationContext.off('environment', this.callbackId.toInt(), (err: BusinessError | null): void => { hilog.info(0x0000, 'testTag', `applicationContext off environment err: code ${err?.code}`); }) @@ -1407,8 +1406,8 @@ export struct ComposeListItem { if (this.containerDirection === FlexDirection.Row) { return LengthMetrics.vp(0); } - let iconSize: number = ICON_SIZE_MAP.get(this.contentItem?.iconStyle! as number) as number; - if (this.contentItem?.icon && iconSize && (iconSize as number) <= HEADSCULPTURE_SIZE) { + let iconSize: number = ICON_SIZE_MAP.get(this.contentItem?.iconStyle! as IconType) as number; + if (this.contentItem?.icon && iconSize && (iconSize.toDouble()) <= HEADSCULPTURE_SIZE) { return LengthMetrics.vp(iconSize + NORMAL_ITEM_ROW_SPACE + LISTITEM_PADDING - this.textArrowLeftSafeOffset); } return LengthMetrics.vp(LISTITEM_PADDING - this.textArrowLeftSafeOffset); @@ -1630,4 +1629,4 @@ export struct ComposeListItem { y: IS_SUPPORT_SUBCOMPONENT_EVENT ? undefined : RECOVER_ITEM_SCALE }; } -} \ No newline at end of file +} diff --git a/advanced_ui_component_static/editabletitlebar/@ohos.arkui.advanced.EditableTitleBar.ets b/advanced_ui_component_static/editabletitlebar/@ohos.arkui.advanced.EditableTitleBar.ets index abda3d4b71d..07334a9122a 100755 --- a/advanced_ui_component_static/editabletitlebar/@ohos.arkui.advanced.EditableTitleBar.ets +++ b/advanced_ui_component_static/editabletitlebar/@ohos.arkui.advanced.EditableTitleBar.ets @@ -1044,7 +1044,7 @@ const densityPixels: number = ((): number => { */ function getNumberByResource(resourceId: number, defaultNumber: number): number { try { - let resourceNumber: number = resourceManager.getSysResourceManager().getDouble(resourceId as Long); + let resourceNumber: number = resourceManager.getSysResourceManager().getDouble(resourceId.toLong()); if (resourceNumber === 0) { return defaultNumber; } else { @@ -1078,4 +1078,4 @@ class Util { } return true; } -} \ No newline at end of file +} diff --git a/advanced_ui_component_static/exceptionprompt/@ohos.arkui.advanced.ExceptionPrompt.ets b/advanced_ui_component_static/exceptionprompt/@ohos.arkui.advanced.ExceptionPrompt.ets index 91300c14f18..9a6f5ea5ee4 100644 --- a/advanced_ui_component_static/exceptionprompt/@ohos.arkui.advanced.ExceptionPrompt.ets +++ b/advanced_ui_component_static/exceptionprompt/@ohos.arkui.advanced.ExceptionPrompt.ets @@ -243,7 +243,7 @@ export struct ExceptionPrompt { if (this.callbackId) { let context: UIContext = this.getUIContext(); if (context.getHostContext() !== undefined) { - this.applicationContext.off('environment', this.callbackId as Int, (err: BusinessError | null): void => { + this.applicationContext.off('environment', this.callbackId.toInt(), (err: BusinessError | null): void => { hilog.info(0x0000, 'testTag', `applicationContext off environment err: code ${err?.code}`); }) } @@ -282,4 +282,4 @@ class Util { } return typeof resource !== 'string'; } -} \ No newline at end of file +} 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 a47b1c4ee2b..9eefb2e0cb3 100644 --- a/advanced_ui_component_static/selecttitlebar/@ohos.arkui.advanced.SelectTitleBar.ets +++ b/advanced_ui_component_static/selecttitlebar/@ohos.arkui.advanced.SelectTitleBar.ets @@ -252,7 +252,7 @@ export struct SelectTitleBar { let resourceManager = (this.getUIContext().getHostContext() as common.UIAbilityContext).resourceManager; this.messageDesc = resourceManager?.getIntPluralStringByNameSync('selecttitlebar_accessibility_message_desc_new', - this.badgeValue as Int) as string; + this.badgeValue.toInt()) as string; } catch (exception) { let code: undefined | number = (exception as ClassCastError)?.code; let message: undefined | string = (exception as ClassCastError)?.message; @@ -971,4 +971,4 @@ class Util { } return true; } -} \ No newline at end of file +} diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/canvas.ets b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/canvas.ets index 0b25e7d91cf..e0a88e19d28 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/canvas.ets +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/canvas.ets @@ -980,19 +980,19 @@ export class TextMetrics_serializer { } public static read(buffer: DeserializerBase): TextMetrics { let valueDeserializer : DeserializerBase = buffer - const actualBoundingBoxAscentTmpResult : number = (valueDeserializer.readNumber() as number) - const actualBoundingBoxDescentTmpResult : number = (valueDeserializer.readNumber() as number) - const actualBoundingBoxLeftTmpResult : number = (valueDeserializer.readNumber() as number) - const actualBoundingBoxRightTmpResult : number = (valueDeserializer.readNumber() as number) - const alphabeticBaselineTmpResult : number = (valueDeserializer.readNumber() as number) - const emHeightAscentTmpResult : number = (valueDeserializer.readNumber() as number) - const emHeightDescentTmpResult : number = (valueDeserializer.readNumber() as number) - const fontBoundingBoxAscentTmpResult : number = (valueDeserializer.readNumber() as number) - const fontBoundingBoxDescentTmpResult : number = (valueDeserializer.readNumber() as number) - const hangingBaselineTmpResult : number = (valueDeserializer.readNumber() as number) - const ideographicBaselineTmpResult : number = (valueDeserializer.readNumber() as number) - const widthTmpResult : number = (valueDeserializer.readNumber() as number) - const heightTmpResult : number = (valueDeserializer.readNumber() as number) + const actualBoundingBoxAscentTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const actualBoundingBoxDescentTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const actualBoundingBoxLeftTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const actualBoundingBoxRightTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const alphabeticBaselineTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const emHeightAscentTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const emHeightDescentTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const fontBoundingBoxAscentTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const fontBoundingBoxDescentTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const hangingBaselineTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const ideographicBaselineTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const widthTmpResult : number = (valueDeserializer.readNumber().toDouble()) + const heightTmpResult : number = (valueDeserializer.readNumber().toDouble()) let value : TextMetrics = ({actualBoundingBoxAscent: actualBoundingBoxAscentTmpResult, actualBoundingBoxDescent: actualBoundingBoxDescentTmpResult, actualBoundingBoxLeft: actualBoundingBoxLeftTmpResult, actualBoundingBoxRight: actualBoundingBoxRightTmpResult, alphabeticBaseline: alphabeticBaselineTmpResult, emHeightAscent: emHeightAscentTmpResult, emHeightDescent: emHeightDescentTmpResult, fontBoundingBoxAscent: fontBoundingBoxAscentTmpResult, fontBoundingBoxDescent: fontBoundingBoxDescentTmpResult, hangingBaseline: hangingBaselineTmpResult, ideographicBaseline: ideographicBaselineTmpResult, width: widthTmpResult, height: heightTmpResult} as TextMetrics) return value } @@ -1530,7 +1530,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { return this.getImageSmoothingEnabled_serialize() } private setImageSmoothingEnabled(imageSmoothingEnabled: boolean): void { - const imageSmoothingEnabled_casted = imageSmoothingEnabled as (boolean) + const imageSmoothingEnabled_casted = imageSmoothingEnabled.toBoolean() this.setImageSmoothingEnabled_serialize(imageSmoothingEnabled_casted) return } @@ -1554,7 +1554,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { return this.getLineDashOffset_serialize() } private setLineDashOffset(lineDashOffset: number): void { - const lineDashOffset_casted = lineDashOffset as (number) + const lineDashOffset_casted = lineDashOffset.toDouble() this.setLineDashOffset_serialize(lineDashOffset_casted) return } @@ -1570,7 +1570,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { return this.getLineWidth_serialize() } private setLineWidth(lineWidth: number): void { - const lineWidth_casted = lineWidth as (number) + const lineWidth_casted = lineWidth.toDouble() this.setLineWidth_serialize(lineWidth_casted) return } @@ -1578,7 +1578,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { return this.getMiterLimit_serialize() } private setMiterLimit(miterLimit: number): void { - const miterLimit_casted = miterLimit as (number) + const miterLimit_casted = miterLimit.toDouble() this.setMiterLimit_serialize(miterLimit_casted) return } @@ -1586,7 +1586,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { return this.getShadowBlur_serialize() } private setShadowBlur(shadowBlur: number): void { - const shadowBlur_casted = shadowBlur as (number) + const shadowBlur_casted = shadowBlur.toDouble() this.setShadowBlur_serialize(shadowBlur_casted) return } @@ -1602,7 +1602,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { return this.getShadowOffsetX_serialize() } private setShadowOffsetX(shadowOffsetX: number): void { - const shadowOffsetX_casted = shadowOffsetX as (number) + const shadowOffsetX_casted = shadowOffsetX.toDouble() this.setShadowOffsetX_serialize(shadowOffsetX_casted) return } @@ -1610,7 +1610,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { return this.getShadowOffsetY_serialize() } private setShadowOffsetY(shadowOffsetY: number): void { - const shadowOffsetY_casted = shadowOffsetY as (number) + const shadowOffsetY_casted = shadowOffsetY.toDouble() this.setShadowOffsetY_serialize(shadowOffsetY_casted) return } @@ -1894,7 +1894,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { const bufferLength : int32 = retvalDeserializer.readInt32() let buffer : Array = new Array(bufferLength) for (let bufferBufCounterI = 0; bufferBufCounterI < bufferLength; bufferBufCounterI++) { - buffer[bufferBufCounterI] = (retvalDeserializer.readNumber() as number) + buffer[bufferBufCounterI] = (retvalDeserializer.readNumber().toDouble()) } const returnResult : Array = buffer return returnResult @@ -2064,7 +2064,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { if (bufferUnionSelector == (0).toChar()) { buffer = (retvalDeserializer.readString() as string) } else if (bufferUnionSelector == (1).toChar()) { - buffer = (retvalDeserializer.readNumber() as number) + buffer = (retvalDeserializer.readNumber().toDouble()) } else if (bufferUnionSelector == (2).toChar()) { buffer = (CanvasGradient_serializer.read(retvalDeserializer) as CanvasGradient) } else if (bufferUnionSelector == (3).toChar()) { @@ -2105,7 +2105,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { if (bufferUnionSelector == (0).toChar()) { buffer = (retvalDeserializer.readString() as string) } else if (bufferUnionSelector == (1).toChar()) { - buffer = (retvalDeserializer.readNumber() as number) + buffer = (retvalDeserializer.readNumber().toDouble()) } else if (bufferUnionSelector == (2).toChar()) { buffer = (CanvasGradient_serializer.read(retvalDeserializer) as CanvasGradient) } else if (bufferUnionSelector == (3).toChar()) { @@ -2124,7 +2124,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { thisSerializer.writeString(strokeStyleForIdx0) } else if (strokeStyle instanceof number) { thisSerializer.writeInt8((1).toChar()) - const strokeStyleForIdx1 = strokeStyle as number + const strokeStyleForIdx1 = strokeStyle.toDouble() thisSerializer.writeNumber(strokeStyleForIdx1) } else if (strokeStyle instanceof CanvasGradient) { thisSerializer.writeInt8((2).toChar()) diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/shape.ets b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/shape.ets index 50d57c78f23..a99bb8af2c7 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/shape.ets +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/generated/component/shape.ets @@ -284,9 +284,10 @@ export class ArkShapePeer extends ArkCommonMethodPeer { thisSerializer.writeString(valueTmpValueForIdx0) } else if (valueTmpValue instanceof number) { thisSerializer.writeInt8((1).toChar()) - const valueTmpValueForIdx1 = valueTmpValue as number - thisSerializer.writeNumber(valueTmpValueForIdx1) - } else if (valueTmpValue instanceof Resource) { + const value_value_1 = value_value.toDouble() + thisSerializer.writeNumber(value_value_1) + } + else if (RuntimeType.OBJECT == value_value_type) { thisSerializer.writeInt8((2).toChar()) const valueTmpValueForIdx2 = valueTmpValue as Resource Resource_serializer.write(thisSerializer, valueTmpValueForIdx2) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/generated/component/units.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/generated/component/units.ets index 400bdbc8516..77424af388e 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/generated/component/units.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/generated/component/units.ets @@ -74,7 +74,7 @@ export class ColorFilter implements MaterializedBase { if (!pointer.isNumber()) { return undefined; } - let pointerVal = pointer.toNumber() as long; + let pointerVal = pointer.toNumber().toLong(); let ctorPtr = ArkUIAniModule._Image_ColorFilter_TransferStatic(pointerVal); if (ctorPtr === 0) { return undefined; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/FrameNode.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/FrameNode.ets index 72e9d8a6b08..a574d210864 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/FrameNode.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/FrameNode.ets @@ -191,7 +191,7 @@ export class FrameNode implements MaterializedBase { setAdapterRef(adapter :NodeAdapter | undefined){ this.nodeAdapterRef_ = adapter; } - + checkValid(node: FrameNode): boolean { return true; } @@ -205,7 +205,7 @@ export class FrameNode implements MaterializedBase { if (this._gestureEvent === undefined) { this._gestureEvent = new UIGestureEvent(); const retval = FrameNodeExtender.getFrameNodePtr(this) - let peer = new ArkFrameNodePeer(retval, this._nodeId as int32, "FrameNode", 0); + let peer = new ArkFrameNodePeer(retval, this._nodeId.toInt(), "FrameNode", 0); // this._gestureEvent!.setPeer(peer); } return this._gestureEvent as UIGestureEvent; @@ -1460,7 +1460,7 @@ export namespace typeNode { return new SearchFrameNode(context, 'Search', (node: FrameNode, type: ModifierType): ArkSearchNode => { let arknode = new ArkSearchNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkSearchPeer(retval, node._nodeId as int32, "Search", 0); + const peer = new ArkSearchPeer(retval, node._nodeId.toInt(), "Search", 0); arknode.setPeer(peer); return arknode; }); @@ -1482,7 +1482,7 @@ export namespace typeNode { return new TextAreaFrameNode(context, 'TextArea', (node: FrameNode, type: ModifierType): ArkTextAreaNode => { let arknode = new ArkTextAreaNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkTextAreaPeer(retval, node._nodeId as int32, "TextArea", 0); + const peer = new ArkTextAreaPeer(retval, node._nodeId.toInt(), "TextArea", 0); arknode.setPeer(peer); return arknode; }); @@ -1493,7 +1493,7 @@ export namespace typeNode { return new TextInputFrameNode(context, 'TextInput', (node: FrameNode, type: ModifierType): ArkTextInputNode => { let arknode = new ArkTextInputNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkTextInputPeer(retval, node._nodeId as int32, "TextInput", 0); + const peer = new ArkTextInputPeer(retval, node._nodeId.toInt(), "TextInput", 0); arknode.setPeer(peer); return arknode; }); @@ -1504,7 +1504,7 @@ export namespace typeNode { return new TextFrameNode(context, 'Text', (node: FrameNode, type: ModifierType): ArkTextNode => { let arknode = new ArkTextNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkTextPeer(retval, node._nodeId as int32, "Text", 0); + const peer = new ArkTextPeer(retval, node._nodeId.toInt(), "Text", 0); arknode.setPeer(peer); return arknode; }); @@ -1520,7 +1520,7 @@ export namespace typeNode { return new MarqueeFrameNode(context, 'Marquee', (node: FrameNode, type: ModifierType): ArkMarqueeNode => { let arknode = new ArkMarqueeNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkMarqueePeerCustom(retval, node._nodeId as int32, "Marquee", 0); + const peer = new ArkMarqueePeerCustom(retval, node._nodeId.toInt(), "Marquee", 0); arknode.setPeer(peer); return arknode; }); @@ -1536,7 +1536,7 @@ export namespace typeNode { return new SymbolGlyphFrameNode(context, 'SymbolGlyph', (node: FrameNode, type: ModifierType): ArkSymbolGlyphNode => { let arknode = new ArkSymbolGlyphNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkSymbolGlyphPeerCustom(retval, node._nodeId as int32, "SymbolGlyph", 0); + const peer = new ArkSymbolGlyphPeerCustom(retval, node._nodeId.toInt(), "SymbolGlyph", 0); arknode.setPeer(peer); return arknode; }); @@ -1547,7 +1547,7 @@ export namespace typeNode { let xcFrameNode = new XComponentFrameNode(context, 'XComponent', (node: FrameNode, type: ModifierType): ArkXComponentNode => { let arknode = new ArkXComponentNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new TypedXComponentPeerInternal(retval, node._nodeId as int32, "XComponent", 0); + const peer = new TypedXComponentPeerInternal(retval, node._nodeId.toInt(), "XComponent", 0); arknode.setPeer(peer); return arknode; }); @@ -1560,7 +1560,7 @@ export namespace typeNode { let xcFrameNode = new XComponentFrameNode(context, 'XComponent', (node: FrameNode, type: ModifierType): ArkXComponentNode => { let arknode = new ArkXComponentNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new TypedXComponentPeerInternal(retval, node._nodeId as int32, "XComponent", 0); + const peer = new TypedXComponentPeerInternal(retval, node._nodeId.toInt(), "XComponent", 0); arknode.setPeer(peer); return arknode; }); @@ -1573,7 +1573,7 @@ export namespace typeNode { let xcFrameNode = new XComponentFrameNode(context, 'XComponent', (node: FrameNode, type: ModifierType): ArkXComponentNode => { let arknode = new ArkXComponentNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new TypedXComponentPeerInternal(retval, node._nodeId as int32, "XComponent", 0); + const peer = new TypedXComponentPeerInternal(retval, node._nodeId.toInt(), "XComponent", 0); arknode.setPeer(peer); return arknode; }); @@ -1586,7 +1586,7 @@ export namespace typeNode { return new ImageFrameNode(context, 'Image', (node: FrameNode, type: ModifierType): ArkImageNode => { let arknode = new ArkImageNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkImagePeer(retval, node._nodeId as int32, 'Image', 0); + const peer = new ArkImagePeer(retval, node._nodeId.toInt(), 'Image', 0); arknode.setPeer(peer); return arknode; }); @@ -1597,7 +1597,7 @@ export namespace typeNode { return new BadgeFrameNode(context, 'Badge', (node: FrameNode, type: ModifierType): ArkBadgeNode => { let arknode = new ArkBadgeNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkBadgePeer(retval, node._nodeId as int32, 'Badge', 0); + const peer = new ArkBadgePeer(retval, node._nodeId.toInt(), 'Badge', 0); arknode.setPeer(peer); return arknode; }); @@ -1608,7 +1608,7 @@ export namespace typeNode { return new QRCodeFrameNode(context, 'QRCode', (node: FrameNode, type: ModifierType): ArkQRCodeNode => { let arknode = new ArkQRCodeNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkQRCodePeer(retval, node._nodeId as int32, 'QRCode', 0); + const peer = new ArkQRCodePeer(retval, node._nodeId.toInt(), 'QRCode', 0); arknode.setPeer(peer); return arknode; }); @@ -1619,7 +1619,7 @@ export namespace typeNode { return new ProgressFrameNode(context, 'Progress', (node: FrameNode, type: ModifierType): ArkProgressNode => { let arknode = new ArkProgressNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkProgressPeer(retval, node._nodeId as int32, 'Progress', 0); + const peer = new ArkProgressPeer(retval, node._nodeId.toInt(), 'Progress', 0); arknode.setPeer(peer); return arknode; }); @@ -1630,7 +1630,7 @@ export namespace typeNode { return new LoadingProgressFrameNode(context, 'LoadingProgress', (node: FrameNode, type: ModifierType): ArkLoadingProgressNode => { let arknode = new ArkLoadingProgressNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkLoadingProgressPeer(retval, node._nodeId as int32, 'LoadingProgress', 0); + const peer = new ArkLoadingProgressPeer(retval, node._nodeId.toInt(), 'LoadingProgress', 0); arknode.setPeer(peer); return arknode; }); @@ -1641,7 +1641,7 @@ export namespace typeNode { return new TextClockFrameNode(context, 'TextClock', (node: FrameNode, type: ModifierType): ArkTextClockNode => { let arknode = new ArkTextClockNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkTextClockPeer(retval, node._nodeId as int32, 'TextClock', 0); + const peer = new ArkTextClockPeer(retval, node._nodeId.toInt(), 'TextClock', 0); arknode.setPeer(peer); return arknode; }); @@ -1652,7 +1652,7 @@ export namespace typeNode { return new TextTimerFrameNode(context, 'TextTimer', (node: FrameNode, type: ModifierType): ArkTextTimerNode => { let arknode = new ArkTextTimerNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkTextTimerPeer(retval, node._nodeId as int32, 'TextTimer', 0); + const peer = new ArkTextTimerPeer(retval, node._nodeId.toInt(), 'TextTimer', 0); arknode.setPeer(peer); return arknode; }); @@ -1663,7 +1663,7 @@ export namespace typeNode { return new ButtonFrameNode(context, 'Button', (node: FrameNode, type: ModifierType): ArkButtonNode => { let arknode = new ArkButtonNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkButtonPeer(retval, node._nodeId as int32, "Button", 0); + const peer = new ArkButtonPeer(retval, node._nodeId.toInt(), "Button", 0); arknode.setPeer(peer); return arknode; }); @@ -1674,7 +1674,7 @@ export namespace typeNode { return new CheckboxFrameNode(context, 'Checkbox', (node: FrameNode, type: ModifierType): ArkCheckboxNode => { let arknode = new ArkCheckboxNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkCheckboxPeer(retval, node._nodeId as int32, "Checkbox", 0); + const peer = new ArkCheckboxPeer(retval, node._nodeId.toInt(), "Checkbox", 0); arknode.setPeer(peer); return arknode; }); @@ -1685,7 +1685,7 @@ export namespace typeNode { return new CheckboxGroupFrameNode(context, 'CheckboxGroup', (node: FrameNode, type: ModifierType): ArkCheckboxGroupNode => { let arknode = new ArkCheckboxGroupNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkCheckboxGroupPeer(retval, node._nodeId as int32, "CheckboxGroup", 0); + const peer = new ArkCheckboxGroupPeer(retval, node._nodeId.toInt(), "CheckboxGroup", 0); arknode.setPeer(peer); return arknode; }); @@ -1696,7 +1696,7 @@ export namespace typeNode { return new RadioFrameNode(context, 'Radio', (node: FrameNode, type: ModifierType): ArkRadioNode => { let arknode = new ArkRadioNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkRadioPeer(retval, node._nodeId as int32, "Radio", 0); + const peer = new ArkRadioPeer(retval, node._nodeId.toInt(), "Radio", 0); arknode.setPeer(peer); return arknode; }); @@ -1707,7 +1707,7 @@ export namespace typeNode { return new RatingFrameNode(context, 'Rating', (node: FrameNode, type: ModifierType): ArkRatingNode => { let arknode = new ArkRatingNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkRatingPeer(retval, node._nodeId as int32, "Rating", 0); + const peer = new ArkRatingPeer(retval, node._nodeId.toInt(), "Rating", 0); arknode.setPeer(peer); return arknode; }); @@ -1718,7 +1718,7 @@ export namespace typeNode { return new SelectFrameNode(context, 'Select', (node: FrameNode, type: ModifierType): ArkSelectNode => { let arknode = new ArkSelectNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkSelectPeer(retval, node._nodeId as int32, "Select", 0); + const peer = new ArkSelectPeer(retval, node._nodeId.toInt(), "Select", 0); arknode.setPeer(peer); return arknode; }); @@ -1729,7 +1729,7 @@ export namespace typeNode { return new SliderFrameNode(context, 'Slider', (node: FrameNode, type: ModifierType): ArkSliderNode => { let arknode = new ArkSliderNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkSliderPeer(retval, node._nodeId as int32, "Slider", 0); + const peer = new ArkSliderPeer(retval, node._nodeId.toInt(), "Slider", 0); arknode.setPeer(peer); return arknode; }); @@ -1740,7 +1740,7 @@ export namespace typeNode { let toggleNode = new ToggleFrameNode(context, 'Toggle', (node: FrameNode, type: ModifierType): ArkToggleNode => { let arknode = new ArkToggleNode(); const retval = FrameNodeExtender.getFrameNodePtr(node); - const peer = new ArkTogglePeer(retval, node._nodeId as int32, "Toggle", 0); + const peer = new ArkTogglePeer(retval, node._nodeId.toInt(), "Toggle", 0); arknode.setPeer(peer); return arknode; }); @@ -1941,4 +1941,4 @@ export class NodeAdapter implements MaterializedBase { static attachNodeAdapter(adapter: NodeAdapter, node: FrameNode) { return ArkUIAniModule._NodeAdapter_AttachNodeAdapter(adapter.peer!.ptr!, node.peer!.ptr!); } -} \ No newline at end of file +} diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/LazyForEach.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/LazyForEach.ets index 3e2fbdc63a3..43ed7909d7b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/LazyForEach.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/LazyForEach.ets @@ -171,11 +171,11 @@ export function LazyForEach(dataSource: IDataSource, let listener = remember((): InternalListener => new InternalListener(parent.peer.ptr, version)) const changeIndex = listener.flush(offset) // first item index that's affected by DataChange - const currentLocal = current.value >= 0 ? Math.max(current.value - offset, 0) as int32 : -1; // translated to local index + const currentLocal = current.value >= 0 ? Math.max(current.value - offset, 0).toInt() : -1; // translated to local index const visibleRange = new VisibleRange(parent, currentLocal, currentLocal) remember((): void => { dataSource.registerDataChangeListener(listener) - LazyForEachManager.OnRangeUpdate(visibleRange.parent, dataSource.totalCount() as int32, (currentIndex: int32, currentMark: pointer, end: int32) => { + LazyForEachManager.OnRangeUpdate(visibleRange.parent, dataSource.totalCount().toInt(), (currentIndex: int32, currentMark: pointer, end: int32) => { // console.log(`LazyForEach[${parent}]: current updated to ${currentIndex} ${currentMark} end=${end}`) current.value = currentIndex mark.value = currentMark @@ -185,15 +185,15 @@ export function LazyForEach(dataSource: IDataSource, // Subscribe to version changes. version.value - let generator = (element: T, index: number): int32 => keyGenerator ? hashCodeFromString(keyGenerator!(element, index)) : index as int32 - let index: number = visibleRange.indexUp as number + let generator = (element: T, index: number): int32 => keyGenerator ? hashCodeFromString(keyGenerator!(element, index)) : index.toInt() + let index: number = visibleRange.indexUp.toDouble() - LazyForEachManager.Prepare(parent, dataSource.totalCount() as int32, offset) + LazyForEachManager.Prepare(parent, dataSource.totalCount().toInt(), offset) LazyForEachManager.SetInsertMark(parent, mark.value, false) while (index >= 0 && index < dataSource.totalCount()) { // console.log(`LazyForEach[${parent}]: index=${index}`) - const element: T = dataSource.getData(index as number) + const element: T = dataSource.getData(index.toDouble()) memoEntry2( __context(), generator(element, index), @@ -215,6 +215,6 @@ export function LazyForEach(dataSource: IDataSource, parent.setInsertMark(nullptr, false) // create DataNode to provide count information to parent - const identifier = new LazyForEachIdentifier(__id(), dataSource.totalCount() as int32, visibleRange.activeCount) + const identifier = new LazyForEachIdentifier(__id(), dataSource.totalCount().toInt(), visibleRange.activeCount) DataNode.attach(LazyForEachType, identifier) } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/base/ArkPageTransition.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/base/ArkPageTransition.ets index bb374e00574..99e349a4dd3 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/base/ArkPageTransition.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/base/ArkPageTransition.ets @@ -99,8 +99,8 @@ function progressAnimation(state: RouterTransitionVisibility, style: ArkPageTran propertyName: KEY_PAGE_TRANSITION_PROPERTY, startValue: 0 as float32, endValue: 1.0 as float32, - duration: (style.params.duration ?? 0) as int32, - delay: (style.params.delay ?? 0) as int32, + duration: (style.params.duration ?? 0).toInt(), + delay: (style.params.delay ?? 0).toInt(), curve: style.params.curve ?? Curve.EaseOut, onProgress: (state == RouterTransitionVisibility.Hiding && style._onExit != undefined) ? (progress: float32) => style._onExit!(RouteType.Pop, progress) : diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/interop.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/interop.ets index dc8f745285f..167f21ff89d 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/interop.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/interop.ets @@ -129,7 +129,7 @@ export function compatibleStaticComponent(node)); - return peerNode.getPeerPtr() as number; + return peerNode.getPeerPtr().toDouble(); } function openInterop(): void { @@ -472,7 +472,7 @@ export function transferCompatibleBuilder( return 0; } uiContext.getDetachedRootEntryManager().detachedRoots_.set(peerNode.peer.ptr, new DetachedRootEntryImpl(node)); - return peerNode.getPeerPtr() as number; + return peerNode.getPeerPtr().toDouble(); } const createDynamicBuilder = ESValue.getGlobal().getProperty('createDynamicBuilder'); const dynamicBuilder = createDynamicBuilder.invoke(ESValue.wrap(staticBuilderFunc)); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/resources.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/resources.ets index 891581d3758..592a08b4a2d 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/resources.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/resources.ets @@ -1,128 +1,128 @@ -import { Resource } from "global.resource"; -import { int32 } from "@koalaui/common"; -import { ArkUIGeneratedNativeModule } from "#components"; -import { InteropNativeModule } from "@koalaui/interop"; -import { SystemOps } from "#generated"; - -enum ResourceType { - COLOR = 10001, - FLOAT, - STRING, - PLURAL, - BOOLEAN, - INTARRAY, - INTEGER, - PATTERN, - STRARRAY, - MEDIA = 20000, - RAWFILE = 30000, - SYMBOL = 40000 -} - -const re = new RegExp("^\\[\\S+?]"); - -export class ArkResource implements Resource { - bundleName: string = ""; - moduleName: string = ""; - params?: Array | undefined; - type?: int32 | undefined; - _id: long = -1; - - castParams(params: Array): Array { - let result: Array = new Array(); - for (let param of params) { - result.push(param); - } - return result; - } - - constructor(resourceName: string | null, bundleName: string, moduleName: string, ...params: Array) { - this.bundleName = bundleName; - this.moduleName = moduleName; - if (resourceName !== null) { - let param1 = new Array(); - param1.push(resourceName); - this.params = param1.concat(this.castParams(params)); - } else { - this.params = this.castParams(params); - } - this._id = -1; - if (this.params!.length > 0) { - const name: string = this.params![0] as string; - this.type = this.parseResourceType(name); - } else { - InteropNativeModule._NativeLog("UI-Plugin do not send resourceName when id is -1"); - } - } - constructor(id: long, type: int32, bundleName: string, moduleName: string, ...params: Array) { - this._id = id; - this.type = type; - this.params = this.castParams(params); - this.bundleName = bundleName; - this.moduleName = moduleName; - } - constructor(id: long, type: int32 | undefined, bundleName: string, moduleName: string) { - this._id = id; - this.type = type; - this.bundleName = bundleName; - this.moduleName = moduleName; - } - set id(value: long) { - this._id = value; - } - get id(): long { - if (this._id == -1) { - this._id = SystemOps.getResourceId(this.bundleName, this.moduleName, [this.params![0] as string]); - if (this.id > -1 && this.params!.length > 0) { - this.params!.shift(); - } - } - return this._id; - } - parseResourceType(resourceName: string): ResourceType { - const typeName: string = resourceName.split(".")[1]; - switch (typeName) { - case 'color': - return ResourceType.COLOR; - case 'float': - return ResourceType.FLOAT; - case 'string': - return ResourceType.STRING; - case 'plural': - return ResourceType.PLURAL; - case 'boolean': - return ResourceType.BOOLEAN; - case 'intarray': - return ResourceType.INTARRAY - case 'integer': - return ResourceType.INTEGER; - case 'pattern': - return ResourceType.PATTERN; - case 'strarray': - return ResourceType.STRARRAY - case 'media': - return ResourceType.MEDIA; - case 'RAWFILE': - return ResourceType.RAWFILE; - case 'symbol': - return ResourceType.SYMBOL; - } - return ResourceType.STRING; - } -} -export function _r(bundleName: string, moduleName: string, name: string, ...params: Array): Resource { - return new ArkResource(name, bundleName, moduleName, ...params) -} -export function _rawfile(bundleName: string, moduleName: string, name: string): Resource { - return new ArkResource(0, 30000, bundleName, moduleName, name); -} -export function _r(id: number, type: number, bundleName: string, moduleName: string, ...params: Array): Resource { - if (id === -1) { - return new ArkResource(null, bundleName, moduleName, ...params); - } - return new ArkResource(id as long, type as int32, bundleName, moduleName, ...params); -} -export function _rawfile(id: number, type: number, bundleName: string, moduleName: string, ...params: Array): Resource { - const name: string = params[0] as string; - return _rawfile(bundleName, moduleName, name); -} +import { Resource } from "global.resource"; +import { int32 } from "@koalaui/common"; +import { ArkUIGeneratedNativeModule } from "#components"; +import { InteropNativeModule } from "@koalaui/interop"; +import { SystemOps } from "#generated"; + +enum ResourceType { + COLOR = 10001, + FLOAT, + STRING, + PLURAL, + BOOLEAN, + INTARRAY, + INTEGER, + PATTERN, + STRARRAY, + MEDIA = 20000, + RAWFILE = 30000, + SYMBOL = 40000 +} + +const re = new RegExp("^\\[\\S+?]"); + +export class ArkResource implements Resource { + bundleName: string = ""; + moduleName: string = ""; + params?: Array | undefined; + type?: int32 | undefined; + _id: long = -1; + + castParams(params: Array): Array { + let result: Array = new Array(); + for (let param of params) { + result.push(param); + } + return result; + } + + constructor(resourceName: string | null, bundleName: string, moduleName: string, ...params: Array) { + this.bundleName = bundleName; + this.moduleName = moduleName; + if (resourceName !== null) { + let param1 = new Array(); + param1.push(resourceName); + this.params = param1.concat(this.castParams(params)); + } else { + this.params = this.castParams(params); + } + this._id = -1; + if (this.params!.length > 0) { + const name: string = this.params![0] as string; + this.type = this.parseResourceType(name); + } else { + InteropNativeModule._NativeLog("UI-Plugin do not send resourceName when id is -1"); + } + } + constructor(id: long, type: int32, bundleName: string, moduleName: string, ...params: Array) { + this._id = id; + this.type = type; + this.params = this.castParams(params); + this.bundleName = bundleName; + this.moduleName = moduleName; + } + constructor(id: long, type: int32 | undefined, bundleName: string, moduleName: string) { + this._id = id; + this.type = type; + this.bundleName = bundleName; + this.moduleName = moduleName; + } + set id(value: long) { + this._id = value; + } + get id(): long { + if (this._id == -1) { + this._id = SystemOps.getResourceId(this.bundleName, this.moduleName, [this.params![0] as string]); + if (this.id > -1 && this.params!.length > 0) { + this.params!.shift(); + } + } + return this._id; + } + parseResourceType(resourceName: string): ResourceType { + const typeName: string = resourceName.split(".")[1]; + switch (typeName) { + case 'color': + return ResourceType.COLOR; + case 'float': + return ResourceType.FLOAT; + case 'string': + return ResourceType.STRING; + case 'plural': + return ResourceType.PLURAL; + case 'boolean': + return ResourceType.BOOLEAN; + case 'intarray': + return ResourceType.INTARRAY + case 'integer': + return ResourceType.INTEGER; + case 'pattern': + return ResourceType.PATTERN; + case 'strarray': + return ResourceType.STRARRAY + case 'media': + return ResourceType.MEDIA; + case 'RAWFILE': + return ResourceType.RAWFILE; + case 'symbol': + return ResourceType.SYMBOL; + } + return ResourceType.STRING; + } +} +export function _r(bundleName: string, moduleName: string, name: string, ...params: Array): Resource { + return new ArkResource(name, bundleName, moduleName, ...params) +} +export function _rawfile(bundleName: string, moduleName: string, name: string): Resource { + return new ArkResource(0, 30000, bundleName, moduleName, name); +} +export function _r(id: number, type: number, bundleName: string, moduleName: string, ...params: Array): Resource { + if (id === -1) { + return new ArkResource(null, bundleName, moduleName, ...params); + } + return new ArkResource(id.toLong(), type.toInt(), bundleName, moduleName, ...params); +} +export function _rawfile(id: number, type: number, bundleName: string, moduleName: string, ...params: Array): Resource { + const name: string = params[0] as string; + return _rawfile(bundleName, moduleName, name); +} diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/LengthMetricsTransfer.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/LengthMetricsTransfer.ets index cfd3faaeeb8..47228005e5b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/LengthMetricsTransfer.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/LengthMetricsTransfer.ets @@ -23,7 +23,7 @@ export class LengthMetricsTransfer { } const value = ESValue.wrap(input).getProperty('value').toNumber(); const unit = ESValue.wrap(input).getProperty('unit').toNumber(); - let unitInt32 = unit as int32; + let unitInt32 = unit.toInt(); let lengthUnit: LengthUnit = LengthUnit.VP; if (unitInt32 >= LengthUnit.PX || unitInt32 <= LengthUnit.LPX) { lengthUnit = unitInt32 as LengthUnit; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ResourceTransfer.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ResourceTransfer.ets index f83a876fa06..c9379e4d6bb 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ResourceTransfer.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ResourceTransfer.ets @@ -43,10 +43,10 @@ export class ResourceTransfer { let type: int32 | undefined = undefined; let id: long = -1; if (ESValue.wrap(input).hasProperty('type')) { - type = ESValue.wrap(input).getProperty('type').toNumber() as int32; + type = ESValue.wrap(input).getProperty('type').toNumber().toInt(); } if (ESValue.wrap(input).hasProperty('id')) { - id = ESValue.wrap(input).getProperty('id').toNumber() as long; + id = ESValue.wrap(input).getProperty('id').toNumber().toLong(); } let resource = new ArkResource(id, type, bundleName, moduleName); resource.params = paramsArray; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/UIContextTransfer.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/UIContextTransfer.ets index 26736d5f99a..9a22953e48b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/UIContextTransfer.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/UIContextTransfer.ets @@ -20,7 +20,7 @@ export class UIContextTransfer { static transferStatic(input: Any): Object { const instanceId = ESValue.wrap(input).getProperty('instanceId_').toNumber(); - let uiContext = new UIContextImpl(instanceId as int32); + let uiContext = new UIContextImpl(instanceId.toInt()); return uiContext; } static transferDynamic(input: Object): Any { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/stateManagement/base/observeWrappedArray.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/stateManagement/base/observeWrappedArray.ts index eb4ee187f36..025294999ce 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/stateManagement/base/observeWrappedArray.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/stateManagement/base/observeWrappedArray.ts @@ -119,7 +119,7 @@ export class WrappedArray extends Array implements IObservedObject, Observ * @param initialValue initial value of elements. */ public static create(arrayLength: number, initialValue: T): WrappedArray { - let other = new Array(arrayLength as int); + let other = new Array(arrayLength.toInt()); other.fill(initialValue); return new WrappedArray(other); } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/incremental/common/src/sha1.ts b/frameworks/bridge/arkts_frontend/koala_projects/incremental/common/src/sha1.ts index dceacb86dac..b54663abca0 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/incremental/common/src/sha1.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/incremental/common/src/sha1.ts @@ -206,16 +206,16 @@ export class SHA1Hash { offset = ((offset ?? 0) | 0) as int32 while (i < inputWords) { - W[i++] = swap32(data[offset!++] as int32) + W[i++] = swap32(data[offset!++].toInt()) } for (i = inputWords; i < workWords; i++) { - W[i] = rotate1((W[i - 3] as int32) ^ (W[i - 8] as int32) ^ (W[i - 14] as int32) ^ (W[i - 16] as int32)) + W[i] = rotate1((W[i - 3].toInt()) ^ (W[i - 8].toInt()) ^ (W[i - 14].toInt()) ^ (W[i - 16].toInt())) } for (i = 0; i < workWords; i++) { const S = (i / 20) | 0 - const T = ((rotate5(A) + ft(S, B, C, D) + E + W[i] + K[S]) as int32) | 0 + const T = ((rotate5(A) + ft(S, B, C, D) + E + W[i] + K[S]).toInt()) | 0 E = D D = C C = rotate30(B) @@ -260,7 +260,7 @@ export class SHA1Hash { // input size const bits64: int32 = this._size * 8 const low32: int32 = ((bits64 & 0xffffffff) as int32 >>> 0) as int32 - const high32: int32 = ((bits64 - low32) as int32 / 0x100000000) as int32 + const high32: int32 = ((bits64 - low32) as int32 / 0x100000000).toInt() if (high32) _word[highIndex] = swap32(high32) as int32 if (low32) _word[lowIndex] = swap32(low32) as int32 diff --git a/frameworks/bridge/arkts_frontend/koala_projects/incremental/common/src/uniqueId.ts b/frameworks/bridge/arkts_frontend/koala_projects/incremental/common/src/uniqueId.ts index a0e324dbe3d..f33e80f3339 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/incremental/common/src/uniqueId.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/incremental/common/src/uniqueId.ts @@ -53,7 +53,7 @@ export class UniqueId { if (data instanceof Uint32Array) { return this.addU32Array(data) } - return this.addI32(data as int32) + return this.addI32(data.toInt()) } public compute(): string { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/Easing.ts b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/Easing.ts index 12cee45fc2f..fd67a7423ae 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/Easing.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/Easing.ts @@ -99,7 +99,7 @@ export class Easing { if (value < 1) { value *= easing.length const index = Math.floor(value) - if (index < easing.length) return easing[index as uint32](value - index) + if (index < easing.length) return easing[index.toInt()](value - index) } return easing[easing.length - 1](1) } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/EasingSupport.ts b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/EasingSupport.ts index 26921809755..d7a71dc7fe3 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/EasingSupport.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/EasingSupport.ts @@ -29,7 +29,7 @@ export class EasingSupport { this.x[last] = xSupplier(1) this.y[last] = ySupplier(1) for (let i = 1; i < last; i++) { - const value = (i as float64) / last + const value = (i.toDouble()) / last this.x[i] = xSupplier(value) this.y[i] = ySupplier(value) } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/TimeAnimation.ts b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/TimeAnimation.ts index d916fdd1952..b187c26b0b9 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/TimeAnimation.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/animation/TimeAnimation.ts @@ -322,7 +322,7 @@ class PeriodicAnimationImpl implements TimeAnimation { let result = this.state let passedTime = currentTime - startTime if (passedTime > this.period) { - result += float64ToLong(Math.floor(passedTime / this.period)) + result += Math.floor(passedTime / this.period).toLong() passedTime = passedTime % this.period // tune start time for long animations this.startTime = currentTime - passedTime @@ -514,7 +514,7 @@ class AnimationImpl implements TimeAnimation { if (this.lastState < 0) { // tune start time on direction change this.running = true - this.startTime = time + (this.lastState * this.duration) as int64 + this.startTime = time + (this.lastState * this.duration).toLong() } } else { @@ -526,7 +526,7 @@ class AnimationImpl implements TimeAnimation { : this.lastState > 0 ? this.lastState * this.duration : (0 - this.delay) // add delay for the state 0 only - ) as int64 + ).toLong() } } @@ -539,7 +539,7 @@ class AnimationImpl implements TimeAnimation { if (this.lastState > 0) { // tune start time on direction change this.running = true - this.startTime = time - (this.duration * (2 - this.lastState)) as int64 + this.startTime = time - (this.duration * (2 - this.lastState)).toLong() } } else { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/common/RuntimeProfiler.ts b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/common/RuntimeProfiler.ts index f44142e0f59..438dacda135 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/common/RuntimeProfiler.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/common/RuntimeProfiler.ts @@ -149,7 +149,7 @@ export class RuntimeProfiler { if (ms - this.lastTime <= 1000) { this.frames++ } else { - this.lastFPS = Math.round(this.frames * 1000 / (ms - this.lastTime)) as int32 + this.lastFPS = Math.round(this.frames * 1000 / (ms - this.lastTime)).toInt() this.frames = 1 this.lastTime = ms } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/states/State.ts b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/states/State.ts index 7ea2ed110ef..cc17bfe2f61 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/states/State.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/states/State.ts @@ -617,8 +617,7 @@ export class StateManagerImpl implements StateManager { let modified: uint32 = 0 // try to update snapshot for every state, except for parameter states const changes = this.journal.getChanges() - // Improve: use compat here (toInt cast) - const created = float64ToInt(this.statesCreated.size) // amount of created states to update + const created = this.statesCreated.size.toInt() // amount of created states to update if (created > 0) { const it = this.statesCreated.keys() while (true) { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/tree/TreeNode.ts b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/tree/TreeNode.ts index 16bc265bebf..6ea44723aa5 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/tree/TreeNode.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/incremental/runtime/src/tree/TreeNode.ts @@ -77,7 +77,7 @@ export class TreeNode implements Disposable, ReadonlyTreeNode { * Returns the number of children of this node. */ get childrenCount(): uint32 { - return float64ToInt(this.myChildren.length) + return this.myChildren.length.toInt() } /** @@ -223,8 +223,10 @@ export class TreeNode implements Disposable, ReadonlyTreeNode { * Removes a child node if possible. */ removeChild(node: TreeNode): boolean { - if (node.myParent !== this) return false // not in hierarchy - const index: int32 = this.myIndicesValid ? node.index : float64ToInt(this.myChildren.indexOf(node)) + if (node.myParent !== this) { + return false // not in hierarchy + } + const index: int32 = this.myIndicesValid ? node.index : this.myChildren.indexOf(node).toInt() return undefined !== this.removeChildAt(index) } @@ -285,7 +287,7 @@ export class TreeNode implements Disposable, ReadonlyTreeNode { } collectParentsTo(array: Array): void { - const index = float64ToInt(array.length) + const index = array.length.toInt() let parent = this.myParent while (parent !== undefined) { array.splice(index, 0, parent!) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/interop/src/arkts/SerializerBase.ts b/frameworks/bridge/arkts_frontend/koala_projects/interop/src/arkts/SerializerBase.ts index 992546fcf97..4354f8c772b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/interop/src/arkts/SerializerBase.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/interop/src/arkts/SerializerBase.ts @@ -392,7 +392,7 @@ export class SerializerBase implements Disposable { this._position = newPos if (value == undefined) - unsafeMemory.writeInt8(pos, Tags.UNDEFINED); + unsafeMemory.writeInt8(pos, (Tags.UNDEFINED).valueOf().toByte()); else if (value == true) unsafeMemory.writeInt8(pos, VALUE_TRUE.toByte()); else if (value == false) -- Gitee