diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_common_bridge.cpp b/frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_common_bridge.cpp index 46906a44d5a55e5d033d569ebd712c8c331a818b..72a41298d8e4c8410029d3790eb32f064d9976ab 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_common_bridge.cpp +++ b/frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_common_bridge.cpp @@ -2532,7 +2532,7 @@ ArkUINativeModuleValue CommonBridge::SetForegroundBlurStyle(ArkUIRuntimeCallInfo intArray[NUM_1] = colorMode; intArray[NUM_2] = adaptiveColor; GetArkUINodeModifiers()->getCommonModifier()->setForegroundBlurStyle( - nativeNode, intArray, scale, blurOption.grayscale.data(), blurOption.grayscale.size()); + nativeNode, &intArray, scale, blurOption.grayscale.data(), blurOption.grayscale.size()); return panda::JSValueRef::Undefined(vm); } @@ -2630,7 +2630,7 @@ ArkUINativeModuleValue CommonBridge::SetBackgroundBlurStyle(ArkUIRuntimeCallInfo intArray[NUM_1] = colorMode; intArray[NUM_2] = adaptiveColor; GetArkUINodeModifiers()->getCommonModifier()->setBackgroundBlurStyle( - nativeNode, intArray, scale, blurOption.grayscale.data(), blurOption.grayscale.size()); + nativeNode, &intArray, scale, blurOption.grayscale.data(), blurOption.grayscale.size()); return panda::JSValueRef::Undefined(vm); } diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_frame_node_bridge.cpp b/frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_frame_node_bridge.cpp index bd97c19dee33d6ffe662cbf8c348812877b8452c..120192b1c109d0190d2e7a5d45e02f18b6fe1593 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_frame_node_bridge.cpp +++ b/frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_frame_node_bridge.cpp @@ -571,7 +571,7 @@ ArkUINativeModuleValue FrameNodeBridge::GetConfigBorderWidth(ArkUIRuntimeCallInf ArkUI_Float32 borderWidthValue[4]; ArkUI_Int32 borderWidthUnit[4]; GetArkUINodeModifiers()->getCommonModifier()->getBorderWidthDimension( - nativeNode, borderWidthValue, borderWidthUnit); + nativeNode, &borderWidthValue, &borderWidthUnit); for (int i = 0; i < 4; i++) { Framework::ArrayRef::SetValueAt(vm, valueArray, i * 2, panda::NumberRef::New(vm, borderWidthValue[i])); Framework::ArrayRef::SetValueAt(vm, valueArray, i * 2 + 1, panda::NumberRef::New(vm, borderWidthUnit[i])); @@ -588,7 +588,7 @@ ArkUINativeModuleValue FrameNodeBridge::GetConfigPadding(ArkUIRuntimeCallInfo* r Local valueArray = Framework::ArrayRef::New(vm, 8); ArkUI_Float32 paddingValue[4]; ArkUI_Int32 paddingUnit[4]; - GetArkUINodeModifiers()->getCommonModifier()->getPaddingDimension(nativeNode, paddingValue, paddingUnit); + GetArkUINodeModifiers()->getCommonModifier()->getPaddingDimension(nativeNode, &paddingValue, &paddingUnit); for (int i = 0; i < 4; i++) { Framework::ArrayRef::SetValueAt(vm, valueArray, i * 2, panda::NumberRef::New(vm, paddingValue[i])); Framework::ArrayRef::SetValueAt(vm, valueArray, i * 2 + 1, panda::NumberRef::New(vm, paddingUnit[i])); @@ -605,7 +605,7 @@ ArkUINativeModuleValue FrameNodeBridge::GetConfigMargin(ArkUIRuntimeCallInfo* ru Local valueArray = Framework::ArrayRef::New(vm, 8); ArkUI_Float32 marginValue[4]; ArkUI_Int32 marginUnit[4]; - GetArkUINodeModifiers()->getCommonModifier()->getMarginDimension(nativeNode, marginValue, marginUnit); + GetArkUINodeModifiers()->getCommonModifier()->getMarginDimension(nativeNode, &marginValue, &marginUnit); for (int i = 0; i < 4; i++) { Framework::ArrayRef::SetValueAt(vm, valueArray, i * 2, panda::NumberRef::New(vm, marginValue[i])); Framework::ArrayRef::SetValueAt(vm, valueArray, i * 2 + 1, panda::NumberRef::New(vm, marginUnit[i])); @@ -622,7 +622,7 @@ ArkUINativeModuleValue FrameNodeBridge::GetConfigSize(ArkUIRuntimeCallInfo* runt Local valueArray = Framework::ArrayRef::New(vm, 4); ArkUI_Float32 sizeValue[2]; ArkUI_Int32 sizeUnit[2]; - GetArkUINodeModifiers()->getCommonModifier()->getConfigSize(nativeNode, sizeValue, sizeUnit); + GetArkUINodeModifiers()->getCommonModifier()->getConfigSize(nativeNode, &sizeValue, &sizeUnit); for (int i = 0; i < 2; i++) { Framework::ArrayRef::SetValueAt(vm, valueArray, i * 2, panda::NumberRef::New(vm, sizeValue[i])); Framework::ArrayRef::SetValueAt(vm, valueArray, i * 2 + 1, panda::NumberRef::New(vm, sizeUnit[i])); diff --git a/frameworks/core/interfaces/arkoala/arkoala_api.h b/frameworks/core/interfaces/arkoala/arkoala_api.h index 4609d47902f713c5d57201f8fb6a24463a57fdce..3076d9b4f1d56aec9770d8f9f0d1856cf02cdf5b 100644 --- a/frameworks/core/interfaces/arkoala/arkoala_api.h +++ b/frameworks/core/interfaces/arkoala/arkoala_api.h @@ -1161,13 +1161,13 @@ struct ArkUICommonModifier { void (*resetBorderImage)(ArkUINodeHandle node); void (*setBorderImageGradient)(ArkUINodeHandle node, const ArkUIInt32orFloat32* values, ArkUI_Int32 valuesLength, const ArkUIInt32orFloat32* colors, ArkUI_Int32 colorsLength); - void (*setForegroundBlurStyle)(ArkUINodeHandle node, ArkUI_Int32* intArray, ArkUI_Float32 scale, + void (*setForegroundBlurStyle)(ArkUINodeHandle node, ArkUI_Int32 (*intArray)[3], ArkUI_Float32 scale, const ArkUI_Float32* blurValues, ArkUI_Int32 blurValuesSize); void (*resetForegroundBlurStyle)(ArkUINodeHandle node); void (*setLinearGradientBlur)(ArkUINodeHandle node, ArkUI_Float32 blurRadius, const ArkUI_Float32* stops, ArkUI_Uint32 stopsLength, ArkUI_Int32 directionValue); void (*resetLinearGradientBlur)(ArkUINodeHandle node); - void (*setBackgroundBlurStyle)(ArkUINodeHandle node, ArkUI_Int32* intArray, ArkUI_Float32 scale, + void (*setBackgroundBlurStyle)(ArkUINodeHandle node, ArkUI_Int32 (*intArray)[3], ArkUI_Float32 scale, const ArkUI_Float32* blurValues, ArkUI_Int32 blurValuesSize); void (*resetBackgroundBlurStyle)(ArkUINodeHandle node); void (*setBorder)(ArkUINodeHandle node, const ArkUI_Float32* values, ArkUI_Int32 valuesSize, @@ -1350,7 +1350,7 @@ struct ArkUICommonModifier { void (*setClip)(ArkUINodeHandle node, ArkUI_Int32 isClip); void (*setClipShape)(ArkUINodeHandle node, ArkUI_CharPtr type, const ArkUI_Float32* attribute, ArkUI_Int32 length); void (*setClipPath)( - ArkUINodeHandle node, ArkUI_CharPtr type, const ArkUI_Float32* attribute, ArkUI_CharPtr commands); + ArkUINodeHandle node, ArkUI_CharPtr type, const ArkUI_Float32 (*attribute)[2], ArkUI_CharPtr commands); void (*resetClip)(ArkUINodeHandle node); void (*setTransitionCenter)(ArkUINodeHandle node, ArkUI_Float32 centerX, ArkUI_Int32 centerXUnit, ArkUI_Float32 centerY, ArkUI_Int32 centerYUnit, ArkUI_Float32 centerZValue, ArkUI_Int32 centerZUnit); @@ -1386,7 +1386,7 @@ struct ArkUICommonModifier { void (*resetOutline)(ArkUINodeHandle node); ArkUI_Bool (*getFocusable)(ArkUINodeHandle node); ArkUI_Bool (*getDefaultFocus)(ArkUINodeHandle node); - ArkUI_Int32 (*getResponseRegion)(ArkUINodeHandle node, ArkUI_Float32* values); + ArkUI_Int32 (*getResponseRegion)(ArkUINodeHandle node, ArkUI_Float32 (*values)[32]); ArkUI_CharPtr (*getOverlay)(ArkUINodeHandle node, ArkUIOverlayOptions* options, ArkUI_Int32 unit); ArkUI_Bool (*getAccessibilityGroup)(ArkUINodeHandle node); ArkUI_CharPtr (*getAccessibilityText)(ArkUINodeHandle node); @@ -1395,24 +1395,24 @@ struct ArkUICommonModifier { void (*setNeedFocus)(ArkUINodeHandle node, ArkUI_Bool value); ArkUI_Bool (*getNeedFocus)(ArkUINodeHandle node); ArkUI_Float32 (*getOpacity)(ArkUINodeHandle node); - void (*getBorderWidth)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 unit); - void (*getBorderWidthDimension)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32* units); - void (*getBorderRadius)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 unit); - void (*getBorderColor)(ArkUINodeHandle node, ArkUI_Uint32* values); - void (*getBorderStyle)(ArkUINodeHandle node, ArkUI_Int32* values); + void (*getBorderWidth)(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 unit); + void (*getBorderWidthDimension)(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 (*units)[4]); + void (*getBorderRadius)(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 unit); + void (*getBorderColor)(ArkUINodeHandle node, ArkUI_Uint32 (*values)[4]); + void (*getBorderStyle)(ArkUINodeHandle node, ArkUI_Int32 (*values)[4]); ArkUI_Int32 (*getZIndex)(ArkUINodeHandle node); ArkUI_Int32 (*getVisibility)(ArkUINodeHandle node); ArkUI_Int32 (*getClip)(ArkUINodeHandle node); void (*getClipShape)(ArkUINodeHandle node, ArkUIClipShapeOptions* options); - void (*getTransform)(ArkUINodeHandle node, ArkUI_Float32* values); + void (*getTransform)(ArkUINodeHandle node, ArkUI_Float32 (*values)[16]); ArkUI_Int32 (*getHitTestBehavior)(ArkUINodeHandle node); void (*getPosition)(ArkUINodeHandle node, ArkUIPositionOptions* options, ArkUI_Int32 unit); ArkUI_Int32 (*getShadow)(ArkUINodeHandle node); void (*getCustomShadow)(ArkUINodeHandle node, ArkUICustomShadowOptions* options); - ArkUI_Int32 (*getSweepGradient)( - ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Uint32* colors, ArkUI_Float32* stops, ArkUI_Int32 unit); - ArkUI_Int32 (*getRadialGradient)( - ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Uint32* colors, ArkUI_Float32* stops, ArkUI_Int32 unit); + ArkUI_Int32 (*getSweepGradient)(ArkUINodeHandle node, ArkUI_Float32 (*values)[6], ArkUI_Uint32 (*colors)[10], + ArkUI_Float32 (*stops)[10], ArkUI_Int32 unit); + ArkUI_Int32 (*getRadialGradient)(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Uint32 (*colors)[10], + ArkUI_Float32 (*stops)[10], ArkUI_Int32 unit); void (*getMask)(ArkUINodeHandle node, ArkUIMaskOptions* options); void (*getBlendMode)(ArkUINodeHandle node, ArkUIBlendModeOptions* options); ArkUI_Int32 (*getDirection)(ArkUINodeHandle node); @@ -1450,20 +1450,20 @@ struct ArkUICommonModifier { ArkUI_Uint32 (*getForegroundColor)(ArkUINodeHandle node); ArkUI_Float32 (*getBlur)(ArkUINodeHandle node); ArkUI_Int32 (*getLinearGradient)( - ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Uint32* colors, ArkUI_Float32* stop); + ArkUINodeHandle node, ArkUI_Float32 (*values)[3], ArkUI_Uint32 (*colors)[10], ArkUI_Float32 (*stop)[10]); ArkUI_Int32 (*getAlign)(ArkUINodeHandle node); ArkUI_Float32 (*getWidth)(ArkUINodeHandle node, ArkUI_Int32 unit); ArkUI_Float32 (*getHeight)(ArkUINodeHandle node, ArkUI_Int32 unit); ArkUI_Uint32 (*getBackgroundColor)(ArkUINodeHandle node); void (*getBackgroundImage)(ArkUINodeHandle node, ArkUIBackgroundImage* options); - void (*getPadding)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 length, ArkUI_Int32 unit); - void (*getPaddingDimension)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32* units); - void (*getConfigSize)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32* units); + void (*getPadding)(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 length, ArkUI_Int32 unit); + void (*getPaddingDimension)(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 (*units)[4]); + void (*getConfigSize)(ArkUINodeHandle node, ArkUI_Float32 (*values)[2], ArkUI_Int32 (*units)[2]); ArkUI_CharPtr (*getKey)(ArkUINodeHandle node); ArkUI_Int32 (*getEnabled)(ArkUINodeHandle node); - void (*getMargin)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 length, ArkUI_Int32 unit); - void (*getMarginDimension)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32* units); - void (*getTranslate)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 unit); + void (*getMargin)(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 length, ArkUI_Int32 unit); + void (*getMarginDimension)(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 (*units)[4]); + void (*getTranslate)(ArkUINodeHandle node, ArkUI_Float32 (*values)[3], ArkUI_Int32 unit); void (*setMoveTransition)(ArkUINodeHandle node, ArkUI_Int32 value, const ArkUIAnimationOptionType* opacityOption); ArkUIMoveTransitionType (*getMoveTransition)(ArkUINodeHandle node); void (*resetMask)(ArkUINodeHandle node); @@ -1473,14 +1473,14 @@ struct ArkUICommonModifier { void (*setBackgroundImageSizeWithUnit)(ArkUINodeHandle node, ArkUI_Float32 valueWidth, ArkUI_Float32 valueHeight, ArkUI_Int32 unit); ArkUI_Int32 (*getRenderFit)(ArkUINodeHandle node); - void (*getOutlineColor)(ArkUINodeHandle node, ArkUI_Uint32* values); - void (*getSize)(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 unit); + void (*getOutlineColor)(ArkUINodeHandle node, ArkUI_Uint32 (*values)[4]); + void (*getSize)(ArkUINodeHandle node, ArkUI_Float32 (*values)[2], ArkUI_Int32 unit); ArkUI_Bool (*getRenderGroup)(ArkUINodeHandle node); void (*setOnVisibleAreaChange)( ArkUINodeHandle node, ArkUI_Int64 extraParam, ArkUI_Float32* values, ArkUI_Int32 size); ArkUI_CharPtr (*getGeometryTransition)(ArkUINodeHandle node, ArkUI_Bool* options); void (*setChainStyle)(ArkUINodeHandle node, ArkUI_Int32 direction, ArkUI_Int32 style); - void (*getChainStyle)(ArkUINodeHandle node, ArkUI_Int32* values); + void (*getChainStyle)(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]); void (*resetChainStyle)(ArkUINodeHandle node); void (*setBias)(ArkUINodeHandle node, ArkUI_Float32 horizontal, ArkUI_Float32 vertical); void (*getBias)(ArkUINodeHandle node, ArkUI_Float32* values); @@ -1666,7 +1666,7 @@ struct ArkUITextModifier { ArkUI_CharPtr (*getTextFontFeature)(ArkUINodeHandle node); ArkUI_Int32 (*getEnableDataDetector)(ArkUINodeHandle node); void (*setTextDataDetectorConfig)(ArkUINodeHandle node, ArkUI_Uint32* values, ArkUI_Int32 size); - ArkUI_Int32 (*getTextDataDetectorConfig)(ArkUINodeHandle node, ArkUI_Int32* values); + ArkUI_Int32 (*getTextDataDetectorConfig)(ArkUINodeHandle node, ArkUI_Int32 (*values)[32]); void (*resetTextDataDetectorConfig)(ArkUINodeHandle node); void (*setLineBreakStrategy)(ArkUINodeHandle node, ArkUI_Uint32 lineBreakStrategy); void (*resetLineBreakStrategy)(ArkUINodeHandle node); @@ -1866,7 +1866,7 @@ struct ArkUIListModifier { ArkUI_Int32 (*getSticky)(ArkUINodeHandle node); void (*setSticky)(ArkUINodeHandle node, ArkUI_Int32 stickyStyle); void (*resetSticky)(ArkUINodeHandle node); - ArkUI_Int32 (*getListEdgeEffect)(ArkUINodeHandle node, ArkUI_Int32* values); + ArkUI_Int32 (*getListEdgeEffect)(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]); void (*setListEdgeEffect)(ArkUINodeHandle node, ArkUI_Int32 edgeEffect, ArkUI_Bool alwaysEnabled); void (*resetListEdgeEffect)(ArkUINodeHandle node); ArkUI_Int32 (*getListDirection)(ArkUINodeHandle node); @@ -1875,7 +1875,7 @@ struct ArkUIListModifier { ArkUI_Float32 (*getListFriction)(ArkUINodeHandle node); void (*setListFriction)(ArkUINodeHandle node, ArkUI_Float32 friction); void (*resetListFriction)(ArkUINodeHandle node); - void (*getListNestedScroll)(ArkUINodeHandle node, ArkUI_Int32* values); + void (*getListNestedScroll)(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]); void (*setListNestedScroll)(ArkUINodeHandle node, ArkUI_Int32 forward, ArkUI_Int32 backward); void (*resetListNestedScroll)(ArkUINodeHandle node); ArkUI_Int32 (*getListScrollBar)(ArkUINodeHandle node); @@ -1995,10 +1995,10 @@ struct ArkUISwiperModifier { void (*resetNodeAdapter)(ArkUINodeHandle node); ArkUINodeAdapterHandle (*getNodeAdapter)(ArkUINodeHandle node); ArkUI_Int32 (*getCachedCount)(ArkUINodeHandle node); - void (*setSwiperNestedScroll)(ArkUINodeHandle node, ArkUI_Int32* value); + void (*setSwiperNestedScroll)(ArkUINodeHandle node, ArkUI_Int32 (*value)[1]); void (*resetSwiperNestedScroll)(ArkUINodeHandle node); ArkUI_Int32 (*getSwiperNestedScroll)(ArkUINodeHandle node); - void (*setSwiperToIndex)(ArkUINodeHandle node, ArkUI_Int32* values); + void (*setSwiperToIndex)(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]); void (*getSwiperPrevMargin)(ArkUINodeHandle node, ArkUI_Int32 unit, ArkUISwiperMarginOptions* options); void (*getSwiperNextMargin)(ArkUINodeHandle node, ArkUI_Int32 unit, ArkUISwiperMarginOptions* options); void (*setSwiperIndicatorStyle)(ArkUINodeHandle node, ArkUISwiperIndicator* swiperIndicator); @@ -2163,7 +2163,7 @@ struct ArkUIScrollModifier { ArkUI_Float32 (*getScrollFriction)(ArkUINodeHandle node); void (*setScrollFriction)(ArkUINodeHandle node, ArkUI_Float32 value); void (*resetScrollFriction)(ArkUINodeHandle node); - ArkUI_Int32 (*getScrollScrollSnap)(ArkUINodeHandle node, ArkUI_Float32* values); + ArkUI_Int32 (*getScrollScrollSnap)(ArkUINodeHandle node, ArkUI_Float32 (*values)[32]); void (*setScrollScrollSnap)(ArkUINodeHandle node, const ArkUI_Float32* paginationValue, ArkUI_Int32 paginationSize, const ArkUI_Int32* paginationParam, ArkUI_Int32 paramSize); void (*resetScrollScrollSnap)(ArkUINodeHandle node); @@ -2179,21 +2179,21 @@ struct ArkUIScrollModifier { ArkUI_Float32 (*getScrollScrollBarWidth)(ArkUINodeHandle node); void (*setScrollScrollBarWidth)(ArkUINodeHandle node, ArkUI_Float32 value, ArkUI_Int32 unit); void (*resetScrollScrollBarWidth)(ArkUINodeHandle node); - ArkUI_Int32 (*getScrollEdgeEffect)(ArkUINodeHandle node, ArkUI_Int32* values); + ArkUI_Int32 (*getScrollEdgeEffect)(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]); void (*setScrollEdgeEffect)(ArkUINodeHandle node, ArkUI_Int32 edgeEffect, ArkUI_Bool alwaysEnabled); void (*resetScrollEdgeEffect)(ArkUINodeHandle node); ArkUI_Bool (*getEnableScrollInteraction)(ArkUINodeHandle node); void (*setEnableScrollInteraction)(ArkUINodeHandle node, ArkUI_Bool enableScrollInteraction); void (*resetEnableScrollInteraction)(ArkUINodeHandle node); - void (*setScrollTo)(ArkUINodeHandle node, const ArkUI_Float32* values); + void (*setScrollTo)(ArkUINodeHandle node, const ArkUI_Float32 (*values)[8]); void (*setScrollEdge)(ArkUINodeHandle node, ArkUI_Int32 value); void (*resetScrollTo)(ArkUINodeHandle node); void (*resetScrollEdge)(ArkUINodeHandle node); ArkUI_Int32 (*getScrollEnablePaging)(ArkUINodeHandle node); void (*setScrollEnablePaging)(ArkUINodeHandle node, ArkUI_Int32 value); void (*resetScrollEnablePaging)(ArkUINodeHandle node); - void (*getScrollNestedScroll)(ArkUINodeHandle node, ArkUI_Int32* values); - void (*getScrollOffset)(ArkUINodeHandle node, ArkUI_Float32* values); + void (*getScrollNestedScroll)(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]); + void (*getScrollOffset)(ArkUINodeHandle node, ArkUI_Float32 (*values)[2]); ArkUI_Int32 (*getScrollEdge)(ArkUINodeHandle node); void (*setScrollInitialOffset)(ArkUINodeHandle node, ArkUI_Float32 xOffsetValue, ArkUI_Int32 xOffsetUnit, ArkUI_Float32 yOffsetValue, ArkUI_Int32 yOffsetUnit); @@ -2370,7 +2370,7 @@ struct ArkUISliderModifier { void (*setSliderBlockImage)(ArkUINodeHandle node, ArkUI_CharPtr src, ArkUI_CharPtr bundle, ArkUI_CharPtr module); void (*resetSliderBlockImage)(ArkUINodeHandle node); void (*setSliderBlockPath)( - ArkUINodeHandle node, ArkUI_CharPtr type, const ArkUI_Float32* attribute, ArkUI_CharPtr commands); + ArkUINodeHandle node, ArkUI_CharPtr type, const ArkUI_Float32 (*attribute)[2], ArkUI_CharPtr commands); void (*setSliderBlockShape)( ArkUINodeHandle node, ArkUI_CharPtr type, const ArkUI_Float32* attribute, ArkUI_Int32 length); void (*resetSliderBlockShape)(ArkUINodeHandle node); @@ -2398,7 +2398,7 @@ struct ArkUISliderModifier { ArkUI_Bool (*getReverse)(ArkUINodeHandle node); ArkUI_Int32 (*getSliderStyle)(ArkUINodeHandle node); ArkUI_CharPtr (*getBlockImageValue)(ArkUINodeHandle node); - ArkUI_CharPtr (*getSliderBlockShape)(ArkUINodeHandle node, ArkUI_Float32* value); + ArkUI_CharPtr (*getSliderBlockShape)(ArkUINodeHandle node, ArkUI_Float32 (*value)[5]); ArkUI_Float32 (*getThickness)(ArkUINodeHandle node, ArkUI_Int32 unit); ArkUISliderValidSlideRange (*getSliderValidSlideRange)(ArkUINodeHandle node); }; @@ -2749,16 +2749,16 @@ struct ArkUITextInputModifier { void (*setTextInputContentType)(ArkUINodeHandle node, ArkUI_Uint32 contentType); void (*resetTextInputContentType)(ArkUINodeHandle node); ArkUI_Int32 (*getTextInputContentType)(ArkUINodeHandle node); - void (*getTextInputUserUnderlineColor)(ArkUINodeHandle node, ArkUI_Uint32* values); + void (*getTextInputUserUnderlineColor)(ArkUINodeHandle node, ArkUI_Uint32 (*values)[4]); ArkUI_CharPtr (*getTextInputPasswordRules)(ArkUINodeHandle node); ArkUI_Int32 (*getTextInputSelectAll)(ArkUINodeHandle node); void (*setTextInputInputFilter)(ArkUINodeHandle node, ArkUI_CharPtr inputFilter); ArkUI_CharPtr (*getTextInputInputFilter)(ArkUINodeHandle node); void (*resetTextInputInputFilter)(ArkUINodeHandle node); ArkUI_Int32 (*getTextInputCaretIndex)(ArkUINodeHandle node); - void (*getTextInputCaretOffset)(ArkUINodeHandle node, ArkUI_Float32* values); + void (*getTextInputCaretOffset)(ArkUINodeHandle node, ArkUI_Float32 (*values)[2]); ArkUI_Int32 (*getTextInputStyle)(ArkUINodeHandle node); - void (*getTextInputContentRect)(ArkUINodeHandle node, ArkUI_Float32* values); + void (*getTextInputContentRect)(ArkUINodeHandle node, ArkUI_Float32 (*values)[4]); ArkUI_Int32 (*getTextInputContentLinesNum)(ArkUINodeHandle node); void (*setBlurOnSubmit)(ArkUINodeHandle node, ArkUI_Bool blurOnSubmit); ArkUI_Bool (*getBlurOnSubmit)(ArkUINodeHandle node); @@ -2930,7 +2930,7 @@ struct ArkUIWaterFlowModifier { ArkUI_CharPtr (*getRowsTemplate)(ArkUINodeHandle node); ArkUI_Float32 (*getColumnsGap)(ArkUINodeHandle node); ArkUI_Float32 (*getRowsGap)(ArkUINodeHandle node); - void (*getWaterFlowNestedScroll)(ArkUINodeHandle node, ArkUI_Int32* value); + void (*getWaterFlowNestedScroll)(ArkUINodeHandle node, ArkUI_Int32 (*value)[2]); ArkUI_Int32 (*setNodeAdapter)(ArkUINodeHandle node, ArkUINodeAdapterHandle handle); void (*resetNodeAdapter)(ArkUINodeHandle node); ArkUINodeAdapterHandle (*getNodeAdapter)(ArkUINodeHandle node); @@ -2948,7 +2948,7 @@ struct ArkUIWaterFlowModifier { void (*setWaterFlowScrollBarColor)(ArkUINodeHandle node, ArkUI_CharPtr value); void (*resetWaterFlowScrollBarColor)(ArkUINodeHandle node); ArkUI_Uint32 (*getWaterFlowScrollBarColor)(ArkUINodeHandle node); - ArkUI_Int32 (*getEdgeEffect)(ArkUINodeHandle node, ArkUI_Int32* values); + ArkUI_Int32 (*getEdgeEffect)(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]); void (*setSectionOption)(ArkUINodeHandle node, ArkUI_Int32 start, ArkUIWaterFlowSectionOption option); void (*resetSectionOption)(ArkUINodeHandle node); void (*getSectionOption)(ArkUINodeHandle node, ArkUIWaterFlowSectionOption option); diff --git a/frameworks/core/interfaces/native/node/node_common_modifier.cpp b/frameworks/core/interfaces/native/node/node_common_modifier.cpp index 89b8479c848f06160564d128cacb164d30638e34..c72aa7d22e74acb61ec74ea707c49b64da78f8b8 100644 --- a/frameworks/core/interfaces/native/node/node_common_modifier.cpp +++ b/frameworks/core/interfaces/native/node/node_common_modifier.cpp @@ -1558,14 +1558,14 @@ void SetBorderImageGradient(ArkUINodeHandle node, const ArkUIInt32orFloat32* val ViewAbstract::SetBorderImageGradient(frameNode, gradient); } -void SetForegroundBlurStyle(ArkUINodeHandle node, ArkUI_Int32* intArray, ArkUI_Float32 scale, +void SetForegroundBlurStyle(ArkUINodeHandle node, ArkUI_Int32 (*intArray)[3], ArkUI_Float32 scale, const ArkUI_Float32* blurValues, ArkUI_Int32 blurValuesSize) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); - ArkUI_Int32 blurStyle = intArray[NUM_0]; - ArkUI_Int32 colorMode = intArray[NUM_1]; - ArkUI_Int32 adaptiveColor = intArray[NUM_2]; + ArkUI_Int32 blurStyle = (*intArray)[NUM_0]; + ArkUI_Int32 colorMode = (*intArray)[NUM_1]; + ArkUI_Int32 adaptiveColor = (*intArray)[NUM_2]; BlurStyleOption fgBlurStyle; if (blurStyle >= 0) { if (blurStyle >= static_cast(BlurStyle::NO_MATERIAL) && @@ -1676,14 +1676,14 @@ void ResetLinearGradientBlur(ArkUINodeHandle node) ViewAbstract::SetLinearGradientBlur(frameNode, blurPara); } -void SetBackgroundBlurStyle(ArkUINodeHandle node, ArkUI_Int32* intArray, ArkUI_Float32 scale, +void SetBackgroundBlurStyle(ArkUINodeHandle node, ArkUI_Int32 (*intArray)[3], ArkUI_Float32 scale, const ArkUI_Float32* blurValues, ArkUI_Int32 blurValuesSize) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); - ArkUI_Int32 blurStyle = intArray[NUM_0]; - ArkUI_Int32 colorMode = intArray[NUM_1]; - ArkUI_Int32 adaptiveColor = intArray[NUM_2]; + ArkUI_Int32 blurStyle = (*intArray)[NUM_0]; + ArkUI_Int32 colorMode = (*intArray)[NUM_1]; + ArkUI_Int32 adaptiveColor = (*intArray)[NUM_2]; BlurStyleOption bgBlurStyle; if (blurStyle >= 0) { if (blurStyle >= static_cast(BlurStyle::NO_MATERIAL) && @@ -3839,13 +3839,13 @@ void SetClipShape(ArkUINodeHandle node, ArkUI_CharPtr type, const ArkUI_Float32* } } -void SetClipPath(ArkUINodeHandle node, ArkUI_CharPtr type, const ArkUI_Float32* attribute, ArkUI_CharPtr commands) +void SetClipPath(ArkUINodeHandle node, ArkUI_CharPtr type, const ArkUI_Float32 (*attribute)[2], ArkUI_CharPtr commands) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto path = AceType::MakeRefPtr(); - auto width = Dimension(attribute[NUM_0], static_cast(1)); - auto height = Dimension(attribute[NUM_1], static_cast(1)); + auto width = Dimension((*attribute)[NUM_0], static_cast(1)); + auto height = Dimension((*attribute)[NUM_1], static_cast(1)); std::string pathCommands(commands); path->SetWidth(width); path->SetHeight(height); @@ -4461,23 +4461,23 @@ void ResetOutlineColor(ArkUINodeHandle node) ViewAbstract::SetOuterBorderColor(frameNode, Color::BLACK); } -void GetOutlineColor(ArkUINodeHandle node, ArkUI_Uint32* values) +void GetOutlineColor(ArkUINodeHandle node, ArkUI_Uint32 (*values)[4]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto colors = ViewAbstract::GetOuterBorderColor(frameNode); - values[NUM_0] = colors.topColor->GetValue(); - values[NUM_1] = colors.rightColor->GetValue(); - values[NUM_2] = colors.bottomColor->GetValue(); - values[NUM_3] = colors.leftColor->GetValue(); + (*values)[NUM_0] = colors.topColor->GetValue(); + (*values)[NUM_1] = colors.rightColor->GetValue(); + (*values)[NUM_2] = colors.bottomColor->GetValue(); + (*values)[NUM_3] = colors.leftColor->GetValue(); } -void GetSize(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 unit) +void GetSize(ArkUINodeHandle node, ArkUI_Float32 (*values)[2], ArkUI_Int32 unit) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); - values[NUM_0] = ViewAbstract::GetWidth(frameNode).GetNativeValue(static_cast(unit)); - values[NUM_1] = ViewAbstract::GetHeight(frameNode).GetNativeValue(static_cast(unit)); + (*values)[NUM_0] = ViewAbstract::GetWidth(frameNode).GetNativeValue(static_cast(unit)); + (*values)[NUM_1] = ViewAbstract::GetHeight(frameNode).GetNativeValue(static_cast(unit)); } ArkUI_Bool GetRenderGroup(ArkUINodeHandle node) @@ -4676,7 +4676,7 @@ ArkUI_Bool GetDefaultFocus(ArkUINodeHandle node) return static_cast(ViewAbstract::GetDefaultFocus(frameNode)); } -ArkUI_Int32 GetResponseRegion(ArkUINodeHandle node, ArkUI_Float32* values) +ArkUI_Int32 GetResponseRegion(ArkUINodeHandle node, ArkUI_Float32 (*values)[32]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, ERROR_INT_CODE); @@ -4684,10 +4684,10 @@ ArkUI_Int32 GetResponseRegion(ArkUINodeHandle node, ArkUI_Float32* values) //set int default int index = 0; for (auto& element : responseRegions) { - values[index++] = element.GetOffset().GetX().Value(); - values[index++] = element.GetOffset().GetY().Value(); - values[index++] = element.GetWidth().Value() * PERCENT_100; - values[index++] = element.GetHeight().Value() * PERCENT_100; + (*values)[index++] = element.GetOffset().GetX().Value(); + (*values)[index++] = element.GetOffset().GetY().Value(); + (*values)[index++] = element.GetWidth().Value() * PERCENT_100; + (*values)[index++] = element.GetHeight().Value() * PERCENT_100; } //values size return index; @@ -4808,63 +4808,63 @@ ArkUI_Float32 GetOpacity(ArkUINodeHandle node) return ViewAbstract::GetOpacity(frameNode); } -void GetBorderWidth(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 unit) +void GetBorderWidth(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 unit) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto width = ViewAbstract::GetBorderWidth(frameNode); - values[NUM_0] = width.topDimen->GetNativeValue(static_cast(unit)); - values[NUM_1] = width.rightDimen->GetNativeValue(static_cast(unit)); - values[NUM_2] = width.bottomDimen->GetNativeValue(static_cast(unit)); - values[NUM_3] = width.leftDimen->GetNativeValue(static_cast(unit)); + (*values)[NUM_0] = width.topDimen->GetNativeValue(static_cast(unit)); + (*values)[NUM_1] = width.rightDimen->GetNativeValue(static_cast(unit)); + (*values)[NUM_2] = width.bottomDimen->GetNativeValue(static_cast(unit)); + (*values)[NUM_3] = width.leftDimen->GetNativeValue(static_cast(unit)); } -void GetBorderWidthDimension(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32* units) +void GetBorderWidthDimension(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 (*units)[4]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto borderWidth = ViewAbstract::GetLayoutBorderWidth(frameNode); - values[NUM_0] = borderWidth.topDimen->Value(); - units[NUM_0] = static_cast(borderWidth.topDimen->Unit()); - values[NUM_1] = borderWidth.rightDimen->Value(); - units[NUM_1] = static_cast(borderWidth.rightDimen->Unit()); - values[NUM_2] = borderWidth.bottomDimen->Value(); - units[NUM_2] = static_cast(borderWidth.bottomDimen->Unit()); - values[NUM_3] = borderWidth.leftDimen->Value(); - units[NUM_3] = static_cast(borderWidth.leftDimen->Unit()); + (*values)[NUM_0] = borderWidth.topDimen->Value(); + (*units)[NUM_0] = static_cast(borderWidth.topDimen->Unit()); + (*values)[NUM_1] = borderWidth.rightDimen->Value(); + (*units)[NUM_1] = static_cast(borderWidth.rightDimen->Unit()); + (*values)[NUM_2] = borderWidth.bottomDimen->Value(); + (*units)[NUM_2] = static_cast(borderWidth.bottomDimen->Unit()); + (*values)[NUM_3] = borderWidth.leftDimen->Value(); + (*units)[NUM_3] = static_cast(borderWidth.leftDimen->Unit()); } -void GetBorderRadius(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 unit) +void GetBorderRadius(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 unit) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto radius = ViewAbstract::GetBorderRadius(frameNode); - values[NUM_0] = radius.radiusTopLeft->GetNativeValue(static_cast(unit)); - values[NUM_1] = radius.radiusTopRight->GetNativeValue(static_cast(unit)); - values[NUM_2] = radius.radiusBottomLeft->GetNativeValue(static_cast(unit)); - values[NUM_3] = radius.radiusBottomRight->GetNativeValue(static_cast(unit)); + (*values)[NUM_0] = radius.radiusTopLeft->GetNativeValue(static_cast(unit)); + (*values)[NUM_1] = radius.radiusTopRight->GetNativeValue(static_cast(unit)); + (*values)[NUM_2] = radius.radiusBottomLeft->GetNativeValue(static_cast(unit)); + (*values)[NUM_3] = radius.radiusBottomRight->GetNativeValue(static_cast(unit)); } -void GetBorderColor(ArkUINodeHandle node, ArkUI_Uint32* values) +void GetBorderColor(ArkUINodeHandle node, ArkUI_Uint32 (*values)[4]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto colors = ViewAbstract::GetBorderColor(frameNode); - values[NUM_0] = colors.topColor->GetValue(); - values[NUM_1] = colors.rightColor->GetValue(); - values[NUM_2] = colors.bottomColor->GetValue(); - values[NUM_3] = colors.leftColor->GetValue(); + (*values)[NUM_0] = colors.topColor->GetValue(); + (*values)[NUM_1] = colors.rightColor->GetValue(); + (*values)[NUM_2] = colors.bottomColor->GetValue(); + (*values)[NUM_3] = colors.leftColor->GetValue(); } -void GetBorderStyle(ArkUINodeHandle node, ArkUI_Int32* values) +void GetBorderStyle(ArkUINodeHandle node, ArkUI_Int32 (*values)[4]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto styles = ViewAbstract::GetBorderStyle(frameNode); - values[NUM_0] = static_cast(styles.styleTop.value()); - values[NUM_1] = static_cast(styles.styleRight.value()); - values[NUM_2] = static_cast(styles.styleBottom.value()); - values[NUM_3] = static_cast(styles.styleLeft.value()); + (*values)[NUM_0] = static_cast(styles.styleTop.value()); + (*values)[NUM_1] = static_cast(styles.styleRight.value()); + (*values)[NUM_2] = static_cast(styles.styleBottom.value()); + (*values)[NUM_3] = static_cast(styles.styleLeft.value()); } ArkUI_Int32 GetZIndex(ArkUINodeHandle node) @@ -4915,13 +4915,13 @@ void GetClipShape(ArkUINodeHandle node, ArkUIClipShapeOptions* options) } } -void GetTransform(ArkUINodeHandle node, ArkUI_Float32* values) +void GetTransform(ArkUINodeHandle node, ArkUI_Float32 (*values)[16]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto transforms = ViewAbstract::GetTransform(frameNode); for (int i = 0; i < NUM_16; i++) { - values[i] = transforms[i]; + (*values)[i] = transforms[i]; } } @@ -4963,51 +4963,53 @@ void GetCustomShadow(ArkUINodeHandle node, ArkUICustomShadowOptions* options) options->fill = static_cast(shadow->GetIsFilled()); } -ArkUI_Int32 GetSweepGradient( - ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Uint32* colors, ArkUI_Float32* stops, ArkUI_Int32 unit) +ArkUI_Int32 GetSweepGradient(ArkUINodeHandle node, ArkUI_Float32 (*values)[6], ArkUI_Uint32 (*colors)[10], + ArkUI_Float32 (*stops)[10], ArkUI_Int32 unit) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, ERROR_INT_CODE); auto gradient = ViewAbstract::GetSweepGradient(frameNode); auto sweepGradient = gradient.GetSweepGradient(); - values[NUM_0] = sweepGradient->centerX->GetNativeValue(static_cast(unit)); - values[NUM_1] = sweepGradient->centerY->GetNativeValue(static_cast(unit)); - values[NUM_2] = sweepGradient->startAngle->Value(); - values[NUM_3] = sweepGradient->endAngle->Value(); - values[NUM_4] = sweepGradient->rotation->Value(); - values[NUM_5] = gradient.GetRepeat(); + (*values)[NUM_0] = sweepGradient->centerX->GetNativeValue(static_cast(unit)); + (*values)[NUM_1] = sweepGradient->centerY->GetNativeValue(static_cast(unit)); + (*values)[NUM_2] = sweepGradient->startAngle->Value(); + (*values)[NUM_3] = sweepGradient->endAngle->Value(); + (*values)[NUM_4] = sweepGradient->rotation->Value(); + (*values)[NUM_5] = gradient.GetRepeat(); std::vector gradientColors = gradient.GetColors(); //0 start index int index = 0; for (auto& gradientColor : gradientColors) { - colors[index] = gradientColor.GetColor().GetValue(); - stops[index] = gradientColor.GetDimension().Value(); + (*colors)[index] = gradientColor.GetColor().GetValue(); + (*stops)[index] = gradientColor.GetDimension().Value(); index++; } return index; } -ArkUI_Int32 GetRadialGradient( - ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Uint32* colors, ArkUI_Float32* stops, ArkUI_Int32 unit) +ArkUI_Int32 GetRadialGradient(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Uint32 (*colors)[10], + ArkUI_Float32 (*stops)[10], ArkUI_Int32 unit) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, ERROR_INT_CODE); auto gradient = ViewAbstract::GetRadialGradient(frameNode); auto radialGradient = gradient.GetRadialGradient(); + CHECK_NULL_RETURN(radialGradient, ERROR_INT_CODE); - values[NUM_0] = radialGradient->radialCenterX->GetNativeValue(static_cast(unit)); - values[NUM_1] = radialGradient->radialCenterY->GetNativeValue(static_cast(unit)); - values[NUM_2] = + (*values)[NUM_0] = radialGradient->radialCenterX->GetNativeValue(static_cast(unit)); + (*values)[NUM_1] = radialGradient->radialCenterY->GetNativeValue(static_cast(unit)); + (*values)[NUM_2] = gradient.GetRadialGradient()->radialHorizontalSize->GetNativeValue(static_cast(unit)); - values[NUM_3] = gradient.GetRepeat(); + (*values)[NUM_3] = gradient.GetRepeat(); + std::vector gradientColors = gradient.GetColors(); //0 start index int index = 0; for (auto& gradientColor : gradientColors) { - colors[index] = gradientColor.GetColor().GetValue(); - stops[index] = gradientColor.GetDimension().Value(); + (*colors)[index] = gradientColor.GetColor().GetValue(); + (*stops)[index] = gradientColor.GetDimension().Value(); index++; } return index; @@ -5136,25 +5138,26 @@ ArkUI_Float32 GetBlur(ArkUINodeHandle node) return ViewAbstract::GetFrontBlur(frameNode).Value(); } -ArkUI_Int32 GetLinearGradient(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Uint32* colors, ArkUI_Float32* stops) +ArkUI_Int32 GetLinearGradient( + ArkUINodeHandle node, ArkUI_Float32 (*values)[3], ArkUI_Uint32 (*colors)[10], ArkUI_Float32 (*stop)[10]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, ERROR_INT_CODE); auto gradient = ViewAbstract::GetLinearGradient(frameNode); auto angle = gradient.GetLinearGradient()->angle; //0 angle - values[0] = angle.has_value() ? angle.value().Value() : DEFAULT_ANGLE; + (*values)[0] = angle.has_value() ? angle.value().Value() : DEFAULT_ANGLE; //1 Direction - values[1] = static_cast(convertToLinearGradientDirection(gradient.GetLinearGradient())); + (*values)[1] = static_cast(convertToLinearGradientDirection(gradient.GetLinearGradient())); //2 Repeat - values[2] = gradient.GetRepeat(); + (*values)[2] = gradient.GetRepeat(); std::vector gradientColors = gradient.GetColors(); //0 start index int index = 0; for (auto& gradientColor : gradientColors) { - colors[index] = gradientColor.GetColor().GetValue(); - stops[index] = gradientColor.GetDimension().Value(); + (*colors)[index] = gradientColor.GetColor().GetValue(); + (*stop)[index] = gradientColor.GetDimension().Value(); index++; } return index; @@ -5197,42 +5200,42 @@ void GetBackgroundImage(ArkUINodeHandle node, ArkUIBackgroundImage* options) options->repeat = static_cast(ViewAbstract::GetBackgroundImageRepeat(frameNode)); } -void GetPadding(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 length, ArkUI_Int32 unit) +void GetPadding(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 length, ArkUI_Int32 unit) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto padding = ViewAbstract::GetPadding(frameNode); - values[NUM_0] = padding.top->GetDimension().GetNativeValue(static_cast(unit)); - values[NUM_1] = padding.right->GetDimension().GetNativeValue(static_cast(unit)); - values[NUM_2] = padding.bottom->GetDimension().GetNativeValue(static_cast(unit)); - values[NUM_3] = padding.left->GetDimension().GetNativeValue(static_cast(unit)); + (*values)[NUM_0] = padding.top->GetDimension().GetNativeValue(static_cast(unit)); + (*values)[NUM_1] = padding.right->GetDimension().GetNativeValue(static_cast(unit)); + (*values)[NUM_2] = padding.bottom->GetDimension().GetNativeValue(static_cast(unit)); + (*values)[NUM_3] = padding.left->GetDimension().GetNativeValue(static_cast(unit)); length = NUM_4; } -void GetPaddingDimension(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32* units) +void GetPaddingDimension(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 (*units)[4]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto padding = ViewAbstract::GetPadding(frameNode); - values[NUM_0] = padding.top->GetDimension().Value(); - units[NUM_0] = static_cast(padding.top->GetDimension().Unit()); - values[NUM_1] = padding.right->GetDimension().Value(); - units[NUM_1] = static_cast(padding.right->GetDimension().Unit()); - values[NUM_2] = padding.bottom->GetDimension().Value(); - units[NUM_2] = static_cast(padding.bottom->GetDimension().Unit()); - values[NUM_3] = padding.left->GetDimension().Value(); - units[NUM_3] = static_cast(padding.left->GetDimension().Unit()); + (*values)[NUM_0] = padding.top->GetDimension().Value(); + (*units)[NUM_0] = static_cast(padding.top->GetDimension().Unit()); + (*values)[NUM_1] = padding.right->GetDimension().Value(); + (*units)[NUM_1] = static_cast(padding.right->GetDimension().Unit()); + (*values)[NUM_2] = padding.bottom->GetDimension().Value(); + (*units)[NUM_2] = static_cast(padding.bottom->GetDimension().Unit()); + (*values)[NUM_3] = padding.left->GetDimension().Value(); + (*units)[NUM_3] = static_cast(padding.left->GetDimension().Unit()); } -void GetConfigSize(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32* units) +void GetConfigSize(ArkUINodeHandle node, ArkUI_Float32 (*values)[2], ArkUI_Int32 (*units)[2]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto size = ViewAbstract::GetConfigSize(frameNode); - values[NUM_0] = size->Width()->GetDimension().Value(); - units[NUM_0] = static_cast(size->Width()->GetDimension().Unit()); - values[NUM_1] = size->Height()->GetDimension().Value(); - units[NUM_1] = static_cast(size->Height()->GetDimension().Unit()); + (*values)[NUM_0] = size->Width()->GetDimension().Value(); + (*units)[NUM_0] = static_cast(size->Width()->GetDimension().Unit()); + (*values)[NUM_1] = size->Height()->GetDimension().Value(); + (*units)[NUM_1] = static_cast(size->Height()->GetDimension().Unit()); } ArkUI_CharPtr GetKey(ArkUINodeHandle node) @@ -5250,41 +5253,41 @@ int GetEnabled(ArkUINodeHandle node) return static_cast(ViewAbstract::GetEnabled(frameNode)); } -void GetMargin(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 length, ArkUI_Int32 unit) +void GetMargin(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 length, ArkUI_Int32 unit) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto margin = ViewAbstract::GetMargin(frameNode); - values[NUM_0] = margin.top->GetDimension().GetNativeValue(static_cast(unit)); - values[NUM_1] = margin.right->GetDimension().GetNativeValue(static_cast(unit)); - values[NUM_2] = margin.bottom->GetDimension().GetNativeValue(static_cast(unit)); - values[NUM_3] = margin.left->GetDimension().GetNativeValue(static_cast(unit)); + (*values)[NUM_0] = margin.top->GetDimension().GetNativeValue(static_cast(unit)); + (*values)[NUM_1] = margin.right->GetDimension().GetNativeValue(static_cast(unit)); + (*values)[NUM_2] = margin.bottom->GetDimension().GetNativeValue(static_cast(unit)); + (*values)[NUM_3] = margin.left->GetDimension().GetNativeValue(static_cast(unit)); length = NUM_4; } -void GetMarginDimension(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32* units) +void GetMarginDimension(ArkUINodeHandle node, ArkUI_Float32 (*values)[4], ArkUI_Int32 (*units)[4]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto margin = ViewAbstract::GetMargin(frameNode); - values[NUM_0] = margin.top->GetDimension().Value(); - units[NUM_0] = static_cast(margin.top->GetDimension().Unit()); - values[NUM_1] = margin.right->GetDimension().Value(); - units[NUM_1] = static_cast(margin.right->GetDimension().Unit()); - values[NUM_2] = margin.bottom->GetDimension().Value(); - units[NUM_2] = static_cast(margin.bottom->GetDimension().Unit()); - values[NUM_3] = margin.left->GetDimension().Value(); - units[NUM_3] = static_cast(margin.left->GetDimension().Unit()); + (*values)[NUM_0] = margin.top->GetDimension().Value(); + (*units)[NUM_0] = static_cast(margin.top->GetDimension().Unit()); + (*values)[NUM_1] = margin.right->GetDimension().Value(); + (*units)[NUM_1] = static_cast(margin.right->GetDimension().Unit()); + (*values)[NUM_2] = margin.bottom->GetDimension().Value(); + (*units)[NUM_2] = static_cast(margin.bottom->GetDimension().Unit()); + (*values)[NUM_3] = margin.left->GetDimension().Value(); + (*units)[NUM_3] = static_cast(margin.left->GetDimension().Unit()); } -void GetTranslate(ArkUINodeHandle node, ArkUI_Float32* values, ArkUI_Int32 unit) +void GetTranslate(ArkUINodeHandle node, ArkUI_Float32 (*values)[3], ArkUI_Int32 unit) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto translate = ViewAbstract::GetTranslate(frameNode); - values[NUM_0] = translate.x.GetNativeValue(static_cast(unit)); - values[NUM_1] = translate.y.GetNativeValue(static_cast(unit)); - values[NUM_2] = translate.z.GetNativeValue(static_cast(unit)); + (*values)[NUM_0] = translate.x.GetNativeValue(static_cast(unit)); + (*values)[NUM_1] = translate.y.GetNativeValue(static_cast(unit)); + (*values)[NUM_2] = translate.z.GetNativeValue(static_cast(unit)); } ArkUI_Float32 GetAspectRatio(ArkUINodeHandle node) @@ -5319,22 +5322,22 @@ void SetChainStyle(ArkUINodeHandle node, ArkUI_Int32 direction, ArkUI_Int32 styl ViewAbstract::SetChainStyle(frameNode, chainInfo); } -void GetChainStyle(ArkUINodeHandle node, ArkUI_Int32* values) +void GetChainStyle(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto chainInfo = ViewAbstract::GetChainStyle(frameNode); // 0 index is direction if (chainInfo.direction.has_value()) { - values[0] = static_cast(chainInfo.direction.value()); + (*values)[0] = static_cast(chainInfo.direction.value()); } else { - values[0] = -1; + (*values)[0] = -1; } // 1 index is style if (chainInfo.style.has_value()) { - values[1] = static_cast(chainInfo.style.value()); + (*values)[1] = static_cast(chainInfo.style.value()); } else { - values[1] = -1; + (*values)[1] = -1; } } diff --git a/frameworks/core/interfaces/native/node/node_list_modifier.cpp b/frameworks/core/interfaces/native/node/node_list_modifier.cpp index 39317c874bc4c5fd86a483597972d2fa2738a175..993345e1b136313614e87ac828c599ed7867d7ce 100644 --- a/frameworks/core/interfaces/native/node/node_list_modifier.cpp +++ b/frameworks/core/interfaces/native/node/node_list_modifier.cpp @@ -205,12 +205,12 @@ void ResetListSpace(ArkUINodeHandle node) ListModelNG::SetListSpace(frameNode, Dimension(0, DimensionUnit::VP)); } -ArkUI_Int32 GetListEdgeEffect(ArkUINodeHandle node, ArkUI_Int32* values) +ArkUI_Int32 GetListEdgeEffect(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, ERROR_INT_CODE); - values[INDEX_0] = ListModelNG::GetEdgeEffect(frameNode); - values[INDEX_1] = ListModelNG::GetEdgeEffectAlways(frameNode); + (*values)[INDEX_0] = ListModelNG::GetEdgeEffect(frameNode); + (*values)[INDEX_1] = ListModelNG::GetEdgeEffectAlways(frameNode); return INDEX_2; } @@ -271,13 +271,13 @@ void ResetListFriction(ArkUINodeHandle node) ListModelNG::SetListFriction(frameNode, friction); } -void GetListNestedScroll(ArkUINodeHandle node, ArkUI_Int32* values) +void GetListNestedScroll(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); NestedScrollOptions options = ListModelNG::GetListNestedScroll(frameNode); - values[0] = static_cast(options.forward); - values[1] = static_cast(options.backward); + (*values)[0] = static_cast(options.forward); + (*values)[1] = static_cast(options.backward); } void SetListNestedScroll(ArkUINodeHandle node, ArkUI_Int32 forward, ArkUI_Int32 backward) diff --git a/frameworks/core/interfaces/native/node/node_scroll_modifier.cpp b/frameworks/core/interfaces/native/node/node_scroll_modifier.cpp index 51baf38d831f079899f1a1e5b9289463c337e775..19f0ec01ba91c81f029e25335b268075f84938d8 100644 --- a/frameworks/core/interfaces/native/node/node_scroll_modifier.cpp +++ b/frameworks/core/interfaces/native/node/node_scroll_modifier.cpp @@ -134,17 +134,17 @@ void ResetScrollFriction(ArkUINodeHandle node) ScrollModelNG::SetFriction(frameNode, FRICTION_DEFAULT); } -ArkUI_Int32 GetScrollScrollSnap(ArkUINodeHandle node, ArkUI_Float32* values) +ArkUI_Int32 GetScrollScrollSnap(ArkUINodeHandle node, ArkUI_Float32 (*values)[32]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, 0); ScrollSnapOptions options = ScrollModelNG::GetScrollSnap(frameNode); - values[0] = static_cast(options.snapAlign); - values[1] = static_cast(options.enableSnapToStart); - values[2] = static_cast(options.enableSnapToEnd); + (*values)[0] = static_cast(options.snapAlign); + (*values)[1] = static_cast(options.enableSnapToStart); + (*values)[2] = static_cast(options.enableSnapToEnd); auto index = 3; for (auto item : options.paginationParams) { - values[index] = item.ConvertToVp(); + (*values)[index] = item.ConvertToVp(); index++; } return index; @@ -300,12 +300,12 @@ void ResetScrollScrollBarWidth(ArkUINodeHandle node) ScrollModelNG::SetScrollBarWidth(frameNode, width); } -ArkUI_Int32 GetScrollEdgeEffect(ArkUINodeHandle node, ArkUI_Int32* values) +ArkUI_Int32 GetScrollEdgeEffect(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, ERROR_INT_CODE); - values[SCROLL_TO_INDEX_0] = static_cast(ScrollModelNG::GetEdgeEffect(frameNode)); - values[SCROLL_TO_INDEX_1] = static_cast(ScrollModelNG::GetEdgeEffectAlways(frameNode)); + (*values)[SCROLL_TO_INDEX_0] = static_cast(ScrollModelNG::GetEdgeEffect(frameNode)); + (*values)[SCROLL_TO_INDEX_1] = static_cast(ScrollModelNG::GetEdgeEffectAlways(frameNode)); return SCROLL_TO_INDEX_2; } @@ -358,20 +358,20 @@ RefPtr GetController(ArkUINodeHandle node) return nullptr; } -void SetScrollTo(ArkUINodeHandle node, const ArkUI_Float32* values) +void SetScrollTo(ArkUINodeHandle node, const ArkUI_Float32 (*values)[8]) { RefPtr scrollControllerBase = GetController(node); CHECK_NULL_VOID(scrollControllerBase); - Dimension xOffset(values[0], static_cast(values[1])); - Dimension yOffset(values[2], static_cast(values[3])); - float duration = values[4]; + Dimension xOffset((*values)[0], static_cast((*values)[1])); + Dimension yOffset((*values)[2], static_cast((*values)[3])); + float duration = (*values)[4]; RefPtr curve = Curves::EASE; - if (static_cast(values[SCROLL_TO_INDEX_CURVE]) < static_cast(CurvesVector.size())) { - curve = CurvesVector[static_cast(values[SCROLL_TO_INDEX_CURVE])]; + if (static_cast((*values)[SCROLL_TO_INDEX_CURVE]) < static_cast(CurvesVector.size())) { + curve = CurvesVector[static_cast((*values)[SCROLL_TO_INDEX_CURVE])]; } - auto smooth = static_cast(values[6]); + auto smooth = static_cast((*values)[6]); //index 7 is canOverScroll - auto canOverScroll = static_cast(values[7]); + auto canOverScroll = static_cast((*values)[7]); auto direction = scrollControllerBase->GetScrollDirection(); auto position = direction == Axis::VERTICAL ? yOffset : xOffset; scrollControllerBase->AnimateTo(position, duration, curve, smooth, canOverScroll); @@ -386,8 +386,8 @@ void SetScrollEdge(ArkUINodeHandle node, ArkUI_Int32 value) void ResetScrollTo(ArkUINodeHandle node) { - std::vector values = { DEFAULT_OFFSET_VALUE, DEFAULT_OFFSET_VALUE }; - SetScrollTo(node, values.data()); + const ArkUI_Float32 values[8] = { DEFAULT_OFFSET_VALUE }; + SetScrollTo(node, &values); } void ResetScrollEdge(ArkUINodeHandle node) @@ -418,22 +418,22 @@ void ResetScrollEnablePaging(ArkUINodeHandle node) ScrollModelNG::SetEnablePaging(frameNode, false); } -void GetScrollNestedScroll(ArkUINodeHandle node, ArkUI_Int32* values) +void GetScrollNestedScroll(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); NestedScrollOptions options = ScrollModelNG::GetNestedScroll(frameNode); - values[0] = static_cast(options.forward); - values[1] = static_cast(options.backward); + (*values)[0] = static_cast(options.forward); + (*values)[1] = static_cast(options.backward); } -void GetScrollOffset(ArkUINodeHandle node, ArkUI_Float32* values) +void GetScrollOffset(ArkUINodeHandle node, ArkUI_Float32 (*values)[2]) { RefPtr scrollControllerBase = GetController(node); CHECK_NULL_VOID(scrollControllerBase); Offset offset = scrollControllerBase->GetCurrentOffset(); - values[0] = offset.GetX(); - values[1] = offset.GetY(); + (*values)[0] = offset.GetX(); + (*values)[1] = offset.GetY(); } ArkUI_Int32 GetScrollEdge(ArkUINodeHandle node) diff --git a/frameworks/core/interfaces/native/node/node_slider_modifier.cpp b/frameworks/core/interfaces/native/node/node_slider_modifier.cpp index 1c838434101da72495b76caf427ad17bc65a1d61..42208119e38fd707ae51320c96eb2b94fe8a090b 100644 --- a/frameworks/core/interfaces/native/node/node_slider_modifier.cpp +++ b/frameworks/core/interfaces/native/node/node_slider_modifier.cpp @@ -387,13 +387,14 @@ void ResetSliderBlockImage(ArkUINodeHandle node) SliderModelNG::ResetBlockImage(frameNode); } -void SetSliderBlockPath(ArkUINodeHandle node, const char* type, const ArkUI_Float32* attribute, const char* commands) +void SetSliderBlockPath( + ArkUINodeHandle node, const char* type, const ArkUI_Float32 (*attribute)[2], const char* commands) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto path = AceType::MakeRefPtr(); - auto width = Dimension(attribute[0], static_cast(1)); - auto height = Dimension(attribute[1], static_cast(1)); + auto width = Dimension((*attribute)[0], static_cast(1)); + auto height = Dimension((*attribute)[1], static_cast(1)); std::string pathCommands(commands); path->SetWidth(width); path->SetHeight(height); @@ -609,18 +610,18 @@ ArkUI_CharPtr GetBlockImageValue(ArkUINodeHandle node) return g_strValue.c_str(); } -ArkUI_CharPtr GetSliderBlockShape(ArkUINodeHandle node, ArkUI_Float32* value) +ArkUI_CharPtr GetSliderBlockShape(ArkUINodeHandle node, ArkUI_Float32 (*value)[5]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, nullptr); RefPtr basicShape = SliderModelNG::GetBlockShape(frameNode); auto shapeType = basicShape->GetBasicShapeType(); //index 0 shapeType - value[0] = SHAPE_TYPE_MAP[shapeType]; + (*value)[0] = SHAPE_TYPE_MAP[shapeType]; //index 1 width - value[1] = basicShape->GetWidth().Value(); + (*value)[1] = basicShape->GetWidth().Value(); //index 2 height - value[2] = basicShape->GetHeight().Value(); + (*value)[2] = basicShape->GetHeight().Value(); switch (shapeType) { case BasicShapeType::PATH: { auto path = AceType::DynamicCast(basicShape); @@ -630,9 +631,9 @@ ArkUI_CharPtr GetSliderBlockShape(ArkUINodeHandle node, ArkUI_Float32* value) case BasicShapeType::RECT: { auto shapeRect = AceType::DynamicCast(basicShape); //index 3 radius x - value[3] = shapeRect->GetTopLeftRadius().GetX().Value(); + (*value)[3] = shapeRect->GetTopLeftRadius().GetX().Value(); //index 4 radius y - value[4] = shapeRect->GetTopLeftRadius().GetY().Value(); + (*value)[4] = shapeRect->GetTopLeftRadius().GetY().Value(); break; } default: diff --git a/frameworks/core/interfaces/native/node/node_swiper_modifier.cpp b/frameworks/core/interfaces/native/node/node_swiper_modifier.cpp index 8ede68c5f33a97865bf3f98b3ce61bd4b52ff72f..91f82ab8cbda4ffc92f5d27e6ed03bce9fc17b2b 100644 --- a/frameworks/core/interfaces/native/node/node_swiper_modifier.cpp +++ b/frameworks/core/interfaces/native/node/node_swiper_modifier.cpp @@ -899,11 +899,11 @@ ArkUI_Int32 GetCachedCount(ArkUINodeHandle node) return SwiperModelNG::GetCachedCount(frameNode); } -void SetSwiperNestedScroll(ArkUINodeHandle node, ArkUI_Int32* values) +void SetSwiperNestedScroll(ArkUINodeHandle node, ArkUI_Int32 (*values)[1]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); - SwiperModelNG::SetNestedScroll(frameNode, values[0]); + SwiperModelNG::SetNestedScroll(frameNode, (*values)[0]); } void ResetSwiperNestedScroll(ArkUINodeHandle node) @@ -920,11 +920,11 @@ ArkUI_Int32 GetSwiperNestedScroll(ArkUINodeHandle node) return SwiperModelNG::GetNestedScroll(frameNode); } -void SetSwiperToIndex(ArkUINodeHandle node, ArkUI_Int32* values) +void SetSwiperToIndex(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); - SwiperModelNG::SetSwiperToIndex(frameNode, values[0], values[1]); + SwiperModelNG::SetSwiperToIndex(frameNode, (*values)[0], (*values)[1]); } void GetSwiperPrevMargin(ArkUINodeHandle node, ArkUI_Int32 unit, ArkUISwiperMarginOptions* options) { diff --git a/frameworks/core/interfaces/native/node/node_text_input_modifier.cpp b/frameworks/core/interfaces/native/node/node_text_input_modifier.cpp index 3ae7ee4a503b5d762902076f29bf4bf262aadd8e..e19ca11cec0bda613ed497b49cc5134ddead0061 100644 --- a/frameworks/core/interfaces/native/node/node_text_input_modifier.cpp +++ b/frameworks/core/interfaces/native/node/node_text_input_modifier.cpp @@ -250,16 +250,16 @@ void ResetTextInputStyle(ArkUINodeHandle node) TextFieldModelNG::SetInputStyle(frameNode, DEFAULT_INPUT_STYLE); } -void GetTextInputContentRect(ArkUINodeHandle node, ArkUI_Float32* values) +void GetTextInputContentRect(ArkUINodeHandle node, ArkUI_Float32 (*values)[4]) { auto *frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto textFieldController = TextFieldModelNG::GetOrCreateController(frameNode); auto rect = textFieldController->GetTextContentRect(); - values[CALL_ARG_0] = rect.Left(); - values[CALL_ARG_1] = rect.Top(); - values[CALL_ARG_2] = rect.Width(); - values[CALL_ARG_3] = rect.Height(); + (*values)[CALL_ARG_0] = rect.Left(); + (*values)[CALL_ARG_1] = rect.Top(); + (*values)[CALL_ARG_2] = rect.Width(); + (*values)[CALL_ARG_3] = rect.Height(); } ArkUI_Int32 GetTextInputContentLinesNum(ArkUINodeHandle node) @@ -379,14 +379,14 @@ ArkUI_Int32 GetTextInputCaretIndex(ArkUINodeHandle node) return textFieldController->GetCaretIndex(); } -void GetTextInputCaretOffset(ArkUINodeHandle node, ArkUI_Float32* values) +void GetTextInputCaretOffset(ArkUINodeHandle node, ArkUI_Float32 (*values)[2]) { auto *frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); auto textFieldController = TextFieldModelNG::GetOrCreateController(frameNode); auto offset = textFieldController->GetCaretPosition(); - values[0] = offset.GetX(); - values[1] = offset.GetY(); + (*values)[0] = offset.GetX(); + (*values)[1] = offset.GetY(); } void SetTextInputContentType(ArkUINodeHandle node, ArkUI_Uint32 contentType) @@ -977,15 +977,15 @@ void SetTextInputUserUnderlineColor(ArkUINodeHandle node, const ArkUI_Uint32* va TextFieldModelNG::SetUserUnderlineColor(frameNode, userColor); } -void GetTextInputUserUnderlineColor(ArkUINodeHandle node, ArkUI_Uint32* values) +void GetTextInputUserUnderlineColor(ArkUINodeHandle node, ArkUI_Uint32 (*values)[4]) { auto *frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); UserUnderlineColor userColor = TextFieldModelNG::GetUnderLineColor(frameNode); - values[CALL_ARG_0] = userColor.typing->GetValue(); - values[CALL_ARG_1] = userColor.normal->GetValue(); - values[CALL_ARG_2] = userColor.error->GetValue(); - values[CALL_ARG_3] = userColor.disable->GetValue(); + (*values)[CALL_ARG_0] = userColor.typing->GetValue(); + (*values)[CALL_ARG_1] = userColor.normal->GetValue(); + (*values)[CALL_ARG_2] = userColor.error->GetValue(); + (*values)[CALL_ARG_3] = userColor.disable->GetValue(); } void ResetTextInputUserUnderlineColor(ArkUINodeHandle node) diff --git a/frameworks/core/interfaces/native/node/node_text_modifier.cpp b/frameworks/core/interfaces/native/node/node_text_modifier.cpp index c0f11914abdf19b087564e682dd500e41277e6e2..2cfabd196dc1a5f12832e8a3afe4e8a3a910d9db 100644 --- a/frameworks/core/interfaces/native/node/node_text_modifier.cpp +++ b/frameworks/core/interfaces/native/node/node_text_modifier.cpp @@ -809,7 +809,7 @@ void SetTextDataDetectorConfig(ArkUINodeHandle node, ArkUI_Uint32* values, ArkUI TextModelNG::SetTextDetectConfig(frameNode, textTypes); } -ArkUI_Int32 GetTextDataDetectorConfig(ArkUINodeHandle node, ArkUI_Int32* values) +ArkUI_Int32 GetTextDataDetectorConfig(ArkUINodeHandle node, ArkUI_Int32 (*values)[32]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, 0); @@ -818,7 +818,7 @@ ArkUI_Int32 GetTextDataDetectorConfig(ArkUINodeHandle node, ArkUI_Int32* values) StringUtils::StringSplitter(typeString, ',', types); for (int i = 0; i < types.size(); i++) { auto ret = std::find(TEXT_DETECT_TYPES.begin(), TEXT_DETECT_TYPES.end(), types[i]); - values[i] = ret != TEXT_DETECT_TYPES.end() ? ret - TEXT_DETECT_TYPES.begin() : -1; + (*values)[i] = ret != TEXT_DETECT_TYPES.end() ? ret - TEXT_DETECT_TYPES.begin() : -1; } return types.size(); } diff --git a/frameworks/core/interfaces/native/node/water_flow_modifier.cpp b/frameworks/core/interfaces/native/node/water_flow_modifier.cpp index caa01040a667efb1a912425a6a1aed8387d4294e..b9bcd2214d3ec2269293c71929db775d427bd422 100644 --- a/frameworks/core/interfaces/native/node/water_flow_modifier.cpp +++ b/frameworks/core/interfaces/native/node/water_flow_modifier.cpp @@ -290,13 +290,13 @@ ArkUI_Float32 GetRowsGap(ArkUINodeHandle node) return WaterFlowModelNG::GetRowsGap(frameNode); } -void GetWaterFlowNestedScroll(ArkUINodeHandle node, ArkUI_Int32* values) +void GetWaterFlowNestedScroll(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); NestedScrollOptions options = WaterFlowModelNG::GetNestedScroll(frameNode); - values[0] = static_cast(options.forward); - values[1] = static_cast(options.backward); + (*values)[0] = static_cast(options.forward); + (*values)[1] = static_cast(options.backward); } ArkUI_Int32 SetNodeAdapter(ArkUINodeHandle node, ArkUINodeAdapterHandle handle) @@ -408,12 +408,12 @@ ArkUI_Uint32 GetWaterFlowScrollBarColor(ArkUINodeHandle node) return WaterFlowModelNG::GetScrollBarColor(frameNode); } -ArkUI_Int32 GetEdgeEffect(ArkUINodeHandle node, ArkUI_Int32* values) +ArkUI_Int32 GetEdgeEffect(ArkUINodeHandle node, ArkUI_Int32 (*values)[2]) { auto* frameNode = reinterpret_cast(node); CHECK_NULL_RETURN(frameNode, ERROR_INT_CODE); - values[INDEX_0] = WaterFlowModelNG::GetEdgeEffect(frameNode); - values[INDEX_1] = WaterFlowModelNG::GetEdgeEffectAlways(frameNode); + (*values)[INDEX_0] = WaterFlowModelNG::GetEdgeEffect(frameNode); + (*values)[INDEX_1] = WaterFlowModelNG::GetEdgeEffectAlways(frameNode); return INDEX_2; } diff --git a/interfaces/native/node/style_modifier.cpp b/interfaces/native/node/style_modifier.cpp index e90263ebeaa632b4ad28c8ca87f15874526b4ee7..bf70dd4e2b13f3dc50e8637be3203cf4725a352b 100644 --- a/interfaces/native/node/style_modifier.cpp +++ b/interfaces/native/node/style_modifier.cpp @@ -396,8 +396,8 @@ bool IsValidDate(uint32_t year, uint32_t month, uint32_t day) if (month < NUM_1 || month > NUM_12) { return false; } - int daysInMonth[] = { 31, IsLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - if (day < NUM_1 || day > daysInMonth[month - 1]) { + uint32_t daysInMonth[] = { 31, IsLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + if (day < 1 || day > daysInMonth[month - 1]) { return false; } return true; @@ -868,7 +868,7 @@ const ArkUI_AttributeItem* GetPadding(ArkUI_NodeHandle node) ArkUI_Float32 paddings[NUM_4]; ArkUI_Int32 length = 0; ArkUI_Int32 unit = GetDefaultUnit(node, UNIT_VP); - fullImpl->getNodeModifiers()->getCommonModifier()->getPadding(node->uiNodeHandle, paddings, length, unit); + fullImpl->getNodeModifiers()->getCommonModifier()->getPadding(node->uiNodeHandle, &paddings, length, unit); g_numberValues[NUM_0].f32 = paddings[NUM_0]; g_numberValues[NUM_1].f32 = paddings[NUM_1]; g_numberValues[NUM_2].f32 = paddings[NUM_2]; @@ -986,7 +986,7 @@ const ArkUI_AttributeItem* GetMargin(ArkUI_NodeHandle node) fullImpl->getNodeModifiers()->getTextAreaModifier()->getTextAreaMargin( node->uiNodeHandle, margins, length, unit); } else { - fullImpl->getNodeModifiers()->getCommonModifier()->getMargin(node->uiNodeHandle, margins, length, unit); + fullImpl->getNodeModifiers()->getCommonModifier()->getMargin(node->uiNodeHandle, &margins, length, unit); } g_numberValues[NUM_0].f32 = margins[NUM_0]; g_numberValues[NUM_1].f32 = margins[NUM_1]; @@ -1027,7 +1027,7 @@ const ArkUI_AttributeItem* GetTranslate(ArkUI_NodeHandle node) auto* fullImpl = GetFullImpl(); ArkUI_Float32 translate[NUM_3]; ArkUI_Int32 unit = GetDefaultUnit(node, UNIT_VP); - fullImpl->getNodeModifiers()->getCommonModifier()->getTranslate(node->uiNodeHandle, translate, unit); + fullImpl->getNodeModifiers()->getCommonModifier()->getTranslate(node->uiNodeHandle, &translate, unit); g_numberValues[NUM_0].f32 = translate[NUM_0]; g_numberValues[NUM_1].f32 = translate[NUM_1]; g_numberValues[NUM_2].f32 = translate[NUM_2]; @@ -1240,7 +1240,7 @@ const ArkUI_AttributeItem* GetLinearGradient(ArkUI_NodeHandle node) //default size 10 ArkUI_Float32 stops[NUM_10]; auto resultValue = GetFullImpl()->getNodeModifiers()->getCommonModifier()->getLinearGradient( - node->uiNodeHandle, values, colors, stops); + node->uiNodeHandle, &values, &colors, &stops); //angle g_numberValues[0].f32 = values[0]; //direction @@ -1383,7 +1383,7 @@ const ArkUI_AttributeItem* GetBorderWidth(ArkUI_NodeHandle node) auto* fullImpl = GetFullImpl(); ArkUI_Float32 borderWidth[NUM_4]; auto unit = GetDefaultUnit(node, UNIT_VP); - fullImpl->getNodeModifiers()->getCommonModifier()->getBorderWidth(node->uiNodeHandle, borderWidth, unit); + fullImpl->getNodeModifiers()->getCommonModifier()->getBorderWidth(node->uiNodeHandle, &borderWidth, unit); g_numberValues[NUM_0].f32 = borderWidth[NUM_0]; g_numberValues[NUM_1].f32 = borderWidth[NUM_1]; g_numberValues[NUM_2].f32 = borderWidth[NUM_2]; @@ -1450,7 +1450,7 @@ const ArkUI_AttributeItem* GetBorderRadius(ArkUI_NodeHandle node) auto* fullImpl = GetFullImpl(); ArkUI_Float32 borderRadius[NUM_4]; ArkUI_Int32 unit = GetDefaultUnit(node, UNIT_VP); - fullImpl->getNodeModifiers()->getCommonModifier()->getBorderRadius(node->uiNodeHandle, borderRadius, unit); + fullImpl->getNodeModifiers()->getCommonModifier()->getBorderRadius(node->uiNodeHandle, &borderRadius, unit); g_numberValues[NUM_0].f32 = borderRadius[NUM_0]; g_numberValues[NUM_1].f32 = borderRadius[NUM_1]; g_numberValues[NUM_2].f32 = borderRadius[NUM_2]; @@ -1505,7 +1505,7 @@ const ArkUI_AttributeItem* GetBorderWidthPercent(ArkUI_NodeHandle node) { auto* fullImpl = GetFullImpl(); ArkUI_Float32 borderWidth[NUM_4]; - fullImpl->getNodeModifiers()->getCommonModifier()->getBorderWidth(node->uiNodeHandle, borderWidth, UNIT_PERCENT); + fullImpl->getNodeModifiers()->getCommonModifier()->getBorderWidth(node->uiNodeHandle, &borderWidth, UNIT_PERCENT); g_numberValues[NUM_0].f32 = borderWidth[NUM_0]; g_numberValues[NUM_1].f32 = borderWidth[NUM_1]; g_numberValues[NUM_2].f32 = borderWidth[NUM_2]; @@ -1563,7 +1563,7 @@ const ArkUI_AttributeItem* GetBorderRadiusPercent(ArkUI_NodeHandle node) { auto* fullImpl = GetFullImpl(); ArkUI_Float32 borderRadius[NUM_4]; - fullImpl->getNodeModifiers()->getCommonModifier()->getBorderRadius(node->uiNodeHandle, borderRadius, UNIT_PERCENT); + fullImpl->getNodeModifiers()->getCommonModifier()->getBorderRadius(node->uiNodeHandle, &borderRadius, UNIT_PERCENT); g_numberValues[NUM_0].f32 = borderRadius[NUM_0]; g_numberValues[NUM_1].f32 = borderRadius[NUM_1]; g_numberValues[NUM_2].f32 = borderRadius[NUM_2]; @@ -1614,7 +1614,7 @@ const ArkUI_AttributeItem* GetBorderColor(ArkUI_NodeHandle node) { auto* fullImpl = GetFullImpl(); ArkUI_Uint32 colors[NUM_4]; - fullImpl->getNodeModifiers()->getCommonModifier()->getBorderColor(node->uiNodeHandle, colors); + fullImpl->getNodeModifiers()->getCommonModifier()->getBorderColor(node->uiNodeHandle, &colors); g_numberValues[NUM_0].u32 = colors[NUM_0]; g_numberValues[NUM_1].u32 = colors[NUM_1]; g_numberValues[NUM_2].u32 = colors[NUM_2]; @@ -1673,7 +1673,7 @@ const ArkUI_AttributeItem* GetBorderStyle(ArkUI_NodeHandle node) { auto* fullImpl = GetFullImpl(); ArkUI_Int32 styles[NUM_4]; - fullImpl->getNodeModifiers()->getCommonModifier()->getBorderStyle(node->uiNodeHandle, styles); + fullImpl->getNodeModifiers()->getCommonModifier()->getBorderStyle(node->uiNodeHandle, &styles); g_numberValues[NUM_0].i32 = styles[NUM_0]; g_numberValues[NUM_1].i32 = styles[NUM_1]; g_numberValues[NUM_2].i32 = styles[NUM_2]; @@ -1777,7 +1777,7 @@ int32_t SetClipShape(ArkUI_NodeHandle node, const ArkUI_AttributeItem* item) pathAttributes[NUM_1] = item->value[NUM_2].f32; } fullImpl->getNodeModifiers()->getCommonModifier()->setClipPath( - node->uiNodeHandle, "path", pathAttributes, item->string); + node->uiNodeHandle, "path", &pathAttributes, item->string); } else { ArkUI_Float32 attributes[item->size - NUM_1]; for (int i = NUM_1; i < item->size; i++) { @@ -1853,7 +1853,7 @@ void ResetTransform(ArkUI_NodeHandle node) const ArkUI_AttributeItem* GetTransform(ArkUI_NodeHandle node) { ArkUI_Float32 values[NUM_16]; - GetFullImpl()->getNodeModifiers()->getCommonModifier()->getTransform(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getCommonModifier()->getTransform(node->uiNodeHandle, &values); for (int i = 0; i < NUM_16; i++) { g_numberValues[i].f32 = values[i]; } @@ -2182,7 +2182,7 @@ const ArkUI_AttributeItem* GetResponseRegion(ArkUI_NodeHandle node) { ArkUI_Float32 values[32]; auto valueSize = - GetFullImpl()->getNodeModifiers()->getCommonModifier()->getResponseRegion(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getCommonModifier()->getResponseRegion(node->uiNodeHandle, &values); for (int i = 0; i < valueSize; i++) { g_numberValues[i].f32 = values[i]; } @@ -2373,7 +2373,7 @@ const ArkUI_AttributeItem* GetSweepGradient(ArkUI_NodeHandle node) ArkUI_Float32 stops[NUM_10]; ArkUI_Int32 unit = GetDefaultUnit(node, UNIT_VP); auto resultValue = GetFullImpl()->getNodeModifiers()->getCommonModifier()->getSweepGradient( - node->uiNodeHandle, values, colors, stops, unit); + node->uiNodeHandle, &values, &colors, &stops, unit); //centerX g_numberValues[NUM_0].f32 = values[NUM_0]; //centerY @@ -2476,7 +2476,7 @@ const ArkUI_AttributeItem* GetRadialGradient(ArkUI_NodeHandle node) ArkUI_Int32 unit = GetDefaultUnit(node, UNIT_VP); auto resultValue = GetFullImpl()->getNodeModifiers()->getCommonModifier()->getRadialGradient( - node->uiNodeHandle, values, colors, stops, unit); + node->uiNodeHandle, &values, &colors, &stops, unit); //centerX g_numberValues[NUM_0].f32 = values[NUM_0]; //centerY @@ -2515,8 +2515,8 @@ int32_t SetMask(ArkUI_NodeHandle node, const ArkUI_AttributeItem* item) if (item->string == nullptr) { return ERROR_CODE_PARAM_INVALID; } - int fill = item->size > NUM_0 ? item->value[0].u32 : DEFAULT_FIll_COLOR; - int stroke = item->size > NUM_1 ? item->value[NUM_1].u32 : DEFAULT_FIll_COLOR; + auto fill = item->size > NUM_0 ? item->value[0].u32 : DEFAULT_FIll_COLOR; + auto stroke = item->size > NUM_1 ? item->value[NUM_1].u32 : DEFAULT_FIll_COLOR; float strokeWidth = item->size > NUM_2 ? item->value[NUM_2].f32 : NUM_0; ArkUI_Float32 pathAttributes[NUM_2]; if (LessNotEqual(item->value[NUM_4].f32, 0.0f) || LessNotEqual(item->value[NUM_5].f32, 0.0f)) { @@ -2548,11 +2548,12 @@ int32_t SetMask(ArkUI_NodeHandle node, const ArkUI_AttributeItem* item) item->size != NUM_4) { return ERROR_CODE_PARAM_INVALID; } - int fill = item->size > NUM_0 ? item->value[0].u32 : DEFAULT_FIll_COLOR; - int stroke = item->size > NUM_1 ? item->value[NUM_1].u32 : DEFAULT_FIll_COLOR; + auto fill = item->size > NUM_0 ? item->value[0].u32 : DEFAULT_FIll_COLOR; + auto stroke = item->size > NUM_1 ? item->value[NUM_1].u32 : DEFAULT_FIll_COLOR; float strokeWidth = item->size > NUM_2 ? item->value[NUM_2].f32 : NUM_0; - ArkUI_Float32 attributes[item->size - NUM_4]; - for (int i = 0; i < item->size - NUM_4; i++) { + auto index = item->size - NUM_4 < 0 ? 0 : item->size - NUM_4; + ArkUI_Float32 attributes[index]; + for (int i = 0; i < index; i++) { if (LessNotEqual(item->value[i + NUM_4].f32, 0.0f)) { return ERROR_CODE_PARAM_INVALID; } else { @@ -3073,7 +3074,7 @@ const ArkUI_AttributeItem* GetDisplayPriority(ArkUI_NodeHandle node) if (!modifier) { return nullptr; } - g_numberValues[0].u32 = modifier->getDisplayPriority(node->uiNodeHandle); + g_numberValues[0].u32 = static_cast(modifier->getDisplayPriority(node->uiNodeHandle)); g_attributeItem.size = REQUIRED_ONE_PARAM; return &g_attributeItem; } @@ -3170,7 +3171,7 @@ const ArkUI_AttributeItem* GetChainMode(ArkUI_NodeHandle node) { //size = 2; direction and style ArkUI_Int32 values[ALLOW_SIZE_2]; - GetFullImpl()->getNodeModifiers()->getCommonModifier()->getChainStyle(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getCommonModifier()->getChainStyle(node->uiNodeHandle, &values); //index 0 direction g_numberValues[0].i32 = values[0]; //index 1 style @@ -3262,7 +3263,7 @@ const ArkUI_AttributeItem* GetPaddingPercent(ArkUI_NodeHandle node) auto* fullImpl = GetFullImpl(); ArkUI_Float32 paddings[NUM_4]; ArkUI_Int32 length = 0; - fullImpl->getNodeModifiers()->getCommonModifier()->getPadding(node->uiNodeHandle, paddings, length, UNIT_PERCENT); + fullImpl->getNodeModifiers()->getCommonModifier()->getPadding(node->uiNodeHandle, &paddings, length, UNIT_PERCENT); g_numberValues[NUM_0].f32 = paddings[NUM_0]; g_numberValues[NUM_1].f32 = paddings[NUM_1]; g_numberValues[NUM_2].f32 = paddings[NUM_2]; @@ -3306,7 +3307,7 @@ const ArkUI_AttributeItem* GetMarginPercent(ArkUI_NodeHandle node) auto* fullImpl = GetFullImpl(); ArkUI_Float32 margins[NUM_4]; ArkUI_Int32 length = 0; - fullImpl->getNodeModifiers()->getCommonModifier()->getMargin(node->uiNodeHandle, margins, length, UNIT_PERCENT); + fullImpl->getNodeModifiers()->getCommonModifier()->getMargin(node->uiNodeHandle, &margins, length, UNIT_PERCENT); g_numberValues[NUM_0].f32 = margins[NUM_0]; g_numberValues[NUM_1].f32 = margins[NUM_1]; g_numberValues[NUM_3].f32 = margins[NUM_3]; @@ -3375,7 +3376,7 @@ const ArkUI_AttributeItem* GetOutlineColor(ArkUI_NodeHandle node) { auto* fullImpl = GetFullImpl(); ArkUI_Uint32 colors[NUM_4]; - fullImpl->getNodeModifiers()->getCommonModifier()->getOutlineColor(node->uiNodeHandle, colors); + fullImpl->getNodeModifiers()->getCommonModifier()->getOutlineColor(node->uiNodeHandle, &colors); g_numberValues[NUM_0].u32 = colors[NUM_0]; g_numberValues[NUM_1].u32 = colors[NUM_1]; g_numberValues[NUM_2].u32 = colors[NUM_2]; @@ -3414,7 +3415,7 @@ const ArkUI_AttributeItem* GetSize(ArkUI_NodeHandle node) auto* fullImpl = GetFullImpl(); ArkUI_Float32 size[NUM_2]; fullImpl->getNodeModifiers()->getCommonModifier()->getSize( - node->uiNodeHandle, size, GetDefaultUnit(node, UNIT_VP)); + node->uiNodeHandle, &size, GetDefaultUnit(node, UNIT_VP)); g_numberValues[NUM_0].f32 = size[NUM_0]; g_numberValues[NUM_1].f32 = size[NUM_1]; return &g_attributeItem; @@ -4236,7 +4237,7 @@ const ArkUI_AttributeItem* GetTextInputUnderlineColor(ArkUI_NodeHandle node) { ArkUI_Uint32 values[NUM_4]; auto* fullImpl = GetFullImpl(); - fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputUserUnderlineColor(node->uiNodeHandle, values); + fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputUserUnderlineColor(node->uiNodeHandle, &values); g_numberValues[NUM_0].u32 = values[NUM_0]; g_numberValues[NUM_1].u32 = values[NUM_1]; g_numberValues[NUM_2].u32 = values[NUM_2]; @@ -4301,8 +4302,10 @@ const ArkUI_AttributeItem* GetTextInputContentType(ArkUI_NodeHandle node) auto fullImpl = GetFullImpl(); auto value = fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputContentType( node->uiNodeHandle); - if (value >= static_cast(ARKUI_TEXTINPUT_CONTENT_TYPE_FORMAT_ADDRESS) + CONVERT_CONTENT_TYPE - && value <= static_cast(ARKUI_TEXTINPUT_CONTENT_TYPE_FORMAT_ADDRESS) + CONVERT_CONTENT_TYPE) { + if (value >= static_cast( + static_cast(ARKUI_TEXTINPUT_CONTENT_TYPE_FORMAT_ADDRESS) + CONVERT_CONTENT_TYPE) && + value <= static_cast( + static_cast(ARKUI_TEXTINPUT_CONTENT_TYPE_FORMAT_ADDRESS) + CONVERT_CONTENT_TYPE)) { value -= CONVERT_CONTENT_TYPE; } g_numberValues[0].i32 = value; @@ -4384,7 +4387,7 @@ const ArkUI_AttributeItem* GetTextInputCaretOffset(ArkUI_NodeHandle node) g_numberValues[NUM_0].i32 = fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputCaretIndex( node->uiNodeHandle); ArkUI_Float32 values[NUM_2]; - fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputCaretOffset(node->uiNodeHandle, values); + fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputCaretOffset(node->uiNodeHandle, &values); g_numberValues[NUM_1].f32 = values[NUM_0]; g_numberValues[NUM_2].f32 = values[NUM_1]; g_attributeItem.size = REQUIRED_TWO_PARAM; @@ -4449,7 +4452,7 @@ const ArkUI_AttributeItem* GetTextInputContentRect(ArkUI_NodeHandle node) { ArkUI_Float32 values[NUM_4]; auto* fullImpl = GetFullImpl(); - fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputContentRect(node->uiNodeHandle, values); + fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputContentRect(node->uiNodeHandle, &values); g_numberValues[NUM_0].f32 = values[NUM_0]; g_numberValues[NUM_1].f32 = values[NUM_1]; g_numberValues[NUM_2].f32 = values[NUM_2]; @@ -4699,7 +4702,8 @@ void ResetScrollFriction(ArkUI_NodeHandle node) const ArkUI_AttributeItem* GetScrollScrollSnap(ArkUI_NodeHandle node) { ArkUI_Float32 values[32]; - auto size = GetFullImpl()->getNodeModifiers()->getScrollModifier()->getScrollScrollSnap(node->uiNodeHandle, values); + auto size = + GetFullImpl()->getNodeModifiers()->getScrollModifier()->getScrollScrollSnap(node->uiNodeHandle, &values); //size index g_numberValues[NUM_0].i32 = values[NUM_0]; @@ -4932,21 +4936,21 @@ const ArkUI_AttributeItem* GetScrollEdgeEffect(ArkUI_NodeHandle node) ArkUI_Int32 values[2]; if (node->type == ARKUI_NODE_LIST) { auto valueSize = - GetFullImpl()->getNodeModifiers()->getListModifier()->getListEdgeEffect(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getListModifier()->getListEdgeEffect(node->uiNodeHandle, &values); for (int i = 0; i < valueSize; i++) { g_numberValues[i].i32 = values[i]; } g_attributeItem.size = valueSize; } else if (node->type == ARKUI_NODE_SCROLL) { auto valueSize = - GetFullImpl()->getNodeModifiers()->getScrollModifier()->getScrollEdgeEffect(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getScrollModifier()->getScrollEdgeEffect(node->uiNodeHandle, &values); for (int i = 0; i < valueSize; i++) { g_numberValues[i].i32 = values[i]; } g_attributeItem.size = valueSize; } else if (node->type == ARKUI_NODE_WATER_FLOW) { auto valueSize = - GetFullImpl()->getNodeModifiers()->getWaterFlowModifier()->getEdgeEffect(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getWaterFlowModifier()->getEdgeEffect(node->uiNodeHandle, &values); for (int i = 0; i < valueSize; i++) { g_numberValues[i].i32 = values[i]; } @@ -5067,11 +5071,12 @@ const ArkUI_AttributeItem* GetScrollNestedScroll(ArkUI_NodeHandle node) { ArkUI_Int32 values[2]; if (node->type == ARKUI_NODE_WATER_FLOW) { - GetFullImpl()->getNodeModifiers()->getWaterFlowModifier()->getWaterFlowNestedScroll(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getWaterFlowModifier()->getWaterFlowNestedScroll( + node->uiNodeHandle, &values); } else if (node->type == ARKUI_NODE_LIST) { - GetFullImpl()->getNodeModifiers()->getListModifier()->getListNestedScroll(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getListModifier()->getListNestedScroll(node->uiNodeHandle, &values); } else { - GetFullImpl()->getNodeModifiers()->getScrollModifier()->getScrollNestedScroll(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getScrollModifier()->getScrollNestedScroll(node->uiNodeHandle, &values); } //size index g_numberValues[0].i32 = values[0]; @@ -5118,14 +5123,14 @@ int32_t SetScrollTo(ArkUI_NodeHandle node, const ArkUI_AttributeItem* item) if (item->size > NUM_5) { values[NUM_7] = static_cast(item->value[NUM_5].i32); } - fullImpl->getNodeModifiers()->getScrollModifier()->setScrollTo(node->uiNodeHandle, values); + fullImpl->getNodeModifiers()->getScrollModifier()->setScrollTo(node->uiNodeHandle, &values); return ERROR_CODE_NO_ERROR; } const ArkUI_AttributeItem* GetScrollOffset(ArkUI_NodeHandle node) { ArkUI_Float32 values[2]; - GetFullImpl()->getNodeModifiers()->getScrollModifier()->getScrollOffset(node->uiNodeHandle, values); + GetFullImpl()->getNodeModifiers()->getScrollModifier()->getScrollOffset(node->uiNodeHandle, &values); //size index g_numberValues[0].f32 = values[0]; g_numberValues[1].f32 = values[1]; @@ -6730,7 +6735,7 @@ int32_t SetSwiperNestedScroll(ArkUI_NodeHandle node, const ArkUI_AttributeItem* values[0] = item->value[0].i32; auto* fullImpl = GetFullImpl(); - fullImpl->getNodeModifiers()->getSwiperModifier()->setSwiperNestedScroll(node->uiNodeHandle, values); + fullImpl->getNodeModifiers()->getSwiperModifier()->setSwiperNestedScroll(node->uiNodeHandle, &values); return ERROR_CODE_NO_ERROR; } @@ -6760,7 +6765,7 @@ int32_t SetSwiperToIndex(ArkUI_NodeHandle node, const ArkUI_AttributeItem* item) values[1] = item->value[1].i32; } auto* fullImpl = GetFullImpl(); - fullImpl->getNodeModifiers()->getSwiperModifier()->setSwiperToIndex(node->uiNodeHandle, values); + fullImpl->getNodeModifiers()->getSwiperModifier()->setSwiperToIndex(node->uiNodeHandle, &values); return ERROR_CODE_NO_ERROR; } @@ -8128,7 +8133,7 @@ int32_t SetBackgroundBlurStyle(ArkUI_NodeHandle node, const ArkUI_AttributeItem* greyVector[NUM_0] = grayScaleStart; greyVector[NUM_1] = grayScaleEnd; fullImpl->getNodeModifiers()->getCommonModifier()->setBackgroundBlurStyle( - node->uiNodeHandle, intArray, scale, blurOption.grayscale.data(), blurOption.grayscale.size()); + node->uiNodeHandle, &intArray, scale, blurOption.grayscale.data(), blurOption.grayscale.size()); return ERROR_CODE_NO_ERROR; } @@ -8165,7 +8170,7 @@ int32_t SetForegroundBlurStyle(ArkUI_NodeHandle node, const ArkUI_AttributeItem* intArray[NUM_1] = colorMode; intArray[NUM_2] = adaptiveColor; fullImpl->getNodeModifiers()->getCommonModifier()->setForegroundBlurStyle( - node->uiNodeHandle, intArray, scale, blurOption.grayscale.data(), blurOption.grayscale.size()); + node->uiNodeHandle, &intArray, scale, blurOption.grayscale.data(), blurOption.grayscale.size()); return ERROR_CODE_NO_ERROR; } @@ -8444,7 +8449,7 @@ int32_t SetRotateTransition(ArkUI_NodeHandle node, const ArkUI_AttributeItem* it return ERROR_CODE_PARAM_INVALID; } std::array rotateArray; - for (int32_t i = 0; i < actualSize && i < rotateArray.size(); i++) { + for (int32_t i = 0; i < static_cast(actualSize) && i < rotateArray.size(); i++) { rotateArray[i] = item->value[i].f32; } float angle = 0.0f; @@ -8473,7 +8478,7 @@ int32_t SetScaleTransition(ArkUI_NodeHandle node, const ArkUI_AttributeItem* ite return ERROR_CODE_PARAM_INVALID; } std::array scaleFloatArray; - for (size_t i = 0; i < actualSize && i < scaleFloatArray.size(); i++) { + for (size_t i = 0; i < static_cast(actualSize) && i < scaleFloatArray.size(); i++) { scaleFloatArray[i] = item->value[i].f32; } ArkUIAnimationOptionType animationOption; @@ -9016,7 +9021,7 @@ const ArkUI_AttributeItem* GetTextDataDetectorConfig(ArkUI_NodeHandle node) ArkUI_Int32 values[32]; auto* fullImpl = GetFullImpl(); auto size = fullImpl->getNodeModifiers()->getTextModifier()->getTextDataDetectorConfig( - node->uiNodeHandle, values); + node->uiNodeHandle, &values); for (auto i = 0; i < size; i++) { g_numberValues[i].i32 = values[i]; } @@ -9274,7 +9279,7 @@ int32_t SetColorFilter(ArkUI_NodeHandle node, const ArkUI_AttributeItem* item) return ERROR_CODE_NO_ERROR; } std::vector colorFloatArray; - for (size_t i = 0; i < actualSize && i < REQUIRED_TWENTY_PARAM; i++) { + for (size_t i = 0; i < static_cast(actualSize) && i < REQUIRED_TWENTY_PARAM; i++) { colorFloatArray.emplace_back(item->value[i].f32); } fullImpl->getNodeModifiers()->getImageModifier()->setColorFilter( @@ -10730,7 +10735,7 @@ int32_t SetSliderBlockStyle(ArkUI_NodeHandle node, const ArkUI_AttributeItem* it } fullImpl->getNodeModifiers()->getSliderModifier()->setSliderBlockPath( - node->uiNodeHandle, "path", pathAttributes, item->string); + node->uiNodeHandle, "path", &pathAttributes, item->string); } else { ArkUI_Float32 attributes[item->size - NUM_2]; for (int i = NUM_2; i < item->size; i++) { @@ -10762,8 +10767,8 @@ const ArkUI_AttributeItem* GetSliderBlockStyle(ArkUI_NodeHandle node) } case NUM_2: { ArkUI_Float32 values[NUM_5]; - auto pathCommands = - GetFullImpl()->getNodeModifiers()->getSliderModifier()->getSliderBlockShape(node->uiNodeHandle, values); + auto pathCommands = GetFullImpl()->getNodeModifiers()->getSliderModifier()->getSliderBlockShape( + node->uiNodeHandle, &values); //index 1 shapeType g_numberValues[1].i32 = values[0]; //index 2 width