diff --git a/.gitee/CODEOWNERS b/.gitee/CODEOWNERS index 24cd01b4f89f5cc5608453e99cd6d145c303324f..f0546d02448fbb003043566ea21d4e4dbe346aec 100644 --- a/.gitee/CODEOWNERS +++ b/.gitee/CODEOWNERS @@ -3411,8 +3411,11 @@ test/unittest/interfaces/form_render/ @form_framework [Generated source] frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/ @arkui-idlize +frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/peers/Deserializer.ts @arkui-idlize frameworks/core/interfaces/native/generated/ @arkui-idlize +frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h @arkui-idlize frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/arkoala_api_generated.h @ArkUI-idlize +frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/Serializers.h @ArkUI-idlize frameworks/core/interfaces/native/utility/converter.cpp @arkui-idlize [Koala mirror] 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 2a890e66bc3a2123e50440df95862afa9916ca34..40e186734fc13b3b953801dad45198a6a531fdbe 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 @@ -12512,7 +12512,7 @@ export class Deserializer extends DeserializerBase { let pressedTime_buf : number | undefined if ((RuntimeType.UNDEFINED) != (pressedTime_buf_runtimeType)) { - pressedTime_buf = (valueDeserializer.readNumber() as number) + pressedTime_buf = (valueDeserializer.readInt64() as number) } const pressedTime_result : number | undefined = pressedTime_buf const pressure_buf_runtimeType = (valueDeserializer.readInt8() as int32) 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 0cfa1b30ec5e86e8b77c1dcbf4874520682b7e1b..6a5d8f023cd782b90f690bafe785406891925cf9 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 @@ -72660,7 +72660,7 @@ class Serializer : public SerializerBase { valueSerializer.writeInt8(value_pressedTime_type); if ((INTEROP_RUNTIME_UNDEFINED) != (value_pressedTime_type)) { const auto value_pressedTime_value = value_pressedTime.value; - valueSerializer.writeNumber(value_pressedTime_value); + valueSerializer.writeInt64(value_pressedTime_value); } const auto value_pressure = value.pressure; Ark_Int32 value_pressure_type = INTEROP_RUNTIME_UNDEFINED; @@ -99980,11 +99980,11 @@ class Deserializer : public DeserializerBase { } value.hand = hand_buf; const auto pressedTime_buf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_Number pressedTime_buf = {}; + Opt_Int64 pressedTime_buf = {}; pressedTime_buf.tag = pressedTime_buf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; if ((INTEROP_RUNTIME_UNDEFINED) != (pressedTime_buf_runtimeType)) { - pressedTime_buf.value = static_cast(valueDeserializer.readNumber()); + pressedTime_buf.value = static_cast(valueDeserializer.readInt64()); } value.pressedTime = pressedTime_buf; const auto pressure_buf_runtimeType = static_cast(valueDeserializer.readInt8()); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/arkoala_api_generated.h b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/arkoala_api_generated.h index 9e1fd9585c6f44aa0a6757235ba21c9ba77e09b0..1516a8aa041ba3c3391b63e33333d45fae48f817 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/arkoala_api_generated.h +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala/framework/native/src/generated/arkoala_api_generated.h @@ -15255,7 +15255,7 @@ typedef struct Ark_TouchObject { Ark_Number x; Ark_Number y; Opt_InteractionHand hand; - Opt_Number pressedTime; + Opt_Int64 pressedTime; Opt_Number pressure; Opt_Number width; Opt_Number height; diff --git a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h index d12d7b7cfc1467991a5f74854c824ebf3a13fca4..9250bd7242f115a0aaf265c6d6a4262d56717dc4 100644 --- a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h +++ b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h @@ -15256,7 +15256,7 @@ typedef struct Ark_TouchObject { Ark_Number x; Ark_Number y; Opt_InteractionHand hand; - Opt_Number pressedTime; + Opt_Int64 pressedTime; Opt_Number pressure; Opt_Number width; Opt_Number height; diff --git a/frameworks/core/interfaces/native/utility/converter.cpp b/frameworks/core/interfaces/native/utility/converter.cpp index 43944b0f74cd256a0d5e6d74f327f240cdf30da8..1effc2fe9a26fdfbee85a5f2074a82547d9e6a4e 100644 --- a/frameworks/core/interfaces/native/utility/converter.cpp +++ b/frameworks/core/interfaces/native/utility/converter.cpp @@ -3029,7 +3029,7 @@ TouchLocationInfo Convert(const Ark_TouchObject& src) PipelineBase::Vp2PxWithCurrentDensity(y))); dst.SetScreenLocation(Offset(PipelineBase::Vp2PxWithCurrentDensity(displayX), PipelineBase::Vp2PxWithCurrentDensity(displayY))); - auto pressedTimeOpt = Converter::OptConvert(src.pressedTime); + auto pressedTimeOpt = Converter::OptConvert(src.pressedTime); std::chrono::nanoseconds nanoseconds(static_cast(pressedTimeOpt.value_or(0))); TimeStamp time(nanoseconds); dst.SetPressedTime(time); diff --git a/frameworks/core/interfaces/native/utility/reverse_converter.cpp b/frameworks/core/interfaces/native/utility/reverse_converter.cpp index 40564a3b4a1cd36609be9aba77f893a8a69612a3..4bc47ba330bd5cf84d99d953660a315716b08bb2 100644 --- a/frameworks/core/interfaces/native/utility/reverse_converter.cpp +++ b/frameworks/core/interfaces/native/utility/reverse_converter.cpp @@ -698,9 +698,7 @@ void AssignArkValue(Ark_TouchObject& dst, const OHOS::Ace::TouchLocationInfo& sr PipelineBase::Px2VpWithCurrentDensity(localOffset.GetY())); dst.pressedTime.tag = Ark_Tag::INTEROP_TAG_OBJECT; - dst.pressedTime.value.tag = Ark_Tag::INTEROP_TAG_INT32; - dst.pressedTime.value.i32 = static_cast( - src.GetPressedTime().time_since_epoch().count()); + dst.pressedTime.value = static_cast(src.GetPressedTime().time_since_epoch().count()); dst.pressure.tag = Ark_Tag::INTEROP_TAG_OBJECT; dst.pressure.value.tag = Ark_Tag::INTEROP_TAG_FLOAT32;