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 c8310a66d29fa94d6dc3a1c12561639252336c65..3662c938866b9136c5163b364926835ee3de6a92 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 @@ -12495,46 +12495,44 @@ export class Deserializer extends DeserializerBase { const displayY_result : number = (valueDeserializer.readNumber() as number) const windowX_result : number = (valueDeserializer.readNumber() as number) const windowY_result : number = (valueDeserializer.readNumber() as number) - const screenX_result : number = (valueDeserializer.readNumber() as number) - const screenY_result : number = (valueDeserializer.readNumber() as number) const x_result : number = (valueDeserializer.readNumber() as number) const y_result : number = (valueDeserializer.readNumber() as number) - const hand_buf_runtimeType = (valueDeserializer.readInt8() as int32) + const hand_buf_runtimeType = valueDeserializer.readInt8().toInt() let hand_buf : InteractionHand | undefined - if ((RuntimeType.UNDEFINED) != (hand_buf_runtimeType)) + if ((hand_buf_runtimeType) != (RuntimeType.UNDEFINED)) { hand_buf = TypeChecker.InteractionHand_FromNumeric(valueDeserializer.readInt32()) } const hand_result : InteractionHand | undefined = hand_buf - const pressedTime_buf_runtimeType = (valueDeserializer.readInt8() as int32) + const pressedTime_buf_runtimeType = valueDeserializer.readInt8().toInt() let pressedTime_buf : number | undefined - if ((RuntimeType.UNDEFINED) != (pressedTime_buf_runtimeType)) + if ((pressedTime_buf_runtimeType) != (RuntimeType.UNDEFINED)) { pressedTime_buf = (valueDeserializer.readNumber() as number) } const pressedTime_result : number | undefined = pressedTime_buf - const pressure_buf_runtimeType = (valueDeserializer.readInt8() as int32) + const pressure_buf_runtimeType = valueDeserializer.readInt8().toInt() let pressure_buf : number | undefined - if ((RuntimeType.UNDEFINED) != (pressure_buf_runtimeType)) + if ((pressure_buf_runtimeType) != (RuntimeType.UNDEFINED)) { pressure_buf = (valueDeserializer.readNumber() as number) } const pressure_result : number | undefined = pressure_buf - const width_buf_runtimeType = (valueDeserializer.readInt8() as int32) + const width_buf_runtimeType = valueDeserializer.readInt8().toInt() let width_buf : number | undefined - if ((RuntimeType.UNDEFINED) != (width_buf_runtimeType)) + if ((width_buf_runtimeType) != (RuntimeType.UNDEFINED)) { width_buf = (valueDeserializer.readNumber() as number) } const width_result : number | undefined = width_buf - const height_buf_runtimeType = (valueDeserializer.readInt8() as int32) + const height_buf_runtimeType = valueDeserializer.readInt8().toInt() let height_buf : number | undefined - if ((RuntimeType.UNDEFINED) != (height_buf_runtimeType)) + if ((height_buf_runtimeType) != (RuntimeType.UNDEFINED)) { height_buf = (valueDeserializer.readNumber() as number) } const height_result : number | undefined = height_buf - let value : TouchObject = ({type: type_result, id: id_result, displayX: displayX_result, displayY: displayY_result, windowX: windowX_result, windowY: windowY_result, screenX: screenX_result, screenY: screenY_result, x: x_result, y: y_result, hand: hand_result, pressedTime: pressedTime_result, pressure: pressure_result, width: width_result, height: height_result} as TouchObject) + let value : TouchObject = ({type: type_result, id: id_result, displayX: displayX_result, displayY: displayY_result, windowX: windowX_result, windowY: windowY_result, x: x_result, y: y_result, hand: hand_result, pressedTime: pressedTime_result, pressure: pressure_result, width: width_result, height: height_result} as TouchObject) return value } readTouchResult(): TouchResult { 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 5e724d5594715ee3342094946f661591f8e41083..74790c64efe8d96dae6cde4602c083d98884bd5a 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 @@ -7595,10 +7595,6 @@ export class Serializer extends SerializerBase { valueSerializer.writeNumber(value_windowX) const value_windowY = value.windowY valueSerializer.writeNumber(value_windowY) - const value_screenX = value.screenX - valueSerializer.writeNumber(value_screenX) - const value_screenY = value.screenY - valueSerializer.writeNumber(value_screenY) const value_x = value.x valueSerializer.writeNumber(value_x) const value_y = value.y @@ -7606,40 +7602,40 @@ export class Serializer extends SerializerBase { const value_hand = value.hand let value_hand_type : int32 = RuntimeType.UNDEFINED value_hand_type = runtimeType(value_hand) - valueSerializer.writeInt8(value_hand_type as int32) - if ((RuntimeType.UNDEFINED) != (value_hand_type)) { + valueSerializer.writeInt8((value_hand_type).toChar()) + if ((value_hand_type) != (RuntimeType.UNDEFINED)) { const value_hand_value = (value_hand as InteractionHand) valueSerializer.writeInt32(TypeChecker.InteractionHand_ToNumeric(value_hand_value)) } const value_pressedTime = value.pressedTime let value_pressedTime_type : int32 = RuntimeType.UNDEFINED value_pressedTime_type = runtimeType(value_pressedTime) - valueSerializer.writeInt8(value_pressedTime_type as int32) - if ((RuntimeType.UNDEFINED) != (value_pressedTime_type)) { + valueSerializer.writeInt8((value_pressedTime_type).toChar()) + if ((value_pressedTime_type) != (RuntimeType.UNDEFINED)) { const value_pressedTime_value = value_pressedTime! valueSerializer.writeNumber(value_pressedTime_value) } const value_pressure = value.pressure let value_pressure_type : int32 = RuntimeType.UNDEFINED value_pressure_type = runtimeType(value_pressure) - valueSerializer.writeInt8(value_pressure_type as int32) - if ((RuntimeType.UNDEFINED) != (value_pressure_type)) { + valueSerializer.writeInt8((value_pressure_type).toChar()) + if ((value_pressure_type) != (RuntimeType.UNDEFINED)) { const value_pressure_value = value_pressure! valueSerializer.writeNumber(value_pressure_value) } const value_width = value.width let value_width_type : int32 = RuntimeType.UNDEFINED value_width_type = runtimeType(value_width) - valueSerializer.writeInt8(value_width_type as int32) - if ((RuntimeType.UNDEFINED) != (value_width_type)) { + valueSerializer.writeInt8((value_width_type).toChar()) + if ((value_width_type) != (RuntimeType.UNDEFINED)) { const value_width_value = value_width! valueSerializer.writeNumber(value_width_value) } const value_height = value.height let value_height_type : int32 = RuntimeType.UNDEFINED value_height_type = runtimeType(value_height) - valueSerializer.writeInt8(value_height_type as int32) - if ((RuntimeType.UNDEFINED) != (value_height_type)) { + valueSerializer.writeInt8((value_height_type).toChar()) + if ((value_height_type) != (RuntimeType.UNDEFINED)) { const value_height_value = value_height! valueSerializer.writeNumber(value_height_value) } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/Serializers.h b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/Serializers.h index a4da1b3427596274c306090d330ab16dc5c027fa..883b5d0f3dbd2c4f201556be24e12e6f5eba46f4 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/Serializers.h +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/Serializers.h @@ -72573,10 +72573,6 @@ class Serializer : public SerializerBase { valueSerializer.writeNumber(value_windowX); const auto value_windowY = value.windowY; valueSerializer.writeNumber(value_windowY); - const auto value_screenX = value.screenX; - valueSerializer.writeNumber(value_screenX); - const auto value_screenY = value.screenY; - valueSerializer.writeNumber(value_screenY); const auto value_x = value.x; valueSerializer.writeNumber(value_x); const auto value_y = value.y; @@ -72585,7 +72581,7 @@ class Serializer : public SerializerBase { Ark_Int32 value_hand_type = INTEROP_RUNTIME_UNDEFINED; value_hand_type = runtimeType(value_hand); valueSerializer.writeInt8(value_hand_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_hand_type)) { + if ((value_hand_type) != (INTEROP_RUNTIME_UNDEFINED)) { const auto value_hand_value = value_hand.value; valueSerializer.writeInt32(static_cast(value_hand_value)); } @@ -72593,7 +72589,7 @@ class Serializer : public SerializerBase { Ark_Int32 value_pressedTime_type = INTEROP_RUNTIME_UNDEFINED; value_pressedTime_type = runtimeType(value_pressedTime); valueSerializer.writeInt8(value_pressedTime_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_pressedTime_type)) { + if ((value_pressedTime_type) != (INTEROP_RUNTIME_UNDEFINED)) { const auto value_pressedTime_value = value_pressedTime.value; valueSerializer.writeNumber(value_pressedTime_value); } @@ -72601,7 +72597,7 @@ class Serializer : public SerializerBase { Ark_Int32 value_pressure_type = INTEROP_RUNTIME_UNDEFINED; value_pressure_type = runtimeType(value_pressure); valueSerializer.writeInt8(value_pressure_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_pressure_type)) { + if ((value_pressure_type) != (INTEROP_RUNTIME_UNDEFINED)) { const auto value_pressure_value = value_pressure.value; valueSerializer.writeNumber(value_pressure_value); } @@ -72609,7 +72605,7 @@ class Serializer : public SerializerBase { Ark_Int32 value_width_type = INTEROP_RUNTIME_UNDEFINED; value_width_type = runtimeType(value_width); valueSerializer.writeInt8(value_width_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_width_type)) { + if ((value_width_type) != (INTEROP_RUNTIME_UNDEFINED)) { const auto value_width_value = value_width.value; valueSerializer.writeNumber(value_width_value); } @@ -72617,7 +72613,7 @@ class Serializer : public SerializerBase { Ark_Int32 value_height_type = INTEROP_RUNTIME_UNDEFINED; value_height_type = runtimeType(value_height); valueSerializer.writeInt8(value_height_type); - if ((INTEROP_RUNTIME_UNDEFINED) != (value_height_type)) { + if ((value_height_type) != (INTEROP_RUNTIME_UNDEFINED)) { const auto value_height_value = value_height.value; valueSerializer.writeNumber(value_height_value); } @@ -99902,14 +99898,12 @@ class Deserializer : public DeserializerBase { value.displayY = static_cast(valueDeserializer.readNumber()); value.windowX = static_cast(valueDeserializer.readNumber()); value.windowY = static_cast(valueDeserializer.readNumber()); - value.screenX = static_cast(valueDeserializer.readNumber()); - value.screenY = static_cast(valueDeserializer.readNumber()); value.x = static_cast(valueDeserializer.readNumber()); value.y = static_cast(valueDeserializer.readNumber()); const auto hand_buf_runtimeType = static_cast(valueDeserializer.readInt8()); Opt_InteractionHand hand_buf = {}; hand_buf.tag = hand_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; - if ((INTEROP_RUNTIME_UNDEFINED) != (hand_buf_runtimeType)) + if ((hand_buf_runtimeType) != (INTEROP_RUNTIME_UNDEFINED)) { hand_buf.value = static_cast(valueDeserializer.readInt32()); } @@ -99917,7 +99911,7 @@ class Deserializer : public DeserializerBase { const auto pressedTime_buf_runtimeType = static_cast(valueDeserializer.readInt8()); Opt_Number pressedTime_buf = {}; pressedTime_buf.tag = pressedTime_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; - if ((INTEROP_RUNTIME_UNDEFINED) != (pressedTime_buf_runtimeType)) + if ((pressedTime_buf_runtimeType) != (INTEROP_RUNTIME_UNDEFINED)) { pressedTime_buf.value = static_cast(valueDeserializer.readNumber()); } @@ -99925,7 +99919,7 @@ class Deserializer : public DeserializerBase { const auto pressure_buf_runtimeType = static_cast(valueDeserializer.readInt8()); Opt_Number pressure_buf = {}; pressure_buf.tag = pressure_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; - if ((INTEROP_RUNTIME_UNDEFINED) != (pressure_buf_runtimeType)) + if ((pressure_buf_runtimeType) != (INTEROP_RUNTIME_UNDEFINED)) { pressure_buf.value = static_cast(valueDeserializer.readNumber()); } @@ -99933,7 +99927,7 @@ class Deserializer : public DeserializerBase { const auto width_buf_runtimeType = static_cast(valueDeserializer.readInt8()); Opt_Number width_buf = {}; width_buf.tag = width_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; - if ((INTEROP_RUNTIME_UNDEFINED) != (width_buf_runtimeType)) + if ((width_buf_runtimeType) != (INTEROP_RUNTIME_UNDEFINED)) { width_buf.value = static_cast(valueDeserializer.readNumber()); } @@ -99941,7 +99935,7 @@ class Deserializer : public DeserializerBase { const auto height_buf_runtimeType = static_cast(valueDeserializer.readInt8()); Opt_Number height_buf = {}; height_buf.tag = height_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; - if ((INTEROP_RUNTIME_UNDEFINED) != (height_buf_runtimeType)) + if ((height_buf_runtimeType) != (INTEROP_RUNTIME_UNDEFINED)) { height_buf.value = static_cast(valueDeserializer.readNumber()); }