diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ArkUIEntry.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ArkUIEntry.ts index 88a836dfb8f300327a2657b8a54573c92c852134..d9c8a6549d81f7671beb80b5176d3a585fb7d658 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ArkUIEntry.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ArkUIEntry.ts @@ -272,7 +272,7 @@ export class Application { handleMessage(ptr: KPointer, type: int32, param : string) : boolean { let result : boolean = false - switch (type as MessageType) { + switch (MessageType.fromValue(type)) { case MessageType.DELETE_DETACHED_ROOT: { result = destroyUiDetachedRoot(ptr, this.instanceId); break @@ -439,7 +439,7 @@ export class Application { const node = PeerNode.findPeerByNativeId(target) if (node != undefined) { try { - switch (type as EventType) { + switch (EventType.fromValue(type)) { case EventType.Click: { EventEmulator.emitClickEvent(node.peer.ptr, makeClickEvent(10, 20)) break diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/Graphics.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/Graphics.ts index dd54f4141bcf304e3a72ef996d19089ee8da8080..a9c7e6f906a70a4f3959383bd96e9658924c4bd5 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/Graphics.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/Graphics.ts @@ -134,7 +134,7 @@ export class LengthMetrics implements MaterializedBase { let unit = returnResult.unit as int32; let lengthUnit: LengthUnit = LengthUnit.PX; if (unit >= LengthUnit.PX || unit <= LengthUnit.LPX) { - lengthUnit = unit as LengthUnit; + lengthUnit = LengthUnit.fromValue(unit); } return new LengthMetrics((returnResult.value as number), lengthUnit); } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/common.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/common.ts index fd8e439f012de034a6d8b2c593dd14340b8458ad..658e878c08297752e435dfcd3d187b668e3da4c7 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/common.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/common.ts @@ -12559,7 +12559,7 @@ export class MouseEventInternal extends BaseEventInternal implements Materialize const buffer_length: int32 = retvalDeserializer.readInt32() let buffer: Array = new Array(buffer_length) for (let buffer_i = 0; buffer_i < buffer_length; buffer_i++) { - buffer[buffer_i] = (retvalDeserializer.readInt32() as int32) as MouseButton + buffer[buffer_i] = MouseButton.fromValue(retvalDeserializer.readInt32() as int32) } returnResult = buffer; } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/CallbackDeserializeCall.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/CallbackDeserializeCall.ts index 2c1d761f10bc5ca24c39eac1fefa5e9206c09816..1881a8c66b6dfc627f9d17850c15d4a280a173dc 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/CallbackDeserializeCall.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/CallbackDeserializeCall.ts @@ -2004,8 +2004,8 @@ export function deserializeAndCallOnWillScrollCallback(thisDeserializer: Deseria const _resourceId : int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as OnWillScrollCallback) let scrollOffset : number = (thisDeserializer.readNumber() as number) - let scrollState : ScrollState = (thisDeserializer.readInt32() as ScrollState) - let scrollSource : ScrollSource = (thisDeserializer.readInt32() as ScrollSource) + let scrollState : ScrollState = ScrollState.fromValue(thisDeserializer.readInt32()) + let scrollSource : ScrollSource = ScrollSource.fromValue(thisDeserializer.readInt32()) let _continuation : ((value: ScrollResult) => void) = thisDeserializer.readCallback_ScrollResult_Void(true) const _callResult = _call(scrollOffset, scrollState, scrollSource) _continuation(_callResult) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/CallbacksChecker.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/CallbacksChecker.ts index 96233064729c0b2246f3da5a411a8c0c526cb6bd..719da47725fad98d56731ec96b26af2d11194407 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/CallbacksChecker.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/CallbacksChecker.ts @@ -38,7 +38,7 @@ export function checkArkoalaCallbacks() { let result = InteropNativeModule._CheckCallbackEvent(buffer.buffer, bufferSize) if (result == 0) break - const eventKind = deserializer.readInt32() as CallbackEventKind + const eventKind = CallbackEventKind.fromValue(deserializer.readInt32()) switch (eventKind) { case CallbackEventKind.Event_CallCallback: { deserializeAndCallCallback(deserializer) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Deserializer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Deserializer.ts index f4a9f879f4049acf0ce99a2d1e17602620106955..ca381841a43847144e885d1dc6a58b4da718d032 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Deserializer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Deserializer.ts @@ -8972,7 +8972,7 @@ export class Deserializer extends DeserializerBase { const unit_runtimeType = (valueDeserializer.readInt8() as int32) let unit_buf: LengthUnit | undefined if ((RuntimeType.UNDEFINED) != (unit_runtimeType)) { - unit_buf = (valueDeserializer.readInt32() as LengthUnit) + unit_buf = LengthUnit.fromValue(valueDeserializer.readInt32()) } const unit_result : LengthUnit | undefined = unit_buf diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/UIContextImpl.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/UIContextImpl.ts index abb7492b49f31a21b6033580160c9d0eb219e9aa..eed1d50f617313d6d12ba5d97d477027b02602fa 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/UIContextImpl.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/UIContextImpl.ts @@ -1547,13 +1547,13 @@ export class UIContextImpl extends UIContext { } private getWindowWidthBreakpoint_serialize(): WidthBreakpoint { const widthBreakpoint = ArkUIGeneratedNativeModule._UIContext_getWindowWidthBreakpoint(this.instanceId_); - let widthBreakpointEnum = widthBreakpoint as int32 as WidthBreakpoint; + let widthBreakpointEnum = WidthBreakpoint.fromValue(widthBreakpoint as int32); return widthBreakpointEnum; } private getWindowHeightBreakpoint_serialize(): HeightBreakpoint { const heightBreakpoint = ArkUIGeneratedNativeModule._UIContext_getWindowHeightBreakpoint(this.instanceId_); - let heightBreakpointEnum = heightBreakpoint as int32 as HeightBreakpoint; + let heightBreakpointEnum = HeightBreakpoint.fromValue(heightBreakpoint as int32); return heightBreakpointEnum; } private setFrameCallback_serialize(onFrameCallback: ((index: number) => void), diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/image.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/image.ts index 52672e28b7db5f4c05be478bc7ecf2c66adabf06..9f5905bfe2e1190bc63aa06c2cd03b12827120fc 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/image.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/image.ts @@ -124,7 +124,7 @@ function SetImageAIOptions(component: ArkImageComponent, imageAIOptions?: ImageA function hookSetImageOptions(component: ArkImageComponent, src: PixelMap | Resource | string | DrawableDescriptor | ImageContent | undefined, imageAIOptions?: ImageAIOptions): void { if (src instanceof DrawableDescriptor) { - let drawableType = checkDrawableType(src) as int + let drawableType: int = checkDrawableType(src) let value = src as DrawableDescriptor ArkUIAniModule._Image_Consturct_DrawableDescriptor(component.getPeer().getPeerPtr(), value, drawableType) SetImageAIOptions(component, imageAIOptions) @@ -150,7 +150,7 @@ function hookSetImageOptions(component: ArkImageComponent, src: PixelMap | Resou } else if (src instanceof ImageContent) { thisSerializer.writeInt8(3 as int32) - thisSerializer.writeInt32(src as int32) + thisSerializer.writeInt32(src) } ArkUIGeneratedNativeModule._ImageInterface_setImageOptions1(component.getPeer().getPeerPtr(), thisSerializer.asBuffer(), thisSerializer.length()) SetImageAIOptions(component, imageAIOptions) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/video.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/video.ts index a7e5280feff2bf89027e074545f63a64ef3dd666..f8b74860a214740e2655debe69bd773083de9c82 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/video.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/video.ts @@ -28,7 +28,7 @@ import { runtimeType, RuntimeType } from "@koalaui/interop" const PlayBackSpeedTable: number[] = [0.75, 1.0, 1.25, 1.75, 2.0]; function convertPlaybackSpeed(value: PlaybackSpeed): number { - const index = value as number; + const index: number = value; return PlayBackSpeedTable[index] } 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 7342ad5a2656d73954905ed97c869601da872456..cfd890ae0a127a5246e0ea0a80e6c15023613366 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 @@ -275,7 +275,7 @@ export class SerializerBase { current = current!.next } // console.log(`Unsupported custom serialization for ${kind}, write undefined`) - this.writeInt8(Tags.UNDEFINED as int32) + this.writeInt8(Tags.UNDEFINED) } writeFunction(value: Object) { this.writeInt32(registerCallback(value)) @@ -337,7 +337,7 @@ export class SerializerBase { final writeBoolean(value: boolean|undefined) { this.checkCapacity(1) if (value == undefined) { - SerializerBase.writeu8(this._buffer, this.position, this._length, RuntimeType.UNDEFINED as int32 as int8) + SerializerBase.writeu8(this._buffer, this.position, this._length, RuntimeType.UNDEFINED) } else { SerializerBase.writeu8(this._buffer, this.position, this._length, (value ? 1 : 0) as int8) }