From e685b44e9a0f4a2e7cc8f6029b9ad3f56fb23477 Mon Sep 17 00:00:00 2001 From: Vladimir Stepanov Date: Thu, 25 Jul 2024 14:36:10 +0300 Subject: [PATCH 1/2] Row generated Signed-off-by: Vladimir Stepanov --- .../native/src/generated/bridge_generated.cc | 61 +++++++++++++++++- arkoala/framework/native/src/library.cc | 64 +++++++++---------- arkoala/framework/src/NativeModule.ts | 8 --- arkoala/framework/src/NativeModuleEmpty.ts | 6 -- .../framework/src/generated/NativeModule.ts | 4 ++ .../src/generated/NativeModuleEmpty.ts | 12 ++++ 6 files changed, 108 insertions(+), 47 deletions(-) diff --git a/arkoala/framework/native/src/generated/bridge_generated.cc b/arkoala/framework/native/src/generated/bridge_generated.cc index ff019e5d3..04e81c82c 100644 --- a/arkoala/framework/native/src/generated/bridge_generated.cc +++ b/arkoala/framework/native/src/generated/bridge_generated.cc @@ -424,7 +424,66 @@ void impl_ColumnAttribute_pointLight(Ark_NativePointer thisPtr, uint8_t* thisArr GetNodeModifiers()->getColumnModifier()->setPointLight(self, (const PointLightStyle*)&value_value); } KOALA_INTEROP_V3(ColumnAttribute_pointLight, Ark_NativePointer, uint8_t*, int32_t) - + +void impl_RowInterface__setRowOptions(Ark_NativePointer thisPtr, uint8_t* thisArray, int32_t thisLength) { + Ark_NodeHandle self = reinterpret_cast(thisPtr); + Deserializer thisDeserializer(thisArray, thisLength); + Opt_Type_RowInterface__setRowOptions_Arg0 value_value; + { + const auto runtimeType = static_cast(thisDeserializer.readInt8()); + value_value.tag = runtimeType == ARK_RUNTIME_UNDEFINED ? ARK_TAG_UNDEFINED : ARK_TAG_OBJECT; + if ((ARK_RUNTIME_UNDEFINED) != (runtimeType)) { + { + { + std::decay::type& typedStruct2 = value_value.value; + { + const auto runtimeType = static_cast(thisDeserializer.readInt8()); + typedStruct2.space.tag = runtimeType == ARK_RUNTIME_UNDEFINED ? ARK_TAG_UNDEFINED : ARK_TAG_OBJECT; + if ((ARK_RUNTIME_UNDEFINED) != (runtimeType)) { + { + { + const int32_t selector = thisDeserializer.readInt8(); + if (selector == 0) { + typedStruct2.space.value.value0 = static_cast::type>(thisDeserializer.readString()); + typedStruct2.space.value.selector = 0; + } + else if (selector == 1) { + typedStruct2.space.value.value1 = static_cast::type>(thisDeserializer.readNumber()); + typedStruct2.space.value.selector = 1; + } + } + } + } + } + } + } + } + } + GetNodeModifiers()->getRowModifier()->_setRowOptions(self, (const Opt_Type_RowInterface__setRowOptions_Arg0*)&value_value); +} +KOALA_INTEROP_V3(RowInterface__setRowOptions, Ark_NativePointer, uint8_t*, int32_t) + +void impl_RowAttribute_alignItems(Ark_NativePointer thisPtr, Ark_Int32 value) { + Ark_NodeHandle self = reinterpret_cast(thisPtr); + GetNodeModifiers()->getRowModifier()->setAlignItems(self, value); +} +KOALA_INTEROP_V2(RowAttribute_alignItems, Ark_NativePointer, Ark_Int32) + +void impl_RowAttribute_justifyContent(Ark_NativePointer thisPtr, Ark_Int32 value) { + Ark_NodeHandle self = reinterpret_cast(thisPtr); + GetNodeModifiers()->getRowModifier()->setJustifyContent(self, value); +} +KOALA_INTEROP_V2(RowAttribute_justifyContent, Ark_NativePointer, Ark_Int32) + +void impl_RowAttribute_pointLight(Ark_NativePointer thisPtr, uint8_t* thisArray, int32_t thisLength) { + Ark_NodeHandle self = reinterpret_cast(thisPtr); + Deserializer thisDeserializer(thisArray, thisLength); + PointLightStyle value_value; + value_value = thisDeserializer.readPointLightStyle(); + GetNodeModifiers()->getRowModifier()->setPointLight(self, (const PointLightStyle*)&value_value); +} +KOALA_INTEROP_V3(RowAttribute_pointLight, Ark_NativePointer, uint8_t*, int32_t) + // Accessors diff --git a/arkoala/framework/native/src/library.cc b/arkoala/framework/native/src/library.cc index ce81385ad..13cd7e0cb 100644 --- a/arkoala/framework/native/src/library.cc +++ b/arkoala/framework/native/src/library.cc @@ -2055,41 +2055,41 @@ KOALA_INTEROP_V2(SwiperAttribute_nestedScroll, KNativePointer, KInt) // row /*alignItems*/ -void impl_RowAttribute_alignItems(KNativePointer nodePtr, KInt value) { - ArkUINodeHandle node = reinterpret_cast(nodePtr); - GetNodeModifiers()->getRowModifier()->setRowAlignItems(node, value); -} -KOALA_INTEROP_V2(RowAttribute_alignItems, KNativePointer, KInt) +// void impl_RowAttribute_alignItems(KNativePointer nodePtr, KInt value) { +// ArkUINodeHandle node = reinterpret_cast(nodePtr); +// GetNodeModifiers()->getRowModifier()->setRowAlignItems(node, value); +// } +// KOALA_INTEROP_V2(RowAttribute_alignItems, KNativePointer, KInt) -void impl_RowAttribute_Reset_alignItems(KNativePointer nodePtr) { - ArkUINodeHandle node = reinterpret_cast(nodePtr); - GetNodeModifiers()->getRowModifier()->resetRowAlignItems(node); -} -KOALA_INTEROP_V1(RowAttribute_Reset_alignItems, KNativePointer) -/*justifyContent*/ -void impl_RowAttribute_justifyContent(KNativePointer nodePtr, KInt value) { - ArkUINodeHandle node = reinterpret_cast(nodePtr); - GetNodeModifiers()->getRowModifier()->setRowJustifyContent(node, value); -} -KOALA_INTEROP_V2(RowAttribute_justifyContent, KNativePointer, KInt) +// void impl_RowAttribute_Reset_alignItems(KNativePointer nodePtr) { +// ArkUINodeHandle node = reinterpret_cast(nodePtr); +// GetNodeModifiers()->getRowModifier()->resetRowAlignItems(node); +// } +// KOALA_INTEROP_V1(RowAttribute_Reset_alignItems, KNativePointer) +// /*justifyContent*/ +// void impl_RowAttribute_justifyContent(KNativePointer nodePtr, KInt value) { +// ArkUINodeHandle node = reinterpret_cast(nodePtr); +// GetNodeModifiers()->getRowModifier()->setRowJustifyContent(node, value); +// } +// KOALA_INTEROP_V2(RowAttribute_justifyContent, KNativePointer, KInt) -void impl_RowAttribute_Reset_justifyContent(KNativePointer nodePtr) { - ArkUINodeHandle node = reinterpret_cast(nodePtr); - GetNodeModifiers()->getRowModifier()->resetRowJustifyContent(node); -} -KOALA_INTEROP_V1(RowAttribute_Reset_justifyContent, KNativePointer) -/*space*/ -void impl_RowAttribute_space (KNativePointer nodePtr, KFloat value, KInt unit) { - ArkUINodeHandle node = reinterpret_cast(nodePtr); - GetNodeModifiers()->getRowModifier()->setRowSpace(node, value, unit); -} -KOALA_INTEROP_V3(RowAttribute_space, KNativePointer, KFloat , KInt) +// void impl_RowAttribute_Reset_justifyContent(KNativePointer nodePtr) { +// ArkUINodeHandle node = reinterpret_cast(nodePtr); +// GetNodeModifiers()->getRowModifier()->resetRowJustifyContent(node); +// } +// KOALA_INTEROP_V1(RowAttribute_Reset_justifyContent, KNativePointer) +// /*space*/ +// void impl_RowAttribute_space (KNativePointer nodePtr, KFloat value, KInt unit) { +// ArkUINodeHandle node = reinterpret_cast(nodePtr); +// GetNodeModifiers()->getRowModifier()->setRowSpace(node, value, unit); +// } +// KOALA_INTEROP_V3(RowAttribute_space, KNativePointer, KFloat , KInt) -void impl_RowAttribute_Reset_space (KNativePointer nodePtr) { - ArkUINodeHandle node = reinterpret_cast(nodePtr); - GetNodeModifiers()->getRowModifier()->resetRowSpace(node); -} -KOALA_INTEROP_V1(RowAttribute_Reset_space, KNativePointer) +// void impl_RowAttribute_Reset_space (KNativePointer nodePtr) { +// ArkUINodeHandle node = reinterpret_cast(nodePtr); +// GetNodeModifiers()->getRowModifier()->resetRowSpace(node); +// } +// KOALA_INTEROP_V1(RowAttribute_Reset_space, KNativePointer) // divider void impl_DividerAttribute_vertical(KNativePointer nodePtr, KBoolean value) { diff --git a/arkoala/framework/src/NativeModule.ts b/arkoala/framework/src/NativeModule.ts index c86ef99d2..db3024df2 100644 --- a/arkoala/framework/src/NativeModule.ts +++ b/arkoala/framework/src/NativeModule.ts @@ -412,14 +412,6 @@ export interface ComponentOps { _ColumnSplitAttribute_divider(ptr: NodePointer, startValue: KFloat, startUnit: KInt, endValue: KFloat, endUnit: KInt): void _ColumnSplitAttribute_Reset_divider(ptr: NodePointer): void - // row - _RowAttribute_alignItems(ptr: NodePointer, value: KInt): void - _RowAttribute_Reset_alignItems(ptr: NodePointer): void - _RowAttribute_justifyContent(ptr: NodePointer, value: KInt): void - _RowAttribute_Reset_justifyContent(ptr: NodePointer): void - _RowAttribute_space(ptr: NodePointer, value: KFloat, unit: KInt): void - _RowAttribute_Reset_space(ptr: NodePointer): void - // rowSplit _RowSplitAttribute_resizeable(ptr: NodePointer, value: KBoolean): void _RowSplitAttribute_Reset_resizeable(ptr: NodePointer): void diff --git a/arkoala/framework/src/NativeModuleEmpty.ts b/arkoala/framework/src/NativeModuleEmpty.ts index d1922dff0..970f8e24c 100644 --- a/arkoala/framework/src/NativeModuleEmpty.ts +++ b/arkoala/framework/src/NativeModuleEmpty.ts @@ -535,12 +535,6 @@ export class NativeModuleEmpty extends NativeModuleEmptyIntegrated implements Na _ColumnSplitAttribute_Reset_resizeable(ptr: NodePointer): void {} _ColumnSplitAttribute_divider(ptr: NodePointer, startValue: KFloat, startUnit: KInt, endValue: KFloat, endUnit: KInt): void {} _ColumnSplitAttribute_Reset_divider(ptr: NodePointer): void {} - _RowAttribute_alignItems(ptr: NodePointer, value: number): void {} - _RowAttribute_Reset_alignItems(ptr: NodePointer): void {} - _RowAttribute_justifyContent(ptr: NodePointer, value: number): void {} - _RowAttribute_Reset_justifyContent(ptr: NodePointer): void {} - _RowAttribute_space(ptr: NodePointer, value: number, unit: KInt): void {} - _RowAttribute_Reset_space(ptr: NodePointer): void {} _RowSplitAttribute_resizeable(ptr: NodePointer, value: KBoolean): void {} _RowSplitAttribute_Reset_resizeable(ptr: NodePointer): void {} _DividerAttribute_vertical(ptr: NodePointer, value: number): void {} diff --git a/arkoala/framework/src/generated/NativeModule.ts b/arkoala/framework/src/generated/NativeModule.ts index 141ced30d..4391dd091 100644 --- a/arkoala/framework/src/generated/NativeModule.ts +++ b/arkoala/framework/src/generated/NativeModule.ts @@ -195,6 +195,10 @@ export interface ComponentOps { _ColumnAttribute_alignItems(ptr: KPointer, value: KInt): void _ColumnAttribute_justifyContent(ptr: KPointer, value: KInt): void _ColumnAttribute_pointLight(ptr: KPointer, thisArray: Uint8Array, thisLength: int32): void + _RowInterface__setRowOptions(ptr: KPointer, thisArray: Uint8Array, thisLength: int32): void + _RowAttribute_alignItems(ptr: KPointer, value: KInt): void + _RowAttribute_justifyContent(ptr: KPointer, value: KInt): void + _RowAttribute_pointLight(ptr: KPointer, thisArray: Uint8Array, thisLength: int32): void _ContentModifier_ctor(): KPointer _ContentModifier_getFinalizer(): KPointer _ContentModifier_applyContent(ptr: KPointer): KPointer diff --git a/arkoala/framework/src/generated/NativeModuleEmpty.ts b/arkoala/framework/src/generated/NativeModuleEmpty.ts index 2b2e20ec8..0e6a7dc84 100644 --- a/arkoala/framework/src/generated/NativeModuleEmpty.ts +++ b/arkoala/framework/src/generated/NativeModuleEmpty.ts @@ -107,6 +107,18 @@ export class NativeModuleEmptyIntegrated implements NativeModuleIntegrated { _ColumnAttribute_pointLight(ptr: KPointer, thisArray: Uint8Array, thisLength: int32): void { console.log("_ColumnAttribute_pointLight") } + _RowInterface__setRowOptions(ptr: KPointer, thisArray: Uint8Array, thisLength: int32): void { + console.log("_RowInterface__setRowOptions") + } + _RowAttribute_alignItems(ptr: KPointer, value: KInt): void { + console.log("_RowAttribute_alignItems") + } + _RowAttribute_justifyContent(ptr: KPointer, value: KInt): void { + console.log("_RowAttribute_justifyContent") + } + _RowAttribute_pointLight(ptr: KPointer, thisArray: Uint8Array, thisLength: int32): void { + console.log("_RowAttribute_pointLight") + } _ContentModifier_ctor(): KPointer { console.log("_ContentModifier_ctor") return -1 -- Gitee From 813e89767d68dffb6698967cb093cbbcdc878296 Mon Sep 17 00:00:00 2001 From: Vladimir Stepanov Date: Thu, 25 Jul 2024 15:21:10 +0300 Subject: [PATCH 2/2] Remove comments Signed-off-by: Vladimir Stepanov --- arkoala/framework/native/src/library.cc | 76 ------------------------- 1 file changed, 76 deletions(-) diff --git a/arkoala/framework/native/src/library.cc b/arkoala/framework/native/src/library.cc index 13cd7e0cb..1938ff47f 100644 --- a/arkoala/framework/native/src/library.cc +++ b/arkoala/framework/native/src/library.cc @@ -2015,82 +2015,6 @@ void impl_SwiperAttribute_nestedScroll(KNativePointer nodePtr, KInt value) } KOALA_INTEROP_V2(SwiperAttribute_nestedScroll, KNativePointer, KInt) -// column -/*AlignItems*/ -// void impl_ColumnAttribute_alignItems(KNativePointer nodePtr, KInt value) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getColumnModifier()->setColumnAlignItems(node, value); -// } -// KOALA_INTEROP_V2(ColumnAttribute_alignItems, KNativePointer, KInt) - -// void impl_ColumnAttribute_Reset_alignItems(KNativePointer nodePtr) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getColumnModifier()->resetColumnAlignItems(node); -// } -// KOALA_INTEROP_V1(ColumnAttribute_Reset_alignItems, KNativePointer) -// /*JustifyContent*/ -// void impl_ColumnAttribute_justifyContent(KNativePointer nodePtr, KInt value) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getColumnModifier()->setColumnJustifyContent(node, value); -// } -// KOALA_INTEROP_V2(ColumnAttribute_justifyContent, KNativePointer, KInt) - -// void impl_ColumnAttribute_Reset_justifyContent(KNativePointer nodePtr) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getColumnModifier()->resetColumnJustifyContent(node); -// } -// KOALA_INTEROP_V1(ColumnAttribute_Reset_justifyContent, KNativePointer) -// /*space*/ -// void impl_ColumnAttribute_space(KNativePointer nodePtr, KFloat value, KInt unit) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getColumnModifier()->setColumnSpace(node, value, unit); -// } -// KOALA_INTEROP_V3(ColumnAttribute_space, KNativePointer, KFloat , KInt) - -// void impl_ColumnAttribute_Reset_space(KNativePointer nodePtr) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getColumnModifier()->resetColumnSpace(node); -// } -// KOALA_INTEROP_V1(ColumnAttribute_Reset_space, KNativePointer) - -// row -/*alignItems*/ -// void impl_RowAttribute_alignItems(KNativePointer nodePtr, KInt value) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getRowModifier()->setRowAlignItems(node, value); -// } -// KOALA_INTEROP_V2(RowAttribute_alignItems, KNativePointer, KInt) - -// void impl_RowAttribute_Reset_alignItems(KNativePointer nodePtr) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getRowModifier()->resetRowAlignItems(node); -// } -// KOALA_INTEROP_V1(RowAttribute_Reset_alignItems, KNativePointer) -// /*justifyContent*/ -// void impl_RowAttribute_justifyContent(KNativePointer nodePtr, KInt value) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getRowModifier()->setRowJustifyContent(node, value); -// } -// KOALA_INTEROP_V2(RowAttribute_justifyContent, KNativePointer, KInt) - -// void impl_RowAttribute_Reset_justifyContent(KNativePointer nodePtr) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getRowModifier()->resetRowJustifyContent(node); -// } -// KOALA_INTEROP_V1(RowAttribute_Reset_justifyContent, KNativePointer) -// /*space*/ -// void impl_RowAttribute_space (KNativePointer nodePtr, KFloat value, KInt unit) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getRowModifier()->setRowSpace(node, value, unit); -// } -// KOALA_INTEROP_V3(RowAttribute_space, KNativePointer, KFloat , KInt) - -// void impl_RowAttribute_Reset_space (KNativePointer nodePtr) { -// ArkUINodeHandle node = reinterpret_cast(nodePtr); -// GetNodeModifiers()->getRowModifier()->resetRowSpace(node); -// } -// KOALA_INTEROP_V1(RowAttribute_Reset_space, KNativePointer) - // divider void impl_DividerAttribute_vertical(KNativePointer nodePtr, KBoolean value) { ArkUINodeHandle node = reinterpret_cast(nodePtr); -- Gitee