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 0648d3a3bf62c296bc461837c0c189803e699ac3..c6f7494e2f933384a6922d0d70ca47071951eae6 100644 --- a/advanced_ui_component_static/composetitlebar/@ohos.arkui.advanced.ComposeTitleBar.ets +++ b/advanced_ui_component_static/composetitlebar/@ohos.arkui.advanced.ComposeTitleBar.ets @@ -114,7 +114,7 @@ export struct ComposeTitleBar { menuItems?: Array = [] as Array; @State titleMaxWidth: number = 0; @State fontSize: number = 1; - @Provide uniqueId?: number = -1; + @Provide uniqueId?: long = -1; build() { Flex({ diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.arkui.UIContext.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.arkui.UIContext.ts index a05cd451c5a8fef7876ecacc5838110d515cf28e..27ea287a4d488d9f0cfc2975cb52a226edabd424 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.arkui.UIContext.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.arkui.UIContext.ts @@ -468,7 +468,7 @@ export class UIContext { getFrameNodeByNodeId(id: number): FrameNode | null { throw Error("getFrameNodeByNodeId not implemented in UIContext!") } - getFrameNodeByUniqueId(id: number): FrameNode | null { + getFrameNodeByUniqueId(id: long): FrameNode | null { throw Error("getFrameNodeByUniqueId not implemented in UIContext!") } getNavigationInfoByUniqueId(id: number): uiObserver.NavigationInfo | undefined { @@ -542,7 +542,7 @@ export class UIContext { postFrameCallback(frameCallback: FrameCallback): void { throw Error("postFrameCallback not implemented in UIContext!") } - postDelayedFrameCallback(frameCallback: FrameCallback, delayTime: number): void { + postDelayedFrameCallback(frameCallback: FrameCallback, delayTime: long): void { throw Error("postDelayedFrameCallback not implemented in UIContext!") } public getUIInspector(): UIInspector { @@ -589,7 +589,7 @@ export class UIContext { throw Error("showTextPickerDialog not implemented in UIContext!") } // @ts-ignore - public freezeUINode(id: number, isFrozen: boolean): void { + public freezeUINode(id: long, isFrozen: boolean): void { throw Error("freezeUINode not implemented in UIContext!") } @@ -607,22 +607,22 @@ export class UIContext { public getWindowHeightBreakpoint(): HeightBreakpoint { throw Error("getWindowHeightBreakpoint not implemented in UIContext!") } - public vp2px(value: number): number { + public vp2px(value: double): double { throw Error("vp2px not implemented in UIContext!") } - public px2vp(value: number): number { + public px2vp(value: double): double { throw Error("px2vp not implemented in UIContext!") } - public fp2px(value: number): number { + public fp2px(value: double): double { throw Error("fp2px not implemented in UIContext!") } - public px2fp(value: number): number { + public px2fp(value: double): double { throw Error("px2fp not implemented in UIContext!") } - public lpx2px(value: number): number { + public lpx2px(value: double): double { throw Error("lpx2px not implemented in UIContext!") } - public px2lpx(value: number): number { + public px2lpx(value: double): double { throw Error("px2lpx not implemented in UIContext!") } @@ -658,8 +658,8 @@ export class UIContext { } } export abstract class FrameCallback { - onFrame(frameTimeInNano: number): void {} - onIdle(timeLeftInNano: number): void {} + onFrame(frameTimeInNano: long): void {} + onIdle(timeLeftInNano: long): void {} } export class UIObserver { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.arkui.dragController.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.arkui.dragController.ts index 7c283512daf197b83a67f04dc5f4e5b29e3acdaf..014f03f2b170cf5d5b241ab7c6ffcd3513f8ae0f 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.arkui.dragController.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.arkui.dragController.ts @@ -86,8 +86,8 @@ export namespace dragController { } else if (RuntimeType.NUMBER == color_type) { thisSerializer.writeInt8(1 as int32) - const color_1 = color as number - thisSerializer.writeNumber(color_1) + const color_1 = color as int32 + thisSerializer.writeInt32(color_1) } else if (RuntimeType.STRING == color_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/FrameNode.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/FrameNode.ts index c95fd17a0f5205e940f316e293476bb1e97c6f08..f9575b6e3dd3100a90bce698c52a915557788197 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/FrameNode.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/FrameNode.ts @@ -15,7 +15,7 @@ import { UIContext } from "@ohos/arkui/UIContext" import { UIContextImpl } from "arkui/handwritten/UIContextImpl" -import { Position, Edges, Size, LengthMetrics, SizeT } from "./Graphics" +import { NodePosition, NodeEdges, Size, LengthMetrics, SizeT } from "./Graphics" import { ArkUIGeneratedNativeModule } from "#components" import { Finalizable, toPeerPtr, KPointer, MaterializedBase, nullptr, KSerializerBuffer, KUint8ArrayPtr, pointer, NativeThunk @@ -352,7 +352,7 @@ export class FrameNode implements MaterializedBase { } return node; } - public getChild(index: number, expandMode?: ExpandMode | undefined): FrameNode | null { + public getChild(index: int32, expandMode?: ExpandMode | undefined): FrameNode | null { const index_casted = index as (number); let expand_casted: number = 1; if (expandMode !== undefined && expandMode !== null) { @@ -432,7 +432,7 @@ export class FrameNode implements MaterializedBase { } return null; } - public getChildrenCount(): number { + public getChildrenCount(): int32 { return this.getChildrenCount_serialize(); } public dispose(): void { @@ -447,44 +447,44 @@ export class FrameNode implements MaterializedBase { this.peer?.close(); } } - public getOpacity(): number { + public getOpacity(): double { return this.getOpacity_serialize(); } - public getPositionToWindowWithTransform(): Position { + public getPositionToWindowWithTransform(): NodePosition { return this.getPositionToWindowWithTransform_serialize(); } public static getFrameNodeByKey(name: string): FrameNode { const name_casted = name as (string); return FrameNode.getFrameNodeByKey_serialize(name_casted); } - public getPositionToParent(): Position { + public getPositionToParent(): NodePosition { return this.getPositionToParent_serialize() } - public getPositionToScreen(): Position { + public getPositionToScreen(): NodePosition { return this.getPositionToScreen_serialize() } - public getPositionToWindow(): Position { + public getPositionToWindow(): NodePosition { return this.getPositionToWindow_serialize() } - public getPositionToParentWithTransform(): Position { + public getPositionToParentWithTransform(): NodePosition { return this.getPositionToParentWithTransform_serialize() } - public getPositionToScreenWithTransform(): Position { + public getPositionToScreenWithTransform(): NodePosition { return this.getPositionToScreenWithTransform_serialize() } public getMeasuredSize(): Size { return this.getMeasuredSize_serialize() } - public getLayoutPosition(): Position { + public getLayoutPosition(): NodePosition { return this.getLayoutPosition_serialize() } - public getUserConfigBorderWidth(): Edges { + public getUserConfigBorderWidth(): NodeEdges { return this.getUserConfigBorderWidth_serialize() } - public getUserConfigPadding(): Edges { + public getUserConfigPadding(): NodeEdges { return this.getUserConfigPadding_serialize() } - public getUserConfigMargin(): Edges { + public getUserConfigMargin(): NodeEdges { return this.getUserConfigMargin_serialize() } public getUserConfigSize(): SizeT { @@ -493,8 +493,8 @@ export class FrameNode implements MaterializedBase { public getId(): string { return ArkUIGeneratedNativeModule._FrameNode_getId(this.peer!.ptr); } - public getUniqueId(): number { - return ArkUIGeneratedNativeModule._FrameNode_getUniqueId(this.peer!.ptr); + public getUniqueId(): long { + return ArkUIGeneratedNativeModule._FrameNode_getUniqueId(this.peer!.ptr) as number as long; } public isVisible(): boolean { return ArkUIGeneratedNativeModule._FrameNode_isVisible(this.peer!.ptr); @@ -522,10 +522,10 @@ export class FrameNode implements MaterializedBase { ArkUIAniModule._OnMeasure_InnerMeasure(this!.peer!.ptr); } public onLayoutInner(x: number, y: number): void { - const position: Position = { x: x, y: y }; + const position: NodePosition = { x: x, y: y }; this.onLayout(position); } - public onLayout(position: Position): void { + public onLayout(position: NodePosition): void { ArkUIAniModule._OnLayout_InnerLayout(this!.peer!.ptr); } public setMeasuredSize(size: Size): void { @@ -535,8 +535,8 @@ export class FrameNode implements MaterializedBase { this.setMeasuredSize_serialize(size_casted); return; } - public setLayoutPosition(position: Position): void { - const position_casted = position as (Position); + public setLayoutPosition(position: NodePosition): void { + const position_casted = position as (NodePosition); this.setLayoutPosition_serialize(position_casted); return; } @@ -548,8 +548,8 @@ export class FrameNode implements MaterializedBase { ArkUIAniModule._Common_Restore_InstanceId(); return; } - public layout(position: Position): void { - const position_casted = position as (Position); + public layout(position: NodePosition): void { + const position_casted = position as (NodePosition); const instanceId = this.instanceId_!.toInt(); ArkUIAniModule._Common_Sync_InstanceId(instanceId); this.layout_serialize(position_casted); @@ -562,7 +562,7 @@ export class FrameNode implements MaterializedBase { ArkUIGeneratedNativeModule._FrameNode_setMeasuredSize(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()); thisSerializer.release(); } - private setLayoutPosition_serialize(position: Position): void { + private setLayoutPosition_serialize(position: NodePosition): void { const thisSerializer: Serializer = Serializer.hold(); thisSerializer.writeGraphicsPosition(position); ArkUIGeneratedNativeModule._FrameNode_setLayoutPosition(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()); @@ -574,7 +574,7 @@ export class FrameNode implements MaterializedBase { ArkUIGeneratedNativeModule._FrameNode_measure(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()); thisSerializer.release(); } - private layout_serialize(position: Position): void { + private layout_serialize(position: NodePosition): void { const thisSerializer: Serializer = Serializer.hold(); thisSerializer.writeGraphicsPosition(position); ArkUIGeneratedNativeModule._FrameNode_layout(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()); @@ -692,7 +692,7 @@ export class FrameNode implements MaterializedBase { const retval = ArkUIGeneratedNativeModule._FrameNode_getOpacity(this.peer!.ptr); return retval; } - private getPositionToWindowWithTransform_serialize(): Position { + private getPositionToWindowWithTransform_serialize(): NodePosition { // @ts-ignore const retval = ArkUIGeneratedNativeModule._FrameNode_getPositionToWindowWithTransform(this.peer!.ptr) as FixedArray; // @ts-ignore @@ -702,7 +702,7 @@ export class FrameNode implements MaterializedBase { exactRetValue.push(new Byte(retval[i])); } let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length!.toInt()); - const returnResult: Position = retvalDeserializer.readGraphicsPosition(); + const returnResult: NodePosition = retvalDeserializer.readGraphicsPosition(); return returnResult; } private static getFrameNodeByKey_serialize(name: string): FrameNode { @@ -718,13 +718,13 @@ export class FrameNode implements MaterializedBase { const retval = ArkUIGeneratedNativeModule._FrameNode_getIdByFrameNode(this.peer!.ptr, toPeerPtr(node)); return retval; } - public moveTo(targetParent: FrameNode, index?: number): void { + public moveTo(targetParent: FrameNode, index?: int32): void { if (targetParent === undefined || targetParent === null) { return; } let index_casted: number = -1; if (index !== undefined && index !== null) { - index_casted = index; + index_casted = index as number; } const oldParent = this.getParent(); if (oldParent && !oldParent.isModifiable() || !targetParent.isModifiable() || !targetParent.checkValid(this)) { @@ -739,11 +739,11 @@ export class FrameNode implements MaterializedBase { ArkUIGeneratedNativeModule._FrameNode_moveTo(this.peer!.ptr, toPeerPtr(targetParent), index); } - public getFirstChildIndexWithoutExpand(): number { - return this.getFirstChildIndexWithoutExpand_serialize(); + public getFirstChildIndexWithoutExpand(): int32 { + return this.getFirstChildIndexWithoutExpand_serialize() as int32; } - public getLastChildIndexWithoutExpand(): number { - return this.getLastChildIndexWithoutExpand_serialize(); + public getLastChildIndexWithoutExpand(): int32 { + return this.getLastChildIndexWithoutExpand_serialize() as int32; } private getFirstChildIndexWithoutExpand_serialize(): number { @@ -781,46 +781,46 @@ export class FrameNode implements MaterializedBase { const obj: FrameNode = FrameNodeInternal.fromPtr(retval); return obj; } - private getPositionToParent_serialize(): Position { + private getPositionToParent_serialize(): NodePosition { const retval = ArkUIGeneratedNativeModule._FrameNode_getPositionToParent(this.peer!.ptr); const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32); - const returnResult: Position = retvalDeserializer.readGraphicsPosition(); + const returnResult: NodePosition = retvalDeserializer.readGraphicsPosition(); return returnResult; } - private getPositionToScreen_serialize(): Position { + private getPositionToScreen_serialize(): NodePosition { const retval = ArkUIGeneratedNativeModule._FrameNode_getPositionToScreen(this.peer!.ptr) const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32) - const returnResult: Position = retvalDeserializer.readGraphicsPosition() + const returnResult: NodePosition = retvalDeserializer.readGraphicsPosition() return returnResult } - private getPositionToWindow_serialize(): Position { + private getPositionToWindow_serialize(): NodePosition { const retval = ArkUIGeneratedNativeModule._FrameNode_getPositionToWindow(this.peer!.ptr) const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32); - const returnResult: Position = retvalDeserializer.readGraphicsPosition() + const returnResult: NodePosition = retvalDeserializer.readGraphicsPosition() return returnResult } - private getPositionToParentWithTransform_serialize(): Position { + private getPositionToParentWithTransform_serialize(): NodePosition { const retval = ArkUIGeneratedNativeModule._FrameNode_getPositionToParentWithTransform(this.peer!.ptr) const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32); - const returnResult: Position = retvalDeserializer.readGraphicsPosition() + const returnResult: NodePosition = retvalDeserializer.readGraphicsPosition() return returnResult } - private getPositionToScreenWithTransform_serialize(): Position { + private getPositionToScreenWithTransform_serialize(): NodePosition { const retval = ArkUIGeneratedNativeModule._FrameNode_getPositionToScreenWithTransform(this.peer!.ptr) const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32); - const returnResult: Position = retvalDeserializer.readGraphicsPosition() + const returnResult: NodePosition = retvalDeserializer.readGraphicsPosition() return returnResult } - private getPositionToWindowWithTransform1_serialize(): Position { + private getPositionToWindowWithTransform1_serialize(): NodePosition { const retval = ArkUIGeneratedNativeModule._FrameNode_getPositionToWindowWithTransform1(this.peer!.ptr) const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32); - const returnResult: Position = retvalDeserializer.readGraphicsPosition() + const returnResult: NodePosition = retvalDeserializer.readGraphicsPosition() return returnResult } private getMeasuredSize_serialize(): Size { @@ -830,32 +830,32 @@ export class FrameNode implements MaterializedBase { const returnResult: Size = retvalDeserializer.readSize() return returnResult } - private getLayoutPosition_serialize(): Position { + private getLayoutPosition_serialize(): NodePosition { const retval = ArkUIGeneratedNativeModule._FrameNode_getLayoutPosition(this.peer!.ptr) const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32); - const returnResult: Position = retvalDeserializer.readGraphicsPosition() + const returnResult: NodePosition = retvalDeserializer.readGraphicsPosition() return returnResult } - private getUserConfigBorderWidth_serialize(): Edges { + private getUserConfigBorderWidth_serialize(): NodeEdges { const retval = ArkUIGeneratedNativeModule._FrameNode_getUserConfigBorderWidth(this.peer!.ptr) const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32); - const returnResult: Edges = retvalDeserializer.readEdgesLengthMetrics() + const returnResult: NodeEdges = retvalDeserializer.readEdgesLengthMetrics() return returnResult } - private getUserConfigPadding_serialize(): Edges { + private getUserConfigPadding_serialize(): NodeEdges { const retval = ArkUIGeneratedNativeModule._FrameNode_getUserConfigPadding(this.peer!.ptr) const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32); - const returnResult: Edges = retvalDeserializer.readEdgesLengthMetrics() + const returnResult: NodeEdges = retvalDeserializer.readEdgesLengthMetrics() return returnResult } - private getUserConfigMargin_serialize(): Edges { + private getUserConfigMargin_serialize(): NodeEdges { const retval = ArkUIGeneratedNativeModule._FrameNode_getUserConfigMargin(this.peer!.ptr) const exactRetValue = GetExactRetValue(retval); let retvalDeserializer: Deserializer = new Deserializer(exactRetValue, exactRetValue.length as int32); - const returnResult: Edges = retvalDeserializer.readEdgesLengthMetrics() + const returnResult: NodeEdges = retvalDeserializer.readEdgesLengthMetrics() return returnResult } private getUserConfigSize_serialize(): SizeT { 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 02552206558fac836b9305688ddd876de266de75..a7e2be6d54427d754445cd0b1e5ac91980bc4039 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 @@ -30,8 +30,8 @@ import { drawing } from "@ohos/graphics/drawing" import { Deserializer } from './component/peers/Deserializer'; import { BusinessError } from '#external'; export interface Size { - width: number; - height: number; + width: double; + height: double; } export interface SizeT { width: T, @@ -46,15 +46,15 @@ export class SizeInternal implements Size { } } export interface Frame { - x: number; - y: number; - width: number; - height: number; + x: double; + y: double; + width: double; + height: double; } -export type Position = Vector2; +export type NodePosition = Vector2; export interface Vector2 { - x: number; - y: number; + x: double; + y: double; } export enum LengthMetricsUnit { DEFAULT = 0, @@ -88,7 +88,7 @@ export class LengthMetrics implements MaterializedBase { static getFinalizer(): KPointer { return ArkUIGeneratedNativeModule._LengthMetrics_getFinalizer() } - constructor(value: number, unit?: LengthUnit) { + constructor(value: double, unit?: LengthUnit) { const ctorPtr: KPointer = LengthMetrics.ctor_lengthmetrics() this.peer = new Finalizable(ctorPtr, LengthMetrics.getFinalizer()) this.value = value; @@ -102,19 +102,19 @@ export class LengthMetrics implements MaterializedBase { this.setValue(this.value); this.setUnit(this.unit); } - static px(value: number) { + static px(value: double) { return new LengthMetrics(value, LengthUnit.PX); } - static vp(value: number) { + static vp(value: double) { return new LengthMetrics(value, LengthUnit.VP); } - static fp(value: number) { + static fp(value: double) { return new LengthMetrics(value, LengthUnit.FP); } - static percent(value: number) { + static percent(value: double) { return new LengthMetrics(value, LengthUnit.PERCENT); } - static lpx(value: number) { + static lpx(value: double) { return new LengthMetrics(value, LengthUnit.LPX); } static resource(res: Resource) { @@ -192,29 +192,29 @@ export class ColorMetrics implements MaterializedBase { get color(): string { return `rgba(${this.red}, ${this.green}, ${this.blue}, ${this.alpha / MAX_CHANNEL_VALUE})`; } - get red(): number { + get red(): int32 { if (!this.red_) { this.red_ = this.getRed(); } - return this.red_!; + return this.red_! as int32; } - get green(): number { + get green(): int32 { if (!this.green_) { this.green_ = this.getGreen(); } - return this.green_!; + return this.green_! as int32; } - get blue(): number { + get blue(): int32 { if (!this.blue_) { this.blue_ = this.getBlue(); } - return this.blue_!; + return this.blue_! as int32; } - get alpha(): number { + get alpha(): int32 { if (!this.alpha_) { this.alpha_ = this.getAlpha(); } - return this.alpha_!; + return this.alpha_! as int32; } private static clamp(value: number): number { return Math.min(Math.max(value, 0), MAX_CHANNEL_VALUE); @@ -233,11 +233,11 @@ export class ColorMetrics implements MaterializedBase { static getFinalizer(): KPointer { return ArkUIGeneratedNativeModule._ColorMetrics_getFinalizer() } - public static numeric(value: number): ColorMetrics { + public static numeric(value: int32): ColorMetrics { const value_casted = value as (number) return ColorMetrics.numeric_serialize(value_casted) } - public static rgba(red: number, green: number, blue: number, alpha?: number): ColorMetrics { + public static rgba(red: int32, green: int32, blue: int32, alpha?: double): ColorMetrics { const red_casted = red as (number) const green_casted = green as (number) const blue_casted = blue as (number) @@ -263,14 +263,14 @@ export class ColorMetrics implements MaterializedBase { const r = ColorMetrics.clamp(Number.parseInt(rgbMatch[1]!, 10)); const g = ColorMetrics.clamp(Number.parseInt(rgbMatch[2]!, 10)); const b = ColorMetrics.clamp(Number.parseInt(rgbMatch[3]!, 10)); - return ColorMetrics.rgba(r, g, b); + return ColorMetrics.rgba(r as int32, g as int32, b as int32); } else if (rgbaMatch) { const r = ColorMetrics.clamp(Number.parseInt(rgbaMatch[1]!, 10)); const g = ColorMetrics.clamp(Number.parseInt(rgbaMatch[2]!, 10)); const b = ColorMetrics.clamp(Number.parseInt(rgbaMatch[3]!, 10)); const a = ColorMetrics.clamp(Number.parseFloat(rgbaMatch[4]!)); - return ColorMetrics.rgba(r, g, b, a); + return ColorMetrics.rgba(r as int32, g as int32, b as int32, a as double); } else { const error = new Error('Parameter error. The format of the input color string is not RGB or RGBA.'); @@ -302,7 +302,7 @@ export class ColorMetrics implements MaterializedBase { } return colorMetrics; } else if (typeof color === 'number') { - return ColorMetrics.numeric(color as number); + return ColorMetrics.numeric(color as int32); } else if (typeof color === 'string') { let colorValue = color as string; if (ColorMetrics.isHexFormat(colorValue)) { @@ -344,7 +344,7 @@ export class ColorMetrics implements MaterializedBase { b = parseInt(hexFormat.slice(7), 16); } - return ColorMetrics.rgba(r, g, b, a); + return ColorMetrics.rgba(r as int32, g as int32, b as int32, a as double); } public blendColor(overlayColor: ColorMetrics): ColorMetrics { const overlayColor_casted = overlayColor as (ColorMetrics) @@ -353,17 +353,17 @@ export class ColorMetrics implements MaterializedBase { private getColor(): string { return this.getColor_serialize() } - private getRed(): number { - return this.getRed_serialize() + private getRed(): int32 { + return this.getRed_serialize() as int32 } - private getGreen(): number { - return this.getGreen_serialize() + private getGreen(): int32 { + return this.getGreen_serialize() as int32 } - private getBlue(): number { - return this.getBlue_serialize() + private getBlue(): int32 { + return this.getBlue_serialize() as int32 } - private getAlpha(): number { - return this.getAlpha_serialize() + private getAlpha(): int32 { + return this.getAlpha_serialize() as int32 } private static numeric_serialize(value: number): ColorMetrics { const retval = ArkUIGeneratedNativeModule._ColorMetrics_numeric(value) @@ -395,8 +395,8 @@ export class ColorMetrics implements MaterializedBase { } else if (RuntimeType.NUMBER == color_type) { thisSerializer.writeInt8(1 as int32) - const color_1 = color as number - thisSerializer.writeNumber(color_1) + const color_1 = color as int32 + thisSerializer.writeInt32(color_1) } else if (RuntimeType.STRING == color_type) { thisSerializer.writeInt8(2 as int32) @@ -507,9 +507,9 @@ export class ShapeMask { this.circle = null; this.roundRect = null; } - public fillColor: number = 0XFF000000; - public strokeColor: number = 0XFF000000; - public strokeWidth: number = 0; + public fillColor: int32 = 0XFF000000; + public strokeColor: int32 = 0XFF000000; + public strokeWidth: int32 = 0; } export class ShapeClip { public rect: Rect | null = null; @@ -578,29 +578,29 @@ export interface Vector2T { } export type PositionT = Vector2T; export interface Vector3 { - x: number; - y: number; - z: number; + x: double; + y: double; + z: double; } export type Matrix4 = [ - number, - number, - number, - number, - number, - number, - number, - number, - number, - number, - number, - number, - number, - number, - number, - number + double, + double, + double, + double, + double, + double, + double, + double, + double, + double, + double, + double, + double, + double, + double, + double ] -export interface Edges { +export interface NodeEdges { top?: T; left?: T; bottom?: T; @@ -619,9 +619,9 @@ export interface RoundRect { corners: CornerRadius; } export interface Circle { - centerX: number; - centerY: number; - radius: number; + centerX: double; + centerY: double; + radius: double; } export interface CommandPath { commands: string; @@ -632,15 +632,15 @@ export type Scale = Vector2; export type Translation = Vector2; export type Rotation = Vector3; -export function edgeColors(all: number): Edges { +export function edgeColors(all: int32): NodeEdges { return { left: all, top: all, right: all, bottom: all }; } -export function edgeWidths(all: number): Edges { +export function edgeWidths(all: double): NodeEdges { return { left: all, top: all, right: all, bottom: all }; } -export function borderStyles(all: BorderStyle): Edges { +export function borderStyles(all: BorderStyle): NodeEdges { return { left: all, top: all, right: all, bottom: all }; } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/NodeController.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/NodeController.ts index c401c62062c05569ef4b5f159ccc69fbb00ff45f..12da07d45dcaf0ab9cb6401f1223a87a2adde7e4 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/NodeController.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/NodeController.ts @@ -46,8 +46,8 @@ export abstract class NodeController { onTouchEvent(event: TouchEvent) {} onAttach() { } onDetach() { } - onBind(containerId: number) { } - onUnbind(containerId: number) { } - onWillBind(containerId: number) { } - onWillUnbind(containerId: number) { } + onBind(containerId: long) { } + onUnbind(containerId: long) { } + onWillBind(containerId: long) { } + onWillUnbind(containerId: long) { } } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/RenderNode.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/RenderNode.ts index 52bc6005616c4ac5a6bb78ef343644acc8ff1620..533cff5312f98a738527d7d650984d55387a57c3 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/RenderNode.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/RenderNode.ts @@ -16,7 +16,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! -import { Position, Rect, Circle, RoundRect, CommandPath, Size, Frame, Vector2, Vector3, Matrix4, Edges, Corners, ShapeMask, ShapeClip, LengthMetricsUnit, DrawContext } from "./Graphics" +import { NodePosition, Rect, Circle, RoundRect, CommandPath, Size, Frame, Vector2, Vector3, Matrix4, NodeEdges, Corners, ShapeMask, ShapeClip, LengthMetricsUnit, DrawContext } from "./Graphics" import { BorderStyle } from "./component/enums" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, registerCallback, wrapCallback, toPeerPtr, KPointer, MaterializedBase, InteropNativeModule } from "@koalaui/interop" @@ -47,20 +47,20 @@ export class RenderNode implements MaterializedBase { private childrenList: RenderNode[] = [] private parentRenderNode: WeakRef | null = null private lengthMetricsUnitValue: LengthMetricsUnit = LengthMetricsUnit.DEFAULT - private borderStyleValue: Edges | null = null - private borderWidthValue: Edges = { left: 0, top: 0, right: 0, bottom: 0 } - private borderColorValue: Edges = { left: 0XFF000000, top: 0XFF000000, right: 0XFF000000, bottom: 0XFF000000 } + private borderStyleValue: NodeEdges | null = null + private borderWidthValue: NodeEdges = { left: 0, top: 0, right: 0, bottom: 0 } + private borderColorValue: NodeEdges = { left: 0XFF000000, top: 0XFF000000, right: 0XFF000000, bottom: 0XFF000000 } private borderRadiusValue: Corners = { topLeft: 0, topRight: 0, bottomLeft: 0, bottomRight: 0 } private shapeMaskValue: ShapeMask | null = null private shapeClipValue: ShapeClip | null = null - private backgroundColorValue: number = 0 + private backgroundColorValue: int32 = 0 private clipToFrameValue: boolean = true private frameValue: Frame = { x: 0, y: 0, width: 0, height: 0 } private opacityValue: number = 1.0 private pivotValue: Vector2 = { x: 0.5, y: 0.5 } private rotationValue: Vector3 = { x: 0, y: 0, z: 0 } private scaleValue: Vector2 = { x: 1.0, y: 1.0 } - private shadowColorValue: number = 0 + private shadowColorValue: int32 = 0 private shadowOffsetValue: Vector2 = { x: 0, y: 0 } private labelValue: string = "" private shadowAlphaValue: number = 0 @@ -79,11 +79,11 @@ export class RenderNode implements MaterializedBase { } return arg as T } - get backgroundColor(): number { + get backgroundColor(): int32 { return this.backgroundColorValue } - set backgroundColor(backgroundColor: number) { - this.backgroundColorValue = this.checkUndefinedOrNullWithDefaultValue(backgroundColor, 0) + set backgroundColor(backgroundColor: int32) { + this.backgroundColorValue = this.checkUndefinedOrNullWithDefaultValue(backgroundColor, 0) this.setBackgroundColor(this.backgroundColorValue) } get clipToFrame(): boolean { @@ -93,10 +93,10 @@ export class RenderNode implements MaterializedBase { this.clipToFrameValue = this.checkUndefinedOrNullWithDefaultValue(clipToFrame, true) this.setClipToFrame(this.clipToFrameValue) } - get opacity(): number { + get opacity(): double { return this.opacityValue } - set opacity(opacity: number) { + set opacity(opacity: double) { this.opacityValue = this.checkUndefinedOrNullWithDefaultValue(opacity, 1.0) this.setOpacity(this.opacityValue) } @@ -114,10 +114,10 @@ export class RenderNode implements MaterializedBase { const size_casted: Size = { width: this.frameValue.width, height: this.frameValue.height } this.setSize(size_casted) } - get position(): Position { + get position(): NodePosition { return { x: this.frameValue.x, y: this.frameValue.y } } - set position(position: Position) { + set position(position: NodePosition) { if (position === undefined || position === null) { this.frameValue.x = 0; this.frameValue.y = 0; @@ -125,7 +125,7 @@ export class RenderNode implements MaterializedBase { this.frameValue.x = this.checkUndefinedOrNullWithDefaultValue(position.x, 0) as number this.frameValue.y = this.checkUndefinedOrNullWithDefaultValue(position.y, 0) as number } - const position_casted: Position = { x: this.frameValue.x, y: this.frameValue.y } + const position_casted: NodePosition = { x: this.frameValue.x, y: this.frameValue.y } this.setPosition(position_casted) } get frame(): Frame { @@ -202,11 +202,11 @@ export class RenderNode implements MaterializedBase { } this.setTransform(this.transformValue); } - get shadowColor(): number { + get shadowColor(): int32 { return this.shadowColorValue } - set shadowColor(shadowColor: number) { - this.shadowColorValue = this.checkUndefinedOrNullWithDefaultValue(shadowColor, 0) + set shadowColor(shadowColor: int32) { + this.shadowColorValue = this.checkUndefinedOrNullWithDefaultValue(shadowColor, 0) this.setShadowColor(this.shadowColorValue) } get shadowOffset(): Vector2 { @@ -229,17 +229,17 @@ export class RenderNode implements MaterializedBase { this.labelValue = this.checkUndefinedOrNullWithDefaultValue(label, '') this.setLabel(this.labelValue) } - get shadowAlpha(): number { + get shadowAlpha(): double { return this.shadowAlphaValue } - set shadowAlpha(shadowAlpha: number) { + set shadowAlpha(shadowAlpha: double) { this.shadowAlphaValue = this.checkUndefinedOrNullWithDefaultValue(shadowAlpha, 0) this.setShadowAlpha(this.shadowAlphaValue) } - get shadowElevation(): number { + get shadowElevation(): double { return this.shadowElevationValue } - set shadowElevation(shadowElevation: number) { + set shadowElevation(shadowElevation: double) { this.shadowElevationValue = this.checkUndefinedOrNullWithDefaultValue(shadowElevation, 0) this.setShadowElevation(this.shadowElevationValue) } @@ -250,10 +250,10 @@ export class RenderNode implements MaterializedBase { this.shadowRadiusValue = this.checkUndefinedOrNullWithDefaultValue(shadowRadius, 0) this.setShadowRadius(this.shadowRadiusValue) } - get borderStyle(): Edges { + get borderStyle(): NodeEdges { return this.borderStyleValue! } - set borderStyle(borderStyle: Edges) { + set borderStyle(borderStyle: NodeEdges) { if (borderStyle === undefined || borderStyle === null) { this.borderStyleValue = null; } else { @@ -261,28 +261,28 @@ export class RenderNode implements MaterializedBase { } this.setBorderStyle(borderStyle!) } - get borderWidth(): Edges { + get borderWidth(): NodeEdges | undefined { return this.borderWidthValue } - set borderWidth(borderWidth: Edges) { + set borderWidth(borderWidth: NodeEdges) { if (borderWidth === undefined || borderWidth === null) { - this.borderWidthValue = { left: 0, top: 0, right: 0, bottom: 0 } as Edges + this.borderWidthValue = { left: 0, top: 0, right: 0, bottom: 0 } as NodeEdges } else { this.borderWidthValue = borderWidth; } - const borderWidth_casted = this.borderWidthValue as Edges + const borderWidth_casted = this.borderWidthValue as NodeEdges this.setBorderWidth(borderWidth_casted) } - get borderColor(): Edges { + get borderColor(): NodeEdges | undefined { return this.borderColorValue } - set borderColor(borderColor: Edges) { + set borderColor(borderColor: NodeEdges) { if (borderColor === undefined || borderColor === null) { this.borderColorValue = { left: 0XFF000000, top: 0XFF000000, right: 0XFF000000, bottom: 0XFF000000 }; } else { this.borderColorValue = borderColor; } - const borderColor_casted = this.borderColorValue as Edges + const borderColor_casted = this.borderColorValue as NodeEdges this.setBorderColor(borderColor_casted) } get borderRadius(): Corners { @@ -410,7 +410,7 @@ export class RenderNode implements MaterializedBase { this.clearChildren_serialize() return } - public getChild(index: number): RenderNode | null { + public getChild(index: int32): RenderNode | null { if (this.childrenList.length > index && index >= 0) { return this.childrenList[index as int32] } @@ -435,7 +435,7 @@ export class RenderNode implements MaterializedBase { if (index === -1) { return null } - return parent!.getChild(index + 1) + return parent!.getChild((index + 1) as int32) } public getPreviousSibling(): RenderNode | null { if (this.parentRenderNode === undefined || this.parentRenderNode === null) { @@ -450,7 +450,7 @@ export class RenderNode implements MaterializedBase { if (index === -1) { return null } - return parent!.getChild(index - 1) + return parent!.getChild((index - 1) as int32) } public draw(context: DrawContext): void { InteropNativeModule._NativeLog("RenderNode Draw") @@ -473,7 +473,7 @@ export class RenderNode implements MaterializedBase { private getBackgroundColor(): number { return this.getBackgroundColor_serialize() } - private setBackgroundColor(backgroundColor: number): void { + private setBackgroundColor(backgroundColor: int32): void { const backgroundColor_casted = backgroundColor as (number) this.setBackgroundColor_serialize(backgroundColor_casted) return @@ -502,11 +502,11 @@ export class RenderNode implements MaterializedBase { this.setSize_serialize(size_casted) return } - private getPosition(): Position { + private getPosition(): NodePosition { return { x: this.frameValue.x, y: this.frameValue.y } } - private setPosition(position: Position): void { - const position_casted = position as (Position) + private setPosition(position: NodePosition): void { + const position_casted = position as (NodePosition) this.setPosition_serialize(position_casted) return } @@ -558,9 +558,8 @@ export class RenderNode implements MaterializedBase { private getShadowColor(): number { return this.getShadowColor_serialize() } - private setShadowColor(shadowColor: number): void { - const shadowColor_casted = shadowColor as (number) - this.setShadowColor_serialize(shadowColor_casted) + private setShadowColor(shadowColor: int32): void { + this.setShadowColor_serialize(shadowColor) return } private getShadowOffset(): Vector2 { @@ -606,24 +605,24 @@ export class RenderNode implements MaterializedBase { // private getBorderStyle(): EdgeStyles { // return this.getBorderStyle_serialize() // } - private setBorderStyle(borderStyle: Edges): void { - const borderStyle_casted = borderStyle as (Edges) + private setBorderStyle(borderStyle: NodeEdges): void { + const borderStyle_casted = borderStyle as (NodeEdges) this.setBorderStyle_serialize(borderStyle_casted) return } - private getBorderWidth(): Edges { + private getBorderWidth(): NodeEdges { return this.getBorderWidth_serialize() } - private setBorderWidth(borderWidth: Edges): void { - const borderWidth_casted = borderWidth as (Edges) + private setBorderWidth(borderWidth: NodeEdges): void { + const borderWidth_casted = borderWidth as (NodeEdges) this.setBorderWidth_serialize(borderWidth_casted) return } - private getBorderColor(): Edges { + private getBorderColor(): NodeEdges { return this.getBorderColor_serialize() } - private setBorderColor(borderColor: Edges): void { - const borderColor_casted = borderColor as (Edges) + private setBorderColor(borderColor: NodeEdges): void { + const borderColor_casted = borderColor as (NodeEdges) this.setBorderColor_serialize(borderColor_casted) return } @@ -801,7 +800,7 @@ export class RenderNode implements MaterializedBase { ArkUIGeneratedNativeModule._RenderNode_setSize(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()) thisSerializer.release() } - private setPosition_serialize(position: Position): void { + private setPosition_serialize(position: NodePosition): void { const thisSerializer : Serializer = Serializer.hold() thisSerializer.writeGraphicsPosition(position) thisSerializer.writeInt32(this.lengthMetricsUnitValue) @@ -983,32 +982,32 @@ export class RenderNode implements MaterializedBase { // const returnResult : EdgeStyles = retvalDeserializer.readEdgeStyles() // return returnResult // } - private setBorderStyle_serialize(borderStyle: Edges): void { + private setBorderStyle_serialize(borderStyle: NodeEdges): void { const thisSerializer : Serializer = Serializer.hold() thisSerializer.writeGraphicsEdgeStyles(borderStyle) ArkUIGeneratedNativeModule._RenderNode_setBorderStyle(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()) thisSerializer.release() } - private getBorderWidth_serialize(): Edges { + private getBorderWidth_serialize(): NodeEdges { const retval = ArkUIGeneratedNativeModule._RenderNode_getBorderWidth(this.peer!.ptr) let retvalDeserializer : Deserializer = new Deserializer(retval, retval.length as int32) - const returnResult : Edges = retvalDeserializer.readEdgesNumber() + const returnResult : NodeEdges = retvalDeserializer.readEdgesNumber() return returnResult } - private setBorderWidth_serialize(borderWidth: Edges): void { + private setBorderWidth_serialize(borderWidth: NodeEdges): void { const thisSerializer : Serializer = Serializer.hold() thisSerializer.writeEdgesNumber(borderWidth) thisSerializer.writeInt32(this.lengthMetricsUnitValue) ArkUIGeneratedNativeModule._RenderNode_setBorderWidth(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()) thisSerializer.release() } - private getBorderColor_serialize(): Edges { + private getBorderColor_serialize(): NodeEdges { const retval = ArkUIGeneratedNativeModule._RenderNode_getBorderColor(this.peer!.ptr) let retvalDeserializer : Deserializer = new Deserializer(retval, retval.length as int32) - const returnResult : Edges = retvalDeserializer.readEdgesNumber() + const returnResult : NodeEdges = retvalDeserializer.readEdgesNumber() return returnResult } - private setBorderColor_serialize(borderColor: Edges): void { + private setBorderColor_serialize(borderColor: NodeEdges): void { const thisSerializer : Serializer = Serializer.hold() thisSerializer.writeEdgesNumber(borderColor) ArkUIGeneratedNativeModule._RenderNode_setBorderColor(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/GlobalScope.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/GlobalScope.ts index 092e123ce33efe27ca5514d283b8c245ec8ff50e..f4b471e21b8030d36f081f4ed11c06272e0346d1 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/GlobalScope.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/GlobalScope.ts @@ -18,7 +18,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ComponentInfo, Offset_componentutils, TranslateResult, ScaleResult, RotateResult, Matrix4Result } from "./arkui-componentutils" -import { Size, Edges } from "./../Graphics" +import { Size, NodeEdges } from "./../Graphics" import { Dimension, BorderRadiuses, Length } from "./units" import { WrappedBuilder, Callback_WrappedBuilder_Args_Void, CommonConfiguration } from "./arkui-wrapper-builder" import { Context, BaseContext, Context_getGroupDir_Callback, ContextInternal } from "./arkui-custom" @@ -44,24 +44,24 @@ export class GlobalScope { const returnResult : ComponentInfo = retvalDeserializer.readComponentInfo() return returnResult } - public static edgeColors(all: number): Edges { + public static edgeColors(all: number): NodeEdges { const all_casted = all as (number) return GlobalScope.edgeColors_serialize(all_casted) } - static edgeColors_serialize(all: number): Edges { + static edgeColors_serialize(all: number): NodeEdges { const retval = ArkUIGeneratedNativeModule._GlobalScope_edgeColors(all) let retvalDeserializer : Deserializer = new Deserializer(retval, retval.length as int32) - const returnResult : Edges = retvalDeserializer.readEdgesNumber() + const returnResult : NodeEdges = retvalDeserializer.readEdgesNumber() return returnResult } - public static edgeWidths(all: number): Edges { + public static edgeWidths(all: number): NodeEdges { const all_casted = all as (number) return GlobalScope.edgeWidths_serialize(all_casted) } - static edgeWidths_serialize(all: number): Edges { + static edgeWidths_serialize(all: number): NodeEdges { const retval = ArkUIGeneratedNativeModule._GlobalScope_edgeWidths(all) let retvalDeserializer : Deserializer = new Deserializer(retval, retval.length as int32) - const returnResult : Edges = retvalDeserializer.readEdgesNumber() + const returnResult : NodeEdges = retvalDeserializer.readEdgesNumber() return returnResult } public static borderRadiuses(all: number): BorderRadiuses { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/alphabetIndexer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/alphabetIndexer.ts index fe8dfad3e81d91219ff4d98dd476eb06904ec6e8..983fc45cdb3db49821b7cea2dd93e5c5407bcc91 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/alphabetIndexer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/alphabetIndexer.ts @@ -80,8 +80,8 @@ export class ArkAlphabetIndexerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -113,8 +113,8 @@ export class ArkAlphabetIndexerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -146,8 +146,8 @@ export class ArkAlphabetIndexerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -179,8 +179,8 @@ export class ArkAlphabetIndexerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -212,8 +212,8 @@ export class ArkAlphabetIndexerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -245,8 +245,8 @@ export class ArkAlphabetIndexerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -278,8 +278,8 @@ export class ArkAlphabetIndexerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -311,8 +311,8 @@ export class ArkAlphabetIndexerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -535,8 +535,8 @@ export class ArkAlphabetIndexerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkui-external.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkui-external.ts index 7c4ed8b88f504c082de8401bc57c2b26935ba218..136dfaff19fa08d2eac592a2145e7cf1b6e26efd 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkui-external.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/arkui-external.ts @@ -216,8 +216,8 @@ export class CommonShape implements MaterializedBase { } else if (RuntimeType.NUMBER == color_type) { thisSerializer.writeInt8(1 as int32) - const color_1 = color as number - thisSerializer.writeNumber(color_1) + const color_1 = color as int32 + thisSerializer.writeInt32(color_1) } else if (RuntimeType.STRING == color_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/blank.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/blank.ts index cc568ea2303156b100ac3ccd9efe624eb94bf0e6..f0d2994b6a2f023f0d1f6e19750bc423c1f3c908 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/blank.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/blank.ts @@ -84,8 +84,8 @@ export class ArkBlankPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/button.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/button.ts index 76c6771905b8cc7bd2ea5d7dd8bc80c0e6c006c1..9612c7756ef9c802675a9caabedec475c29db976 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/button.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/button.ts @@ -150,8 +150,8 @@ export class ArkButtonPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/checkbox.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/checkbox.ts index 8126eefe3bb8493b13dca8322edda5c0a41c9c5e..392deb311080e8150e5da62e020b47395ba67cbb 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/checkbox.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/checkbox.ts @@ -97,8 +97,8 @@ export class ArkCheckboxPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -130,8 +130,8 @@ export class ArkCheckboxPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -187,8 +187,8 @@ export class ArkCheckboxPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -220,8 +220,8 @@ export class ArkCheckboxPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/checkboxgroup.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/checkboxgroup.ts index 676e37c6de7065f6d328208b38384113d14c6f3e..6bc72f63147fefeb48a4d934187fd02afc1d1a3b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/checkboxgroup.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/checkboxgroup.ts @@ -97,8 +97,8 @@ export class ArkCheckboxGroupPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -130,8 +130,8 @@ export class ArkCheckboxGroupPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -163,8 +163,8 @@ export class ArkCheckboxGroupPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -196,8 +196,8 @@ export class ArkCheckboxGroupPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) 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 1f879effd24c7fb0e7bb5768083f231d4da79ada..5a4ad661f845010817681973d1b67319cbb13e02 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 @@ -1275,8 +1275,8 @@ export class ProgressMask implements MaterializedBase { } else if (RuntimeType.NUMBER == color_type) { thisSerializer.writeInt8(1 as int32) - const color_1 = color as number - thisSerializer.writeNumber(color_1) + const color_1 = color as int32 + thisSerializer.writeInt32(color_1) } else if (RuntimeType.STRING == color_type) { thisSerializer.writeInt8(2 as int32) @@ -1330,8 +1330,8 @@ export class ProgressMask implements MaterializedBase { } else if (RuntimeType.NUMBER == value_type) { thisSerializer.writeInt8(1 as int32) - const value_1 = value as number - thisSerializer.writeNumber(value_1) + const value_1 = value as int32 + thisSerializer.writeInt32(value_1) } else if (RuntimeType.STRING == value_type) { thisSerializer.writeInt8(2 as int32) @@ -2286,8 +2286,8 @@ export class ArkCommonMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -2319,8 +2319,8 @@ export class ArkCommonMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -2628,8 +2628,8 @@ export class ArkCommonMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) @@ -2833,8 +2833,8 @@ export class ArkCommonMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) @@ -2882,8 +2882,8 @@ export class ArkCommonMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) @@ -2977,8 +2977,8 @@ export class ArkCommonMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) @@ -6209,8 +6209,8 @@ export class ArkCommonShapeMethodPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -6242,8 +6242,8 @@ export class ArkCommonShapeMethodPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/dataPanel.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/dataPanel.ts index 08fb4683f42408277efc478d1ea35640532274ff..c0d451526172fac6a56bd1c2f24e8ab2496225c2 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/dataPanel.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/dataPanel.ts @@ -124,8 +124,8 @@ export class ArkDataPanelPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_element_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_element_0_1 = value_value_element_0 as number - thisSerializer.writeNumber(value_value_element_0_1) + const value_value_element_0_1 = value_value_element_0 as int32 + thisSerializer.writeInt32(value_value_element_0_1) } else if (RuntimeType.STRING == value_value_element_0_type) { thisSerializer.writeInt8(2 as int32) @@ -159,8 +159,8 @@ export class ArkDataPanelPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/divider.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/divider.ts index a210f8aa5547e57ef38c29af1c4ea70bedd61b21..aaf99d7dbedd861937a8844598c32d5dac08f900 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/divider.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/divider.ts @@ -76,8 +76,8 @@ export class ArkDividerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/edgeColors.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/edgeColors.ts index f000e8bc2820ba2846b89e013edc64378392f0a4..84de212ccc414e296a1915d450e5755f91ced760 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/edgeColors.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/edgeColors.ts @@ -16,8 +16,8 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! -import { Edges } from "./../Graphics" +import { NodeEdges } from "./../Graphics" import { GlobalScope } from "./GlobalScope" -export function edgeColors(all: number): Edges { +export function edgeColors(all: number): NodeEdges { return GlobalScope.edgeColors(all) } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/edgeWidths.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/edgeWidths.ts index b63f096b6a4e8db60491c2ecc622f64d6af98fb8..38093a3afb48654955f2794b27a127c86e5daeab 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/edgeWidths.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/edgeWidths.ts @@ -16,8 +16,8 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! -import { Edges } from "./../Graphics" +import { NodeEdges } from "./../Graphics" import { GlobalScope } from "./GlobalScope" -export function edgeWidths(all: number): Edges { +export function edgeWidths(all: number): NodeEdges { return GlobalScope.edgeWidths(all) } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/gauge.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/gauge.ts index 221592a05a0fa114d16c6b2d6ead8f4cb904ccc8..b97092982eb17f0efae8a7b7f8d96c76ce8105da 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/gauge.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/gauge.ts @@ -111,8 +111,8 @@ export class ArkGaugePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) @@ -151,8 +151,8 @@ export class ArkGaugePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_2_element_0_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_2_element_0_0_1 = value_value_2_element_0_0 as number - thisSerializer.writeNumber(value_value_2_element_0_0_1) + const value_value_2_element_0_0_1 = value_value_2_element_0_0 as int32 + thisSerializer.writeInt32(value_value_2_element_0_0_1) } else if (RuntimeType.STRING == value_value_2_element_0_0_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/image.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/image.ts index 324e3ae2d534c91b8f0485aca6086a5716222e33..ed88ff7dc4b029b662d6af85f8fc728201742f74 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/image.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/image.ts @@ -211,8 +211,8 @@ export class ArkImagePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -249,8 +249,8 @@ export class ArkImagePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/loadingProgress.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/loadingProgress.ts index 8b4c81cd61a3364b6222db69b91cd610f4dd9a42..a3f2c965ec276d478fc73848da7c10bd34ce592b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/loadingProgress.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/loadingProgress.ts @@ -61,8 +61,8 @@ export class ArkLoadingProgressPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/marquee.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/marquee.ts index 4abe57a9432897b15b2e3cc37e757e701e0a5f18..d60bc6961def08623841ddaccf1a7d97affed7b4 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/marquee.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/marquee.ts @@ -66,8 +66,8 @@ export class ArkMarqueePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/menu.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/menu.ts index 5bcdbe08363b7e0f597b67f921fd2100253e6df7..432bdac728dfb59daf65c3ea598b8bbe18429a72 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/menu.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/menu.ts @@ -87,8 +87,8 @@ export class ArkMenuPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/menuItem.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/menuItem.ts index 83525e321613208c886084a398bccb5ce6f258e4..d77473c8b7a661bf989627e0d4a9ab3302f40ac8 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/menuItem.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/menuItem.ts @@ -162,8 +162,8 @@ export class ArkMenuItemPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -207,8 +207,8 @@ export class ArkMenuItemPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/panel.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/panel.ts index 0fbb759bd9827d9264c171ef5cfd7abc7d0db13a..67d4599bb84b3bf6654a15f43624bd8a3491c0b3 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/panel.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/panel.ts @@ -201,8 +201,8 @@ export class ArkPanelPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/particle_helper.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/particle_helper.ts index e2d6996e9cd9922bb0827ca06164c9405f8f4b9e..bda7956c5083035f6aaf2e66241c14c39adda642 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/particle_helper.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/particle_helper.ts @@ -268,8 +268,8 @@ export class ParticlePropertyAnimationColorInner_serializer { } else if (RuntimeType.NUMBER == value_from_type) { valueSerializer.writeInt8(1) - const value_from_1 = value_from as number - valueSerializer.writeNumber(value_from_1) + const value_from_1 = value_from as int32 + valueSerializer.writeInt32(value_from_1) } else if (RuntimeType.STRING == value_from_type) { valueSerializer.writeInt8(2) @@ -291,8 +291,8 @@ export class ParticlePropertyAnimationColorInner_serializer { } else if (RuntimeType.NUMBER == value_to_type) { valueSerializer.writeInt8(1) - const value_to_1 = value_to as number - valueSerializer.writeNumber(value_to_1) + const value_to_1 = value_to as int32 + valueSerializer.writeInt32(value_to_1) } else if (RuntimeType.STRING == value_to_type) { valueSerializer.writeInt8(2) @@ -642,8 +642,8 @@ export class ParticleColorPropertyOptionsInner_serializer { } else if (RuntimeType.NUMBER == value_range_0_type) { valueSerializer.writeInt8(1) - const value_range_0_1 = value_range_0 as number - valueSerializer.writeNumber(value_range_0_1) + const value_range_0_1 = value_range_0 as int32 + valueSerializer.writeInt32(value_range_0_1) } else if (RuntimeType.STRING == value_range_0_type) { valueSerializer.writeInt8(2) @@ -665,8 +665,8 @@ export class ParticleColorPropertyOptionsInner_serializer { } else if (RuntimeType.NUMBER == value_range_1_type) { valueSerializer.writeInt8(1) - const value_range_1_1 = value_range_1 as number - valueSerializer.writeNumber(value_range_1_1) + const value_range_1_1 = value_range_1 as int32 + valueSerializer.writeInt32(value_range_1_1) } else if (RuntimeType.STRING == value_range_1_type) { valueSerializer.writeInt8(2) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/patternLock.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/patternLock.ts index 6811d932034e7804df867d4f28757cdec1f1f4db..3eeddf80f86356cd4c0f03ad8aed9cfe5999a936 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/patternLock.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/patternLock.ts @@ -136,8 +136,8 @@ export class ArkPatternLockPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -169,8 +169,8 @@ export class ArkPatternLockPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -202,8 +202,8 @@ export class ArkPatternLockPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -235,8 +235,8 @@ export class ArkPatternLockPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -268,8 +268,8 @@ export class ArkPatternLockPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) 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 26255f2f8564319f6ea1940acbf54d6d8c83d60e..9144aa59a806484fcdacf17f58672d545da28846 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 @@ -109,7 +109,7 @@ import { Matrix2D, Matrix2DInternal } from "./../matrix2d" import { ColorMode, LayoutDirection } from "./../stateManagement" import { Component3DAttribute, ModelType, SceneOptions } from "./../component3d" import { CustomDialogController, CustomDialogControllerInternal, CustomDialogControllerOptions, CustomDialogControllerExternalOptions } from "./../customDialogController" -import { DrawContext, Rect, LengthMetricsUnit, LengthUnit, ColorMetrics, ColorMetricsInternal, ShapeClip, RoundRect, Circle, CommandPath, ShapeMask, Size, Vector2, Vector3, Corners, CornerRadius, Edges as EdgesT, Frame, Matrix4, LengthMetrics, Position as GraphicsPosition, SizeT } from "./../../Graphics" +import { DrawContext, Rect, LengthMetricsUnit, LengthUnit, ColorMetrics, ColorMetricsInternal, ShapeClip, RoundRect, Circle, CommandPath, ShapeMask, Size, Vector2, Vector3, Corners, CornerRadius, NodeEdges as EdgesT, Frame, Matrix4, LengthMetrics, NodePosition as GraphicsPosition, SizeT } from "./../../Graphics" import { DataOperationType } from "./../lazyForEach" import { DataPanelType, LinearGradient, LinearGradientInternal, ColorStop, DataPanelOptions, DataPanelShadowOptions } from "./../dataPanel" import { DatePickerMode, Callback_DatePickerResult_Void, DatePickerResult, DatePickerOptions, LunarSwitchStyle, DatePickerDialogOptions } from "./../datePicker" @@ -6513,7 +6513,7 @@ export class Deserializer extends DeserializerBase { } const placement_result : Placement | undefined = placement_buf const popupColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) - let popupColor_buf : Color | string | Resource | number | undefined + let popupColor_buf : Color | string | Resource | int32 | undefined if ((RuntimeType.UNDEFINED) != (popupColor_buf_runtimeType)) { const popupColor_buf__selector : int32 = valueDeserializer.readInt8() @@ -6528,14 +6528,14 @@ export class Deserializer extends DeserializerBase { popupColor_buf_ = valueDeserializer.readResource() } else if (popupColor_buf__selector == 3) { - popupColor_buf_ = (valueDeserializer.readNumber() as number) + popupColor_buf_ = (valueDeserializer.readInt32() as int32) } else { throw new Error("One of the branches for popupColor_buf_ has to be chosen through deserialisation.") } - popupColor_buf = (popupColor_buf_ as Color | string | Resource | number) + popupColor_buf = (popupColor_buf_ as Color | string | Resource | int32) } - const popupColor_result : Color | string | Resource | number | undefined = popupColor_buf + const popupColor_result : Color | string | Resource | int32 | undefined = popupColor_buf const enableArrow_buf_runtimeType = (valueDeserializer.readInt8() as int32) let enableArrow_buf : boolean | undefined if ((RuntimeType.UNDEFINED) != (enableArrow_buf_runtimeType)) @@ -6598,7 +6598,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for mask_buf__u_color_buf has to be chosen through deserialisation.") } - const mask_buf__u_color : ResourceColor = (mask_buf__u_color_buf as Color | number | string | Resource) + const mask_buf__u_color : ResourceColor = (mask_buf__u_color_buf as Color | int32 | string | Resource) mask_buf_ = ({color: mask_buf__u_color} as PopupMaskType) } else { @@ -9065,7 +9065,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for colors_buf_buf_value0_buf has to be chosen through deserialisation.") } - const colors_buf_buf_value0 : ResourceColor = (colors_buf_buf_value0_buf as Color | number | string | Resource) + const colors_buf_buf_value0 : ResourceColor = (colors_buf_buf_value0_buf as Color | int | string | Resource) const colors_buf_buf_value1 : number = (valueDeserializer.readNumber() as number) colors_buf[colors_buf_i] = ([colors_buf_buf_value0, colors_buf_buf_value1] as [ ResourceColor, number ]) } @@ -10550,7 +10550,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for colors_buf_buf_value0_buf has to be chosen through deserialisation.") } - const colors_buf_buf_value0 : ResourceColor = (colors_buf_buf_value0_buf as Color | number | string | Resource) + const colors_buf_buf_value0 : ResourceColor = (colors_buf_buf_value0_buf as Color | int32 | string | Resource) const colors_buf_buf_value1 : number = (valueDeserializer.readNumber() as number) colors_buf[colors_buf_i] = ([colors_buf_buf_value0, colors_buf_buf_value1] as [ ResourceColor, number ]) } @@ -11951,7 +11951,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for colors_buf_buf_value0_buf has to be chosen through deserialisation.") } - const colors_buf_buf_value0 : ResourceColor = (colors_buf_buf_value0_buf as Color | number | string | Resource) + const colors_buf_buf_value0 : ResourceColor = (colors_buf_buf_value0_buf as Color | int32 | string | Resource) const colors_buf_buf_value1 : number = (valueDeserializer.readNumber() as number) colors_buf[colors_buf_i] = ([colors_buf_buf_value0, colors_buf_buf_value1] as [ ResourceColor, number ]) } @@ -13182,7 +13182,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf_ has to be chosen through deserialisation.") } - fontColor_buf = (fontColor_buf_ as Color | number | string | Resource) + fontColor_buf = (fontColor_buf_ as Color | int32 | string | Resource) } const fontColor_result : ResourceColor | undefined = fontColor_buf const backgroundColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -13206,7 +13206,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const action_result : VoidCallback = valueDeserializer.readVoidCallback() @@ -13269,7 +13269,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf_ has to be chosen through deserialisation.") } - fontColor_buf = (fontColor_buf_ as Color | number | string | Resource) + fontColor_buf = (fontColor_buf_ as Color | int | string | Resource) } const fontColor_result : ResourceColor | undefined = fontColor_buf const backgroundColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -13293,7 +13293,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const action_result : VoidCallback = valueDeserializer.readVoidCallback() @@ -13508,7 +13508,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const arrowSize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -13539,7 +13539,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for arrowColor_buf_ has to be chosen through deserialisation.") } - arrowColor_buf = (arrowColor_buf_ as Color | number | string | Resource) + arrowColor_buf = (arrowColor_buf_ as Color | int32 | string | Resource) } const arrowColor_result : ResourceColor | undefined = arrowColor_buf let value : ArrowStyle = ({showBackground: showBackground_result, isSidebarMiddle: isSidebarMiddle_result, backgroundSize: backgroundSize_result, backgroundColor: backgroundColor_result, arrowSize: arrowSize_result, arrowColor: arrowColor_result} as ArrowStyle) @@ -13603,7 +13603,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for inactiveColor_buf_ has to be chosen through deserialisation.") } - inactiveColor_buf = (inactiveColor_buf_ as Color | number | string | Resource) + inactiveColor_buf = (inactiveColor_buf_ as Color | int32 | string | Resource) } const inactiveColor_result : ResourceColor | undefined = inactiveColor_buf let value : BackgroundBlurStyleOptions = ({colorMode: colorMode_result, adaptiveColor: adaptiveColor_result, scale: scale_result, blurOptions: blurOptions_result, policy: policy_result, inactiveColor: inactiveColor_result} as BackgroundBlurStyleOptions) @@ -13647,7 +13647,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const adaptiveColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -13692,7 +13692,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for inactiveColor_buf_ has to be chosen through deserialisation.") } - inactiveColor_buf = (inactiveColor_buf_ as Color | number | string | Resource) + inactiveColor_buf = (inactiveColor_buf_ as Color | int32 | string | Resource) } const inactiveColor_result : ResourceColor | undefined = inactiveColor_buf let value : BackgroundEffectOptions = ({radius: radius_result, saturation: saturation_result, brightness: brightness_result, color: color_result, adaptiveColor: adaptiveColor_result, blurOptions: blurOptions_result, policy: policy_result, inactiveColor: inactiveColor_result} as BackgroundEffectOptions) @@ -13721,7 +13721,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const fontSize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -13781,7 +13781,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for badgeColor_buf_ has to be chosen through deserialisation.") } - badgeColor_buf = (badgeColor_buf_ as Color | number | string | Resource) + badgeColor_buf = (badgeColor_buf_ as Color | int32 | string | Resource) } const badgeColor_result : ResourceColor | undefined = badgeColor_buf const borderColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -13805,7 +13805,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for borderColor_buf_ has to be chosen through deserialisation.") } - borderColor_buf = (borderColor_buf_ as Color | number | string | Resource) + borderColor_buf = (borderColor_buf_ as Color | int32 | string | Resource) } const borderColor_result : ResourceColor | undefined = borderColor_buf const borderWidth_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -13991,7 +13991,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf let value : CaretStyle = ({width: width_result, color: color_result} as CaretStyle) @@ -14020,7 +14020,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const radius_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14066,7 +14066,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf has to be chosen through deserialisation.") } - const color_result : ResourceColor = (color_buf as Color | number | string | Resource) + const color_result : ResourceColor = (color_buf as Color | int32 | string | Resource) const offset_result : Length = (valueDeserializer.readLength() as Length) let value : ColorStop = ({color: color_result, offset: offset_result} as ColorStop) return value @@ -14123,7 +14123,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const onAppear_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14231,7 +14231,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for dayColor_buf_ has to be chosen through deserialisation.") } - dayColor_buf = (dayColor_buf_ as Color | number | string | Resource) + dayColor_buf = (dayColor_buf_ as Color | int32 | string | Resource) } const dayColor_result : ResourceColor | undefined = dayColor_buf const lunarColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14255,7 +14255,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for lunarColor_buf_ has to be chosen through deserialisation.") } - lunarColor_buf = (lunarColor_buf_ as Color | number | string | Resource) + lunarColor_buf = (lunarColor_buf_ as Color | int32 | string | Resource) } const lunarColor_result : ResourceColor | undefined = lunarColor_buf const markLunarColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14279,7 +14279,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for markLunarColor_buf_ has to be chosen through deserialisation.") } - markLunarColor_buf = (markLunarColor_buf_ as Color | number | string | Resource) + markLunarColor_buf = (markLunarColor_buf_ as Color | int32 | string | Resource) } const markLunarColor_result : ResourceColor | undefined = markLunarColor_buf const dayFontSize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14448,7 +14448,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for brand_buf_ has to be chosen through deserialisation.") } - brand_buf = (brand_buf_ as Color | number | string | Resource) + brand_buf = (brand_buf_ as Color | int32 | string | Resource) } const brand_result : ResourceColor | undefined = brand_buf const warning_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14472,7 +14472,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for warning_buf_ has to be chosen through deserialisation.") } - warning_buf = (warning_buf_ as Color | number | string | Resource) + warning_buf = (warning_buf_ as Color | int32 | string | Resource) } const warning_result : ResourceColor | undefined = warning_buf const alert_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14496,7 +14496,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for alert_buf_ has to be chosen through deserialisation.") } - alert_buf = (alert_buf_ as Color | number | string | Resource) + alert_buf = (alert_buf_ as Color | int32 | string | Resource) } const alert_result : ResourceColor | undefined = alert_buf const confirm_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14520,7 +14520,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for confirm_buf_ has to be chosen through deserialisation.") } - confirm_buf = (confirm_buf_ as Color | number | string | Resource) + confirm_buf = (confirm_buf_ as Color | int32 | string | Resource) } const confirm_result : ResourceColor | undefined = confirm_buf const fontPrimary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14544,7 +14544,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontPrimary_buf_ has to be chosen through deserialisation.") } - fontPrimary_buf = (fontPrimary_buf_ as Color | number | string | Resource) + fontPrimary_buf = (fontPrimary_buf_ as Color | int32 | string | Resource) } const fontPrimary_result : ResourceColor | undefined = fontPrimary_buf const fontSecondary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14568,7 +14568,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontSecondary_buf_ has to be chosen through deserialisation.") } - fontSecondary_buf = (fontSecondary_buf_ as Color | number | string | Resource) + fontSecondary_buf = (fontSecondary_buf_ as Color | int32 | string | Resource) } const fontSecondary_result : ResourceColor | undefined = fontSecondary_buf const fontTertiary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14592,7 +14592,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontTertiary_buf_ has to be chosen through deserialisation.") } - fontTertiary_buf = (fontTertiary_buf_ as Color | number | string | Resource) + fontTertiary_buf = (fontTertiary_buf_ as Color | int32 | string | Resource) } const fontTertiary_result : ResourceColor | undefined = fontTertiary_buf const fontFourth_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14616,7 +14616,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontFourth_buf_ has to be chosen through deserialisation.") } - fontFourth_buf = (fontFourth_buf_ as Color | number | string | Resource) + fontFourth_buf = (fontFourth_buf_ as Color | int32 | string | Resource) } const fontFourth_result : ResourceColor | undefined = fontFourth_buf const fontEmphasize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14640,7 +14640,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontEmphasize_buf_ has to be chosen through deserialisation.") } - fontEmphasize_buf = (fontEmphasize_buf_ as Color | number | string | Resource) + fontEmphasize_buf = (fontEmphasize_buf_ as Color | int32 | string | Resource) } const fontEmphasize_result : ResourceColor | undefined = fontEmphasize_buf const fontOnPrimary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14664,7 +14664,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontOnPrimary_buf_ has to be chosen through deserialisation.") } - fontOnPrimary_buf = (fontOnPrimary_buf_ as Color | number | string | Resource) + fontOnPrimary_buf = (fontOnPrimary_buf_ as Color | int32 | string | Resource) } const fontOnPrimary_result : ResourceColor | undefined = fontOnPrimary_buf const fontOnSecondary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14688,7 +14688,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontOnSecondary_buf_ has to be chosen through deserialisation.") } - fontOnSecondary_buf = (fontOnSecondary_buf_ as Color | number | string | Resource) + fontOnSecondary_buf = (fontOnSecondary_buf_ as Color | int32 | string | Resource) } const fontOnSecondary_result : ResourceColor | undefined = fontOnSecondary_buf const fontOnTertiary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14712,7 +14712,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontOnTertiary_buf_ has to be chosen through deserialisation.") } - fontOnTertiary_buf = (fontOnTertiary_buf_ as Color | number | string | Resource) + fontOnTertiary_buf = (fontOnTertiary_buf_ as Color | int32 | string | Resource) } const fontOnTertiary_result : ResourceColor | undefined = fontOnTertiary_buf const fontOnFourth_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14736,7 +14736,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontOnFourth_buf_ has to be chosen through deserialisation.") } - fontOnFourth_buf = (fontOnFourth_buf_ as Color | number | string | Resource) + fontOnFourth_buf = (fontOnFourth_buf_ as Color | int32 | string | Resource) } const fontOnFourth_result : ResourceColor | undefined = fontOnFourth_buf const iconPrimary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14760,7 +14760,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconPrimary_buf_ has to be chosen through deserialisation.") } - iconPrimary_buf = (iconPrimary_buf_ as Color | number | string | Resource) + iconPrimary_buf = (iconPrimary_buf_ as Color | int32 | string | Resource) } const iconPrimary_result : ResourceColor | undefined = iconPrimary_buf const iconSecondary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14784,7 +14784,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconSecondary_buf_ has to be chosen through deserialisation.") } - iconSecondary_buf = (iconSecondary_buf_ as Color | number | string | Resource) + iconSecondary_buf = (iconSecondary_buf_ as Color | int32 | string | Resource) } const iconSecondary_result : ResourceColor | undefined = iconSecondary_buf const iconTertiary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14808,7 +14808,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconTertiary_buf_ has to be chosen through deserialisation.") } - iconTertiary_buf = (iconTertiary_buf_ as Color | number | string | Resource) + iconTertiary_buf = (iconTertiary_buf_ as Color | int32 | string | Resource) } const iconTertiary_result : ResourceColor | undefined = iconTertiary_buf const iconFourth_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14832,7 +14832,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconFourth_buf_ has to be chosen through deserialisation.") } - iconFourth_buf = (iconFourth_buf_ as Color | number | string | Resource) + iconFourth_buf = (iconFourth_buf_ as Color | int32 | string | Resource) } const iconFourth_result : ResourceColor | undefined = iconFourth_buf const iconEmphasize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14856,7 +14856,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconEmphasize_buf_ has to be chosen through deserialisation.") } - iconEmphasize_buf = (iconEmphasize_buf_ as Color | number | string | Resource) + iconEmphasize_buf = (iconEmphasize_buf_ as Color | int32 | string | Resource) } const iconEmphasize_result : ResourceColor | undefined = iconEmphasize_buf const iconSubEmphasize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14880,7 +14880,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconSubEmphasize_buf_ has to be chosen through deserialisation.") } - iconSubEmphasize_buf = (iconSubEmphasize_buf_ as Color | number | string | Resource) + iconSubEmphasize_buf = (iconSubEmphasize_buf_ as Color | int32 | string | Resource) } const iconSubEmphasize_result : ResourceColor | undefined = iconSubEmphasize_buf const iconOnPrimary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14904,7 +14904,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconOnPrimary_buf_ has to be chosen through deserialisation.") } - iconOnPrimary_buf = (iconOnPrimary_buf_ as Color | number | string | Resource) + iconOnPrimary_buf = (iconOnPrimary_buf_ as Color | int32 | string | Resource) } const iconOnPrimary_result : ResourceColor | undefined = iconOnPrimary_buf const iconOnSecondary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14928,7 +14928,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconOnSecondary_buf_ has to be chosen through deserialisation.") } - iconOnSecondary_buf = (iconOnSecondary_buf_ as Color | number | string | Resource) + iconOnSecondary_buf = (iconOnSecondary_buf_ as Color | int32 | string | Resource) } const iconOnSecondary_result : ResourceColor | undefined = iconOnSecondary_buf const iconOnTertiary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14952,7 +14952,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconOnTertiary_buf_ has to be chosen through deserialisation.") } - iconOnTertiary_buf = (iconOnTertiary_buf_ as Color | number | string | Resource) + iconOnTertiary_buf = (iconOnTertiary_buf_ as Color | int32 | string | Resource) } const iconOnTertiary_result : ResourceColor | undefined = iconOnTertiary_buf const iconOnFourth_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -14976,7 +14976,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for iconOnFourth_buf_ has to be chosen through deserialisation.") } - iconOnFourth_buf = (iconOnFourth_buf_ as Color | number | string | Resource) + iconOnFourth_buf = (iconOnFourth_buf_ as Color | int32 | string | Resource) } const iconOnFourth_result : ResourceColor | undefined = iconOnFourth_buf const backgroundPrimary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15000,7 +15000,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundPrimary_buf_ has to be chosen through deserialisation.") } - backgroundPrimary_buf = (backgroundPrimary_buf_ as Color | number | string | Resource) + backgroundPrimary_buf = (backgroundPrimary_buf_ as Color | int32 | string | Resource) } const backgroundPrimary_result : ResourceColor | undefined = backgroundPrimary_buf const backgroundSecondary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15024,7 +15024,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundSecondary_buf_ has to be chosen through deserialisation.") } - backgroundSecondary_buf = (backgroundSecondary_buf_ as Color | number | string | Resource) + backgroundSecondary_buf = (backgroundSecondary_buf_ as Color | int32 | string | Resource) } const backgroundSecondary_result : ResourceColor | undefined = backgroundSecondary_buf const backgroundTertiary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15048,7 +15048,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundTertiary_buf_ has to be chosen through deserialisation.") } - backgroundTertiary_buf = (backgroundTertiary_buf_ as Color | number | string | Resource) + backgroundTertiary_buf = (backgroundTertiary_buf_ as Color | int32 | string | Resource) } const backgroundTertiary_result : ResourceColor | undefined = backgroundTertiary_buf const backgroundFourth_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15072,7 +15072,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundFourth_buf_ has to be chosen through deserialisation.") } - backgroundFourth_buf = (backgroundFourth_buf_ as Color | number | string | Resource) + backgroundFourth_buf = (backgroundFourth_buf_ as Color | int32 | string | Resource) } const backgroundFourth_result : ResourceColor | undefined = backgroundFourth_buf const backgroundEmphasize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15096,7 +15096,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundEmphasize_buf_ has to be chosen through deserialisation.") } - backgroundEmphasize_buf = (backgroundEmphasize_buf_ as Color | number | string | Resource) + backgroundEmphasize_buf = (backgroundEmphasize_buf_ as Color | int32 | string | Resource) } const backgroundEmphasize_result : ResourceColor | undefined = backgroundEmphasize_buf const compForegroundPrimary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15120,7 +15120,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compForegroundPrimary_buf_ has to be chosen through deserialisation.") } - compForegroundPrimary_buf = (compForegroundPrimary_buf_ as Color | number | string | Resource) + compForegroundPrimary_buf = (compForegroundPrimary_buf_ as Color | int32 | string | Resource) } const compForegroundPrimary_result : ResourceColor | undefined = compForegroundPrimary_buf const compBackgroundPrimary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15144,7 +15144,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compBackgroundPrimary_buf_ has to be chosen through deserialisation.") } - compBackgroundPrimary_buf = (compBackgroundPrimary_buf_ as Color | number | string | Resource) + compBackgroundPrimary_buf = (compBackgroundPrimary_buf_ as Color | int32 | string | Resource) } const compBackgroundPrimary_result : ResourceColor | undefined = compBackgroundPrimary_buf const compBackgroundPrimaryTran_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15168,7 +15168,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compBackgroundPrimaryTran_buf_ has to be chosen through deserialisation.") } - compBackgroundPrimaryTran_buf = (compBackgroundPrimaryTran_buf_ as Color | number | string | Resource) + compBackgroundPrimaryTran_buf = (compBackgroundPrimaryTran_buf_ as Color | int32 | string | Resource) } const compBackgroundPrimaryTran_result : ResourceColor | undefined = compBackgroundPrimaryTran_buf const compBackgroundPrimaryContrary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15192,7 +15192,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compBackgroundPrimaryContrary_buf_ has to be chosen through deserialisation.") } - compBackgroundPrimaryContrary_buf = (compBackgroundPrimaryContrary_buf_ as Color | number | string | Resource) + compBackgroundPrimaryContrary_buf = (compBackgroundPrimaryContrary_buf_ as Color | int32 | string | Resource) } const compBackgroundPrimaryContrary_result : ResourceColor | undefined = compBackgroundPrimaryContrary_buf const compBackgroundGray_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15216,7 +15216,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compBackgroundGray_buf_ has to be chosen through deserialisation.") } - compBackgroundGray_buf = (compBackgroundGray_buf_ as Color | number | string | Resource) + compBackgroundGray_buf = (compBackgroundGray_buf_ as Color | int32 | string | Resource) } const compBackgroundGray_result : ResourceColor | undefined = compBackgroundGray_buf const compBackgroundSecondary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15240,7 +15240,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compBackgroundSecondary_buf_ has to be chosen through deserialisation.") } - compBackgroundSecondary_buf = (compBackgroundSecondary_buf_ as Color | number | string | Resource) + compBackgroundSecondary_buf = (compBackgroundSecondary_buf_ as Color | int32 | string | Resource) } const compBackgroundSecondary_result : ResourceColor | undefined = compBackgroundSecondary_buf const compBackgroundTertiary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15264,7 +15264,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compBackgroundTertiary_buf_ has to be chosen through deserialisation.") } - compBackgroundTertiary_buf = (compBackgroundTertiary_buf_ as Color | number | string | Resource) + compBackgroundTertiary_buf = (compBackgroundTertiary_buf_ as Color | int32 | string | Resource) } const compBackgroundTertiary_result : ResourceColor | undefined = compBackgroundTertiary_buf const compBackgroundEmphasize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15288,7 +15288,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compBackgroundEmphasize_buf_ has to be chosen through deserialisation.") } - compBackgroundEmphasize_buf = (compBackgroundEmphasize_buf_ as Color | number | string | Resource) + compBackgroundEmphasize_buf = (compBackgroundEmphasize_buf_ as Color | int32 | string | Resource) } const compBackgroundEmphasize_result : ResourceColor | undefined = compBackgroundEmphasize_buf const compBackgroundNeutral_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15312,7 +15312,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compBackgroundNeutral_buf_ has to be chosen through deserialisation.") } - compBackgroundNeutral_buf = (compBackgroundNeutral_buf_ as Color | number | string | Resource) + compBackgroundNeutral_buf = (compBackgroundNeutral_buf_ as Color | int32 | string | Resource) } const compBackgroundNeutral_result : ResourceColor | undefined = compBackgroundNeutral_buf const compEmphasizeSecondary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15336,7 +15336,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compEmphasizeSecondary_buf_ has to be chosen through deserialisation.") } - compEmphasizeSecondary_buf = (compEmphasizeSecondary_buf_ as Color | number | string | Resource) + compEmphasizeSecondary_buf = (compEmphasizeSecondary_buf_ as Color | int32 | string | Resource) } const compEmphasizeSecondary_result : ResourceColor | undefined = compEmphasizeSecondary_buf const compEmphasizeTertiary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15360,7 +15360,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compEmphasizeTertiary_buf_ has to be chosen through deserialisation.") } - compEmphasizeTertiary_buf = (compEmphasizeTertiary_buf_ as Color | number | string | Resource) + compEmphasizeTertiary_buf = (compEmphasizeTertiary_buf_ as Color | int32 | string | Resource) } const compEmphasizeTertiary_result : ResourceColor | undefined = compEmphasizeTertiary_buf const compDivider_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15384,7 +15384,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compDivider_buf_ has to be chosen through deserialisation.") } - compDivider_buf = (compDivider_buf_ as Color | number | string | Resource) + compDivider_buf = (compDivider_buf_ as Color | int32 | string | Resource) } const compDivider_result : ResourceColor | undefined = compDivider_buf const compCommonContrary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15408,7 +15408,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compCommonContrary_buf_ has to be chosen through deserialisation.") } - compCommonContrary_buf = (compCommonContrary_buf_ as Color | number | string | Resource) + compCommonContrary_buf = (compCommonContrary_buf_ as Color | int32 | string | Resource) } const compCommonContrary_result : ResourceColor | undefined = compCommonContrary_buf const compBackgroundFocus_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15432,7 +15432,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compBackgroundFocus_buf_ has to be chosen through deserialisation.") } - compBackgroundFocus_buf = (compBackgroundFocus_buf_ as Color | number | string | Resource) + compBackgroundFocus_buf = (compBackgroundFocus_buf_ as Color | int32 | string | Resource) } const compBackgroundFocus_result : ResourceColor | undefined = compBackgroundFocus_buf const compFocusedPrimary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15456,7 +15456,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compFocusedPrimary_buf_ has to be chosen through deserialisation.") } - compFocusedPrimary_buf = (compFocusedPrimary_buf_ as Color | number | string | Resource) + compFocusedPrimary_buf = (compFocusedPrimary_buf_ as Color | int32 | string | Resource) } const compFocusedPrimary_result : ResourceColor | undefined = compFocusedPrimary_buf const compFocusedSecondary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15480,7 +15480,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compFocusedSecondary_buf_ has to be chosen through deserialisation.") } - compFocusedSecondary_buf = (compFocusedSecondary_buf_ as Color | number | string | Resource) + compFocusedSecondary_buf = (compFocusedSecondary_buf_ as Color | int32 | string | Resource) } const compFocusedSecondary_result : ResourceColor | undefined = compFocusedSecondary_buf const compFocusedTertiary_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15504,7 +15504,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for compFocusedTertiary_buf_ has to be chosen through deserialisation.") } - compFocusedTertiary_buf = (compFocusedTertiary_buf_ as Color | number | string | Resource) + compFocusedTertiary_buf = (compFocusedTertiary_buf_ as Color | int32 | string | Resource) } const compFocusedTertiary_result : ResourceColor | undefined = compFocusedTertiary_buf const interactiveHover_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15528,7 +15528,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for interactiveHover_buf_ has to be chosen through deserialisation.") } - interactiveHover_buf = (interactiveHover_buf_ as Color | number | string | Resource) + interactiveHover_buf = (interactiveHover_buf_ as Color | int32 | string | Resource) } const interactiveHover_result : ResourceColor | undefined = interactiveHover_buf const interactivePressed_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15552,7 +15552,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for interactivePressed_buf_ has to be chosen through deserialisation.") } - interactivePressed_buf = (interactivePressed_buf_ as Color | number | string | Resource) + interactivePressed_buf = (interactivePressed_buf_ as Color | int32 | string | Resource) } const interactivePressed_result : ResourceColor | undefined = interactivePressed_buf const interactiveFocus_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15576,7 +15576,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for interactiveFocus_buf_ has to be chosen through deserialisation.") } - interactiveFocus_buf = (interactiveFocus_buf_ as Color | number | string | Resource) + interactiveFocus_buf = (interactiveFocus_buf_ as Color | int32 | string | Resource) } const interactiveFocus_result : ResourceColor | undefined = interactiveFocus_buf const interactiveActive_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15600,7 +15600,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for interactiveActive_buf_ has to be chosen through deserialisation.") } - interactiveActive_buf = (interactiveActive_buf_ as Color | number | string | Resource) + interactiveActive_buf = (interactiveActive_buf_ as Color | int32 | string | Resource) } const interactiveActive_result : ResourceColor | undefined = interactiveActive_buf const interactiveSelect_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15624,7 +15624,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for interactiveSelect_buf_ has to be chosen through deserialisation.") } - interactiveSelect_buf = (interactiveSelect_buf_ as Color | number | string | Resource) + interactiveSelect_buf = (interactiveSelect_buf_ as Color | int32 | string | Resource) } const interactiveSelect_result : ResourceColor | undefined = interactiveSelect_buf const interactiveClick_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15648,7 +15648,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for interactiveClick_buf_ has to be chosen through deserialisation.") } - interactiveClick_buf = (interactiveClick_buf_ as Color | number | string | Resource) + interactiveClick_buf = (interactiveClick_buf_ as Color | int32 | string | Resource) } const interactiveClick_result : ResourceColor | undefined = interactiveClick_buf let value : CustomColors = ({brand: brand_result, warning: warning_result, alert: alert_result, confirm: confirm_result, fontPrimary: fontPrimary_result, fontSecondary: fontSecondary_result, fontTertiary: fontTertiary_result, fontFourth: fontFourth_result, fontEmphasize: fontEmphasize_result, fontOnPrimary: fontOnPrimary_result, fontOnSecondary: fontOnSecondary_result, fontOnTertiary: fontOnTertiary_result, fontOnFourth: fontOnFourth_result, iconPrimary: iconPrimary_result, iconSecondary: iconSecondary_result, iconTertiary: iconTertiary_result, iconFourth: iconFourth_result, iconEmphasize: iconEmphasize_result, iconSubEmphasize: iconSubEmphasize_result, iconOnPrimary: iconOnPrimary_result, iconOnSecondary: iconOnSecondary_result, iconOnTertiary: iconOnTertiary_result, iconOnFourth: iconOnFourth_result, backgroundPrimary: backgroundPrimary_result, backgroundSecondary: backgroundSecondary_result, backgroundTertiary: backgroundTertiary_result, backgroundFourth: backgroundFourth_result, backgroundEmphasize: backgroundEmphasize_result, compForegroundPrimary: compForegroundPrimary_result, compBackgroundPrimary: compBackgroundPrimary_result, compBackgroundPrimaryTran: compBackgroundPrimaryTran_result, compBackgroundPrimaryContrary: compBackgroundPrimaryContrary_result, compBackgroundGray: compBackgroundGray_result, compBackgroundSecondary: compBackgroundSecondary_result, compBackgroundTertiary: compBackgroundTertiary_result, compBackgroundEmphasize: compBackgroundEmphasize_result, compBackgroundNeutral: compBackgroundNeutral_result, compEmphasizeSecondary: compEmphasizeSecondary_result, compEmphasizeTertiary: compEmphasizeTertiary_result, compDivider: compDivider_result, compCommonContrary: compCommonContrary_result, compBackgroundFocus: compBackgroundFocus_result, compFocusedPrimary: compFocusedPrimary_result, compFocusedSecondary: compFocusedSecondary_result, compFocusedTertiary: compFocusedTertiary_result, interactiveHover: interactiveHover_result, interactivePressed: interactivePressed_result, interactiveFocus: interactiveFocus_result, interactiveActive: interactiveActive_result, interactiveSelect: interactiveSelect_result, interactiveClick: interactiveClick_result} as CustomColors) @@ -15737,7 +15737,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for colors_buf__buf_u has to be chosen through deserialisation.") } - colors_buf__buf = (colors_buf__buf_u as Color | number | string | Resource) + colors_buf__buf = (colors_buf__buf_u as Color | int32 | string | Resource) } else if (colors_buf__buf_selector == 1) { colors_buf__buf = (valueDeserializer.readLinearGradient() as LinearGradient) @@ -15782,7 +15782,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const style_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15815,7 +15815,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf has to be chosen through deserialisation.") } - const color_result : ResourceColor = (color_buf as Color | number | string | Resource) + const color_result : ResourceColor = (color_buf as Color | int32 | string | Resource) const style_buf_runtimeType = (valueDeserializer.readInt8() as int32) let style_buf : TextDecorationStyle | undefined if ((RuntimeType.UNDEFINED) != (style_buf_runtimeType)) @@ -15856,7 +15856,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const startMargin_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15900,7 +15900,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const startMargin_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15944,7 +15944,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const startMargin_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -15994,7 +15994,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const startMargin_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -16107,7 +16107,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for top_buf_ has to be chosen through deserialisation.") } - top_buf = (top_buf_ as Color | number | string | Resource) + top_buf = (top_buf_ as Color | int32 | string | Resource) } const top_result : ResourceColor | undefined = top_buf const right_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -16131,7 +16131,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for right_buf_ has to be chosen through deserialisation.") } - right_buf = (right_buf_ as Color | number | string | Resource) + right_buf = (right_buf_ as Color | int32 | string | Resource) } const right_result : ResourceColor | undefined = right_buf const bottom_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -16155,7 +16155,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for bottom_buf_ has to be chosen through deserialisation.") } - bottom_buf = (bottom_buf_ as Color | number | string | Resource) + bottom_buf = (bottom_buf_ as Color | int32 | string | Resource) } const bottom_result : ResourceColor | undefined = bottom_buf const left_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -16179,7 +16179,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for left_buf_ has to be chosen through deserialisation.") } - left_buf = (left_buf_ as Color | number | string | Resource) + left_buf = (left_buf_ as Color | int32 | string | Resource) } const left_result : ResourceColor | undefined = left_buf let value : EdgeColors = ({top: top_result, right: right_result, bottom: bottom_result, left: left_result} as EdgeColors) @@ -16711,7 +16711,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const src_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -16972,7 +16972,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const selectedColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -16996,7 +16996,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for selectedColor_buf_ has to be chosen through deserialisation.") } - selectedColor_buf = (selectedColor_buf_ as Color | number | string | Resource) + selectedColor_buf = (selectedColor_buf_ as Color | int32 | string | Resource) } const selectedColor_result : ResourceColor | undefined = selectedColor_buf const left_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -17067,7 +17067,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const height_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -17172,7 +17172,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf let value : LightSource = ({positionX: positionX_result, positionY: positionY_result, positionZ: positionZ_result, intensity: intensity_result, color: color_result} as LightSource) @@ -17282,7 +17282,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const startMargin_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -17412,7 +17412,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for top_buf_ has to be chosen through deserialisation.") } - top_buf = (top_buf_ as Color | number | string | Resource) + top_buf = (top_buf_ as Color | int32 | string | Resource) } const top_result : ResourceColor | undefined = top_buf const end_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -17436,7 +17436,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for end_buf_ has to be chosen through deserialisation.") } - end_buf = (end_buf_ as Color | number | string | Resource) + end_buf = (end_buf_ as Color | int32 | string | Resource) } const end_result : ResourceColor | undefined = end_buf const bottom_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -17460,7 +17460,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for bottom_buf_ has to be chosen through deserialisation.") } - bottom_buf = (bottom_buf_ as Color | number | string | Resource) + bottom_buf = (bottom_buf_ as Color | int32 | string | Resource) } const bottom_result : ResourceColor | undefined = bottom_buf const start_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -17484,7 +17484,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for start_buf_ has to be chosen through deserialisation.") } - start_buf = (start_buf_ as Color | number | string | Resource) + start_buf = (start_buf_ as Color | int32 | string | Resource) } const start_result : ResourceColor | undefined = start_buf let value : LocalizedEdgeColors = ({top: top_result, end: end_result, bottom: bottom_result, start: start_result} as LocalizedEdgeColors) @@ -17636,7 +17636,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for selectedColor_buf_ has to be chosen through deserialisation.") } - selectedColor_buf = (selectedColor_buf_ as Color | number | string | Resource) + selectedColor_buf = (selectedColor_buf_ as Color | int32 | string | Resource) } const selectedColor_result : ResourceColor | undefined = selectedColor_buf const unselectedColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -17660,7 +17660,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for unselectedColor_buf_ has to be chosen through deserialisation.") } - unselectedColor_buf = (unselectedColor_buf_ as Color | number | string | Resource) + unselectedColor_buf = (unselectedColor_buf_ as Color | int32 | string | Resource) } const unselectedColor_result : ResourceColor | undefined = unselectedColor_buf const strokeColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -17684,7 +17684,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for strokeColor_buf_ has to be chosen through deserialisation.") } - strokeColor_buf = (strokeColor_buf_ as Color | number | string | Resource) + strokeColor_buf = (strokeColor_buf_ as Color | int32 | string | Resource) } const strokeColor_result : ResourceColor | undefined = strokeColor_buf let value : LunarSwitchStyle = ({selectedColor: selectedColor_result, unselectedColor: unselectedColor_result, strokeColor: strokeColor_result} as LunarSwitchStyle) @@ -17713,7 +17713,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for strokeColor_buf_ has to be chosen through deserialisation.") } - strokeColor_buf = (strokeColor_buf_ as Color | number | string | Resource) + strokeColor_buf = (strokeColor_buf_ as Color | int32 | string | Resource) } const strokeColor_result : ResourceColor | undefined = strokeColor_buf const size_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -18444,7 +18444,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for nonCurrentMonthDayColor_buf_ has to be chosen through deserialisation.") } - nonCurrentMonthDayColor_buf = (nonCurrentMonthDayColor_buf_ as Color | number | string | Resource) + nonCurrentMonthDayColor_buf = (nonCurrentMonthDayColor_buf_ as Color | int32 | string | Resource) } const nonCurrentMonthDayColor_result : ResourceColor | undefined = nonCurrentMonthDayColor_buf const nonCurrentMonthLunarColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -18468,7 +18468,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for nonCurrentMonthLunarColor_buf_ has to be chosen through deserialisation.") } - nonCurrentMonthLunarColor_buf = (nonCurrentMonthLunarColor_buf_ as Color | number | string | Resource) + nonCurrentMonthLunarColor_buf = (nonCurrentMonthLunarColor_buf_ as Color | int32 | string | Resource) } const nonCurrentMonthLunarColor_result : ResourceColor | undefined = nonCurrentMonthLunarColor_buf const nonCurrentMonthWorkDayMarkColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -18492,7 +18492,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for nonCurrentMonthWorkDayMarkColor_buf_ has to be chosen through deserialisation.") } - nonCurrentMonthWorkDayMarkColor_buf = (nonCurrentMonthWorkDayMarkColor_buf_ as Color | number | string | Resource) + nonCurrentMonthWorkDayMarkColor_buf = (nonCurrentMonthWorkDayMarkColor_buf_ as Color | int32 | string | Resource) } const nonCurrentMonthWorkDayMarkColor_result : ResourceColor | undefined = nonCurrentMonthWorkDayMarkColor_buf const nonCurrentMonthOffDayMarkColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -18516,7 +18516,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for nonCurrentMonthOffDayMarkColor_buf_ has to be chosen through deserialisation.") } - nonCurrentMonthOffDayMarkColor_buf = (nonCurrentMonthOffDayMarkColor_buf_ as Color | number | string | Resource) + nonCurrentMonthOffDayMarkColor_buf = (nonCurrentMonthOffDayMarkColor_buf_ as Color | int32 | string | Resource) } const nonCurrentMonthOffDayMarkColor_result : ResourceColor | undefined = nonCurrentMonthOffDayMarkColor_buf let value : NonCurrentDayStyle = ({nonCurrentMonthDayColor: nonCurrentMonthDayColor_result, nonCurrentMonthLunarColor: nonCurrentMonthLunarColor_result, nonCurrentMonthWorkDayMarkColor: nonCurrentMonthWorkDayMarkColor_result, nonCurrentMonthOffDayMarkColor: nonCurrentMonthOffDayMarkColor_result} as NonCurrentDayStyle) @@ -18727,7 +18727,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf_ has to be chosen through deserialisation.") } - fontColor_buf = (fontColor_buf_ as Color | number | string | Resource) + fontColor_buf = (fontColor_buf_ as Color | int32 | string | Resource) } const fontColor_result : ResourceColor | undefined = fontColor_buf const fontWeight_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -18797,7 +18797,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const borderRadius_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -18863,7 +18863,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for checkedBackgroundColor_buf_ has to be chosen through deserialisation.") } - checkedBackgroundColor_buf = (checkedBackgroundColor_buf_ as Color | number | string | Resource) + checkedBackgroundColor_buf = (checkedBackgroundColor_buf_ as Color | int32 | string | Resource) } const checkedBackgroundColor_result : ResourceColor | undefined = checkedBackgroundColor_buf const uncheckedBorderColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -18887,7 +18887,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for uncheckedBorderColor_buf_ has to be chosen through deserialisation.") } - uncheckedBorderColor_buf = (uncheckedBorderColor_buf_ as Color | number | string | Resource) + uncheckedBorderColor_buf = (uncheckedBorderColor_buf_ as Color | int32 | string | Resource) } const uncheckedBorderColor_result : ResourceColor | undefined = uncheckedBorderColor_buf const indicatorColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -18911,7 +18911,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for indicatorColor_buf_ has to be chosen through deserialisation.") } - indicatorColor_buf = (indicatorColor_buf_ as Color | number | string | Resource) + indicatorColor_buf = (indicatorColor_buf_ as Color | int32 | string | Resource) } const indicatorColor_result : ResourceColor | undefined = indicatorColor_buf let value : RadioStyle = ({checkedBackgroundColor: checkedBackgroundColor_result, uncheckedBorderColor: uncheckedBorderColor_result, indicatorColor: indicatorColor_result} as RadioStyle) @@ -19373,7 +19373,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf__buf has to be chosen through deserialisation.") } - fontColor_buf_[fontColor_buf__i] = (fontColor_buf__buf as Color | number | string | Resource) + fontColor_buf_[fontColor_buf__i] = (fontColor_buf__buf as Color | int32 | string | Resource) } fontColor_buf = fontColor_buf_ } @@ -19599,7 +19599,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf_ has to be chosen through deserialisation.") } - fontColor_buf = (fontColor_buf_ as Color | number | string | Resource) + fontColor_buf = (fontColor_buf_ as Color | int32 | string | Resource) } const fontColor_result : ResourceColor | undefined = fontColor_buf const autoDisable_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -20284,7 +20284,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for unselectedColor_buf_ has to be chosen through deserialisation.") } - unselectedColor_buf = (unselectedColor_buf_ as Color | number | string | Resource) + unselectedColor_buf = (unselectedColor_buf_ as Color | int32 | string | Resource) } const unselectedColor_result : ResourceColor | undefined = unselectedColor_buf const pointColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -20308,7 +20308,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for pointColor_buf_ has to be chosen through deserialisation.") } - pointColor_buf = (pointColor_buf_ as Color | number | string | Resource) + pointColor_buf = (pointColor_buf_ as Color | int32 | string | Resource) } const pointColor_result : ResourceColor | undefined = pointColor_buf const trackBorderRadius_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -20355,7 +20355,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for selectedColor_buf_ has to be chosen through deserialisation.") } - selectedColor_buf = (selectedColor_buf_ as Color | number | string | Resource) + selectedColor_buf = (selectedColor_buf_ as Color | int32 | string | Resource) } const selectedColor_result : ResourceColor | undefined = selectedColor_buf const unselectedColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -20379,7 +20379,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for unselectedColor_buf_ has to be chosen through deserialisation.") } - unselectedColor_buf = (unselectedColor_buf_ as Color | number | string | Resource) + unselectedColor_buf = (unselectedColor_buf_ as Color | int32 | string | Resource) } const unselectedColor_result : ResourceColor | undefined = unselectedColor_buf let value : TabBarIconStyle = ({selectedColor: selectedColor_result, unselectedColor: unselectedColor_result} as TabBarIconStyle) @@ -20548,7 +20548,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const radius_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -20634,7 +20634,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const style_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -20960,7 +20960,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf_ has to be chosen through deserialisation.") } - fontColor_buf = (fontColor_buf_ as Color | number | string | Resource) + fontColor_buf = (fontColor_buf_ as Color | int32 | string | Resource) } const fontColor_result : ResourceColor | undefined = fontColor_buf const fontFamily_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21042,7 +21042,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for focusedDayColor_buf_ has to be chosen through deserialisation.") } - focusedDayColor_buf = (focusedDayColor_buf_ as Color | number | string | Resource) + focusedDayColor_buf = (focusedDayColor_buf_ as Color | int32 | string | Resource) } const focusedDayColor_result : ResourceColor | undefined = focusedDayColor_buf const focusedLunarColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21066,7 +21066,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for focusedLunarColor_buf_ has to be chosen through deserialisation.") } - focusedLunarColor_buf = (focusedLunarColor_buf_ as Color | number | string | Resource) + focusedLunarColor_buf = (focusedLunarColor_buf_ as Color | int32 | string | Resource) } const focusedLunarColor_result : ResourceColor | undefined = focusedLunarColor_buf const focusedAreaBackgroundColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21090,7 +21090,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for focusedAreaBackgroundColor_buf_ has to be chosen through deserialisation.") } - focusedAreaBackgroundColor_buf = (focusedAreaBackgroundColor_buf_ as Color | number | string | Resource) + focusedAreaBackgroundColor_buf = (focusedAreaBackgroundColor_buf_ as Color | int32 | string | Resource) } const focusedAreaBackgroundColor_result : ResourceColor | undefined = focusedAreaBackgroundColor_buf const focusedAreaRadius_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21252,7 +21252,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for typing_buf_ has to be chosen through deserialisation.") } - typing_buf = (typing_buf_ as Color | number | string | Resource) + typing_buf = (typing_buf_ as Color | int32 | string | Resource) } const typing_result : ResourceColor | undefined = typing_buf const normal_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21276,7 +21276,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for normal_buf_ has to be chosen through deserialisation.") } - normal_buf = (normal_buf_ as Color | number | string | Resource) + normal_buf = (normal_buf_ as Color | int32 | string | Resource) } const normal_result : ResourceColor | undefined = normal_buf const error_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21300,7 +21300,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for error_buf_ has to be chosen through deserialisation.") } - error_buf = (error_buf_ as Color | number | string | Resource) + error_buf = (error_buf_ as Color | int32 | string | Resource) } const error_result : ResourceColor | undefined = error_buf const disable_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21324,7 +21324,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for disable_buf_ has to be chosen through deserialisation.") } - disable_buf = (disable_buf_ as Color | number | string | Resource) + disable_buf = (disable_buf_ as Color | int32 | string | Resource) } const disable_result : ResourceColor | undefined = disable_buf let value : UnderlineColor = ({typing: typing_result, normal: normal_result, error: error_result, disable: disable_result} as UnderlineColor) @@ -21439,7 +21439,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for weekColor_buf_ has to be chosen through deserialisation.") } - weekColor_buf = (weekColor_buf_ as Color | number | string | Resource) + weekColor_buf = (weekColor_buf_ as Color | int32 | string | Resource) } const weekColor_result : ResourceColor | undefined = weekColor_buf const weekendDayColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21463,7 +21463,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for weekendDayColor_buf_ has to be chosen through deserialisation.") } - weekendDayColor_buf = (weekendDayColor_buf_ as Color | number | string | Resource) + weekendDayColor_buf = (weekendDayColor_buf_ as Color | int32 | string | Resource) } const weekendDayColor_result : ResourceColor | undefined = weekendDayColor_buf const weekendLunarColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21487,7 +21487,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for weekendLunarColor_buf_ has to be chosen through deserialisation.") } - weekendLunarColor_buf = (weekendLunarColor_buf_ as Color | number | string | Resource) + weekendLunarColor_buf = (weekendLunarColor_buf_ as Color | int32 | string | Resource) } const weekendLunarColor_result : ResourceColor | undefined = weekendLunarColor_buf const weekFontSize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21544,7 +21544,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for workDayMarkColor_buf_ has to be chosen through deserialisation.") } - workDayMarkColor_buf = (workDayMarkColor_buf_ as Color | number | string | Resource) + workDayMarkColor_buf = (workDayMarkColor_buf_ as Color | int32 | string | Resource) } const workDayMarkColor_result : ResourceColor | undefined = workDayMarkColor_buf const offDayMarkColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21568,7 +21568,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for offDayMarkColor_buf_ has to be chosen through deserialisation.") } - offDayMarkColor_buf = (offDayMarkColor_buf_ as Color | number | string | Resource) + offDayMarkColor_buf = (offDayMarkColor_buf_ as Color | int32 | string | Resource) } const offDayMarkColor_result : ResourceColor | undefined = offDayMarkColor_buf const workDayMarkSize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21762,7 +21762,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -21880,7 +21880,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for borderColor_buf__u has to be chosen through deserialisation.") } - borderColor_buf_ = (borderColor_buf__u as Color | number | string | Resource) + borderColor_buf_ = (borderColor_buf__u as Color | int32 | string | Resource) } else if (borderColor_buf__selector == 1) { borderColor_buf_ = valueDeserializer.readEdgeColors() @@ -22084,7 +22084,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const textColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -22108,7 +22108,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for textColor_buf_ has to be chosen through deserialisation.") } - textColor_buf = (textColor_buf_ as Color | number | string | Resource) + textColor_buf = (textColor_buf_ as Color | int32 | string | Resource) } const textColor_result : ResourceColor | undefined = textColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -22280,7 +22280,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -22398,7 +22398,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for borderColor_buf__u has to be chosen through deserialisation.") } - borderColor_buf_ = (borderColor_buf__u as Color | number | string | Resource) + borderColor_buf_ = (borderColor_buf__u as Color | int32 | string | Resource) } else if (borderColor_buf__selector == 1) { borderColor_buf_ = valueDeserializer.readEdgeColors() @@ -22657,7 +22657,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -22775,7 +22775,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for borderColor_buf__u has to be chosen through deserialisation.") } - borderColor_buf_ = (borderColor_buf__u as Color | number | string | Resource) + borderColor_buf_ = (borderColor_buf__u as Color | int32 | string | Resource) } else if (borderColor_buf__selector == 1) { borderColor_buf_ = valueDeserializer.readEdgeColors() @@ -23039,7 +23039,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -23157,7 +23157,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for borderColor_buf__u has to be chosen through deserialisation.") } - borderColor_buf_ = (borderColor_buf__u as Color | number | string | Resource) + borderColor_buf_ = (borderColor_buf__u as Color | int32 | string | Resource) } else if (borderColor_buf__selector == 1) { borderColor_buf_ = valueDeserializer.readEdgeColors() @@ -23549,7 +23549,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf__u has to be chosen through deserialisation.") } - color_buf_ = (color_buf__u as Color | number | string | Resource) + color_buf_ = (color_buf__u as Color | int32 | string | Resource) } else if (color_buf__selector == 2) { color_buf_ = valueDeserializer.readLocalizedEdgeColors() @@ -23779,7 +23779,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -23936,7 +23936,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for borderColor_buf_ has to be chosen through deserialisation.") } - borderColor_buf = (borderColor_buf_ as Color | number | string | Resource) + borderColor_buf = (borderColor_buf_ as Color | int32 | string | Resource) } const borderColor_result : ResourceColor | undefined = borderColor_buf const borderWidth_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -23981,7 +23981,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf_ has to be chosen through deserialisation.") } - fontColor_buf = (fontColor_buf_ as Color | number | string | Resource) + fontColor_buf = (fontColor_buf_ as Color | int32 | string | Resource) } const fontColor_result : ResourceColor | undefined = fontColor_buf const showDefaultPercentage_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -24072,7 +24072,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for maskColor_buf_ has to be chosen through deserialisation.") } - maskColor_buf = (maskColor_buf_ as Color | number | string | Resource) + maskColor_buf = (maskColor_buf_ as Color | int32 | string | Resource) } const maskColor_result : ResourceColor | undefined = maskColor_buf const maskRect_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -24124,7 +24124,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const cornerRadius_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -24215,7 +24215,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for borderColor_buf__u has to be chosen through deserialisation.") } - borderColor_buf_ = (borderColor_buf__u as Color | number | string | Resource) + borderColor_buf_ = (borderColor_buf__u as Color | int32 | string | Resource) } else if (borderColor_buf__selector == 1) { borderColor_buf_ = valueDeserializer.readEdgeColors() @@ -24485,7 +24485,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for mask_buf__u_color_buf has to be chosen through deserialisation.") } - const mask_buf__u_color : ResourceColor = (mask_buf__u_color_buf as Color | number | string | Resource) + const mask_buf__u_color : ResourceColor = (mask_buf__u_color_buf as Color | int32 | string | Resource) mask_buf_ = ({color: mask_buf__u_color} as PopupMaskType) } else { @@ -24924,7 +24924,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for selectedColor_buf_ has to be chosen through deserialisation.") } - selectedColor_buf = (selectedColor_buf_ as Color | number | string | Resource) + selectedColor_buf = (selectedColor_buf_ as Color | int32 | string | Resource) } const selectedColor_result : ResourceColor | undefined = selectedColor_buf const unselectedColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -24948,7 +24948,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for unselectedColor_buf_ has to be chosen through deserialisation.") } - unselectedColor_buf = (unselectedColor_buf_ as Color | number | string | Resource) + unselectedColor_buf = (unselectedColor_buf_ as Color | int32 | string | Resource) } const unselectedColor_result : ResourceColor | undefined = unselectedColor_buf let value : LabelStyle = ({overflow: overflow_result, maxLines: maxLines_result, minFontSize: minFontSize_result, maxFontSize: maxFontSize_result, heightAdaptivePolicy: heightAdaptivePolicy_result, font: font_result, selectedColor: selectedColor_result, unselectedColor: unselectedColor_result} as LabelStyle) @@ -25063,7 +25063,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for selectedColor_buf_ has to be chosen through deserialisation.") } - selectedColor_buf = (selectedColor_buf_ as Color | number | string | Resource) + selectedColor_buf = (selectedColor_buf_ as Color | int32 | string | Resource) } const selectedColor_result : ResourceColor | undefined = selectedColor_buf const unselectedColor_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -25087,7 +25087,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for unselectedColor_buf_ has to be chosen through deserialisation.") } - unselectedColor_buf = (unselectedColor_buf_ as Color | number | string | Resource) + unselectedColor_buf = (unselectedColor_buf_ as Color | int32 | string | Resource) } const unselectedColor_result : ResourceColor | undefined = unselectedColor_buf let value : TabBarLabelStyle = ({overflow: overflow_result, maxLines: maxLines_result, minFontSize: minFontSize_result, maxFontSize: maxFontSize_result, heightAdaptivePolicy: heightAdaptivePolicy_result, font: font_result, selectedColor: selectedColor_result, unselectedColor: unselectedColor_result} as TabBarLabelStyle) @@ -25137,7 +25137,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf__u has to be chosen through deserialisation.") } - color_buf_ = (color_buf__u as Color | number | string | Resource) + color_buf_ = (color_buf__u as Color | int32 | string | Resource) } else if (color_buf__selector == 1) { color_buf_ = valueDeserializer.readEdgeColors() @@ -25259,7 +25259,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -25375,7 +25375,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf__u has to be chosen through deserialisation.") } - color_buf_ = (color_buf__u as Color | number | string | Resource) + color_buf_ = (color_buf__u as Color | int32 | string | Resource) } else if (color_buf__selector == 2) { color_buf_ = valueDeserializer.readLocalizedEdgeColors() @@ -25448,7 +25448,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const font_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -25491,7 +25491,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf_ has to be chosen through deserialisation.") } - fontColor_buf = (fontColor_buf_ as Color | number | string | Resource) + fontColor_buf = (fontColor_buf_ as Color | int32 | string | Resource) } const fontColor_result : ResourceColor | undefined = fontColor_buf let value : PlaceholderStyle = ({font: font_result, fontColor: fontColor_result} as PlaceholderStyle) @@ -25546,7 +25546,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for textColor_buf_ has to be chosen through deserialisation.") } - textColor_buf = (textColor_buf_ as Color | number | string | Resource) + textColor_buf = (textColor_buf_ as Color | int32 | string | Resource) } const textColor_result : ResourceColor | undefined = textColor_buf const font_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -25735,7 +25735,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf_ has to be chosen through deserialisation.") } - fontColor_buf = (fontColor_buf_ as Color | number | string | Resource) + fontColor_buf = (fontColor_buf_ as Color | int32 | string | Resource) } const fontColor_result : ResourceColor | undefined = fontColor_buf const fontSize_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -25914,7 +25914,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for fontColor_buf has to be chosen through deserialisation.") } - const fontColor_result : ResourceColor = (fontColor_buf as Color | number | string | Resource) + const fontColor_result : ResourceColor = (fontColor_buf as Color | int32 | string | Resource) const fontSize_result : number = (valueDeserializer.readNumber() as number) const fontStyle_result : FontStyle = TypeChecker.FontStyle_FromNumeric(valueDeserializer.readInt32()) const fontWeight_result : number = (valueDeserializer.readNumber() as number) @@ -26040,7 +26040,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const onAppear_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -26117,7 +26117,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for maskColor_buf_ has to be chosen through deserialisation.") } - maskColor_buf = (maskColor_buf_ as Color | number | string | Resource) + maskColor_buf = (maskColor_buf_ as Color | int32 | string | Resource) } const maskColor_result : ResourceColor | undefined = maskColor_buf const detents_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -26305,7 +26305,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for borderColor_buf__u has to be chosen through deserialisation.") } - borderColor_buf_ = (borderColor_buf__u as Color | number | string | Resource) + borderColor_buf_ = (borderColor_buf__u as Color | int32 | string | Resource) } else if (borderColor_buf__selector == 1) { borderColor_buf_ = valueDeserializer.readEdgeColors() @@ -26603,7 +26603,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const decoration_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -26639,7 +26639,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for color_buf_ has to be chosen through deserialisation.") } - color_buf = (color_buf_ as Color | number | string | Resource) + color_buf = (color_buf_ as Color | int32 | string | Resource) } const color_result : ResourceColor | undefined = color_buf const font_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -26857,7 +26857,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -26919,7 +26919,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for outlineColor_buf__u has to be chosen through deserialisation.") } - outlineColor_buf_ = (outlineColor_buf__u as Color | number | string | Resource) + outlineColor_buf_ = (outlineColor_buf__u as Color | int32 | string | Resource) } else if (outlineColor_buf__selector == 1) { outlineColor_buf_ = valueDeserializer.readEdgeColors() @@ -27135,7 +27135,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -27389,7 +27389,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -27451,7 +27451,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for outlineColor_buf__u has to be chosen through deserialisation.") } - outlineColor_buf_ = (outlineColor_buf__u as Color | number | string | Resource) + outlineColor_buf_ = (outlineColor_buf__u as Color | int32 | string | Resource) } else if (outlineColor_buf__selector == 1) { outlineColor_buf_ = valueDeserializer.readEdgeColors() @@ -27550,7 +27550,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -27680,7 +27680,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for mask_buf__u_color_buf has to be chosen through deserialisation.") } - const mask_buf__u_color : ResourceColor = (mask_buf__u_color_buf as Color | number | string | Resource) + const mask_buf__u_color : ResourceColor = (mask_buf__u_color_buf as Color | int32 | string | Resource) mask_buf_ = ({color: mask_buf__u_color} as PopupMaskType) } else { @@ -28324,7 +28324,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) @@ -28560,7 +28560,7 @@ export class Deserializer extends DeserializerBase { else { throw new Error("One of the branches for backgroundColor_buf_ has to be chosen through deserialisation.") } - backgroundColor_buf = (backgroundColor_buf_ as Color | number | string | Resource) + backgroundColor_buf = (backgroundColor_buf_ as Color | int32 | string | Resource) } const backgroundColor_result : ResourceColor | undefined = backgroundColor_buf const backgroundBlurStyle_buf_runtimeType = (valueDeserializer.readInt8() as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Serializer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Serializer.ts index 30b3759e96bbb4f5e7a1649669142e15d24caec4..f038d975e46ab885f2874f3060c8582e0623043d 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Serializer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Serializer.ts @@ -96,7 +96,7 @@ import { Matrix2D, Matrix2DInternal } from "./../matrix2d" import { ColorMode, LayoutDirection } from "./../stateManagement" import { Component3DAttribute, ModelType, SceneOptions } from "./../component3d" import { CustomDialogController, CustomDialogControllerInternal, CustomDialogControllerOptions, CustomDialogControllerExternalOptions } from "./../customDialogController" -import { DrawContext, Rect, LengthMetricsUnit, LengthUnit, ShapeClip, RoundRect, Circle, CommandPath, ShapeMask, Size, Vector2, Vector3, Corners, CornerRadius, Edges as EdgesT, Frame, Matrix4, LengthMetrics, Position as GraphicsPosition, ColorMetrics } from "./../../Graphics" +import { DrawContext, Rect, LengthMetricsUnit, LengthUnit, ShapeClip, RoundRect, Circle, CommandPath, ShapeMask, Size, Vector2, Vector3, Corners, CornerRadius, NodeEdges as EdgesT, Frame, Matrix4, LengthMetrics, NodePosition as GraphicsPosition, ColorMetrics } from "./../../Graphics" import { DataOperationType } from "./../lazyForEach" import { DataPanelType, LinearGradient, LinearGradientInternal, ColorStop, DataPanelOptions, DataPanelShadowOptions } from "./../dataPanel" import { DatePickerMode, Callback_DatePickerResult_Void, DatePickerResult, DatePickerOptions, LunarSwitchStyle, DatePickerDialogOptions } from "./../datePicker" @@ -1309,8 +1309,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_popupColor_value_type) { valueSerializer.writeInt8(3 as int32) - const value_popupColor_value_3 = value_popupColor_value as number - valueSerializer.writeNumber(value_popupColor_value_3) + const value_popupColor_value_3 = value_popupColor_value as int32 + valueSerializer.writeInt32(value_popupColor_value_3) } } const value_enableArrow = value.enableArrow @@ -1379,8 +1379,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_mask_value_1_color_type) { valueSerializer.writeInt8(1 as int32) - const value_mask_value_1_color_1 = value_mask_value_1_color as number - valueSerializer.writeNumber(value_mask_value_1_color_1) + const value_mask_value_1_color_1 = value_mask_value_1_color as int32 + valueSerializer.writeInt32(value_mask_value_1_color_1) } else if (RuntimeType.STRING == value_mask_value_1_color_type) { valueSerializer.writeInt8(2 as int32) @@ -4009,8 +4009,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_colors_element_0_type) { valueSerializer.writeInt8(1 as int32) - const value_colors_element_0_1 = value_colors_element_0 as number - valueSerializer.writeNumber(value_colors_element_0_1) + const value_colors_element_0_1 = value_colors_element_0 as int32 + valueSerializer.writeInt32(value_colors_element_0_1) } else if (RuntimeType.STRING == value_colors_element_0_type) { valueSerializer.writeInt8(2 as int32) @@ -5535,8 +5535,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_colors_element_0_type) { valueSerializer.writeInt8(1 as int32) - const value_colors_element_0_1 = value_colors_element_0 as number - valueSerializer.writeNumber(value_colors_element_0_1) + const value_colors_element_0_1 = value_colors_element_0 as int32 + valueSerializer.writeInt32(value_colors_element_0_1) } else if (RuntimeType.STRING == value_colors_element_0_type) { valueSerializer.writeInt8(2 as int32) @@ -6991,8 +6991,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_colors_element_0_type) { valueSerializer.writeInt8(1 as int32) - const value_colors_element_0_1 = value_colors_element_0 as number - valueSerializer.writeNumber(value_colors_element_0_1) + const value_colors_element_0_1 = value_colors_element_0 as int32 + valueSerializer.writeInt32(value_colors_element_0_1) } else if (RuntimeType.STRING == value_colors_element_0_type) { valueSerializer.writeInt8(2 as int32) @@ -8290,8 +8290,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_value_1 = value_fontColor_value as number - valueSerializer.writeNumber(value_fontColor_value_1) + const value_fontColor_value_1 = value_fontColor_value as int32 + valueSerializer.writeInt32(value_fontColor_value_1) } else if (RuntimeType.STRING == value_fontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8319,8 +8319,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8390,8 +8390,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_value_1 = value_fontColor_value as number - valueSerializer.writeNumber(value_fontColor_value_1) + const value_fontColor_value_1 = value_fontColor_value as int32 + valueSerializer.writeInt32(value_fontColor_value_1) } else if (RuntimeType.STRING == value_fontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8419,8 +8419,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8664,8 +8664,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8701,8 +8701,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_arrowColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_arrowColor_value_1 = value_arrowColor_value as number - valueSerializer.writeNumber(value_arrowColor_value_1) + const value_arrowColor_value_1 = value_arrowColor_value as int32 + valueSerializer.writeInt32(value_arrowColor_value_1) } else if (RuntimeType.STRING == value_arrowColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8773,8 +8773,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_inactiveColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_inactiveColor_value_1 = value_inactiveColor_value as number - valueSerializer.writeNumber(value_inactiveColor_value_1) + const value_inactiveColor_value_1 = value_inactiveColor_value as int32 + valueSerializer.writeInt32(value_inactiveColor_value_1) } else if (RuntimeType.STRING == value_inactiveColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8823,8 +8823,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8876,8 +8876,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_inactiveColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_inactiveColor_value_1 = value_inactiveColor_value as number - valueSerializer.writeNumber(value_inactiveColor_value_1) + const value_inactiveColor_value_1 = value_inactiveColor_value as int32 + valueSerializer.writeInt32(value_inactiveColor_value_1) } else if (RuntimeType.STRING == value_inactiveColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8908,8 +8908,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -8975,8 +8975,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_badgeColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_badgeColor_value_1 = value_badgeColor_value as number - valueSerializer.writeNumber(value_badgeColor_value_1) + const value_badgeColor_value_1 = value_badgeColor_value as int32 + valueSerializer.writeInt32(value_badgeColor_value_1) } else if (RuntimeType.STRING == value_badgeColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9004,8 +9004,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_borderColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_borderColor_value_1 = value_borderColor_value as number - valueSerializer.writeNumber(value_borderColor_value_1) + const value_borderColor_value_1 = value_borderColor_value as int32 + valueSerializer.writeInt32(value_borderColor_value_1) } else if (RuntimeType.STRING == value_borderColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9205,8 +9205,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9237,8 +9237,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9288,8 +9288,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_type) { valueSerializer.writeInt8(1 as int32) - const value_color_1 = value_color as number - valueSerializer.writeNumber(value_color_1) + const value_color_1 = value_color as int32 + valueSerializer.writeInt32(value_color_1) } else if (RuntimeType.STRING == value_color_type) { valueSerializer.writeInt8(2 as int32) @@ -9371,8 +9371,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9492,8 +9492,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_dayColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_dayColor_value_1 = value_dayColor_value as number - valueSerializer.writeNumber(value_dayColor_value_1) + const value_dayColor_value_1 = value_dayColor_value as int32 + valueSerializer.writeInt32(value_dayColor_value_1) } else if (RuntimeType.STRING == value_dayColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9521,8 +9521,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_lunarColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_lunarColor_value_1 = value_lunarColor_value as number - valueSerializer.writeNumber(value_lunarColor_value_1) + const value_lunarColor_value_1 = value_lunarColor_value as int32 + valueSerializer.writeInt32(value_lunarColor_value_1) } else if (RuntimeType.STRING == value_lunarColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9550,8 +9550,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_markLunarColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_markLunarColor_value_1 = value_markLunarColor_value as number - valueSerializer.writeNumber(value_markLunarColor_value_1) + const value_markLunarColor_value_1 = value_markLunarColor_value as int32 + valueSerializer.writeInt32(value_markLunarColor_value_1) } else if (RuntimeType.STRING == value_markLunarColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9742,8 +9742,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_brand_value_type) { valueSerializer.writeInt8(1 as int32) - const value_brand_value_1 = value_brand_value as number - valueSerializer.writeNumber(value_brand_value_1) + const value_brand_value_1 = value_brand_value as int32 + valueSerializer.writeInt32(value_brand_value_1) } else if (RuntimeType.STRING == value_brand_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9771,8 +9771,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_warning_value_type) { valueSerializer.writeInt8(1 as int32) - const value_warning_value_1 = value_warning_value as number - valueSerializer.writeNumber(value_warning_value_1) + const value_warning_value_1 = value_warning_value as int32 + valueSerializer.writeInt32(value_warning_value_1) } else if (RuntimeType.STRING == value_warning_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9800,8 +9800,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_alert_value_type) { valueSerializer.writeInt8(1 as int32) - const value_alert_value_1 = value_alert_value as number - valueSerializer.writeNumber(value_alert_value_1) + const value_alert_value_1 = value_alert_value as int32 + valueSerializer.writeInt32(value_alert_value_1) } else if (RuntimeType.STRING == value_alert_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9829,8 +9829,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_confirm_value_type) { valueSerializer.writeInt8(1 as int32) - const value_confirm_value_1 = value_confirm_value as number - valueSerializer.writeNumber(value_confirm_value_1) + const value_confirm_value_1 = value_confirm_value as int32 + valueSerializer.writeInt32(value_confirm_value_1) } else if (RuntimeType.STRING == value_confirm_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9858,8 +9858,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontPrimary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontPrimary_value_1 = value_fontPrimary_value as number - valueSerializer.writeNumber(value_fontPrimary_value_1) + const value_fontPrimary_value_1 = value_fontPrimary_value as int32 + valueSerializer.writeInt32(value_fontPrimary_value_1) } else if (RuntimeType.STRING == value_fontPrimary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9887,8 +9887,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontSecondary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontSecondary_value_1 = value_fontSecondary_value as number - valueSerializer.writeNumber(value_fontSecondary_value_1) + const value_fontSecondary_value_1 = value_fontSecondary_value as int32 + valueSerializer.writeInt32(value_fontSecondary_value_1) } else if (RuntimeType.STRING == value_fontSecondary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9916,8 +9916,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontTertiary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontTertiary_value_1 = value_fontTertiary_value as number - valueSerializer.writeNumber(value_fontTertiary_value_1) + const value_fontTertiary_value_1 = value_fontTertiary_value as int32 + valueSerializer.writeInt32(value_fontTertiary_value_1) } else if (RuntimeType.STRING == value_fontTertiary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9945,8 +9945,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontFourth_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontFourth_value_1 = value_fontFourth_value as number - valueSerializer.writeNumber(value_fontFourth_value_1) + const value_fontFourth_value_1 = value_fontFourth_value as int32 + valueSerializer.writeInt32(value_fontFourth_value_1) } else if (RuntimeType.STRING == value_fontFourth_value_type) { valueSerializer.writeInt8(2 as int32) @@ -9974,8 +9974,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontEmphasize_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontEmphasize_value_1 = value_fontEmphasize_value as number - valueSerializer.writeNumber(value_fontEmphasize_value_1) + const value_fontEmphasize_value_1 = value_fontEmphasize_value as int32 + valueSerializer.writeInt32(value_fontEmphasize_value_1) } else if (RuntimeType.STRING == value_fontEmphasize_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10003,8 +10003,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontOnPrimary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontOnPrimary_value_1 = value_fontOnPrimary_value as number - valueSerializer.writeNumber(value_fontOnPrimary_value_1) + const value_fontOnPrimary_value_1 = value_fontOnPrimary_value as int32 + valueSerializer.writeInt32(value_fontOnPrimary_value_1) } else if (RuntimeType.STRING == value_fontOnPrimary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10032,8 +10032,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontOnSecondary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontOnSecondary_value_1 = value_fontOnSecondary_value as number - valueSerializer.writeNumber(value_fontOnSecondary_value_1) + const value_fontOnSecondary_value_1 = value_fontOnSecondary_value as int32 + valueSerializer.writeInt32(value_fontOnSecondary_value_1) } else if (RuntimeType.STRING == value_fontOnSecondary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10061,8 +10061,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontOnTertiary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontOnTertiary_value_1 = value_fontOnTertiary_value as number - valueSerializer.writeNumber(value_fontOnTertiary_value_1) + const value_fontOnTertiary_value_1 = value_fontOnTertiary_value as int32 + valueSerializer.writeInt32(value_fontOnTertiary_value_1) } else if (RuntimeType.STRING == value_fontOnTertiary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10090,8 +10090,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontOnFourth_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontOnFourth_value_1 = value_fontOnFourth_value as number - valueSerializer.writeNumber(value_fontOnFourth_value_1) + const value_fontOnFourth_value_1 = value_fontOnFourth_value as int32 + valueSerializer.writeInt32(value_fontOnFourth_value_1) } else if (RuntimeType.STRING == value_fontOnFourth_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10119,8 +10119,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconPrimary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconPrimary_value_1 = value_iconPrimary_value as number - valueSerializer.writeNumber(value_iconPrimary_value_1) + const value_iconPrimary_value_1 = value_iconPrimary_value as int32 + valueSerializer.writeInt32(value_iconPrimary_value_1) } else if (RuntimeType.STRING == value_iconPrimary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10148,8 +10148,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconSecondary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconSecondary_value_1 = value_iconSecondary_value as number - valueSerializer.writeNumber(value_iconSecondary_value_1) + const value_iconSecondary_value_1 = value_iconSecondary_value as int32 + valueSerializer.writeInt32(value_iconSecondary_value_1) } else if (RuntimeType.STRING == value_iconSecondary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10177,8 +10177,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconTertiary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconTertiary_value_1 = value_iconTertiary_value as number - valueSerializer.writeNumber(value_iconTertiary_value_1) + const value_iconTertiary_value_1 = value_iconTertiary_value as int32 + valueSerializer.writeInt32(value_iconTertiary_value_1) } else if (RuntimeType.STRING == value_iconTertiary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10206,8 +10206,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconFourth_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconFourth_value_1 = value_iconFourth_value as number - valueSerializer.writeNumber(value_iconFourth_value_1) + const value_iconFourth_value_1 = value_iconFourth_value as int32 + valueSerializer.writeInt32(value_iconFourth_value_1) } else if (RuntimeType.STRING == value_iconFourth_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10235,8 +10235,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconEmphasize_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconEmphasize_value_1 = value_iconEmphasize_value as number - valueSerializer.writeNumber(value_iconEmphasize_value_1) + const value_iconEmphasize_value_1 = value_iconEmphasize_value as int32 + valueSerializer.writeInt32(value_iconEmphasize_value_1) } else if (RuntimeType.STRING == value_iconEmphasize_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10264,8 +10264,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconSubEmphasize_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconSubEmphasize_value_1 = value_iconSubEmphasize_value as number - valueSerializer.writeNumber(value_iconSubEmphasize_value_1) + const value_iconSubEmphasize_value_1 = value_iconSubEmphasize_value as int32 + valueSerializer.writeInt32(value_iconSubEmphasize_value_1) } else if (RuntimeType.STRING == value_iconSubEmphasize_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10293,8 +10293,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconOnPrimary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconOnPrimary_value_1 = value_iconOnPrimary_value as number - valueSerializer.writeNumber(value_iconOnPrimary_value_1) + const value_iconOnPrimary_value_1 = value_iconOnPrimary_value as int32 + valueSerializer.writeInt32(value_iconOnPrimary_value_1) } else if (RuntimeType.STRING == value_iconOnPrimary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10322,8 +10322,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconOnSecondary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconOnSecondary_value_1 = value_iconOnSecondary_value as number - valueSerializer.writeNumber(value_iconOnSecondary_value_1) + const value_iconOnSecondary_value_1 = value_iconOnSecondary_value as int32 + valueSerializer.writeInt32(value_iconOnSecondary_value_1) } else if (RuntimeType.STRING == value_iconOnSecondary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10351,8 +10351,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconOnTertiary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconOnTertiary_value_1 = value_iconOnTertiary_value as number - valueSerializer.writeNumber(value_iconOnTertiary_value_1) + const value_iconOnTertiary_value_1 = value_iconOnTertiary_value as int32 + valueSerializer.writeInt32(value_iconOnTertiary_value_1) } else if (RuntimeType.STRING == value_iconOnTertiary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10380,8 +10380,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_iconOnFourth_value_type) { valueSerializer.writeInt8(1 as int32) - const value_iconOnFourth_value_1 = value_iconOnFourth_value as number - valueSerializer.writeNumber(value_iconOnFourth_value_1) + const value_iconOnFourth_value_1 = value_iconOnFourth_value as int32 + valueSerializer.writeInt32(value_iconOnFourth_value_1) } else if (RuntimeType.STRING == value_iconOnFourth_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10409,8 +10409,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundPrimary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundPrimary_value_1 = value_backgroundPrimary_value as number - valueSerializer.writeNumber(value_backgroundPrimary_value_1) + const value_backgroundPrimary_value_1 = value_backgroundPrimary_value as int32 + valueSerializer.writeInt32(value_backgroundPrimary_value_1) } else if (RuntimeType.STRING == value_backgroundPrimary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10438,8 +10438,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundSecondary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundSecondary_value_1 = value_backgroundSecondary_value as number - valueSerializer.writeNumber(value_backgroundSecondary_value_1) + const value_backgroundSecondary_value_1 = value_backgroundSecondary_value as int32 + valueSerializer.writeInt32(value_backgroundSecondary_value_1) } else if (RuntimeType.STRING == value_backgroundSecondary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10467,8 +10467,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundTertiary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundTertiary_value_1 = value_backgroundTertiary_value as number - valueSerializer.writeNumber(value_backgroundTertiary_value_1) + const value_backgroundTertiary_value_1 = value_backgroundTertiary_value as int32 + valueSerializer.writeInt32(value_backgroundTertiary_value_1) } else if (RuntimeType.STRING == value_backgroundTertiary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10496,8 +10496,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundFourth_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundFourth_value_1 = value_backgroundFourth_value as number - valueSerializer.writeNumber(value_backgroundFourth_value_1) + const value_backgroundFourth_value_1 = value_backgroundFourth_value as int32 + valueSerializer.writeInt32(value_backgroundFourth_value_1) } else if (RuntimeType.STRING == value_backgroundFourth_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10525,8 +10525,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundEmphasize_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundEmphasize_value_1 = value_backgroundEmphasize_value as number - valueSerializer.writeNumber(value_backgroundEmphasize_value_1) + const value_backgroundEmphasize_value_1 = value_backgroundEmphasize_value as int32 + valueSerializer.writeInt32(value_backgroundEmphasize_value_1) } else if (RuntimeType.STRING == value_backgroundEmphasize_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10554,8 +10554,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compForegroundPrimary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compForegroundPrimary_value_1 = value_compForegroundPrimary_value as number - valueSerializer.writeNumber(value_compForegroundPrimary_value_1) + const value_compForegroundPrimary_value_1 = value_compForegroundPrimary_value as int32 + valueSerializer.writeInt32(value_compForegroundPrimary_value_1) } else if (RuntimeType.STRING == value_compForegroundPrimary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10583,8 +10583,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compBackgroundPrimary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compBackgroundPrimary_value_1 = value_compBackgroundPrimary_value as number - valueSerializer.writeNumber(value_compBackgroundPrimary_value_1) + const value_compBackgroundPrimary_value_1 = value_compBackgroundPrimary_value as int32 + valueSerializer.writeInt32(value_compBackgroundPrimary_value_1) } else if (RuntimeType.STRING == value_compBackgroundPrimary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10612,8 +10612,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compBackgroundPrimaryTran_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compBackgroundPrimaryTran_value_1 = value_compBackgroundPrimaryTran_value as number - valueSerializer.writeNumber(value_compBackgroundPrimaryTran_value_1) + const value_compBackgroundPrimaryTran_value_1 = value_compBackgroundPrimaryTran_value as int32 + valueSerializer.writeInt32(value_compBackgroundPrimaryTran_value_1) } else if (RuntimeType.STRING == value_compBackgroundPrimaryTran_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10641,8 +10641,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compBackgroundPrimaryContrary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compBackgroundPrimaryContrary_value_1 = value_compBackgroundPrimaryContrary_value as number - valueSerializer.writeNumber(value_compBackgroundPrimaryContrary_value_1) + const value_compBackgroundPrimaryContrary_value_1 = value_compBackgroundPrimaryContrary_value as int32 + valueSerializer.writeInt32(value_compBackgroundPrimaryContrary_value_1) } else if (RuntimeType.STRING == value_compBackgroundPrimaryContrary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10670,8 +10670,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compBackgroundGray_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compBackgroundGray_value_1 = value_compBackgroundGray_value as number - valueSerializer.writeNumber(value_compBackgroundGray_value_1) + const value_compBackgroundGray_value_1 = value_compBackgroundGray_value as int32 + valueSerializer.writeInt32(value_compBackgroundGray_value_1) } else if (RuntimeType.STRING == value_compBackgroundGray_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10699,8 +10699,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compBackgroundSecondary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compBackgroundSecondary_value_1 = value_compBackgroundSecondary_value as number - valueSerializer.writeNumber(value_compBackgroundSecondary_value_1) + const value_compBackgroundSecondary_value_1 = value_compBackgroundSecondary_value as int32 + valueSerializer.writeInt32(value_compBackgroundSecondary_value_1) } else if (RuntimeType.STRING == value_compBackgroundSecondary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10728,8 +10728,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compBackgroundTertiary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compBackgroundTertiary_value_1 = value_compBackgroundTertiary_value as number - valueSerializer.writeNumber(value_compBackgroundTertiary_value_1) + const value_compBackgroundTertiary_value_1 = value_compBackgroundTertiary_value as int32 + valueSerializer.writeInt32(value_compBackgroundTertiary_value_1) } else if (RuntimeType.STRING == value_compBackgroundTertiary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10757,8 +10757,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compBackgroundEmphasize_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compBackgroundEmphasize_value_1 = value_compBackgroundEmphasize_value as number - valueSerializer.writeNumber(value_compBackgroundEmphasize_value_1) + const value_compBackgroundEmphasize_value_1 = value_compBackgroundEmphasize_value as int32 + valueSerializer.writeInt32(value_compBackgroundEmphasize_value_1) } else if (RuntimeType.STRING == value_compBackgroundEmphasize_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10786,8 +10786,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compBackgroundNeutral_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compBackgroundNeutral_value_1 = value_compBackgroundNeutral_value as number - valueSerializer.writeNumber(value_compBackgroundNeutral_value_1) + const value_compBackgroundNeutral_value_1 = value_compBackgroundNeutral_value as int32 + valueSerializer.writeInt32(value_compBackgroundNeutral_value_1) } else if (RuntimeType.STRING == value_compBackgroundNeutral_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10815,8 +10815,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compEmphasizeSecondary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compEmphasizeSecondary_value_1 = value_compEmphasizeSecondary_value as number - valueSerializer.writeNumber(value_compEmphasizeSecondary_value_1) + const value_compEmphasizeSecondary_value_1 = value_compEmphasizeSecondary_value as int32 + valueSerializer.writeInt32(value_compEmphasizeSecondary_value_1) } else if (RuntimeType.STRING == value_compEmphasizeSecondary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10844,8 +10844,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compEmphasizeTertiary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compEmphasizeTertiary_value_1 = value_compEmphasizeTertiary_value as number - valueSerializer.writeNumber(value_compEmphasizeTertiary_value_1) + const value_compEmphasizeTertiary_value_1 = value_compEmphasizeTertiary_value as int32 + valueSerializer.writeInt32(value_compEmphasizeTertiary_value_1) } else if (RuntimeType.STRING == value_compEmphasizeTertiary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10873,8 +10873,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compDivider_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compDivider_value_1 = value_compDivider_value as number - valueSerializer.writeNumber(value_compDivider_value_1) + const value_compDivider_value_1 = value_compDivider_value as int32 + valueSerializer.writeInt32(value_compDivider_value_1) } else if (RuntimeType.STRING == value_compDivider_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10902,8 +10902,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compCommonContrary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compCommonContrary_value_1 = value_compCommonContrary_value as number - valueSerializer.writeNumber(value_compCommonContrary_value_1) + const value_compCommonContrary_value_1 = value_compCommonContrary_value as int32 + valueSerializer.writeInt32(value_compCommonContrary_value_1) } else if (RuntimeType.STRING == value_compCommonContrary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10931,8 +10931,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compBackgroundFocus_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compBackgroundFocus_value_1 = value_compBackgroundFocus_value as number - valueSerializer.writeNumber(value_compBackgroundFocus_value_1) + const value_compBackgroundFocus_value_1 = value_compBackgroundFocus_value as int32 + valueSerializer.writeInt32(value_compBackgroundFocus_value_1) } else if (RuntimeType.STRING == value_compBackgroundFocus_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10960,8 +10960,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compFocusedPrimary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compFocusedPrimary_value_1 = value_compFocusedPrimary_value as number - valueSerializer.writeNumber(value_compFocusedPrimary_value_1) + const value_compFocusedPrimary_value_1 = value_compFocusedPrimary_value as int32 + valueSerializer.writeInt32(value_compFocusedPrimary_value_1) } else if (RuntimeType.STRING == value_compFocusedPrimary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -10989,8 +10989,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compFocusedSecondary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compFocusedSecondary_value_1 = value_compFocusedSecondary_value as number - valueSerializer.writeNumber(value_compFocusedSecondary_value_1) + const value_compFocusedSecondary_value_1 = value_compFocusedSecondary_value as int32 + valueSerializer.writeInt32(value_compFocusedSecondary_value_1) } else if (RuntimeType.STRING == value_compFocusedSecondary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11018,8 +11018,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_compFocusedTertiary_value_type) { valueSerializer.writeInt8(1 as int32) - const value_compFocusedTertiary_value_1 = value_compFocusedTertiary_value as number - valueSerializer.writeNumber(value_compFocusedTertiary_value_1) + const value_compFocusedTertiary_value_1 = value_compFocusedTertiary_value as int32 + valueSerializer.writeInt32(value_compFocusedTertiary_value_1) } else if (RuntimeType.STRING == value_compFocusedTertiary_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11047,8 +11047,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_interactiveHover_value_type) { valueSerializer.writeInt8(1 as int32) - const value_interactiveHover_value_1 = value_interactiveHover_value as number - valueSerializer.writeNumber(value_interactiveHover_value_1) + const value_interactiveHover_value_1 = value_interactiveHover_value as int32 + valueSerializer.writeInt32(value_interactiveHover_value_1) } else if (RuntimeType.STRING == value_interactiveHover_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11076,8 +11076,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_interactivePressed_value_type) { valueSerializer.writeInt8(1 as int32) - const value_interactivePressed_value_1 = value_interactivePressed_value as number - valueSerializer.writeNumber(value_interactivePressed_value_1) + const value_interactivePressed_value_1 = value_interactivePressed_value as int32 + valueSerializer.writeInt32(value_interactivePressed_value_1) } else if (RuntimeType.STRING == value_interactivePressed_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11105,8 +11105,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_interactiveFocus_value_type) { valueSerializer.writeInt8(1 as int32) - const value_interactiveFocus_value_1 = value_interactiveFocus_value as number - valueSerializer.writeNumber(value_interactiveFocus_value_1) + const value_interactiveFocus_value_1 = value_interactiveFocus_value as int32 + valueSerializer.writeInt32(value_interactiveFocus_value_1) } else if (RuntimeType.STRING == value_interactiveFocus_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11134,8 +11134,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_interactiveActive_value_type) { valueSerializer.writeInt8(1 as int32) - const value_interactiveActive_value_1 = value_interactiveActive_value as number - valueSerializer.writeNumber(value_interactiveActive_value_1) + const value_interactiveActive_value_1 = value_interactiveActive_value as int32 + valueSerializer.writeInt32(value_interactiveActive_value_1) } else if (RuntimeType.STRING == value_interactiveActive_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11163,8 +11163,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_interactiveSelect_value_type) { valueSerializer.writeInt8(1 as int32) - const value_interactiveSelect_value_1 = value_interactiveSelect_value as number - valueSerializer.writeNumber(value_interactiveSelect_value_1) + const value_interactiveSelect_value_1 = value_interactiveSelect_value as int32 + valueSerializer.writeInt32(value_interactiveSelect_value_1) } else if (RuntimeType.STRING == value_interactiveSelect_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11192,8 +11192,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_interactiveClick_value_type) { valueSerializer.writeInt8(1 as int32) - const value_interactiveClick_value_1 = value_interactiveClick_value as number - valueSerializer.writeNumber(value_interactiveClick_value_1) + const value_interactiveClick_value_1 = value_interactiveClick_value as int32 + valueSerializer.writeInt32(value_interactiveClick_value_1) } else if (RuntimeType.STRING == value_interactiveClick_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11294,8 +11294,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_colors_value_element_0_type) { valueSerializer.writeInt8(1 as int32) - const value_colors_value_element_0_1 = value_colors_value_element_0 as number - valueSerializer.writeNumber(value_colors_value_element_0_1) + const value_colors_value_element_0_1 = value_colors_value_element_0 as int32 + valueSerializer.writeInt32(value_colors_value_element_0_1) } else if (RuntimeType.STRING == value_colors_value_element_0_type) { valueSerializer.writeInt8(2 as int32) @@ -11334,8 +11334,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11371,8 +11371,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_type) { valueSerializer.writeInt8(1 as int32) - const value_color_1 = value_color as number - valueSerializer.writeNumber(value_color_1) + const value_color_1 = value_color as int32 + valueSerializer.writeInt32(value_color_1) } else if (RuntimeType.STRING == value_color_type) { valueSerializer.writeInt8(2 as int32) @@ -11418,8 +11418,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11468,8 +11468,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11518,8 +11518,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11574,8 +11574,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11718,8 +11718,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value__color_value_type) { valueSerializer.writeInt8(1 as int32) - const value__color_value_1 = value__color_value as number - valueSerializer.writeNumber(value__color_value_1) + const value__color_value_1 = value__color_value as int32 + valueSerializer.writeInt32(value__color_value_1) } else if (RuntimeType.STRING == value__color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11747,8 +11747,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value__selectedColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value__selectedColor_value_1 = value__selectedColor_value as number - valueSerializer.writeNumber(value__selectedColor_value_1) + const value__selectedColor_value_1 = value__selectedColor_value as int32 + valueSerializer.writeInt32(value__selectedColor_value_1) } else if (RuntimeType.STRING == value__selectedColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11848,8 +11848,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_top_value_type) { valueSerializer.writeInt8(1 as int32) - const value_top_value_1 = value_top_value as number - valueSerializer.writeNumber(value_top_value_1) + const value_top_value_1 = value_top_value as int32 + valueSerializer.writeInt32(value_top_value_1) } else if (RuntimeType.STRING == value_top_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11877,8 +11877,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_right_value_type) { valueSerializer.writeInt8(1 as int32) - const value_right_value_1 = value_right_value as number - valueSerializer.writeNumber(value_right_value_1) + const value_right_value_1 = value_right_value as int32 + valueSerializer.writeInt32(value_right_value_1) } else if (RuntimeType.STRING == value_right_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11906,8 +11906,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_bottom_value_type) { valueSerializer.writeInt8(1 as int32) - const value_bottom_value_1 = value_bottom_value as number - valueSerializer.writeNumber(value_bottom_value_1) + const value_bottom_value_1 = value_bottom_value as int32 + valueSerializer.writeInt32(value_bottom_value_1) } else if (RuntimeType.STRING == value_bottom_value_type) { valueSerializer.writeInt8(2 as int32) @@ -11935,8 +11935,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_left_value_type) { valueSerializer.writeInt8(1 as int32) - const value_left_value_1 = value_left_value as number - valueSerializer.writeNumber(value_left_value_1) + const value_left_value_1 = value_left_value as int32 + valueSerializer.writeInt32(value_left_value_1) } else if (RuntimeType.STRING == value_left_value_type) { valueSerializer.writeInt8(2 as int32) @@ -12486,8 +12486,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -12765,8 +12765,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -12794,8 +12794,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_selectedColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_selectedColor_value_1 = value_selectedColor_value as number - valueSerializer.writeNumber(value_selectedColor_value_1) + const value_selectedColor_value_1 = value_selectedColor_value as int32 + valueSerializer.writeInt32(value_selectedColor_value_1) } else if (RuntimeType.STRING == value_selectedColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -12874,8 +12874,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -12992,8 +12992,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -13112,8 +13112,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -13254,8 +13254,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_top_value_type) { valueSerializer.writeInt8(1 as int32) - const value_top_value_1 = value_top_value as number - valueSerializer.writeNumber(value_top_value_1) + const value_top_value_1 = value_top_value as int32 + valueSerializer.writeInt32(value_top_value_1) } else if (RuntimeType.STRING == value_top_value_type) { valueSerializer.writeInt8(2 as int32) @@ -13283,8 +13283,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_end_value_type) { valueSerializer.writeInt8(1 as int32) - const value_end_value_1 = value_end_value as number - valueSerializer.writeNumber(value_end_value_1) + const value_end_value_1 = value_end_value as int32 + valueSerializer.writeInt32(value_end_value_1) } else if (RuntimeType.STRING == value_end_value_type) { valueSerializer.writeInt8(2 as int32) @@ -13312,8 +13312,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_bottom_value_type) { valueSerializer.writeInt8(1 as int32) - const value_bottom_value_1 = value_bottom_value as number - valueSerializer.writeNumber(value_bottom_value_1) + const value_bottom_value_1 = value_bottom_value as int32 + valueSerializer.writeInt32(value_bottom_value_1) } else if (RuntimeType.STRING == value_bottom_value_type) { valueSerializer.writeInt8(2 as int32) @@ -13341,8 +13341,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_start_value_type) { valueSerializer.writeInt8(1 as int32) - const value_start_value_1 = value_start_value as number - valueSerializer.writeNumber(value_start_value_1) + const value_start_value_1 = value_start_value as int32 + valueSerializer.writeInt32(value_start_value_1) } else if (RuntimeType.STRING == value_start_value_type) { valueSerializer.writeInt8(2 as int32) @@ -13501,8 +13501,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_selectedColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_selectedColor_value_1 = value_selectedColor_value as number - valueSerializer.writeNumber(value_selectedColor_value_1) + const value_selectedColor_value_1 = value_selectedColor_value as int32 + valueSerializer.writeInt32(value_selectedColor_value_1) } else if (RuntimeType.STRING == value_selectedColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -13530,8 +13530,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_unselectedColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_unselectedColor_value_1 = value_unselectedColor_value as number - valueSerializer.writeNumber(value_unselectedColor_value_1) + const value_unselectedColor_value_1 = value_unselectedColor_value as int32 + valueSerializer.writeInt32(value_unselectedColor_value_1) } else if (RuntimeType.STRING == value_unselectedColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -13559,8 +13559,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_strokeColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_strokeColor_value_1 = value_strokeColor_value as number - valueSerializer.writeNumber(value_strokeColor_value_1) + const value_strokeColor_value_1 = value_strokeColor_value as int32 + valueSerializer.writeInt32(value_strokeColor_value_1) } else if (RuntimeType.STRING == value_strokeColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -13591,8 +13591,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_strokeColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_strokeColor_value_1 = value_strokeColor_value as number - valueSerializer.writeNumber(value_strokeColor_value_1) + const value_strokeColor_value_1 = value_strokeColor_value as int32 + valueSerializer.writeInt32(value_strokeColor_value_1) } else if (RuntimeType.STRING == value_strokeColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -14362,8 +14362,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_nonCurrentMonthDayColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_nonCurrentMonthDayColor_value_1 = value_nonCurrentMonthDayColor_value as number - valueSerializer.writeNumber(value_nonCurrentMonthDayColor_value_1) + const value_nonCurrentMonthDayColor_value_1 = value_nonCurrentMonthDayColor_value as int32 + valueSerializer.writeInt32(value_nonCurrentMonthDayColor_value_1) } else if (RuntimeType.STRING == value_nonCurrentMonthDayColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -14391,8 +14391,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_nonCurrentMonthLunarColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_nonCurrentMonthLunarColor_value_1 = value_nonCurrentMonthLunarColor_value as number - valueSerializer.writeNumber(value_nonCurrentMonthLunarColor_value_1) + const value_nonCurrentMonthLunarColor_value_1 = value_nonCurrentMonthLunarColor_value as int32 + valueSerializer.writeInt32(value_nonCurrentMonthLunarColor_value_1) } else if (RuntimeType.STRING == value_nonCurrentMonthLunarColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -14420,8 +14420,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_nonCurrentMonthWorkDayMarkColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_nonCurrentMonthWorkDayMarkColor_value_1 = value_nonCurrentMonthWorkDayMarkColor_value as number - valueSerializer.writeNumber(value_nonCurrentMonthWorkDayMarkColor_value_1) + const value_nonCurrentMonthWorkDayMarkColor_value_1 = value_nonCurrentMonthWorkDayMarkColor_value as int32 + valueSerializer.writeInt32(value_nonCurrentMonthWorkDayMarkColor_value_1) } else if (RuntimeType.STRING == value_nonCurrentMonthWorkDayMarkColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -14449,8 +14449,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_nonCurrentMonthOffDayMarkColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_nonCurrentMonthOffDayMarkColor_value_1 = value_nonCurrentMonthOffDayMarkColor_value as number - valueSerializer.writeNumber(value_nonCurrentMonthOffDayMarkColor_value_1) + const value_nonCurrentMonthOffDayMarkColor_value_1 = value_nonCurrentMonthOffDayMarkColor_value as int32 + valueSerializer.writeInt32(value_nonCurrentMonthOffDayMarkColor_value_1) } else if (RuntimeType.STRING == value_nonCurrentMonthOffDayMarkColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -14655,8 +14655,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_value_1 = value_fontColor_value as number - valueSerializer.writeNumber(value_fontColor_value_1) + const value_fontColor_value_1 = value_fontColor_value as int32 + valueSerializer.writeInt32(value_fontColor_value_1) } else if (RuntimeType.STRING == value_fontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -14735,8 +14735,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -14805,8 +14805,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_checkedBackgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_checkedBackgroundColor_value_1 = value_checkedBackgroundColor_value as number - valueSerializer.writeNumber(value_checkedBackgroundColor_value_1) + const value_checkedBackgroundColor_value_1 = value_checkedBackgroundColor_value as int32 + valueSerializer.writeInt32(value_checkedBackgroundColor_value_1) } else if (RuntimeType.STRING == value_checkedBackgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -14834,8 +14834,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_uncheckedBorderColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_uncheckedBorderColor_value_1 = value_uncheckedBorderColor_value as number - valueSerializer.writeNumber(value_uncheckedBorderColor_value_1) + const value_uncheckedBorderColor_value_1 = value_uncheckedBorderColor_value as int32 + valueSerializer.writeInt32(value_uncheckedBorderColor_value_1) } else if (RuntimeType.STRING == value_uncheckedBorderColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -14863,8 +14863,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_indicatorColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_indicatorColor_value_1 = value_indicatorColor_value as number - valueSerializer.writeNumber(value_indicatorColor_value_1) + const value_indicatorColor_value_1 = value_indicatorColor_value as int32 + valueSerializer.writeInt32(value_indicatorColor_value_1) } else if (RuntimeType.STRING == value_indicatorColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -15358,8 +15358,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_value_element_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_value_element_1 = value_fontColor_value_element as number - valueSerializer.writeNumber(value_fontColor_value_element_1) + const value_fontColor_value_element_1 = value_fontColor_value_element as int32 + valueSerializer.writeInt32(value_fontColor_value_element_1) } else if (RuntimeType.STRING == value_fontColor_value_element_type) { valueSerializer.writeInt8(2 as int32) @@ -15590,8 +15590,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_value_1 = value_fontColor_value as number - valueSerializer.writeNumber(value_fontColor_value_1) + const value_fontColor_value_1 = value_fontColor_value as int32 + valueSerializer.writeInt32(value_fontColor_value_1) } else if (RuntimeType.STRING == value_fontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -16278,8 +16278,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_unselectedColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_unselectedColor_value_1 = value_unselectedColor_value as number - valueSerializer.writeNumber(value_unselectedColor_value_1) + const value_unselectedColor_value_1 = value_unselectedColor_value as int32 + valueSerializer.writeInt32(value_unselectedColor_value_1) } else if (RuntimeType.STRING == value_unselectedColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -16307,8 +16307,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_pointColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_pointColor_value_1 = value_pointColor_value as number - valueSerializer.writeNumber(value_pointColor_value_1) + const value_pointColor_value_1 = value_pointColor_value as int32 + valueSerializer.writeInt32(value_pointColor_value_1) } else if (RuntimeType.STRING == value_pointColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -16358,8 +16358,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_selectedColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_selectedColor_value_1 = value_selectedColor_value as number - valueSerializer.writeNumber(value_selectedColor_value_1) + const value_selectedColor_value_1 = value_selectedColor_value as int32 + valueSerializer.writeInt32(value_selectedColor_value_1) } else if (RuntimeType.STRING == value_selectedColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -16387,8 +16387,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_unselectedColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_unselectedColor_value_1 = value_unselectedColor_value as number - valueSerializer.writeNumber(value_unselectedColor_value_1) + const value_unselectedColor_value_1 = value_unselectedColor_value as int32 + valueSerializer.writeInt32(value_unselectedColor_value_1) } else if (RuntimeType.STRING == value_unselectedColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -16573,8 +16573,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -16665,8 +16665,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17004,8 +17004,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_value_1 = value_fontColor_value as number - valueSerializer.writeNumber(value_fontColor_value_1) + const value_fontColor_value_1 = value_fontColor_value as int32 + valueSerializer.writeInt32(value_fontColor_value_1) } else if (RuntimeType.STRING == value_fontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17095,8 +17095,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_focusedDayColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_focusedDayColor_value_1 = value_focusedDayColor_value as number - valueSerializer.writeNumber(value_focusedDayColor_value_1) + const value_focusedDayColor_value_1 = value_focusedDayColor_value as int32 + valueSerializer.writeInt32(value_focusedDayColor_value_1) } else if (RuntimeType.STRING == value_focusedDayColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17124,8 +17124,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_focusedLunarColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_focusedLunarColor_value_1 = value_focusedLunarColor_value as number - valueSerializer.writeNumber(value_focusedLunarColor_value_1) + const value_focusedLunarColor_value_1 = value_focusedLunarColor_value as int32 + valueSerializer.writeInt32(value_focusedLunarColor_value_1) } else if (RuntimeType.STRING == value_focusedLunarColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17153,8 +17153,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_focusedAreaBackgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_focusedAreaBackgroundColor_value_1 = value_focusedAreaBackgroundColor_value as number - valueSerializer.writeNumber(value_focusedAreaBackgroundColor_value_1) + const value_focusedAreaBackgroundColor_value_1 = value_focusedAreaBackgroundColor_value as int32 + valueSerializer.writeInt32(value_focusedAreaBackgroundColor_value_1) } else if (RuntimeType.STRING == value_focusedAreaBackgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17327,8 +17327,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_typing_value_type) { valueSerializer.writeInt8(1 as int32) - const value_typing_value_1 = value_typing_value as number - valueSerializer.writeNumber(value_typing_value_1) + const value_typing_value_1 = value_typing_value as int32 + valueSerializer.writeInt32(value_typing_value_1) } else if (RuntimeType.STRING == value_typing_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17356,8 +17356,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_normal_value_type) { valueSerializer.writeInt8(1 as int32) - const value_normal_value_1 = value_normal_value as number - valueSerializer.writeNumber(value_normal_value_1) + const value_normal_value_1 = value_normal_value as int32 + valueSerializer.writeInt32(value_normal_value_1) } else if (RuntimeType.STRING == value_normal_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17385,8 +17385,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_error_value_type) { valueSerializer.writeInt8(1 as int32) - const value_error_value_1 = value_error_value as number - valueSerializer.writeNumber(value_error_value_1) + const value_error_value_1 = value_error_value as int32 + valueSerializer.writeInt32(value_error_value_1) } else if (RuntimeType.STRING == value_error_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17414,8 +17414,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_disable_value_type) { valueSerializer.writeInt8(1 as int32) - const value_disable_value_1 = value_disable_value as number - valueSerializer.writeNumber(value_disable_value_1) + const value_disable_value_1 = value_disable_value as int32 + valueSerializer.writeInt32(value_disable_value_1) } else if (RuntimeType.STRING == value_disable_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17540,8 +17540,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_weekColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_weekColor_value_1 = value_weekColor_value as number - valueSerializer.writeNumber(value_weekColor_value_1) + const value_weekColor_value_1 = value_weekColor_value as int32 + valueSerializer.writeInt32(value_weekColor_value_1) } else if (RuntimeType.STRING == value_weekColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17569,8 +17569,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_weekendDayColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_weekendDayColor_value_1 = value_weekendDayColor_value as number - valueSerializer.writeNumber(value_weekendDayColor_value_1) + const value_weekendDayColor_value_1 = value_weekendDayColor_value as int32 + valueSerializer.writeInt32(value_weekendDayColor_value_1) } else if (RuntimeType.STRING == value_weekendDayColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17598,8 +17598,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_weekendLunarColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_weekendLunarColor_value_1 = value_weekendLunarColor_value as number - valueSerializer.writeNumber(value_weekendLunarColor_value_1) + const value_weekendLunarColor_value_1 = value_weekendLunarColor_value as int32 + valueSerializer.writeInt32(value_weekendLunarColor_value_1) } else if (RuntimeType.STRING == value_weekendLunarColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17662,8 +17662,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_workDayMarkColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_workDayMarkColor_value_1 = value_workDayMarkColor_value as number - valueSerializer.writeNumber(value_workDayMarkColor_value_1) + const value_workDayMarkColor_value_1 = value_workDayMarkColor_value as int32 + valueSerializer.writeInt32(value_workDayMarkColor_value_1) } else if (RuntimeType.STRING == value_workDayMarkColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17691,8 +17691,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_offDayMarkColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_offDayMarkColor_value_1 = value_offDayMarkColor_value as number - valueSerializer.writeNumber(value_offDayMarkColor_value_1) + const value_offDayMarkColor_value_1 = value_offDayMarkColor_value as int32 + valueSerializer.writeInt32(value_offDayMarkColor_value_1) } else if (RuntimeType.STRING == value_offDayMarkColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -17905,8 +17905,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -18043,8 +18043,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_borderColor_value_0_type) { valueSerializer.writeInt8(1 as int32) - const value_borderColor_value_0_1 = value_borderColor_value_0 as number - valueSerializer.writeNumber(value_borderColor_value_0_1) + const value_borderColor_value_0_1 = value_borderColor_value_0 as int32 + valueSerializer.writeInt32(value_borderColor_value_0_1) } else if (RuntimeType.STRING == value_borderColor_value_0_type) { valueSerializer.writeInt8(2 as int32) @@ -18319,8 +18319,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -18457,8 +18457,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_borderColor_value_0_type) { valueSerializer.writeInt8(1 as int32) - const value_borderColor_value_0_1 = value_borderColor_value_0 as number - valueSerializer.writeNumber(value_borderColor_value_0_1) + const value_borderColor_value_0_1 = value_borderColor_value_0 as int32 + valueSerializer.writeInt32(value_borderColor_value_0_1) } else if (RuntimeType.STRING == value_borderColor_value_0_type) { valueSerializer.writeInt8(2 as int32) @@ -18745,8 +18745,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -18883,8 +18883,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_borderColor_value_0_type) { valueSerializer.writeInt8(1 as int32) - const value_borderColor_value_0_1 = value_borderColor_value_0 as number - valueSerializer.writeNumber(value_borderColor_value_0_1) + const value_borderColor_value_0_1 = value_borderColor_value_0 as int32 + valueSerializer.writeInt32(value_borderColor_value_0_1) } else if (RuntimeType.STRING == value_borderColor_value_0_type) { valueSerializer.writeInt8(2 as int32) @@ -19175,8 +19175,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -19313,8 +19313,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_borderColor_value_0_type) { valueSerializer.writeInt8(1 as int32) - const value_borderColor_value_0_1 = value_borderColor_value_0 as number - valueSerializer.writeNumber(value_borderColor_value_0_1) + const value_borderColor_value_0_1 = value_borderColor_value_0 as int32 + valueSerializer.writeInt32(value_borderColor_value_0_1) } else if (RuntimeType.STRING == value_borderColor_value_0_type) { valueSerializer.writeInt8(2 as int32) @@ -19721,8 +19721,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_1_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1_1 = value_color_value_1 as number - valueSerializer.writeNumber(value_color_value_1_1) + const value_color_value_1_1 = value_color_value_1 as int32 + valueSerializer.writeInt32(value_color_value_1_1) } else if (RuntimeType.STRING == value_color_value_1_type) { valueSerializer.writeInt8(2 as int32) @@ -19972,8 +19972,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -20146,8 +20146,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_borderColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_borderColor_value_1 = value_borderColor_value as number - valueSerializer.writeNumber(value_borderColor_value_1) + const value_borderColor_value_1 = value_borderColor_value as int32 + valueSerializer.writeInt32(value_borderColor_value_1) } else if (RuntimeType.STRING == value_borderColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -20199,8 +20199,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_value_1 = value_fontColor_value as number - valueSerializer.writeNumber(value_fontColor_value_1) + const value_fontColor_value_1 = value_fontColor_value as int32 + valueSerializer.writeInt32(value_fontColor_value_1) } else if (RuntimeType.STRING == value_fontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -20301,8 +20301,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_maskColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_maskColor_value_1 = value_maskColor_value as number - valueSerializer.writeNumber(value_maskColor_value_1) + const value_maskColor_value_1 = value_maskColor_value as int32 + valueSerializer.writeInt32(value_maskColor_value_1) } else if (RuntimeType.STRING == value_maskColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -20362,8 +20362,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -20466,8 +20466,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_borderColor_value_0_type) { valueSerializer.writeInt8(1 as int32) - const value_borderColor_value_0_1 = value_borderColor_value_0 as number - valueSerializer.writeNumber(value_borderColor_value_0_1) + const value_borderColor_value_0_1 = value_borderColor_value_0 as int32 + valueSerializer.writeInt32(value_borderColor_value_0_1) } else if (RuntimeType.STRING == value_borderColor_value_0_type) { valueSerializer.writeInt8(2 as int32) @@ -20771,8 +20771,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_mask_value_1_color_type) { valueSerializer.writeInt8(1 as int32) - const value_mask_value_1_color_1 = value_mask_value_1_color as number - valueSerializer.writeNumber(value_mask_value_1_color_1) + const value_mask_value_1_color_1 = value_mask_value_1_color as int32 + valueSerializer.writeInt32(value_mask_value_1_color_1) } else if (RuntimeType.STRING == value_mask_value_1_color_type) { valueSerializer.writeInt8(2 as int32) @@ -21005,8 +21005,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value__fontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value__fontColor_value_1 = value__fontColor_value as number - valueSerializer.writeNumber(value__fontColor_value_1) + const value__fontColor_value_1 = value__fontColor_value as int32 + valueSerializer.writeInt32(value__fontColor_value_1) } else if (RuntimeType.STRING == value__fontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -21034,8 +21034,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value__selectedFontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value__selectedFontColor_value_1 = value__selectedFontColor_value as number - valueSerializer.writeNumber(value__selectedFontColor_value_1) + const value__selectedFontColor_value_1 = value__selectedFontColor_value as int32 + valueSerializer.writeInt32(value__selectedFontColor_value_1) } else if (RuntimeType.STRING == value__selectedFontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -21453,8 +21453,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_selectedColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_selectedColor_value_1 = value_selectedColor_value as number - valueSerializer.writeNumber(value_selectedColor_value_1) + const value_selectedColor_value_1 = value_selectedColor_value as int32 + valueSerializer.writeInt32(value_selectedColor_value_1) } else if (RuntimeType.STRING == value_selectedColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -21482,8 +21482,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_unselectedColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_unselectedColor_value_1 = value_unselectedColor_value as number - valueSerializer.writeNumber(value_unselectedColor_value_1) + const value_unselectedColor_value_1 = value_unselectedColor_value as int32 + valueSerializer.writeInt32(value_unselectedColor_value_1) } else if (RuntimeType.STRING == value_unselectedColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -21538,8 +21538,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_0_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_0_1 = value_color_value_0 as number - valueSerializer.writeNumber(value_color_value_0_1) + const value_color_value_0_1 = value_color_value_0 as int32 + valueSerializer.writeInt32(value_color_value_0_1) } else if (RuntimeType.STRING == value_color_value_0_type) { valueSerializer.writeInt8(2 as int32) @@ -21665,8 +21665,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -21799,8 +21799,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_1_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1_1 = value_color_value_1 as number - valueSerializer.writeNumber(value_color_value_1_1) + const value_color_value_1_1 = value_color_value_1 as int32 + valueSerializer.writeInt32(value_color_value_1_1) } else if (RuntimeType.STRING == value_color_value_1_type) { valueSerializer.writeInt8(2 as int32) @@ -21875,8 +21875,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -21923,8 +21923,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_value_1 = value_fontColor_value as number - valueSerializer.writeNumber(value_fontColor_value_1) + const value_fontColor_value_1 = value_fontColor_value as int32 + valueSerializer.writeInt32(value_fontColor_value_1) } else if (RuntimeType.STRING == value_fontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -21982,8 +21982,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_textColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_textColor_value_1 = value_textColor_value as number - valueSerializer.writeNumber(value_textColor_value_1) + const value_textColor_value_1 = value_textColor_value as int32 + valueSerializer.writeInt32(value_textColor_value_1) } else if (RuntimeType.STRING == value_textColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -22185,8 +22185,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_value_1 = value_fontColor_value as number - valueSerializer.writeNumber(value_fontColor_value_1) + const value_fontColor_value_1 = value_fontColor_value as int32 + valueSerializer.writeInt32(value_fontColor_value_1) } else if (RuntimeType.STRING == value_fontColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -22380,8 +22380,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_fontColor_type) { valueSerializer.writeInt8(1 as int32) - const value_fontColor_1 = value_fontColor as number - valueSerializer.writeNumber(value_fontColor_1) + const value_fontColor_1 = value_fontColor as int32 + valueSerializer.writeInt32(value_fontColor_1) } else if (RuntimeType.STRING == value_fontColor_type) { valueSerializer.writeInt8(2 as int32) @@ -22523,8 +22523,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -22611,8 +22611,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_maskColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_maskColor_value_1 = value_maskColor_value as number - valueSerializer.writeNumber(value_maskColor_value_1) + const value_maskColor_value_1 = value_maskColor_value as int32 + valueSerializer.writeInt32(value_maskColor_value_1) } else if (RuntimeType.STRING == value_maskColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -22892,8 +22892,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_borderColor_value_0_type) { valueSerializer.writeInt8(1 as int32) - const value_borderColor_value_0_1 = value_borderColor_value_0 as number - valueSerializer.writeNumber(value_borderColor_value_0_1) + const value_borderColor_value_0_1 = value_borderColor_value_0 as int32 + valueSerializer.writeInt32(value_borderColor_value_0_1) } else if (RuntimeType.STRING == value_borderColor_value_0_type) { valueSerializer.writeInt8(2 as int32) @@ -23239,8 +23239,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -23279,8 +23279,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_color_value_type) { valueSerializer.writeInt8(1 as int32) - const value_color_value_1 = value_color_value as number - valueSerializer.writeNumber(value_color_value_1) + const value_color_value_1 = value_color_value as int32 + valueSerializer.writeInt32(value_color_value_1) } else if (RuntimeType.STRING == value_color_value_type) { valueSerializer.writeInt8(2 as int32) @@ -23677,8 +23677,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -23751,8 +23751,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_outlineColor_value_0_type) { valueSerializer.writeInt8(1 as int32) - const value_outlineColor_value_0_1 = value_outlineColor_value_0 as number - valueSerializer.writeNumber(value_outlineColor_value_0_1) + const value_outlineColor_value_0_1 = value_outlineColor_value_0 as int32 + valueSerializer.writeInt32(value_outlineColor_value_0_1) } else if (RuntimeType.STRING == value_outlineColor_value_0_type) { valueSerializer.writeInt8(2 as int32) @@ -23994,8 +23994,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -24280,8 +24280,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -24354,8 +24354,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_outlineColor_value_0_type) { valueSerializer.writeInt8(1 as int32) - const value_outlineColor_value_0_1 = value_outlineColor_value_0 as number - valueSerializer.writeNumber(value_outlineColor_value_0_1) + const value_outlineColor_value_0_1 = value_outlineColor_value_0 as int32 + valueSerializer.writeInt32(value_outlineColor_value_0_1) } else if (RuntimeType.STRING == value_outlineColor_value_0_type) { valueSerializer.writeInt8(2 as int32) @@ -24457,8 +24457,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -24606,8 +24606,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_mask_value_1_color_type) { valueSerializer.writeInt8(1 as int32) - const value_mask_value_1_color_1 = value_mask_value_1_color as number - valueSerializer.writeNumber(value_mask_value_1_color_1) + const value_mask_value_1_color_1 = value_mask_value_1_color as int32 + valueSerializer.writeInt32(value_mask_value_1_color_1) } else if (RuntimeType.STRING == value_mask_value_1_color_type) { valueSerializer.writeInt8(2 as int32) @@ -25460,8 +25460,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) @@ -25729,8 +25729,8 @@ export class Serializer extends SerializerBase { } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/progress.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/progress.ts index ca81aaf2d446c7af8e3e36fe4f6612f5be9d9459..041f2783d9d4e8409c2803db8e30ff7e8bf8da68 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/progress.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/progress.ts @@ -88,8 +88,8 @@ export class ArkProgressPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/qrcode.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/qrcode.ts index a27e358f20c4ebd2986b0677d720e5b0f347e45c..20a45053da1538fb85f9ee325f930e6e0bad095d 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/qrcode.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/qrcode.ts @@ -60,8 +60,8 @@ export class ArkQRCodePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -93,8 +93,8 @@ export class ArkQRCodePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/richEditor.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/richEditor.ts index e3f4edfb8f2225fadb504636abb99ab829666126..2943d28c2229ba2a5788c2927ccdf5a1e13c4f69 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/richEditor.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/richEditor.ts @@ -388,8 +388,8 @@ export class ArkRichEditorPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -421,8 +421,8 @@ export class ArkRichEditorPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/search.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/search.ts index 25b12918656fe4509fbcc21c610869544bb8f916..fd943b148f989282d5ff64b5e1859abed547edc8 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/search.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/search.ts @@ -80,8 +80,8 @@ export class ArkSearchPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -183,8 +183,8 @@ export class ArkSearchPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -228,8 +228,8 @@ export class ArkSearchPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/securityComponent.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/securityComponent.ts index a63c0cac097bf48cc9e28888570d7df300e2c6f9..dbe2e5cbe7ec6791dfc5f8621287a35f6711c07b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/securityComponent.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/securityComponent.ts @@ -208,8 +208,8 @@ export class ArkSecurityComponentMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -241,8 +241,8 @@ export class ArkSecurityComponentMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -274,8 +274,8 @@ export class ArkSecurityComponentMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -331,8 +331,8 @@ export class ArkSecurityComponentMethodPeer extends PeerNode { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/select.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/select.ts index 1a05778ccef18fbe4ddc6c31263ef070a9b7259e..1b8382ae9f5ca3d02252a6849cd1f91b71c5c531 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/select.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/select.ts @@ -416,8 +416,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -449,8 +449,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -482,8 +482,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -515,8 +515,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -572,8 +572,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -605,8 +605,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -638,8 +638,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -671,8 +671,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -728,8 +728,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -761,8 +761,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -938,8 +938,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -971,8 +971,8 @@ export class ArkSelectPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/shape.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/shape.ts index b9dd5a93a7ba6ac15bd666eed6ccb2675296aff2..11e51d8fdbe1395623b3b8e2dabdc89e7aba66ca 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/shape.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/shape.ts @@ -81,8 +81,8 @@ export class ArkShapePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -114,8 +114,8 @@ export class ArkShapePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/slider.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/slider.ts index 29caca36fa251ce06f8420987d0851206e908261..586ca4dfd79b7cfbfab5a6533f580cc46627d853 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/slider.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/slider.ts @@ -74,8 +74,8 @@ export class ArkSliderPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -117,8 +117,8 @@ export class ArkSliderPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) @@ -151,8 +151,8 @@ export class ArkSliderPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -194,8 +194,8 @@ export class ArkSliderPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) @@ -288,8 +288,8 @@ export class ArkSliderPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -333,8 +333,8 @@ export class ArkSliderPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/span.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/span.ts index 8f1deae73864b1666d18e82a9d9cde8133479cd1..37fe34662165621ea439a1a11340fc2942643a53 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/span.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/span.ts @@ -127,8 +127,8 @@ export class ArkSpanPeer extends ArkBaseSpanPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/styledString.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/styledString.ts index 1356d86d410501484b1e7c8da10da64bbad03a1c..cca6102822d3f3065b4c4c54c065cfdc6f47e7ed 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/styledString.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/styledString.ts @@ -335,7 +335,7 @@ export class TextStyle implements MaterializedBase { else { throw new Error("One of the branches for buffer_ has to be chosen through deserialisation.") } - buffer = (buffer_ as Color | number | string | Resource) + buffer = (buffer_ as Color | int32 | string | Resource) } const returnResult : ResourceColor | undefined = buffer return returnResult @@ -499,7 +499,7 @@ export class DecorationStyle implements MaterializedBase { else { throw new Error("One of the branches for buffer_ has to be chosen through deserialisation.") } - buffer = (buffer_ as Color | number | string | Resource) + buffer = (buffer_ as Color | int32 | string | Resource) } const returnResult : ResourceColor | undefined = buffer return returnResult diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/symbolSpan.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/symbolSpan.ts index eb1c4af86ebfa1109b0079103c8873514734108a..434e779bb093c95a06422c91d4b93df1f86dfa00 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/symbolSpan.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/symbolSpan.ts @@ -99,8 +99,8 @@ export class ArkSymbolSpanPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_element_type) { thisSerializer.writeInt8(1 as int32) - const value_value_element_1 = value_value_element as number - thisSerializer.writeNumber(value_value_element_1) + const value_value_element_1 = value_value_element as int32 + thisSerializer.writeInt32(value_value_element_1) } else if (RuntimeType.STRING == value_value_element_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/symbolglyph.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/symbolglyph.ts index a4fbf12e73210f78fc669fa7faf2891b9d74f60d..c3c292a6d229c220a092e1567b63d4cece61c05f 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/symbolglyph.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/symbolglyph.ts @@ -275,8 +275,8 @@ export class ArkSymbolGlyphPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_element_type) { thisSerializer.writeInt8(1 as int32) - const value_value_element_1 = value_value_element as number - thisSerializer.writeNumber(value_value_element_1) + const value_value_element_1 = value_value_element as int32 + thisSerializer.writeInt32(value_value_element_1) } else if (RuntimeType.STRING == value_value_element_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/tabs.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/tabs.ts index 993d94704e23662fb27a8b892abf7ece543f746d..4b8adfec0eedad30b610ee7117a2990f97328e62 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/tabs.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/tabs.ts @@ -473,8 +473,8 @@ export class ArkTabsPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/text.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/text.ts index f3f379262e98e6285980ffcd27819e25c60845c3..e0cc8ab4f255d331d0b34fb1aa22ff609dda858d 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/text.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/text.ts @@ -174,8 +174,8 @@ export class ArkTextPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -692,8 +692,8 @@ export class ArkTextPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -725,8 +725,8 @@ export class ArkTextPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textArea.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textArea.ts index 68eb1a6d6cff6e209bbc1fe9e7096e0ff41f70ef..6dbaed7a9233549605aca46d72ca40f59efdc523 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textArea.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textArea.ts @@ -81,8 +81,8 @@ export class ArkTextAreaPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -150,8 +150,8 @@ export class ArkTextAreaPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -183,8 +183,8 @@ export class ArkTextAreaPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -327,8 +327,8 @@ export class ArkTextAreaPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textClock.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textClock.ts index 901f59b25b0c034933f43afcb7507cca39e143ba..d9691059b296a09406f6366f8e8b868ea2686729 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textClock.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textClock.ts @@ -137,8 +137,8 @@ export class ArkTextClockPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textInput.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textInput.ts index bacc067c8631c8cb5a13c395bd58dbafe9a3b351..e11c39eba07548bdc4fc45f8cbddd9babdbd3b6d 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textInput.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textInput.ts @@ -158,8 +158,8 @@ export class ArkTextInputPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -239,8 +239,8 @@ export class ArkTextInputPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -356,8 +356,8 @@ export class ArkTextInputPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -571,8 +571,8 @@ export class ArkTextInputPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -693,8 +693,8 @@ export class ArkTextInputPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textTimer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textTimer.ts index a65a838aebd5ca883d05b97865120ff5c07bbd02..787a8a59a81b4726f0d27c2e91b22136863c7d62 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textTimer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textTimer.ts @@ -132,8 +132,8 @@ export class ArkTextTimerPeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textfieldops.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textfieldops.ts index 24088cf1c8ed016165d9888d969b486c45983d73..81e9239039f986912955a9535eb325c0dbf5a6cb 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textfieldops.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/textfieldops.ts @@ -335,8 +335,8 @@ export class TextFieldOps { } else if (RuntimeType.NUMBER == value_value_0_type) { thisSerializer.writeInt8(1 as int32) - const value_value_0_1 = value_value_0 as number - thisSerializer.writeNumber(value_value_0_1) + const value_value_0_1 = value_value_0 as int32 + thisSerializer.writeInt32(value_value_0_1) } else if (RuntimeType.STRING == value_value_0_type) { thisSerializer.writeInt8(2 as int32) @@ -433,8 +433,8 @@ export class TextFieldOps { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/toggle.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/toggle.ts index 746f3af0802634ea3c4ba461f5ceea60c1a2ea9e..3e64c179be328548b5de447b13baf532ec8e66eb 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/toggle.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/toggle.ts @@ -91,8 +91,8 @@ export class ArkTogglePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) @@ -124,8 +124,8 @@ export class ArkTogglePeer extends ArkCommonMethodPeer { } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/units.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/units.ts index 870b015823cfa8a02da58c75b8a48f11595ba110..88336b218de1a09162c1f9bd012b364c1cf0c595 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/units.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/units.ts @@ -62,9 +62,9 @@ export class ColorFilter implements MaterializedBase { return ArkUIGeneratedNativeModule._ColorFilter_getFinalizer() } } -export type Length = string | number | Resource; +export type Length = string | double | Resource; export type PX = string; -export type VP = string | number; +export type VP = string | double; export type FP = string; export type LPX = string; export type Percentage = string; @@ -144,7 +144,7 @@ export interface Offset { dx: Length; dy: Length; } -export type ResourceColor = Color | number | string | Resource; +export type ResourceColor = Color | int32 | string | Resource; export interface LengthConstrain { minLength: Length; maxLength: Length; 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 dbbb3a81f311fe97ade999dce21db1f4789979c2..6294d1eca2caf166e2d34c1921ed816afa853e0f 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 @@ -1455,9 +1455,9 @@ export class UIContextImpl extends UIContext { ArkUIAniModule._Common_Restore_InstanceId(); return node; } - getFrameNodeByUniqueId(id: number): FrameNode | null { + getFrameNodeByUniqueId(id: long): FrameNode | null { ArkUIAniModule._Common_Sync_InstanceId(this.instanceId_); - const retval = ArkUIGeneratedNativeModule._FrameNode_getFrameNodeByUniqueId(id); + const retval = ArkUIGeneratedNativeModule._FrameNode_getFrameNodeByUniqueId(id as number); if (retval === nullptr) { ArkUIAniModule._Common_Restore_InstanceId(); return null; @@ -1555,10 +1555,10 @@ export class UIContextImpl extends UIContext { ArkUIAniModule._Common_Restore_InstanceId(); return animatorRet; } - public setFrameCallback(onFrameCallback: ((index: number) => void), onIdleCallback: ((index: number) => void), + public setFrameCallback(onFrameCallback: ((index: long) => void), onIdleCallback: ((index: long) => void), delayTime: number): void { - const onFrameCallback_casted = onFrameCallback as (((index: number) => void)) - const onIdleCallback_casted = onIdleCallback as (((index: number) => void)) + const onFrameCallback_casted = onFrameCallback as (((index: long) => void)) + const onIdleCallback_casted = onIdleCallback as (((index: long) => void)) const delayTime_casted = delayTime as (number) this.setFrameCallback_serialize(onFrameCallback_casted, onIdleCallback_casted, delayTime_casted) return @@ -1576,22 +1576,22 @@ export class UIContextImpl extends UIContext { return this.getWindowHeightBreakpoint_serialize() as HeightBreakpoint; } - public vp2px(value: number): number { + public vp2px(value: double): double { return ArkUIAniModule._Common_vp2px(value, this.instanceId_); } - public px2vp(value: number): number { + public px2vp(value: double): double { return ArkUIAniModule._Common_px2vp(value, this.instanceId_); } - public fp2px(value: number): number { + public fp2px(value: double): double { return ArkUIAniModule._Common_fp2px(value, this.instanceId_); } - public px2fp(value: number): number { + public px2fp(value: double): double { return ArkUIAniModule._Common_px2fp(value, this.instanceId_); } - public lpx2px(value: number): number { + public lpx2px(value: double): double { return ArkUIAniModule._Common_lpx2px(value, this.instanceId_); } - public px2lpx(value: number): number { + public px2lpx(value: double): double { return ArkUIAniModule._Common_px2lpx(value, this.instanceId_); } @@ -1609,8 +1609,8 @@ export class UIContextImpl extends UIContext { let heightBreakpointEnum = heightBreakpoint as int32 as HeightBreakpoint; return heightBreakpointEnum; } - private setFrameCallback_serialize(onFrameCallback: ((index: number) => void), - onIdleCallback: ((index: number) => void), + private setFrameCallback_serialize(onFrameCallback: ((index: long) => void), + onIdleCallback: ((index: long) => void), delayTime: number): void { const thisSerializer: Serializer = Serializer.hold() thisSerializer.holdAndWriteCallback(onFrameCallback) @@ -1654,11 +1654,11 @@ export class UIContextImpl extends UIContext { this.setFrameCallback(onFrameFunc, onIdleFunc, 0) ArkUIAniModule._Common_Restore_InstanceId() } - postDelayedFrameCallback(frameCallback: FrameCallback, delayTime: number): void { + postDelayedFrameCallback(frameCallback: FrameCallback, delayTime: long): void { ArkUIAniModule._Common_Sync_InstanceId(this.instanceId_) const onFrameFunc = frameCallback.onFrame const onIdleFunc = frameCallback.onIdle - this.setFrameCallback(onFrameFunc, onIdleFunc, delayTime) + this.setFrameCallback(onFrameFunc, onIdleFunc, delayTime as number) ArkUIAniModule._Common_Restore_InstanceId() } public getUIInspector(): UIInspector { @@ -1744,9 +1744,9 @@ export class UIContextImpl extends UIContext { } // @ts-ignore - public freezeUINode(id: number, isFrozen: boolean): void { + public freezeUINode(id: long, isFrozen: boolean): void { ArkUIAniModule._Common_Sync_InstanceId(this.instanceId_) - ArkUIGeneratedNativeModule._IUIContext_freezeUINode1(id, isFrozen ? 1 : 0); + ArkUIGeneratedNativeModule._IUIContext_freezeUINode1(id as number, isFrozen ? 1 : 0); ArkUIAniModule._Common_Restore_InstanceId() } 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 9676d3871dc61e0858ebc48ef82471738b6b1133..9103e0442ce402ecb5892b3ac413138d1b6008d7 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 @@ -35,8 +35,8 @@ function fillColor0Attribute(peer: KPointer, value: ResourceColor | undefined): } else if (RuntimeType.NUMBER == value_value_type) { thisSerializer.writeInt8(1 as int32) - const value_value_1 = value_value as number - thisSerializer.writeNumber(value_value_1) + const value_value_1 = value_value as int32 + thisSerializer.writeInt32(value_value_1) } else if (RuntimeType.STRING == value_value_type) { thisSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/resources.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/resources.ts index 6323d158a5f7f883603b0a22d8a91665b390532e..36467961e77c0dab26d4c76dd2b129c6f5f303f3 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/resources.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/resources.ts @@ -135,13 +135,13 @@ export function _r(bundleName: string, moduleName: string, name: string, ...para 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 { +export function _r(id: long, type: long, 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 { +export function _rawfile(id: long, type: long, 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/component/textPicker.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/textPicker.ts index d0bd9b90022066427a1851d9e3cae10ee5941d07..093cb64c14209b4bb4202f6de3f79a94eb4f19d5 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/textPicker.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/component/textPicker.ts @@ -476,8 +476,8 @@ function HookWriteTextPickerDialogOptions(valueSerializer : Serializer, value: T } else if (RuntimeType.NUMBER == value_backgroundColor_value_type) { valueSerializer.writeInt8(1 as int32) - const value_backgroundColor_value_1 = value_backgroundColor_value as number - valueSerializer.writeNumber(value_backgroundColor_value_1) + const value_backgroundColor_value_1 = value_backgroundColor_value as int32 + valueSerializer.writeInt32(value_backgroundColor_value_1) } else if (RuntimeType.STRING == value_backgroundColor_value_type) { valueSerializer.writeInt8(2 as int32) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/theme/ArkColorsImpl.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/theme/ArkColorsImpl.ts index 6c793fb4a1cf0ac7f37fcc297a0484bd938fd574..416d5d159199d44c0e424b2dc412b008f02102bd 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/theme/ArkColorsImpl.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/theme/ArkColorsImpl.ts @@ -19,6 +19,8 @@ import { Resource } from 'global.resource'; import { ArkUIAniModule } from 'arkui.ani'; import { Colors, CustomColors } from '@ohos/arkui/theme'; import { _r } from 'arkui/component/resources'; +import { int16 } from '@koalaui/compat'; +import { int32 } from '@koalaui/common'; export class ArkColorsImpl implements Colors { brand: ResourceColor = _r(125830976, 10001, '', ''); @@ -260,11 +262,11 @@ export class ArkColorsImpl implements Colors { const brandColorValue = brandColor as number | string; const argbColor = ArkUIAniModule._GetColorValue(brandColorValue); result.primary = argbColor; - result.secondary = ArkColorsImpl.blendOpacity(argbColor, 0.6); - result.tertiary = ArkColorsImpl.blendOpacity(argbColor, 0.4); - result.fourth = ArkColorsImpl.blendOpacity(argbColor, 0.2); - result.fifth = ArkColorsImpl.blendOpacity(argbColor, 0.1); - result.sixth = ArkColorsImpl.blendOpacity(argbColor, 0.05); + result.secondary = ArkColorsImpl.blendOpacity(argbColor, 0.6) as int32; + result.tertiary = ArkColorsImpl.blendOpacity(argbColor, 0.4) as int32; + result.fourth = ArkColorsImpl.blendOpacity(argbColor, 0.2) as int32; + result.fifth = ArkColorsImpl.blendOpacity(argbColor, 0.1) as int32; + result.sixth = ArkColorsImpl.blendOpacity(argbColor, 0.05) as int32; } } return result; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ColorMetricsTransfer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ColorMetricsTransfer.ts index f8bd96e0f6ae2777cbaeb3977a652fa7c43db535..760f2af9885dd35754b20acfa3db095342610852 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ColorMetricsTransfer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ColorMetricsTransfer.ts @@ -13,6 +13,7 @@ * limitations under the License. */ +import { int32 } from "@koalaui/compat"; import { ColorMetrics } from "../../Graphics" const MAX_CHANNEL_VALUE = 0xFF; @@ -30,7 +31,7 @@ export class ColorMetricsTransfer { if (ESValue.wrap(input).hasProperty("resourceId_")) { resourceId = ESValue.wrap(input).getProperty("resourceId_").toNumber(); } - let colorMetrics = ColorMetrics.rgba(red, green, blue, alpha); + let colorMetrics = ColorMetrics.rgba(red as int32, green as int32, blue as int32, alpha as double); colorMetrics.setResourceId(resourceId); return colorMetrics; } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/FrameNodeTransfer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/FrameNodeTransfer.ts index 5ca054005f9e52b9ce2d3a43625aad43293679e2..28cd3ee17cd7cefb9612a8f435d00d15e2c39f07 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/FrameNodeTransfer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/FrameNodeTransfer.ts @@ -23,7 +23,7 @@ import { UIContext } from '@ohos.arkui.UIContext'; import { RenderNode } from '../../RenderNode'; import { BusinessError } from '#external'; import { CustomProperty, CommonMethod, UICommonEvent, UIGestureEvent } from '../../component/common'; -import { DrawContext, Position, Size } from '../../Graphics'; +import { DrawContext, NodePosition, Size } from '../../Graphics'; import { ComponentContent } from '../../ComponentContent'; import { ArkUIAniModule } from "arkui.ani" export class FrameNodeTransfer { @@ -107,7 +107,7 @@ export class TransFrameNode extends FrameNode { const error = Error('frameNode created by transferStatic not support setMeasuredSize'); throw new BusinessError(100021, error); } - public setLayoutPosition(position: Position): void { + public setLayoutPosition(position: NodePosition): void { const error = Error('frameNode created by transferStatic not support setLayoutPosition'); throw new BusinessError(100021, error); } @@ -115,7 +115,7 @@ export class TransFrameNode extends FrameNode { const error = Error('frameNode created by transferStatic not support measure'); throw new BusinessError(100021, error); } - public layout(position: Position): void { + public layout(position: NodePosition): void { const error = Error('frameNode created by transferStatic not support layout'); throw new BusinessError(100021, error); } @@ -135,7 +135,7 @@ export class TransFrameNode extends FrameNode { final onMeasure(constraint: LayoutConstraint): void { ArkUIAniModule._OnMeasure_InnerMeasure(this!.peer!.ptr); } - final onLayout(position: Position): void { + final onLayout(position: NodePosition): void { ArkUIAniModule._OnLayout_InnerLayout(this!.peer!.ptr); } } \ No newline at end of file diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/RenderNodeTransfer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/RenderNodeTransfer.ts index a27c9678a3a52ff4f243940044574715c3013546..d09a2d14785ff440baf46fcb3b9f06ec3e837960 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/RenderNodeTransfer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/RenderNodeTransfer.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Position, Rect, Circle, RoundRect, CommandPath, Size, Frame, Vector2, Vector3, Matrix4, Edges, Corners, ShapeMask, ShapeClip, LengthMetricsUnit, DrawContext } from "../../Graphics" +import { NodePosition, Rect, Circle, RoundRect, CommandPath, Size, Frame, Vector2, Vector3, Matrix4, NodeEdges, Corners, ShapeMask, ShapeClip, LengthMetricsUnit, DrawContext } from "../../Graphics" import { BorderStyle } from "../../component/enums" import { RenderNode } from "../../RenderNode" import { Utils } from "@ohos/arkui/graphics" @@ -21,7 +21,7 @@ import { ArkUIAniModule } from "arkui.ani" import hilog from '@ohos.hilog' import { Finalizable, runtimeType, RuntimeType, SerializerBase, registerCallback, wrapCallback, toPeerPtr, KPointer, MaterializedBase, InteropNativeModule } from "@koalaui/interop" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" -import { int16, uint32 } from "@koalaui/compat" +import { int16, int32, uint32 } from "@koalaui/compat" import { ShapeClipTransfer } from "./ShapeClipTransfer" import { ShapeMaskTransfer } from "./ShapeMaskTransfer" import { TransferUtil } from "./TransferUtil" @@ -33,12 +33,12 @@ export class RenderNodeTransfer { private transProperty2Static(inVal: ESValue, rn: RenderNode): void { rn.lengthMetricsUnit = TransferUtil.getPropNumber(inVal, "lengthMetricsUnitValue") as int as LengthMetricsUnit; let styleVal = TransferUtil.getPropBorderStyle(inVal, "borderStyleValue"); - rn.borderStyle = {left: undefined, top: undefined, right: undefined, bottom: undefined} as Edges; + rn.borderStyle = {left: undefined, top: undefined, right: undefined, bottom: undefined} as NodeEdges; let borderWidthVal = TransferUtil.getPropBorderNoExcept(inVal, "borderWidthValue"); - rn.borderWidth = borderWidthVal as Edges; + rn.borderWidth = borderWidthVal as NodeEdges; let borderColorVal = TransferUtil.getPropEdgesColor(inVal, "borderColorValue"); - rn.borderColor = borderColorVal as Edges; + rn.borderColor = borderColorVal as NodeEdges; let borderRadiusVal = TransferUtil.getPropCornersNoExcept(inVal, "borderRadiusValue"); rn.borderRadius = borderRadiusVal as Corners; @@ -57,7 +57,7 @@ export class RenderNodeTransfer { } let colorVal = TransferUtil.getPropColorInt(inVal, "backgroundColorValue"); if (colorVal !== undefined) { - rn.backgroundColor = colorVal as number; + rn.backgroundColor = colorVal as int32; } rn.clipToFrame = TransferUtil.getPropBool(inVal, "clipToFrameValue"); rn.frame = TransferUtil.getPropFrame(inVal, "frameValue"); @@ -68,7 +68,7 @@ export class RenderNodeTransfer { rn.scale = TransferUtil.getPropVector2(inVal, "scaleValue"); let ClrVal = TransferUtil.getPropColorInt(inVal, "shadowColorValue"); if (ClrVal !== undefined) { - rn.shadowColor = ClrVal as number; + rn.shadowColor = ClrVal as int32; } rn.shadowOffset = TransferUtil.getPropVector2(inVal, "shadowOffsetValue"); rn.label = TransferUtil.getPropString(inVal, "labelValue"); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ShapeMaskTransfer.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ShapeMaskTransfer.ts index 710bf31db272f2adf6e5d365f529b9cabd8042ba..257b74597b49d388e90a4335c6a2fd440457eea7 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ShapeMaskTransfer.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/ShapeMaskTransfer.ts @@ -18,6 +18,7 @@ import { ArkUIAniModule } from "arkui.ani" import { ShapeMask, Rect, RoundRect, CornerRadius, Vector2, Circle, CommandPath } from "../../Graphics" import { ShapeBaseTransfer } from "./ShapeBaseTransfer"; import { TransferUtil } from "./TransferUtil"; +import { int32 } from "@koalaui/compat"; export class ShapeMaskTransfer { static transferStatic(input: Any): Object { @@ -54,15 +55,15 @@ export class ShapeMaskTransfer { let maskVal = ESValue.wrap(input); let fiColor = TransferUtil.getPropColorInt(maskVal, "fillColor"); if (fiColor !== undefined) { - shapeMask.fillColor = fiColor as number; + shapeMask.fillColor = fiColor as int32; } let stroColor = TransferUtil.getPropColorInt(maskVal, "strokeColor"); if (stroColor !== undefined) { - shapeMask.strokeColor = stroColor as number; + shapeMask.strokeColor = stroColor as int32; } if (ESValue.wrap(input).getProperty("strokeWidth").isNumber()) { const strokeWidth = ESValue.wrap(input).getProperty("strokeWidth").toNumber(); - shapeMask.strokeWidth = strokeWidth; + shapeMask.strokeWidth = strokeWidth as int32; } return shapeMask; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/TransferUtil.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/TransferUtil.ts index cc45b3adadc70d53c59be0aded1bfb8a12e4cfa7..0892c85245375726eb17302d9dd693c1f3ca0c73 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/TransferUtil.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/transfer/TransferUtil.ts @@ -13,12 +13,13 @@ * limitations under the License. */ -import { Position, Rect, Circle, RoundRect, CommandPath, Size, Frame, Vector2, Vector3, Matrix4, Edges, Corners, ShapeMask, ShapeClip, LengthMetricsUnit, DrawContext } from "../../Graphics" +import { NodePosition, Rect, Circle, RoundRect, CommandPath, Size, Frame, Vector2, Vector3, Matrix4, NodeEdges, Corners, ShapeMask, ShapeClip, LengthMetricsUnit, DrawContext } from "../../Graphics" import { KPointer } from "@koalaui/interop" import { BorderStyle } from "../../component/enums" import { ArkUIAniModule } from "arkui.ani" import { ShapeClipTransfer } from "./ShapeClipTransfer" import { ShapeMaskTransfer } from "./ShapeMaskTransfer" +import { int32 } from "@koalaui/compat" export class TransferUtil { /******************************************************************************* @@ -159,10 +160,10 @@ export class TransferUtil { return {x: x, y: y, z: z} as Vector3; } - static getPropBorderStyle(inVal: ESValue, name: string): Edges { + static getPropBorderStyle(inVal: ESValue, name: string): NodeEdges { const borderVal = inVal.getProperty(name); if (borderVal.isUndefined() || borderVal.isNull()) { - return { left: undefined, top: undefined, right: undefined, bottom: undefined } as Edges; + return { left: undefined, top: undefined, right: undefined, bottom: undefined } as NodeEdges; } const getStyle = (property: string): BorderStyle | undefined => { @@ -175,34 +176,34 @@ export class TransferUtil { top: getStyle('top'), right: getStyle('right'), bottom: getStyle('bottom') - } as Edges; + } as NodeEdges; } // borderWidthValue: 1.1 -> 1.2(int) - static getPropBorderNoExcept(inVal: ESValue, name: string): Edges { + static getPropBorderNoExcept(inVal: ESValue, name: string): NodeEdges { let borderVal = inVal.getProperty(name); if (borderVal.isUndefined() || borderVal.isNull()) { - return {left: undefined, top: undefined, right: undefined, bottom: undefined} as Edges; + return {left: undefined, top: undefined, right: undefined, bottom: undefined} as NodeEdges; } let left = TransferUtil.getPropNumberNoExcept(borderVal, "left"); let top = TransferUtil.getPropNumberNoExcept(borderVal, "top"); let right = TransferUtil.getPropNumberNoExcept(borderVal, "right"); let bottom = TransferUtil.getPropNumberNoExcept(borderVal, "bottom"); - let egVal = {left: left, top: top, right: right, bottom: bottom} as Edges; + let egVal = {left: left, top: top, right: right, bottom: bottom} as NodeEdges; return egVal; } // number color: 1.1(long) -> 1.2(int) - static getPropEdgesColor(inVal: ESValue, name: string): Edges { + static getPropEdgesColor(inVal: ESValue, name: string): NodeEdges { let borderVal = inVal.getProperty(name); if (borderVal.isUndefined() || borderVal.isNull()) { - return {left: undefined, top: undefined, right: undefined, bottom: undefined} as Edges; + return {left: undefined, top: undefined, right: undefined, bottom: undefined} as NodeEdges; } let left = TransferUtil.getPropColorInt(borderVal, "left"); let top = TransferUtil.getPropColorInt(borderVal, "top"); let right = TransferUtil.getPropColorInt(borderVal, "right"); let bottom = TransferUtil.getPropColorInt(borderVal, "bottom"); - let egVal = {left: left, top: top, right: right, bottom: bottom} as Edges; + let egVal = {left: left, top: top, right: right, bottom: bottom} as NodeEdges; return egVal; } @@ -283,7 +284,7 @@ export class TransferUtil { } // number color: int(1.2) -> long(1.1) - static setPropColorLong(name: string, inVal: number | undefined, outJs: ESValue) { + static setPropColorLong(name: string, inVal: int32 | undefined, outJs: ESValue) { if (inVal === undefined) { return; } @@ -300,26 +301,26 @@ export class TransferUtil { outJs.setProperty(name, inVal); } - static setPropEdges(name: string, inVal: Edges, outJs: ESValue) { + static setPropEdges(name: string, inVal: NodeEdges | undefined, outJs: ESValue) { let propVal: ESValue = ESValue.instantiateEmptyObject(); - propVal.setProperty("left", inVal.left); - propVal.setProperty("top", inVal.top); - propVal.setProperty("right", inVal.right); - propVal.setProperty("bottom", inVal.bottom); + propVal.setProperty("left", inVal?.left); + propVal.setProperty("top", inVal?.top); + propVal.setProperty("right", inVal?.right); + propVal.setProperty("bottom", inVal?.bottom); outJs.setProperty(name, propVal); } // number color: int(1.2) -> long(1.1) - static setPropEdgesColor(name: string, inVal: Edges, outJs: ESValue) { + static setPropEdgesColor(name: string, inVal: NodeEdges | undefined, outJs: ESValue) { let propVal: ESValue = ESValue.instantiateEmptyObject(); - TransferUtil.setPropColorLong("left", inVal.left, propVal); - TransferUtil.setPropColorLong("top", inVal.top, propVal); - TransferUtil.setPropColorLong("right", inVal.right, propVal); - TransferUtil.setPropColorLong("bottom", inVal.bottom, propVal); + TransferUtil.setPropColorLong("left", inVal?.left, propVal); + TransferUtil.setPropColorLong("top", inVal?.top, propVal); + TransferUtil.setPropColorLong("right", inVal?.right, propVal); + TransferUtil.setPropColorLong("bottom", inVal?.bottom, propVal); outJs.setProperty(name, propVal); } - static setPropEdgeStyle(name: string, inVal: Edges, outJs: ESValue) { + static setPropEdgeStyle(name: string, inVal: NodeEdges, outJs: ESValue) { const propVal: ESValue = ESValue.instantiateEmptyObject(); const setEdgeProperty = (propertyName: string, value: BorderStyle | undefined) => { if (value !== undefined) { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/utils/SerializeUtils.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/utils/SerializeUtils.ts index 6151c42ff519e2d4de03bce87e5fd8bd1e559d4a..a7d5a65cf9b6ff70e8b820d613f03b0c5a5c3be9 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/utils/SerializeUtils.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/handwritten/utils/SerializeUtils.ts @@ -31,8 +31,8 @@ export class SerializeUtils { thisSerializer.writeInt32(TypeChecker.Color_ToNumeric(color_0)); } else if (RuntimeType.NUMBER == color_type) { thisSerializer.writeInt8(1 as int32); - const color_1 = colorArray[i] as number; - thisSerializer.writeNumber(color_1); + const color_1 = colorArray[i] as int32; + thisSerializer.writeInt32(color_1); } else if (RuntimeType.STRING == color_type) { thisSerializer.writeInt8(2 as int32); const color_2 = colorArray[i] as string;