diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/common/common_module.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/common/common_module.cpp index 9b9ea6a7464bd1376cd671a5a7e9df9030fc585e..ebad4c55a2183a0a63b8710bab9cbd1c3fa31279 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/common/common_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/common/common_module.cpp @@ -344,7 +344,7 @@ ani_string GetCustomProperty( void GetAlignmentEnum(ani_env* env, ani_object align, AniOverlayOptions& opt) { ani_enum enumType; - if (ANI_OK != env->FindEnum("Larkui/component/enums/Alignment;", &enumType)) { + if (ANI_OK != env->FindEnum("arkui.component.enums.Alignment", &enumType)) { return; } @@ -386,13 +386,13 @@ void ParseOverlayOptions(ani_env* env, ani_object options, AniOverlayOptions& op ani_ref x; if (ANI_OK == env->Object_GetPropertyByName_Ref(offset, "x", &x)) { ani_double param_value; - env->Object_CallMethodByName_Double(static_cast(x), "unboxed", ":D", ¶m_value); + env->Object_CallMethodByName_Double(static_cast(x), "unboxed", ":d", ¶m_value); opt.x = static_cast(param_value); } ani_ref y; if (ANI_OK == env->Object_GetPropertyByName_Ref(offset, "y", &y)) { ani_double param_value; - env->Object_CallMethodByName_Double(static_cast(y), "unboxed", ":D", ¶m_value); + env->Object_CallMethodByName_Double(static_cast(y), "unboxed", ":d", ¶m_value); opt.y = static_cast(param_value); } } diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/componentSnapshot/componentSnapshot_module.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/componentSnapshot/componentSnapshot_module.cpp index 0a89d7b1a4ae8c0eb9dc02136c8fa7e0c6a03044..30ea15b1a262a515fc62fb20f78ba1219a6ce8f9 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/componentSnapshot/componentSnapshot_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/componentSnapshot/componentSnapshot_module.cpp @@ -45,10 +45,10 @@ ani_object WrapStsError(ani_env* env, const std::string& msg) return nullptr; } - if ((status = env->FindClass("Lescompat/Error;", &cls)) != ANI_OK) { + if ((status = env->FindClass("escompat.Error", &cls)) != ANI_OK) { return nullptr; } - if ((status = env->Class_FindMethod(cls, "", "Lstd/core/String;Lescompat/ErrorOptions;:V", &method)) != + if ((status = env->Class_FindMethod(cls, "", "C{std.core.String}C{escompat.ErrorOptions}:", &method)) != ANI_OK) { return nullptr; } @@ -63,11 +63,11 @@ static ani_ref CreateStsError(ani_env* env, ani_int code, const std::string& msg { ani_class cls; ani_status status = ANI_OK; - if ((status = env->FindClass("L@ohos/base/BusinessError;", &cls)) != ANI_OK) { + if ((status = env->FindClass("@ohos.base.BusinessError", &cls)) != ANI_OK) { return nullptr; } ani_method ctor; - if ((status = env->Class_FindMethod(cls, "", "DLescompat/Error;:V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "dC{escompat.Error}:", &ctor)) != ANI_OK) { return nullptr; } ani_object error = WrapStsError(env, msg); @@ -92,7 +92,7 @@ static bool GetOptionsScale(ani_env* env, ani_object options, float& value) return false; } ani_class optionsClass; - if (ANI_OK != env->FindClass("L@ohos/arkui/componentSnapshot/componentSnapshot/SnapshotOptions;", &optionsClass)) { + if (ANI_OK != env->FindClass("@ohos.arkui.componentSnapshot.componentSnapshot.SnapshotOptions", &optionsClass)) { return false; } ani_boolean isOptions; @@ -133,7 +133,7 @@ static bool GetOptionsWaitUntilRenderFinished(ani_env* env, ani_object options, } ani_class optionsClass; - if (ANI_OK != env->FindClass("L@ohos/arkui/componentSnapshot/componentSnapshot/SnapshotOptions;", &optionsClass)) { + if (ANI_OK != env->FindClass("@ohos.arkui.componentSnapshot.componentSnapshot.SnapshotOptions", &optionsClass)) { return false; } ani_boolean isOptions; diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom/ani_measure_layout.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom/ani_measure_layout.cpp index ec1aeaaa91ef5aa2ca9db17fe90f99244684143c..7466737c6f7fde0843574f998c61dd300012a1f7 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom/ani_measure_layout.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom/ani_measure_layout.cpp @@ -39,7 +39,7 @@ bool ParseAniDimension(ani_env* env, ani_object obj, CalcDimension& result, Dime } if (AniUtils::IsNumber(env, obj)) { ani_double param_value; - env->Object_CallMethodByName_Double(obj, "unboxed", ":D", ¶m_value); + env->Object_CallMethodByName_Double(obj, "unboxed", ":d", ¶m_value); result = CalcDimension(param_value, defaultUnit); return true; @@ -64,7 +64,7 @@ ani_object GenConstraintNG(ani_env* env, const NG::LayoutConstraintF& parentCons auto maxSize = parentConstraint.maxSize; ani_class cls; ani_object constraint_obj; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/ConstraintSizeOptionsInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.ConstraintSizeOptionsInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -104,7 +104,7 @@ ani_object GenPlaceChildrenConstraintNG(ani_env* env, const NG::SizeF& size, Ref { ani_object constraint_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/ConstraintSizeOptionsInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.ConstraintSizeOptionsInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -165,7 +165,7 @@ ani_object GenPlaceChildrenConstraintNG(ani_env* env, const NG::SizeF& size, Ref ani_object GenPadding(ani_env* env, const std::unique_ptr& paddingNative) { ani_object padding_obj; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/PaddingInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.PaddingInner"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; @@ -194,7 +194,7 @@ ani_object GenMargin(ani_env* env, const std::unique_ptr& m { ani_object margin_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MarginInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MarginInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -223,7 +223,7 @@ ani_object GenEdgeWidths(ani_env* env, const std::unique_ptrFindClass(className, &cls)) { return nullptr; } @@ -252,7 +252,7 @@ ani_object GenEdgesGlobalized(ani_env* env, const NG::PaddingPropertyT& e { ani_object edges_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/DirectionalEdgesTInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.DirectionalEdgesTInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -292,7 +292,7 @@ ani_object GenBorderWidthGlobalized(ani_env* env, const NG::BorderWidthPropertyT { ani_object edges_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/DirectionalEdgesTInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.DirectionalEdgesTInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -331,7 +331,7 @@ ani_object GenSelfLayoutInfo(ani_env* env, RefPtr layoutProp { ani_object selfLayoutInfo_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/GeometryInfoInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.GeometryInfoInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -402,7 +402,7 @@ void FillPlaceSizeProperty(ani_env* env, ani_object info, const NG::SizeF& size) { ani_object measureResult_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasureResultInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MeasureResultInner"; if (ANI_OK != env->FindClass(className, &cls)) { return; } @@ -428,7 +428,7 @@ ani_object GenMeasureResult(ani_env* env, const NG::SizeF& size) { ani_object measureResult_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasureResultInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MeasureResultInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -493,7 +493,7 @@ ani_object GenMeasurable(ani_env* env, NG::MeasureLayoutChild* child) { ani_class cls ; static const char *className = - "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasurableLayoutableInner;"; + "arkui.ani.arkts.ArkUIAniCustomNodeModule.MeasurableLayoutableInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -574,7 +574,7 @@ void JSMeasureLayoutParamNG::Update(ani_env* env, NG::LayoutWrapper* layoutWrap } if (count < newCount) { ani_class childCls = nullptr; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasurableLayoutableInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MeasurableLayoutableInner"; if (ANI_OK != env->FindClass(className, &childCls)) { return; } @@ -783,7 +783,7 @@ ani_object ANIPlaceChildren(ani_env* env, ani_object aniClass, ani_object positi ani_status BindMeasurable(ani_env* env) { - static const char* className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasurableLayoutableInner;"; + static const char* className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MeasurableLayoutableInner"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { return ANI_ERROR; diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom/custom_node_module.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom/custom_node_module.cpp index 24e65ab749675693f91e2af3a97fefad5353e55b..262d5a462f96fdf9a73c4acc657246e3415b4e55 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom/custom_node_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom/custom_node_module.cpp @@ -28,7 +28,7 @@ ani_status NativeCustomComponent::BindNativeCustomComponent(ani_env *env) { ani_class cls; static const char *className = - "Larkui/ani/arkts/ArkUIAniCustomNodeModule/ArkUIAniCustomNodeModule;"; + "arkui.ani.arkts.ArkUIAniCustomNodeModule.ArkUIAniCustomNodeModule"; auto ani_status = env->FindClass(className, &cls); if (ani_status != ANI_OK) { HILOGE("BindNativeCustomComponent FindClass failed, className: %{public}s", className); diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom_node/custom_node_module.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom_node/custom_node_module.cpp index 4e2188bafbd21ab4bfc5233cefa1b766087043fd..a3b329cd70941e78f623e617752388b1b0712304 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom_node/custom_node_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/custom_node/custom_node_module.cpp @@ -45,7 +45,7 @@ ani_long ConstructCustomNode(ani_env* env, [[maybe_unused]] ani_object aniClass, env->Object_GetType(obj, &type); ani_method onPageShowMethod; - env->Class_FindMethod(static_cast(type), "onPageShow", ":V", &onPageShowMethod); + env->Class_FindMethod(static_cast(type), "onPageShow", ":", &onPageShowMethod); auto&& onPageShow = [vm, weakRef, onPageShowMethod]() { ani_env* env = nullptr; vm->GetEnv(ANI_VERSION_1, &env); @@ -59,7 +59,7 @@ ani_long ConstructCustomNode(ani_env* env, [[maybe_unused]] ani_object aniClass, }; ani_method onPageHideMethod; - env->Class_FindMethod(static_cast(type), "onPageHide", ":V", &onPageHideMethod); + env->Class_FindMethod(static_cast(type), "onPageHide", ":", &onPageHideMethod); auto&& onPageHide = [vm, weakRef, onPageHideMethod]() { ani_env* env = nullptr; vm->GetEnv(ANI_VERSION_1, &env); @@ -107,7 +107,7 @@ ani_long ConstructCustomNode(ani_env* env, [[maybe_unused]] ani_object aniClass, }; ani_method onDumpInspectorMethod; - env->Class_FindMethod(static_cast(type), "onDumpInspector", ":Lstd/core/String;", + env->Class_FindMethod(static_cast(type), "onDumpInspector", ":C{std.core.String}", &onDumpInspectorMethod); auto onDumpInspector = [vm, weakRef, onDumpInspectorMethod]() { ani_env *env = nullptr; diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/dragController/drag_controller_module.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/dragController/drag_controller_module.cpp index f9dfe7b49505d17287f1ac533fecd95bd4c71171..47db29af17285f8bd398affcb03213ecfba8c349 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/dragController/drag_controller_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/dragController/drag_controller_module.cpp @@ -73,7 +73,7 @@ public: return; } ani_method method; - if ((status = env->Class_FindMethod(cls, "", "J:V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK) { HILOGE("AceDrag, find constructor method failed. status = %{public}d", status); return; } @@ -263,7 +263,7 @@ ani_object CreateDragEventObject(ani_env* env, const ArkUIDragNotifyMessage& dra ani_object dragEventObj = {}; CHECK_NULL_RETURN(env, dragEventObj); ani_status status = ANI_OK; - static const char* className = "Larkui/component/common/DragEventInternal;"; + static const char* className = "arkui.component.common.DragEventInternal"; ani_class cls; if ((status = env->FindClass(className, &cls)) != ANI_OK) { HILOGE("AceDrag, find DragEventInner calss fail. status = %{public}d", status); @@ -271,7 +271,7 @@ ani_object CreateDragEventObject(ani_env* env, const ArkUIDragNotifyMessage& dra } ani_method ctor; - if ((status = env->Class_FindMethod(cls, "", ":V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &ctor)) != ANI_OK) { HILOGE("AceDrag, find constructor method fail. status = %{public}d", status); return dragEventObj; } @@ -455,7 +455,7 @@ bool ParseDragItemInfoParam(ani_env* env, ArkUIDragControllerAsync& asyncCtx, an HILOGE("AceDrag, get extraInfo failed."); return false; } - if (AniUtils::IsClassObject(env, extraInfoAni, "Lstd/core/String;")) { + if (AniUtils::IsClassObject(env, extraInfoAni, "std.core.String")) { std::string extraParamsStr = AniUtils::ANIStringToStdString(env, static_cast(extraInfoAni)); std::string extraInfoLimited = extraParamsStr.size() > EXTRA_INFO_MAX_LENGTH ? extraParamsStr.substr(0, EXTRA_INFO_MAX_LENGTH) @@ -562,8 +562,8 @@ bool CheckAndParseFirstParams(ani_env* env, ArkUIDragControllerAsync& asyncCtx, asyncCtx.customBuilderNode = builderNode; return true; } - if (AniUtils::IsClassObject(env, dragItemInfo, "Lescompat/Array;") || - AniUtils::IsClassObject(env, builderNodeArray, "Lescompat/Array;")) { + if (AniUtils::IsClassObject(env, dragItemInfo, "escompat.Array") || + AniUtils::IsClassObject(env, builderNodeArray, "escompat.Array")) { asyncCtx.isArray = true; HILOGI("AceDrag, drag controller is multi object drag."); return ParseDragItemListInfoParam(env, asyncCtx, dragItemInfo, builderNodeArray); @@ -610,16 +610,16 @@ bool SetDragPreviewOptionMode( bool ParseNumberBadge(ani_env* env, ArkUIDragControllerAsync& asyncCtx, ani_object numberBadgeAni) { ani_status status = ANI_OK; - if (AniUtils::IsClassObject(env, numberBadgeAni, "Lstd/core/Boolean;")) { + if (AniUtils::IsClassObject(env, numberBadgeAni, "std.core.Boolean")) { asyncCtx.dragPreviewOption.isNumber = false; ani_boolean aniValue; if (env->Object_CallMethodByName_Boolean(numberBadgeAni, "unboxed", nullptr, &aniValue) == ANI_OK) { asyncCtx.dragPreviewOption.isShowBadge = static_cast(aniValue); } - } else if (AniUtils::IsClassObject(env, numberBadgeAni, "Lstd/core/Numeric;")) { + } else if (AniUtils::IsClassObject(env, numberBadgeAni, "std.core.Numeric")) { ani_double numberValue; if ((status = env->Object_CallMethodByName_Double( - static_cast(numberBadgeAni), "unboxed", ":D", &numberValue)) != ANI_OK) { + static_cast(numberBadgeAni), "unboxed", ":d", &numberValue)) != ANI_OK) { HILOGE("AceDrag, Object_CallMethodByName_Double failed. status = %{public}d", status); } auto number = static_cast(numberValue); @@ -648,7 +648,7 @@ bool ParseModifier(ani_env* env, ArkUIDragControllerAsync& asyncCtx, ani_object return false; } // modifierFunc may have two args - if (!AniUtils::IsClassObject(env, modifierFunc, "Lstd/core/Function2;")) { + if (!AniUtils::IsClassObject(env, modifierFunc, "std.core.Function2")) { HILOGE("AceDrag, applyImageModifierToNode is not a function object."); return false; } @@ -662,7 +662,7 @@ bool ParseDragPreviewMode(ani_env* env, ArkUIDragControllerAsync& asyncCtx, ani_ return true; } bool isAuto = false; - if (AniUtils::IsClassObject(env, previewModeObj, "Lescompat/Array;")) { + if (AniUtils::IsClassObject(env, previewModeObj, "escompat.Array")) { ani_double lengthAni; if (ANI_OK != env->Object_GetPropertyByName_Double(previewModeObj, "length", &lengthAni)) { HILOGE("AceDrag, Object_GetPropertyByName_Double failed."); @@ -672,7 +672,7 @@ bool ParseDragPreviewMode(ani_env* env, ArkUIDragControllerAsync& asyncCtx, ani_ for (int32_t i = 0; i < lengthInt; i++) { ani_ref modeRef; if (ANI_OK != env->Object_CallMethodByName_Ref( - previewModeObj, "$_get", "I:Lstd/core/Object;", &modeRef, (ani_int)i)) { + previewModeObj, "$_get", "i:C{std.core.Object}", &modeRef, (ani_int)i)) { HILOGE("AceDrag, Object_CallMethodByName_Ref failed."); return false; } @@ -737,17 +737,17 @@ std::optional ConvertDimensionType(ani_env* env, ani_ref touchPoint) return std::nullopt; } Dimension parameter; - if (AniUtils::IsClassObject(env, touchPoint, "Lstd/core/Numeric;")) { + if (AniUtils::IsClassObject(env, touchPoint, "std.core.Numeric")) { ani_double numberValue; if (ANI_OK != - env->Object_CallMethodByName_Double(static_cast(touchPoint), "unboxed", ":D", &numberValue)) { + env->Object_CallMethodByName_Double(static_cast(touchPoint), "unboxed", ":d", &numberValue)) { HILOGW("Failed to call unboxed method on Numeric object"); } parameter.SetValue(static_cast(numberValue)); parameter.SetUnit(DimensionUnit::VP); return parameter; } - if (AniUtils::IsClassObject(env, touchPoint, "Lstd/core/String;")) { + if (AniUtils::IsClassObject(env, touchPoint, "std.core.String")) { auto parameterStr = AniUtils::ANIStringToStdString(env, static_cast(touchPoint)); parameter = StringUtils::StringToDimensionWithUnit(parameterStr, DimensionUnit::VP); return parameter; @@ -799,7 +799,7 @@ bool CheckAndParseSecondParams(ani_env* env, ArkUIDragControllerAsync& asyncCtx, asyncCtx.dragPointerEvent.pointerId = static_cast(pointerIdAni); HILOGI("AceDrag, pointerId = %{public}d", asyncCtx.dragPointerEvent.pointerId); - if (AniUtils::IsClassObject(env, extraParamsAni, "Lstd/core/String;")) { + if (AniUtils::IsClassObject(env, extraParamsAni, "std.core.String")) { std::string extraParamsStr = AniUtils::ANIStringToStdString(env, static_cast(extraParamsAni)); std::string extraInfoLimited = extraParamsStr.size() > EXTRA_INFO_MAX_LENGTH ? extraParamsStr.substr(0, EXTRA_INFO_MAX_LENGTH) @@ -844,7 +844,7 @@ bool CheckAndParseSecondParams(ani_env* env, ArkUIDragControllerAsync& asyncCtx, bool CreateCallbackFunc( ani_env* env, ArkUIDragControllerAsync& asyncCtx, ani_object callback, ani_object& result) { - if (AniUtils::IsClassObject(env, callback, "Lstd/core/Function2;")) { + if (AniUtils::IsClassObject(env, callback, "std.core.Function2")) { HILOGI("AceDrag, Create async callback"); ani_ref fnObjGlobalRef = nullptr; if (ANI_OK != env->GlobalReference_Create(callback, &fnObjGlobalRef)) { diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/drag_and_drop/native_drag_drop_global.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/drag_and_drop/native_drag_drop_global.cpp index 520bef5ae2edf4b8f6283e27f7aa9e5c30af715a..7d9d52e751d3574b3ef47f446ec0b48b0937db02 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/drag_and_drop/native_drag_drop_global.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/drag_and_drop/native_drag_drop_global.cpp @@ -63,7 +63,7 @@ ani_object DragEventGetData([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_ auto unifiedData_obj = OHOS::UDMF::AniConverter::WrapUnifiedData(env, unifiedData); ani_boolean isUnifiedData; ani_class dataClass; - env->FindClass("L@ohos/data/unifiedDataChannel/unifiedDataChannel/UnifiedData;", &dataClass); + env->FindClass("@ohos.data.unifiedDataChannel.unifiedDataChannel.UnifiedData", &dataClass); env->Object_InstanceOf(unifiedData_obj, dataClass, &isUnifiedData); if (!isUnifiedData) { return result_obj; @@ -90,7 +90,7 @@ ani_object DragEventGetSummary([[maybe_unused]] ani_env* env, [[maybe_unused]] a auto summary_obj = OHOS::UDMF::AniConverter::WrapSummary(env, summary); ani_boolean isSummary; ani_class summaryClass; - env->FindClass("L@ohos/data/unifiedDataChannel/unifiedDataChannel/Summary;", &summaryClass); + env->FindClass("@ohos.data.unifiedDataChannel.unifiedDataChannel.Summary", &summaryClass); env->Object_InstanceOf(summary_obj, summaryClass, &isSummary); if (!isSummary) { return result_obj; diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/module.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/module.cpp index 294c6322e0e677504c3198a67ccb8a3b3026bc52..044b6027ccbe12516510a361e057490130dcba75 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/module.cpp @@ -50,7 +50,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) } ani_class cls; - auto ani_status = env->FindClass("Larkui/ani/arkts/ArkUIAniModule/ArkUIAniModule;", &cls); + auto ani_status = env->FindClass("arkui.ani.arkts.ArkUIAniModule.ArkUIAniModule", &cls); if (ani_status != ANI_OK) { return ANI_ERROR; } @@ -78,12 +78,12 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_Web_SetWebOptions", - "JL@ohos/web/webview/webview/WebviewController;:V", + "lC{@ohos.web.webview.webview.WebviewController}:", reinterpret_cast(OHOS::Ace::Ani::SetWebOptions) }, ani_native_function { "_Web_SetWebController_ControllerHandler", - "JL@ohos/web/webview/webview/WebviewController;:V", + "lC{@ohos.web.webview.webview.WebviewController}:", reinterpret_cast(OHOS::Ace::Ani::SetWebControllerControllerHandler) }, ani_native_function { @@ -268,7 +268,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_ConvertUtils_ConvertFromPixelMapAni", - "L@ohos/multimedia/image/image/PixelMap;:J", + "C{@ohos.multimedia.image.image.PixelMap}:l", reinterpret_cast(OHOS::Ace::Ani::ConvertFromPixelMapAni) }, ani_native_function { @@ -293,7 +293,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_ConvertUtils_ConvertToPixelMapAni", - "J:L@ohos/multimedia/image/image/PixelMap;", + "l:C{@ohos.multimedia.image.image.PixelMap}", reinterpret_cast(OHOS::Ace::Ani::ConvertToPixelMapAni) }, ani_native_function { @@ -303,67 +303,67 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_Common_Sync_InstanceId", - "I:V", + "i:", reinterpret_cast(OHOS::Ace::Ani::SyncInstanceId) }, ani_native_function { "_Common_Restore_InstanceId", - ":V", + ":", reinterpret_cast(OHOS::Ace::Ani::RestoreInstanceId) }, ani_native_function { "_Common_Get_Current_InstanceId", - ":I", + ":i", reinterpret_cast(OHOS::Ace::Ani::GetCurrentInstanceId) }, ani_native_function { "_Common_GetFocused_InstanceId", - ":I", + ":i", reinterpret_cast(OHOS::Ace::Ani::GetFocusedInstanceId) }, ani_native_function { "_CustomNode_Construct", - "ILarkui/ArkCustomComponent/ArkCustomComponent;:J", + "iC{arkui.ArkCustomComponent.ArkCustomComponent}:l", reinterpret_cast(OHOS::Ace::Ani::ConstructCustomNode) }, ani_native_function { "_CustomNode_RequestFrame", - ":V", + ":", reinterpret_cast(OHOS::Ace::Ani::RequestFrame) }, ani_native_function { "_LazyForEachNode_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ConstructLazyForEachNode) }, ani_native_function { "_BuilderProxyNode_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::BuilderProxyNodeConstruct) }, ani_native_function { "_ContentSlot_construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ContentSlotConstruct) }, ani_native_function { "_ContentSlotInterface_setContentSlotOptions", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::SetContentSlotOptions) }, ani_native_function { "_SetDrawCallback", - "JLstd/core/Function1;:V", + "lC{std.core.Function1}:", reinterpret_cast(OHOS::Ace::Ani::SetDrawCallback) }, ani_native_function { "_SetDrawModifier", - "JILarkui/component/common/DrawModifier;:V", + "liC{arkui.component.common.DrawModifier}:", reinterpret_cast(OHOS::Ace::Ani::SetDrawModifier) }, ani_native_function { "_Invalidate", - "J:V", + "l:", reinterpret_cast(OHOS::Ace::Ani::Invalidate) }, ani_native_function { @@ -373,27 +373,27 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_SetWaterFlowOptions", - "JLarkui/component/waterFlow/WaterFlowOptions;:V", + "lC{arkui.component.waterFlow.WaterFlowOptions}:", reinterpret_cast(OHOS::Ace::Ani::SetWaterFlowOptions) }, ani_native_function { "_SetListChildrenMainSize", - "JLarkui/component/common/ChildrenMainSize;:V", + "lC{arkui.component.common.ChildrenMainSize}:", reinterpret_cast(OHOS::Ace::Ani::SetListChildrenMainSize) }, ani_native_function { "_DragEvent_Set_Data", - "JL@ohos/data/unifiedDataChannel/unifiedDataChannel/UnifiedData;:V", + "lC{@ohos.data.unifiedDataChannel.unifiedDataChannel.UnifiedData}:", reinterpret_cast(OHOS::Ace::Ani::DragEventSetData) }, ani_native_function { "_DragEvent_Get_Data", - "J:L@ohos/data/unifiedDataChannel/unifiedDataChannel/UnifiedData;", + "l:C{@ohos.data.unifiedDataChannel.unifiedDataChannel.UnifiedData}", reinterpret_cast(OHOS::Ace::Ani::DragEventGetData) }, ani_native_function { "_DragEvent_Get_Summary", - "J:L@ohos/data/unifiedDataChannel/unifiedDataChannel/Summary;", + "l:C{@ohos.data.unifiedDataChannel.unifiedDataChannel.Summary}", reinterpret_cast(OHOS::Ace::Ani::DragEventGetSummary) }, ani_native_function { @@ -403,22 +403,22 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_DragEvent_Set_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::DragEventSetPixelMap) }, ani_native_function { "_DragEvent_Set_ExtraInfo", - "JLstd/core/String;:V", + "lC{std.core.String}:", reinterpret_cast(OHOS::Ace::Ani::DragEventSetExtraInfo) }, ani_native_function { "_DragEvent_Set_CustomNode", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::DragEventSetCustomNode) }, ani_native_function { "_Drag_Set_AllowDrop_Null", - "J:V", + "l:", reinterpret_cast(OHOS::Ace::Ani::DragSetAllowDropNull) }, ani_native_function { @@ -458,17 +458,17 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_CreateViewStackProcessor", - ":J", + ":l", reinterpret_cast(OHOS::Ace::Ani::CreateViewStackProcessor) }, ani_native_function { "_PopViewStackProcessor", - ":J", + ":l", reinterpret_cast(OHOS::Ace::Ani::PopViewStackProcessor) }, ani_native_function { "_DeleteViewStackProcessor", - "J:V", + "l:", reinterpret_cast(OHOS::Ace::Ani::DeleteViewStackProcessor) }, ani_native_function { @@ -538,22 +538,22 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_StyledString_SetPixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::StyledStringModule::SetPixelMap) }, ani_native_function { "_StyledString_GetPixelMap", - "J:L@ohos/multimedia/image/image/PixelMap;", + "l:C{@ohos.multimedia.image.image.PixelMap}", reinterpret_cast(OHOS::Ace::Ani::StyledStringModule::GetPixelMap) }, ani_native_function { "_ImageSpan_Set_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::SetImageSpanPixelMap) }, ani_native_function { "_ImageSpan_SetAlt_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::SetImageSpanAltPixelMap) }, ani_native_function { @@ -568,37 +568,37 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_RequireArkoalaNodeId", - "I:I", + "i:i", reinterpret_cast(OHOS::Ace::Ani::RequireArkoalaNodeId) }, ani_native_function { "_Video_Transfer_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::SetVideoPixelMap) }, ani_native_function { "_Shape_Transfer_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::SetShapePixelMap) }, ani_native_function { "_RichEditor_Transfer_PixelMap", - "L@ohos/multimedia/image/image/PixelMap;:J", + "C{@ohos.multimedia.image.image.PixelMap}:l", reinterpret_cast(OHOS::Ace::Ani::RichEditorTransferPixelMap) }, ani_native_function { "_PersistentStorage_Get", - "Lstd/core/String;:Lstd/core/String;", + "C{std.core.String}:C{std.core.String}", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Get) }, ani_native_function { "_PersistentStorage_Set", - "Lstd/core/String;Lstd/core/String;:V", + "C{std.core.String}C{std.core.String}:", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Set) }, ani_native_function { "_PersistentStorage_Has", - "Lstd/core/String;:Z", + "C{std.core.String}:z", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Has) }, ani_native_function { @@ -608,62 +608,62 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_PersistentStorage_Delete", - "Lstd/core/String;:V", + "C{std.core.String}:", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Delete) }, ani_native_function { "_Env_GetColorMode", - ":I", + ":i", reinterpret_cast(OHOS::Ace::Ani::Env_GetColorMode) }, ani_native_function { "_Env_GetFontScale", - ":F", + ":f", reinterpret_cast(OHOS::Ace::Ani::Env_GetFontScale) }, ani_native_function { "_Env_GetFontWeightScale", - ":F", + ":f", reinterpret_cast(OHOS::Ace::Ani::Env_GetFontWeightScale) }, ani_native_function { "_Env_GetAccessibilityEnabled", - ":Z", + ":z", reinterpret_cast(OHOS::Ace::Ani::Env_GetAccessibilityEnabled) }, ani_native_function { "_Env_GetLayoutDirection", - ":Lstd/core/String;", + ":C{std.core.String}", reinterpret_cast(OHOS::Ace::Ani::Env_GetLayoutDirection) }, ani_native_function { "_Env_GetLanguageCode", - ":Lstd/core/String;", + ":C{std.core.String}", reinterpret_cast(OHOS::Ace::Ani::Env_GetLanguageCode) }, ani_native_function { "_XComponent_SetSurfaceCallback", - "JLarkui/component/xcomponent/XComponentControllerCallbackInternal;:V", + "lC{arkui.component.xcomponent.XComponentControllerCallbackInternal}:", reinterpret_cast(OHOS::Ace::Ani::SetXComponentControllerCallback) }, ani_native_function { "_RemoveComponent_FromFrameNode", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::RemoveComponentFromFrameNode) }, ani_native_function { "_AddComponent_ToFrameNode", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::AddComponentToFrameNode) }, ani_native_function { "_CheckIsUIThread", - "I:I", + "i:i", reinterpret_cast(OHOS::Ace::Ani::CheckIsUIThread) }, ani_native_function { "_IsDebugMode", - "I:I", + "i:i", reinterpret_cast(OHOS::Ace::Ani::IsDebugMode) }, ani_native_function { @@ -678,7 +678,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_SetParallelScoped", - "Z:V", + "z:", reinterpret_cast(OHOS::Ace::Ani::SetParallelScoped) }, ani_native_function { @@ -725,40 +725,40 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) "_Common_px2lpx", nullptr, reinterpret_cast(OHOS::Ace::Ani::Px2lpx) - }, - ani_native_function { + }, + ani_native_function { "_CanvasRenderer_SetPixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::SetPixelMap) }, ani_native_function { "_CanvasRenderer_GetPixelMap", - "JDDDD:L@ohos/multimedia/image/image/PixelMap;", + "ldddd:C{@ohos.multimedia.image.image.PixelMap}", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::GetPixelMap) }, ani_native_function { "_CanvasRenderer_DrawPixelMap0", - "JL@ohos/multimedia/image/image/PixelMap;DD:V", + "lC{@ohos.multimedia.image.image.PixelMap}dd:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::DrawPixelMap0) }, ani_native_function { "_CanvasRenderer_DrawPixelMap1", - "JL@ohos/multimedia/image/image/PixelMap;DDDD:V", + "lC{@ohos.multimedia.image.image.PixelMap}dddd:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::DrawPixelMap1) }, ani_native_function { "_CanvasRenderer_DrawPixelMap2", - "JL@ohos/multimedia/image/image/PixelMap;DDDDDDDD:V", + "lC{@ohos.multimedia.image.image.PixelMap}dddddddd:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::DrawPixelMap2) }, ani_native_function { "_ImageBitmap_Construct0", - "Lstd/core/String;I:J", + "C{std.core.String}i:l", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::ImageBitmapConstruct0) }, ani_native_function { "_ImageBitmap_Construct1", - "L@ohos/multimedia/image/image/PixelMap;I:J", + "C{@ohos.multimedia.image.image.PixelMap}i:l", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::ImageBitmapConstruct1) } }; diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/ui_extension/native_dynamic_module.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/ui_extension/native_dynamic_module.cpp index 24deab595618dd7f1daa7e81fdd56cd671b67f23..63192864a012d7ec93139d5c07bd2a3b2cac6850 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/ui_extension/native_dynamic_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/ui_extension/native_dynamic_module.cpp @@ -39,7 +39,7 @@ ani_status NativeDynamicModule::BindNativeDynamicComponent(ani_env *env) { ani_class cls; static const char *className = - "Larkui/ani/arkts/ui_extension/ArkUIAniDynamicModal/ArkUIAniDynamicModal;"; + "arkui.ani.arkts.ui_extension.ArkUIAniDynamicModal.ArkUIAniDynamicModal"; auto ani_status = env->FindClass(className, &cls); if (ani_status != ANI_OK) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_DYNAMIC_COMPONENT, @@ -77,7 +77,7 @@ ani_status NativeDynamicModule::SetDynamicOption( } std::string optionClassName = - "Larkui/ani/arkts/ui_extension/ArkUIAniDynamicModal/ArkUIAniDynamicOptions;"; + "arkui.ani.arkts.ui_extension.ArkUIAniDynamicModal.ArkUIAniDynamicOptions"; if (!AniUtils::CheckType(env, obj, optionClassName)) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_DYNAMIC_COMPONENT, "CheckType %{public}s failed when SetDynamicOption", diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/ui_extension/native_ui_extension.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/ui_extension/native_ui_extension.cpp index 138b931042d0a878c7dea890fc25eff39d03c01e..979d3dd4bc33803f916542b440b29ec6a2f8ab54 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/ui_extension/native_ui_extension.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/ui_extension/native_ui_extension.cpp @@ -45,7 +45,7 @@ ani_status NativeUiExtension::BindNativeUiExtensionComponent(ani_env *env) { ani_class cls; static const char *className = - "Larkui/ani/ui_extension/ArkUIAniUiextensionModal/ArkUIAniUiextensionModal;"; + "arkui.ani.ui_extension.ArkUIAniUiextensionModal.ArkUIAniUiextensionModal"; auto ani_status = env->FindClass(className, &cls); if (ani_status != ANI_OK) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_UIEXTENSIONCOMPONENT, @@ -105,7 +105,7 @@ ani_status NativeUiExtension::SetUiextensionOption( } std::string optionClassName = - "Larkui/ani/ui_extension/ArkUIAniUiextensionModal/ArkUIAniUIExtensionOptions;"; + "arkui.ani.ui_extension.ArkUIAniUiextensionModal.ArkUIAniUIExtensionOptions"; if (!AniUtils::CheckType(env, obj, optionClassName)) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_UIEXTENSIONCOMPONENT, "CheckType %{public}s failed when SetUiextensionOption", @@ -143,7 +143,7 @@ ani_status NativeUiExtension::SetUiextensionWant( } std::string wantClassName = - "L@ohos/app/ability/Want/Want;"; + "@ohos.app.ability.Want.Want"; if (!AniUtils::CheckType(env, obj, wantClassName)) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_UIEXTENSIONCOMPONENT, "CheckType failed when SetUiextensionWant"); diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/utils/ani_utils.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/utils/ani_utils.cpp index 7b5f73eaebc7179435654b7eeb589787974cd860..1de10d270087a206c1e18f953b9b0e3d5c289dc1 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/utils/ani_utils.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/utils/ani_utils.cpp @@ -21,13 +21,13 @@ namespace OHOS::Ace::Ani { ani_object AniUtils::CreateDouble(ani_env *env, double value) { CHECK_NULL_RETURN(env, nullptr); - static const char *className = "Lstd/core/Double;"; + static const char *className = "std.core.Double"; ani_class persion_cls; if (ANI_OK != env->FindClass(className, &persion_cls)) { return nullptr; } ani_method infoCtor; - if (ANI_OK != env->Class_FindMethod(persion_cls, "", "D:V", &infoCtor)) { + if (ANI_OK != env->Class_FindMethod(persion_cls, "", "d:", &infoCtor)) { return nullptr; } ani_object personInfoObj; @@ -110,7 +110,7 @@ bool AniUtils::IsString(ani_env* env, ani_object obj) { CHECK_NULL_RETURN(env, false); ani_class stringClass; - env->FindClass("Lstd/core/String;", &stringClass); + env->FindClass("std.core.String", &stringClass); ani_boolean isString; env->Object_InstanceOf(obj, stringClass, &isString); @@ -121,7 +121,7 @@ bool AniUtils::IsNumber(ani_env* env, ani_object obj) { CHECK_NULL_RETURN(env, false); ani_class numberClass; - env->FindClass("Lstd/core/Double;", &numberClass); + env->FindClass("std.core.Double", &numberClass); ani_boolean isNumber; env->Object_InstanceOf(obj, numberClass, &isNumber); @@ -176,11 +176,11 @@ ani_object WrapBusinessError(ani_env* env, const char *msg, ani_int code) return nullptr; } - if ((status = env->FindClass("Lescompat/Error;", &cls)) != ANI_OK) { + if ((status = env->FindClass("escompat.Error", &cls)) != ANI_OK) { return nullptr; } - if ((status = env->Class_FindMethod(cls, "", "DLstd/core/String;Lescompat/ErrorOptions;:V", &method)) != + if ((status = env->Class_FindMethod(cls, "", "dC{std.core.String}C{escompat.ErrorOptions}:", &method)) != ANI_OK) { return nullptr; } @@ -196,11 +196,11 @@ ani_ref AniUtils::CreateBusinessError(ani_env* env, const char *msg, ani_int cod { ani_class cls; ani_status status = ANI_OK; - if ((status = env->FindClass("L@ohos/base/BusinessError;", &cls)) != ANI_OK) { + if ((status = env->FindClass("@ohos.base.BusinessError", &cls)) != ANI_OK) { return nullptr; } ani_method ctor; - if ((status = env->Class_FindMethod(cls, "", "DLescompat/Error;:V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "dC{escompat.Error}:", &ctor)) != ANI_OK) { return nullptr; } ani_object error = WrapBusinessError(env, msg, code); @@ -253,7 +253,7 @@ bool AniUtils::GetBigIntValue(ani_env* env, ani_object object, int64_t& longValu CHECK_NULL_RETURN(env, false); auto status = ANI_OK; ani_long value; - if ((status = env->Object_CallMethodByName_Long(object, "unboxed", ":J", &value)) != ANI_OK) { + if ((status = env->Object_CallMethodByName_Long(object, "unboxed", ":l", &value)) != ANI_OK) { return false; } longValue = value; diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/utils/convert_utils.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/utils/convert_utils.cpp index 2fb9f82985d56e1aea079d45c3e159e07420e258..cb645fd92d6b95ac2f7b8be783bac1ba8f4decbe 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/utils/convert_utils.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/utils/convert_utils.cpp @@ -35,13 +35,13 @@ ani_long ConvertFromPixelMapAni(ani_env* env, [[maybe_unused]]ani_object aniClas ani_object ConvertToPixelMapAni(ani_env* env, [[maybe_unused]] ani_object aniClass, ani_long pixelMapPtr) { - static const char* className = "L@ohos/multimedia/image/image/PixelMapInner;"; + static const char* className = "@ohos.multimedia.image.image.PixelMapInner"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", "J:V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", "l:", &ctor)) { return nullptr; } ani_object aniValue; diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/web/web_module_methods.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/web/web_module_methods.cpp index 162eba6ca9c05cfe823de48cc3c90a059c1018a8..9867e16d0886686b0036dc7d036610277330ba1b 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/web/web_module_methods.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/web/web_module_methods.cpp @@ -44,7 +44,7 @@ static void GetCommonFunc(ani_vm* vm, ani_ref savePtr, ani_long nativePtr = 0; ani_env* envTemp = GetAniEnv(vm); if (!envTemp || envTemp->Object_CallMethodByName_Long( - reinterpret_cast(object), "innerGetThisVar", ":J", &nativePtr) != ANI_OK) { + reinterpret_cast(object), "innerGetThisVar", ":l", &nativePtr) != ANI_OK) { return 0; } return static_cast(nativePtr); @@ -76,7 +76,7 @@ void SetWebOptions(ani_env* env, ani_class aniClass, ani_long node, ani_object o auto setWebIdFunc = [vm, object = savePtr](int32_t nwebId) { ani_env* envTemp = GetAniEnv(vm); if (!envTemp || envTemp->Object_CallMethodByName_Void( - reinterpret_cast(object), "_setNWebId", "I:V", static_cast(nwebId)) != ANI_OK) { + reinterpret_cast(object), "_setNWebId", "i:", static_cast(nwebId)) != ANI_OK) { return; } }; @@ -88,7 +88,7 @@ void SetWebOptions(ani_env* env, ani_class aniClass, ani_long node, ani_object o } if (envTemp->String_NewUTF8(hapPath.c_str(), hapPath.size(), &aniHapPath) != ANI_OK || envTemp->Object_CallMethodByName_Void( - reinterpret_cast(object), "_setHapPath", "Lstd/core/String;:V", aniHapPath) != ANI_OK) { + reinterpret_cast(object), "_setHapPath", "C{std.core.String}:", aniHapPath) != ANI_OK) { envTemp->GlobalReference_Delete(object); return; } @@ -124,7 +124,7 @@ void SetWebControllerControllerHandler(ani_env* env, ani_class aniClass, ani_lon ani_int nwebId; ani_env* envTemp = GetAniEnv(vm); if (!envTemp || envTemp->Object_CallMethodByName_Int( - reinterpret_cast(object), "getWebId", ":I", &nwebId) != ANI_OK) { + reinterpret_cast(object), "getWebId", ":i", &nwebId) != ANI_OK) { return -1; } return static_cast(nwebId); @@ -135,7 +135,7 @@ void SetWebControllerControllerHandler(ani_env* env, ani_class aniClass, ani_lon return; } envTemp->Object_CallMethodByName_Void( - reinterpret_cast(object), "innerCompleteWindowNew", "I:V", static_cast(parentId)); + reinterpret_cast(object), "innerCompleteWindowNew", "i:", static_cast(parentId)); }; std::function getNativePtrFunc = nullptr; std::function releaseRefFunc = nullptr; diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/xcomponent/xcomponent_module_methods.cpp b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/xcomponent/xcomponent_module_methods.cpp index d4081d4718f75f23cb2d06980402520d8cf1ff67..a80d0f7447fb94d21edb538efbc19f0e006a246e 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/xcomponent/xcomponent_module_methods.cpp +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/ani/native/xcomponent/xcomponent_module_methods.cpp @@ -44,13 +44,13 @@ ani_string CreateSurfaceIdAni(ani_env* env, const std::string& surfaceId) ani_object CreateSurfaceRectAni(ani_env* env, float width, float height, float offsetX, float offsetY) { CHECK_NULL_RETURN(env, nullptr); - static const char* className = "Larkui/component/xcomponent/SurfaceRectAniInternal;"; + static const char* className = "arkui.component.xcomponent.SurfaceRectAniInternal"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", "DDDD:V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", "dddd:", &ctor)) { return nullptr; } ani_object surfaceRectRef; diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/interop/src/cpp/ani/convertors-ani.h b/frameworks/bridge/arkts_frontend/koala_mirror/interop/src/cpp/ani/convertors-ani.h index 5aab1c70b09d2880dbebb3afea550c36e7c2573f..685392ae6caa3bde2664da1d984eecbfc4d6f38a 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/interop/src/cpp/ani/convertors-ani.h +++ b/frameworks/bridge/arkts_frontend/koala_mirror/interop/src/cpp/ani/convertors-ani.h @@ -427,7 +427,7 @@ public: } #define KOALA_ANI_INTEROP_MODULE_CLASSPATH(module, classpath) \ static void __init_classpath_##module() { \ - AniExports::getInstance()->setClasspath(KOALA_QUOTE(module), "L" classpath ";"); \ + AniExports::getInstance()->setClasspath(KOALA_QUOTE(module), classpath); \ } \ namespace { \ struct __Init_classpath_##module { \ @@ -443,7 +443,7 @@ public: #define KOALA_ANI_INTEROP_MODULE_CLASSPATH(module, classpath) \ __attribute__((constructor)) \ static void __init_ani_classpath_##module() { \ - AniExports::getInstance()->setClasspath(KOALA_QUOTE(module), "L" classpath ";"); \ + AniExports::getInstance()->setClasspath(KOALA_QUOTE(module), classpath); \ } #endif diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/animation/animation_ani_impl.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/animation/animation_ani_impl.cpp index 3b92b222d71aa9c3deb265a58239085d7bb52bf3..b4c7569c34d1e9b99f119a5991b92212ef122e74 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/animation/animation_ani_impl.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/animation/animation_ani_impl.cpp @@ -60,7 +60,7 @@ AnimatableExtendPropertyType GetPropertyType(ani_env* env, ani_object property) } ani_class arithmeticClass {}; ani_boolean isArithmetic = ANI_FALSE; - if ((status = env->FindClass("Larkui/component/common/AnimatableArithmetic;", &arithmeticClass)) != ANI_OK) { + if ((status = env->FindClass("arkui.component.common.AnimatableArithmetic", &arithmeticClass)) != ANI_OK) { HILOGW("cannot find AnimatableArithmetic class, errorCode:%{public}d", status); return AnimatableExtendPropertyType::UNKNOWN; } @@ -212,7 +212,7 @@ bool ParseCurveObject(ani_env* env, ani_ref curveRef, ArkUIAniUnionCurveStringIC } // for Curve enum ani_enum curveEnum {}; - if ((status = env->FindEnum("L@ohos/curves/curves/Curve;", &curveEnum)) != ANI_OK) { + if ((status = env->FindEnum("@ohos.curves.curves.Curve", &curveEnum)) != ANI_OK) { HILOGW("GetCurve enum class error, status:%{public}d", status); return false; } @@ -302,7 +302,7 @@ bool GetRouteTypeEnum(ani_env* env, ArkUIAniRouteType type, ani_enum_item& item) } ani_enum enumType; ani_status status; - if ((status = env->FindEnum("Larkui/component/pageTransition/RouteType;", &enumType)) != ANI_OK) { + if ((status = env->FindEnum("arkui.component.pageTransition.RouteType", &enumType)) != ANI_OK) { HILOGW("find routeType class error, status:%{public}d", status); return false; } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/canvas/canvas_module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/canvas/canvas_module.cpp index f1b5257f9f05d24ff2774243172d0d11b5926064..04d5d5a80c5bf750a01be0d2e8a318cc73cc40a9 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/canvas/canvas_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/canvas/canvas_module.cpp @@ -173,13 +173,13 @@ ani_object CanvasModule::GetImageData(ani_env* env, [[maybe_unused]] ani_object return nullptr; } canvasModifier->getImageData(peer, imageData, sx * density, sy * density, sw * density, sh * density); - static const char* className = "Lescompat/Uint8ClampedArray;"; + static const char* className = "escompat.Uint8ClampedArray"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", "Lstd/core/Object;:V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", "C{std.core.Object}:", &ctor)) { return nullptr; } ani_object aniValue; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/common/common_module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/common/common_module.cpp index 6cec9f0ff5214442bc32767921d497cb323bb9e4..4d3979f7365a62c74d655d5fd4515a8fed0d3326 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/common/common_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/common/common_module.cpp @@ -145,12 +145,12 @@ ani_object CreateSizeObject(ani_env* env, const NG::DrawingContext& context) { ani_status status; ani_class sizeClass; - if ((status = env->FindClass("Larkui/Graphics/SizeInternal;", &sizeClass)) != ANI_OK) { + if ((status = env->FindClass("arkui.Graphics.SizeInternal", &sizeClass)) != ANI_OK) { HILOGE("FindClass Size failed, %{public}d", status); return nullptr; } ani_method sizeCtor; - if ((status = env->Class_FindMethod(sizeClass, "", "DD:V", &sizeCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(sizeClass, "", "dd:", &sizeCtor)) != ANI_OK) { HILOGE("Class_FindMethod sizeClass ctor failed, %{public}d", status); return nullptr; } @@ -172,12 +172,12 @@ ani_object CreateSizeInPixelObject(ani_env* env, const NG::DrawingContext& conte { ani_status status; ani_class sizeInPixelClass; - if ((status = env->FindClass("Larkui/Graphics/SizeInternal;", &sizeInPixelClass)) != ANI_OK) { + if ((status = env->FindClass("arkui.Graphics.SizeInternal", &sizeInPixelClass)) != ANI_OK) { HILOGE("FindClass Size failed, %{public}d", status); return nullptr; } ani_method sizeInPixelCtor; - if ((status = env->Class_FindMethod(sizeInPixelClass, "", "DD:V", &sizeInPixelCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(sizeInPixelClass, "", "dd:", &sizeInPixelCtor)) != ANI_OK) { HILOGE("Class_FindMethod sizeInPixelClass ctor failed, %{public}d", status); return nullptr; } @@ -199,12 +199,12 @@ ani_object CreateDrawingContext(ani_env* env, const NG::DrawingContext& context) // DrawContext object ani_class drawContextClass; - if ((status = env->FindClass("Larkui/Graphics/DrawContext;", &drawContextClass)) != ANI_OK) { + if ((status = env->FindClass("arkui.Graphics.DrawContext", &drawContextClass)) != ANI_OK) { HILOGE("FindClass DrawContext failed, %{public}d", status); return nullptr; } ani_method drawContextCtor; - if ((status = env->Class_FindMethod(drawContextClass, "", ":V", &drawContextCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(drawContextClass, "", ":", &drawContextCtor)) != ANI_OK) { HILOGE("Class_FindMethod drawContextClass ctor failed, %{public}d", status); return nullptr; } @@ -309,7 +309,7 @@ std::function ConvertFnObjDrawBehindFu return; } env->Object_CallMethodByName_Void(reinterpret_cast(object), "drawBehind", - "Larkui/Graphics/DrawContext;:V", drawingContext); + "C{arkui.Graphics.DrawContext}:", drawingContext); std::vector params = {}; ani_ref ret = nullptr; callbackAni->Call(env, params.size(), params.data(), &ret); @@ -334,7 +334,7 @@ std::function ConvertFnObjDrawContentF return; } env->Object_CallMethodByName_Void(reinterpret_cast(object), "drawContent", - "Larkui/Graphics/DrawContext;:V", drawingContext); + "C{arkui.Graphics.DrawContext}:", drawingContext); std::vector params = {}; ani_ref ret = nullptr; callbackAni->Call(env, params.size(), params.data(), &ret); @@ -360,7 +360,7 @@ std::function ConvertFnObjDrawFrontFun } env->Object_CallMethodByName_Void( reinterpret_cast(object), "drawFront", - "Larkui/Graphics/DrawContext;:V", drawingContext); + "C{arkui.Graphics.DrawContext}:", drawingContext); std::vector params = {}; ani_ref ret = nullptr; callbackAni->Call(env, params.size(), params.data(), &ret); @@ -789,7 +789,7 @@ ani_string GetCustomProperty( void GetAlignmentEnum(ani_env* env, ani_object align, AniOverlayOptions& opt) { ani_enum enumType; - if (ANI_OK != env->FindEnum("Larkui/component/enums/Alignment;", &enumType)) { + if (ANI_OK != env->FindEnum("arkui.component.enums.Alignment", &enumType)) { return; } @@ -831,13 +831,13 @@ void ParseOverlayOptions(ani_env* env, ani_object options, AniOverlayOptions& op ani_ref x; if (ANI_OK == env->Object_GetPropertyByName_Ref(offset, "x", &x)) { ani_double param_value; - env->Object_CallMethodByName_Double(static_cast(x), "unboxed", ":D", ¶m_value); + env->Object_CallMethodByName_Double(static_cast(x), "unboxed", ":d", ¶m_value); opt.x = static_cast(param_value); } ani_ref y; if (ANI_OK == env->Object_GetPropertyByName_Ref(offset, "y", &y)) { ani_double param_value; - env->Object_CallMethodByName_Double(static_cast(y), "unboxed", ":D", ¶m_value); + env->Object_CallMethodByName_Double(static_cast(y), "unboxed", ":d", ¶m_value); opt.y = static_cast(param_value); } } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/componentSnapshot/componentSnapshot_module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/componentSnapshot/componentSnapshot_module.cpp index 3b5235a879234bbb63ffac2d8b3b4097b51afa08..fd225b68257b9d7ddf0a4b71b791cba9f0b17607 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/componentSnapshot/componentSnapshot_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/componentSnapshot/componentSnapshot_module.cpp @@ -37,7 +37,7 @@ static bool GetOptionsScale(ani_env* env, ani_object options, float& value) return false; } ani_class optionsClass; - if (ANI_OK != env->FindClass("L@ohos/arkui/componentSnapshot/componentSnapshot/SnapshotOptions;", &optionsClass)) { + if (ANI_OK != env->FindClass("@ohos.arkui.componentSnapshot.componentSnapshot.SnapshotOptions", &optionsClass)) { return false; } ani_boolean isOptions; @@ -79,7 +79,7 @@ static bool GetOptionsWaitUntilRenderFinished(ani_env* env, ani_object options, } ani_class optionsClass; - if (ANI_OK != env->FindClass("L@ohos/arkui/componentSnapshot/componentSnapshot/SnapshotOptions;", &optionsClass)) { + if (ANI_OK != env->FindClass("@ohos.arkui.componentSnapshot.componentSnapshot.SnapshotOptions", &optionsClass)) { return false; } ani_boolean isOptions; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom/ani_measure_layout.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom/ani_measure_layout.cpp index 9ffb6518b57fc3743977c64698759bcb30ef3255..dfee4a782cb405a034e6a39b9d290f4894208d3f 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom/ani_measure_layout.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom/ani_measure_layout.cpp @@ -39,7 +39,7 @@ bool ParseAniDimension(ani_env* env, ani_object obj, CalcDimension& result, Dime } if (AniUtils::IsNumber(env, obj)) { ani_double param_value; - env->Object_CallMethodByName_Double(obj, "unboxed", ":D", ¶m_value); + env->Object_CallMethodByName_Double(obj, "unboxed", ":d", ¶m_value); result = CalcDimension(param_value, defaultUnit); return true; @@ -164,7 +164,7 @@ ani_object GenPlaceChildrenConstraintNG(ani_env* env, const NG::SizeF& size, Ref ani_object GenPadding(ani_env* env, const std::unique_ptr& paddingNative) { ani_object padding_obj; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/PaddingInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.PaddingInner"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; @@ -193,7 +193,7 @@ ani_object GenMargin(ani_env* env, const std::unique_ptr& m { ani_object margin_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MarginInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MarginInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -222,7 +222,7 @@ ani_object GenEdgeWidths(ani_env* env, const std::unique_ptrFindClass(className, &cls)) { return nullptr; } @@ -251,7 +251,7 @@ ani_object GenEdgesGlobalized(ani_env* env, const NG::PaddingPropertyT& e { ani_object edges_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/DirectionalEdgesTInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.DirectionalEdgesTInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -291,7 +291,7 @@ ani_object GenBorderWidthGlobalized(ani_env* env, const NG::BorderWidthPropertyT { ani_object edges_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/DirectionalEdgesTInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.DirectionalEdgesTInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -330,7 +330,7 @@ ani_object GenSelfLayoutInfo(ani_env* env, RefPtr layoutProp { ani_object selfLayoutInfo_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/GeometryInfoInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.GeometryInfoInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -401,7 +401,7 @@ void FillPlaceSizeProperty(ani_env* env, ani_object info, const NG::SizeF& size) { ani_object measureResult_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasureResultInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MeasureResultInner"; if (ANI_OK != env->FindClass(className, &cls)) { return; } @@ -427,7 +427,7 @@ ani_object GenMeasureResult(ani_env* env, const NG::SizeF& size) { ani_object measureResult_obj; ani_class cls; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasureResultInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MeasureResultInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -492,7 +492,7 @@ ani_object GenMeasurable(ani_env* env, NG::MeasureLayoutChild* child) { ani_class cls ; static const char *className = - "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasurableLayoutableInner;"; + "arkui.ani.arkts.ArkUIAniCustomNodeModule/MeasurableLayoutableInner"; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } @@ -573,7 +573,7 @@ void JSMeasureLayoutParamNG::Update(ani_env* env, NG::LayoutWrapper* layoutWrap } if (count < newCount) { ani_class childCls = nullptr; - static const char *className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasurableLayoutableInner;"; + static const char *className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MeasurableLayoutableInner"; if (ANI_OK != env->FindClass(className, &childCls)) { return; } @@ -786,7 +786,7 @@ ani_object ANIPlaceChildren(ani_env* env, ani_object aniClass, ani_object positi ani_status BindMeasurable(ani_env* env) { - static const char* className = "Larkui/ani/arkts/ArkUIAniCustomNodeModule/MeasurableLayoutableInner;"; + static const char* className = "arkui.ani.arkts.ArkUIAniCustomNodeModule.MeasurableLayoutableInner"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { return ANI_ERROR; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom/custom_node_module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom/custom_node_module.cpp index 24e65ab749675693f91e2af3a97fefad5353e55b..262d5a462f96fdf9a73c4acc657246e3415b4e55 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom/custom_node_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom/custom_node_module.cpp @@ -28,7 +28,7 @@ ani_status NativeCustomComponent::BindNativeCustomComponent(ani_env *env) { ani_class cls; static const char *className = - "Larkui/ani/arkts/ArkUIAniCustomNodeModule/ArkUIAniCustomNodeModule;"; + "arkui.ani.arkts.ArkUIAniCustomNodeModule.ArkUIAniCustomNodeModule"; auto ani_status = env->FindClass(className, &cls); if (ani_status != ANI_OK) { HILOGE("BindNativeCustomComponent FindClass failed, className: %{public}s", className); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom_node/custom_node_module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom_node/custom_node_module.cpp index 660f62199ad74f8b631a8c48a0f58e7fa6b46396..4cc4609837d2c9b96e9bd32ba432e778d73e2990 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom_node/custom_node_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/custom_node/custom_node_module.cpp @@ -45,7 +45,7 @@ ani_long ConstructCustomNode(ani_env* env, [[maybe_unused]] ani_object aniClass, env->Object_GetType(obj, &type); ani_method onPageShowMethod; - env->Class_FindMethod(static_cast(type), "onPageShow", ":V", &onPageShowMethod); + env->Class_FindMethod(static_cast(type), "onPageShow", ":", &onPageShowMethod); auto&& onPageShow = [vm, weakRef, onPageShowMethod]() { ani_env* env = nullptr; vm->GetEnv(ANI_VERSION_1, &env); @@ -59,7 +59,7 @@ ani_long ConstructCustomNode(ani_env* env, [[maybe_unused]] ani_object aniClass, }; ani_method onPageHideMethod; - env->Class_FindMethod(static_cast(type), "onPageHide", ":V", &onPageHideMethod); + env->Class_FindMethod(static_cast(type), "onPageHide", ":", &onPageHideMethod); auto&& onPageHide = [vm, weakRef, onPageHideMethod]() { ani_env* env = nullptr; vm->GetEnv(ANI_VERSION_1, &env); @@ -89,7 +89,7 @@ ani_long ConstructCustomNode(ani_env* env, [[maybe_unused]] ani_object aniClass, }; ani_method pageTransitionMethod; - env->Class_FindMethod(static_cast(type), "pageTransition", ":V", &pageTransitionMethod); + env->Class_FindMethod(static_cast(type), "pageTransition", ":", &pageTransitionMethod); auto pageTransition = [vm, weakRef, pageTransitionMethod]() { ani_env* env = nullptr; vm->GetEnv(ANI_VERSION_1, &env); @@ -120,7 +120,7 @@ ani_long ConstructCustomNode(ani_env* env, [[maybe_unused]] ani_object aniClass, }; ani_method onDumpInspectorMethod; - env->Class_FindMethod(static_cast(type), "onDumpInspector", ":Lstd/core/String;", + env->Class_FindMethod(static_cast(type), "onDumpInspector", ":C{std.core.String}", &onDumpInspectorMethod); auto onDumpInspector = [vm, weakRef, onDumpInspectorMethod]() { ani_env *env = nullptr; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/dragController/drag_controller_module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/dragController/drag_controller_module.cpp index 959bd064fc5c11c329b772de46e590c59d5ae562..a64f8df0bb1611b3df1a1244fbe8e88019166eb6 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/dragController/drag_controller_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/dragController/drag_controller_module.cpp @@ -76,7 +76,7 @@ public: return; } ani_method method; - if ((status = env->Class_FindMethod(cls, "", "J:V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "l:", &method)) != ANI_OK) { HILOGE("AceDrag, find constructor method failed. status = %{public}d", status); return; } @@ -266,7 +266,7 @@ ani_object CreateDragEventObject(ani_env* env, const ArkUIDragNotifyMessage& dra ani_object dragEventObj = {}; CHECK_NULL_RETURN(env, dragEventObj); ani_status status = ANI_OK; - static const char* className = "Larkui/component/common/DragEventInternal;"; + static const char* className = "arkui.component.common.DragEventInternal"; ani_class cls; if ((status = env->FindClass(className, &cls)) != ANI_OK) { HILOGE("AceDrag, find DragEventInner calss fail. status = %{public}d", status); @@ -274,7 +274,7 @@ ani_object CreateDragEventObject(ani_env* env, const ArkUIDragNotifyMessage& dra } ani_method ctor; - if ((status = env->Class_FindMethod(cls, "", ":V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &ctor)) != ANI_OK) { HILOGE("AceDrag, find constructor method fail. status = %{public}d", status); return dragEventObj; } @@ -458,7 +458,7 @@ bool ParseDragItemInfoParam(ani_env* env, ArkUIDragControllerAsync& asyncCtx, an HILOGE("AceDrag, get extraInfo failed."); return false; } - if (AniUtils::IsClassObject(env, extraInfoAni, "Lstd/core/String;")) { + if (AniUtils::IsClassObject(env, extraInfoAni, "std.core.String")) { std::string extraParamsStr = AniUtils::ANIStringToStdString(env, static_cast(extraInfoAni)); std::string extraInfoLimited = extraParamsStr.size() > EXTRA_INFO_MAX_LENGTH ? extraParamsStr.substr(0, EXTRA_INFO_MAX_LENGTH) @@ -568,8 +568,8 @@ bool CheckAndParseFirstParams(ani_env* env, ArkUIDragControllerAsync& asyncCtx, asyncCtx.customBuilderNode = builderNode; return true; } - if (AniUtils::IsClassObject(env, dragItemInfo, "Lescompat/Array;") || - AniUtils::IsClassObject(env, builderNodeArray, "Lescompat/Array;")) { + if (AniUtils::IsClassObject(env, dragItemInfo, "escompat.Array") || + AniUtils::IsClassObject(env, builderNodeArray, "escompat.Array")) { asyncCtx.isArray = true; HILOGI("AceDrag, drag controller is multi object drag."); return ParseDragItemListInfoParam(env, asyncCtx, dragItemInfo, builderNodeArray); @@ -612,17 +612,17 @@ std::optional ConvertDimensionType(ani_env* env, ani_ref touchPoint) return std::nullopt; } Dimension parameter; - if (AniUtils::IsClassObject(env, touchPoint, "Lstd/core/Numeric;")) { + if (AniUtils::IsClassObject(env, touchPoint, "std.core.Numeric")) { ani_double numberValue; if (ANI_OK != - env->Object_CallMethodByName_Double(static_cast(touchPoint), "unboxed", ":D", &numberValue)) { + env->Object_CallMethodByName_Double(static_cast(touchPoint), "unboxed", ":d", &numberValue)) { HILOGW("Failed to call unboxed method on Numeric object"); } parameter.SetValue(static_cast(numberValue)); parameter.SetUnit(DimensionUnit::VP); return parameter; } - if (AniUtils::IsClassObject(env, touchPoint, "Lstd/core/String;")) { + if (AniUtils::IsClassObject(env, touchPoint, "std.core.String")) { auto parameterStr = AniUtils::ANIStringToStdString(env, static_cast(touchPoint)); parameter = StringUtils::StringToDimensionWithUnit(parameterStr, DimensionUnit::VP); return parameter; @@ -663,7 +663,7 @@ bool CheckAndParseSecondParams(ani_env* env, ArkUIDragControllerAsync& asyncCtx, asyncCtx.dragPointerEvent.pointerId = static_cast(pointerIdAni); HILOGI("AceDrag, pointerId = %{public}d", asyncCtx.dragPointerEvent.pointerId); - if (AniUtils::IsClassObject(env, extraParamsAni, "Lstd/core/String;")) { + if (AniUtils::IsClassObject(env, extraParamsAni, "std.core.String")) { std::string extraParamsStr = AniUtils::ANIStringToStdString(env, static_cast(extraParamsAni)); std::string extraInfoLimited = extraParamsStr.size() > EXTRA_INFO_MAX_LENGTH ? extraParamsStr.substr(0, EXTRA_INFO_MAX_LENGTH) @@ -710,7 +710,7 @@ bool CheckAndParseSecondParams(ani_env* env, ArkUIDragControllerAsync& asyncCtx, bool CreateCallbackFunc( ani_env* env, ArkUIDragControllerAsync& asyncCtx, ani_object callback, ani_object& result) { - if (AniUtils::IsClassObject(env, callback, "Lstd/core/Function2;")) { + if (AniUtils::IsClassObject(env, callback, "std.core.Function2")) { HILOGI("AceDrag, Create async callback"); ani_ref fnObjGlobalRef = nullptr; if (ANI_OK != env->GlobalReference_Create(callback, &fnObjGlobalRef)) { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/dragController/drag_preview.h b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/dragController/drag_preview.h index 979d1ac99a6730666676ed80b0fff44f71c291ce..a351484255fc34d15b9b43c35e59b4ec1dde6942 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/dragController/drag_preview.h +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/dragController/drag_preview.h @@ -133,7 +133,7 @@ private: dragPreview->previewAsync_.previewAnimation.duration = DEFAULT_DURATION_VALUE; } else { if ((status = env->Object_CallMethodByName_Double( - static_cast(durationAni), "unboxed", ":D", &duration)) != ANI_OK) { + static_cast(durationAni), "unboxed", ":d", &duration)) != ANI_OK) { HILOGE("AceDrag, Object_CallMethodByName_Double failed. status = %{public}d", status); } else { if (GreatOrEqual(static_cast(duration), INT32_MAX)) { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/drag_and_drop/native_drag_drop_global.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/drag_and_drop/native_drag_drop_global.cpp index ac9d203d995a8c9b0d18df8d9213bfb9a8c5e5cb..23f35d141f4b97f3b3067202b17641a68a494e83 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/drag_and_drop/native_drag_drop_global.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/drag_and_drop/native_drag_drop_global.cpp @@ -74,7 +74,7 @@ ani_object DragEventGetData([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_ auto unifiedData_obj = OHOS::UDMF::AniConverter::WrapUnifiedData(env, unifiedData); ani_boolean isUnifiedData; ani_class dataClass; - env->FindClass("L@ohos/data/unifiedDataChannel/unifiedDataChannel/UnifiedData;", &dataClass); + env->FindClass("@ohos.data.unifiedDataChannel.unifiedDataChannel.UnifiedData", &dataClass); env->Object_InstanceOf(unifiedData_obj, dataClass, &isUnifiedData); if (!isUnifiedData) { return result_obj; @@ -101,7 +101,7 @@ ani_object DragEventGetSummary([[maybe_unused]] ani_env* env, [[maybe_unused]] a auto summary_obj = OHOS::UDMF::AniConverter::WrapSummary(env, summary); ani_boolean isSummary; ani_class summaryClass; - env->FindClass("L@ohos/data/unifiedDataChannel/unifiedDataChannel/Summary;", &summaryClass); + env->FindClass("@ohos.data.unifiedDataChannel.unifiedDataChannel.Summary", &summaryClass); env->Object_InstanceOf(summary_obj, summaryClass, &isSummary); if (!isSummary) { return result_obj; @@ -284,7 +284,7 @@ ani_object CreateImagePeer(ani_env* env, void* ptr) { CHECK_NULL_RETURN(env, nullptr); CHECK_NULL_RETURN(ptr, nullptr); - static const char* className = "Larkui/component/image/ImageUtils;"; + static const char* className = "arkui.component.image.ImageUtils"; ani_status status; ani_class cls; status = env->FindClass(className, &cls); @@ -294,7 +294,7 @@ ani_object CreateImagePeer(ani_env* env, void* ptr) } ani_ref imagePeer; status = env->Class_CallStaticMethodByName_Ref(cls, "createImagePeerFromPtr", - "J:Larkui/component/image/ArkImagePeer;", &imagePeer, reinterpret_cast(ptr)); + "l:C{arkui.component.image.ArkImagePeer}", &imagePeer, reinterpret_cast(ptr)); if (ANI_OK != status) { HILOGE("AceDrag: create ArkImagePeer failed status = %{public}d", static_cast(status)); return nullptr; @@ -305,7 +305,7 @@ ani_object CreateImagePeer(ani_env* env, void* ptr) ani_object CreateImageModifier(ani_env* env) { CHECK_NULL_RETURN(env, nullptr); - static const char* className = "Larkui/ImageModifier/ImageModifier;"; + static const char* className = "arkui.ImageModifier.ImageModifier"; ani_class cls; ani_status status = env->FindClass(className, &cls); if (ANI_OK != status) { @@ -313,7 +313,7 @@ ani_object CreateImageModifier(ani_env* env) return nullptr; } ani_method method; - status = env->Class_FindMethod(cls, "", ":V", &method); + status = env->Class_FindMethod(cls, "", ":", &method); if (ANI_OK != status) { HILOGE("AceDrag: Find ImageModifier constructor failed status = %{public}d", static_cast(status)); return nullptr; @@ -380,7 +380,7 @@ bool ParseDragPreviewMode(ani_env* env, ArkUIDragPreviewOption& previewOptions, return true; } bool isAuto = false; - if (AniUtils::IsClassObject(env, modeObj, "Lescompat/Array;")) { + if (AniUtils::IsClassObject(env, modeObj, "escompat.Array")) { ani_size length; ani_array arrayObj = static_cast(modeObj); if (ANI_OK != env->Array_GetLength(arrayObj, &length)) { @@ -390,7 +390,7 @@ bool ParseDragPreviewMode(ani_env* env, ArkUIDragPreviewOption& previewOptions, for (int32_t i = 0; i < lengthInt; i++) { ani_ref modeRef; if (ANI_OK != env->Object_CallMethodByName_Ref( - modeObj, "$_get", "I:Lstd/core/Object;", &modeRef, (ani_int)i)) { + modeObj, "$_get", "i:C{std.core.Object}", &modeRef, (ani_int)i)) { return false; } if (AniUtils::IsUndefined(env, static_cast(modeRef))) { @@ -423,12 +423,12 @@ bool ParseDragPreviewModifier(ani_env* env, ArkUIDragPreviewOption& previewOptio env->Object_GetType(modifier, &type); ani_method modifierFunc; if (ANI_OK != env->Class_FindMethod(static_cast(type), "applyModifierPatch", - "Larkui/component/image/ArkImagePeer;:V", &modifierFunc)) { + "C{arkui.component.image.ArkImagePeer}:", &modifierFunc)) { return false; } ani_method mergeFunc; if (ANI_OK != env->Class_FindMethod(static_cast(type), "mergeModifier", - "Larkui/ImageModifier/ImageModifier;:V", &mergeFunc)) { + "C{arkui.ImageModifier.ImageModifier}:", &mergeFunc)) { return false; } @@ -473,7 +473,7 @@ bool ParseNumberBadge(ani_env* env, ArkUIDragPreviewOption& previewOptions, ani_ if (AniUtils::IsUndefined(env, numberBadgeObj)) { return true; } - if (AniUtils::IsClassObject(env, numberBadgeObj, "Lstd/core/Boolean;")) { + if (AniUtils::IsClassObject(env, numberBadgeObj, "std.core.Boolean")) { previewOptions.isNumber = false; ani_boolean aniValue; if (ANI_OK == env->Object_CallMethodByName_Boolean(numberBadgeObj, "unboxed", nullptr, &aniValue)) { @@ -481,11 +481,11 @@ bool ParseNumberBadge(ani_env* env, ArkUIDragPreviewOption& previewOptions, ani_ } return true; } - if (!AniUtils::IsClassObject(env, numberBadgeObj, "Lstd/core/Numeric;")) { + if (!AniUtils::IsClassObject(env, numberBadgeObj, "std.core.Numeric")) { return false; } ani_double numberValue; - if ((ANI_OK != env->Object_CallMethodByName_Double(numberBadgeObj, "unboxed", ":D", &numberValue))) { + if ((ANI_OK != env->Object_CallMethodByName_Double(numberBadgeObj, "unboxed", ":d", &numberValue))) { return false; } auto number = static_cast(numberValue); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/module.cpp index 8e443d707c311d18677df7e08969adc68b61840a..b7eec2aad391e64f663d92974b688eee6250481e 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/module.cpp @@ -58,7 +58,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) } ani_class cls; - auto ani_status = env->FindClass("Larkui/ani/arkts/ArkUIAniModule/ArkUIAniModule;", &cls); + auto ani_status = env->FindClass("arkui.ani.arkts.ArkUIAniModule.ArkUIAniModule", &cls); if (ani_status != ANI_OK) { return ANI_ERROR; } @@ -96,12 +96,12 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_Web_SetWebOptions", - "JL@ohos/web/webview/webview/WebviewController;:V", + "lC{@ohos.web.webview.webview.WebviewController}:", reinterpret_cast(OHOS::Ace::Ani::SetWebOptions) }, ani_native_function { "_Web_SetWebController_ControllerHandler", - "JL@ohos/web/webview/webview/WebviewController;:V", + "lC{@ohos.web.webview.webview.WebviewController}:", reinterpret_cast(OHOS::Ace::Ani::SetWebControllerControllerHandler) }, ani_native_function { @@ -286,7 +286,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_ConvertUtils_ConvertFromPixelMapAni", - "L@ohos/multimedia/image/image/PixelMap;:J", + "C{@ohos.multimedia.image.image.PixelMap}:l", reinterpret_cast(OHOS::Ace::Ani::ConvertFromPixelMapAni) }, ani_native_function { @@ -321,7 +321,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_ConvertUtils_ConvertToPixelMapAni", - "J:L@ohos/multimedia/image/image/PixelMap;", + "l:C{@ohos.multimedia.image.image.PixelMap}", reinterpret_cast(OHOS::Ace::Ani::ConvertToPixelMapAni) }, ani_native_function { @@ -336,22 +336,22 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_Common_Sync_InstanceId", - "I:V", + "i:", reinterpret_cast(OHOS::Ace::Ani::SyncInstanceId) }, ani_native_function { "_Common_Restore_InstanceId", - ":V", + ":", reinterpret_cast(OHOS::Ace::Ani::RestoreInstanceId) }, ani_native_function { "_Common_Get_Current_InstanceId", - ":I", + ":i", reinterpret_cast(OHOS::Ace::Ani::GetCurrentInstanceId) }, ani_native_function { "_Common_GetFocused_InstanceId", - ":I", + ":i", reinterpret_cast(OHOS::Ace::Ani::GetFocusedInstanceId) }, ani_native_function { @@ -386,52 +386,52 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_CustomNode_Construct", - "ILarkui/ArkCustomComponent/ArkCustomComponent;:J", + "iC{arkui.ArkCustomComponent.ArkCustomComponent}:l", reinterpret_cast(OHOS::Ace::Ani::ConstructCustomNode) }, ani_native_function { "_CustomNode_RequestFrame", - ":V", + ":", reinterpret_cast(OHOS::Ace::Ani::RequestFrame) }, ani_native_function { "_LazyForEachNode_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ConstructLazyForEachNode) }, ani_native_function { "_BuilderProxyNode_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::BuilderProxyNodeConstruct) }, ani_native_function { "_ContentSlot_construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ContentSlotConstruct) }, ani_native_function { "_ContentSlotInterface_setContentSlotOptions", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::SetContentSlotOptions) }, ani_native_function { "_SetDrawCallback", - "JLstd/core/Function1;:V", + "lC{std.core.Function1}:", reinterpret_cast(OHOS::Ace::Ani::SetDrawCallback) }, ani_native_function { "_SetFrameNodeDrawCallback", - "JLstd/core/Function1;:V", + "lC{std.core.Function1}:", reinterpret_cast(OHOS::Ace::Ani::SetFrameNodeDrawCallback) }, ani_native_function { "_SetDrawModifier", - "JILarkui/component/common/DrawModifier;:V", + "liC{arkui.component.common.DrawModifier}:", reinterpret_cast(OHOS::Ace::Ani::SetDrawModifier) }, ani_native_function { "_Invalidate", - "J:V", + "l:", reinterpret_cast(OHOS::Ace::Ani::Invalidate) }, ani_native_function { @@ -441,47 +441,47 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_SetWaterFlowSection", - "JLarkui/component/waterFlow/WaterFlowSections;:V", + "lC{arkui.component.waterFlow.WaterFlowSections}:", reinterpret_cast(OHOS::Ace::Ani::SetWaterFlowSection) }, ani_native_function { "_SetWaterFlowFooterContent", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::SetWaterFlowFooterContent) }, ani_native_function { "_SetWaterFlowFooter", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::SetWaterFlowFooter) }, ani_native_function { "_SetWaterFlowScroller", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::SetWaterFlowScroller) }, ani_native_function { "_SetWaterFlowLayoutMode", - "JI:V", + "li:", reinterpret_cast(OHOS::Ace::Ani::SetWaterFlowLayoutMode) }, ani_native_function { "_SetListChildrenMainSize", - "JLarkui/component/common/ChildrenMainSize;:V", + "lC{arkui.component.common.ChildrenMainSize}:", reinterpret_cast(OHOS::Ace::Ani::SetListChildrenMainSize) }, ani_native_function { "_DragEvent_Set_Data", - "JL@ohos/data/unifiedDataChannel/unifiedDataChannel/UnifiedData;:V", + "lC{@ohos.data.unifiedDataChannel.unifiedDataChannel.UnifiedData}:", reinterpret_cast(OHOS::Ace::Ani::DragEventSetData) }, ani_native_function { "_DragEvent_Get_Data", - "J:L@ohos/data/unifiedDataChannel/unifiedDataChannel/UnifiedData;", + "l:C{@ohos.data.unifiedDataChannel.unifiedDataChannel.UnifiedData}", reinterpret_cast(OHOS::Ace::Ani::DragEventGetData) }, ani_native_function { "_DragEvent_Get_Summary", - "J:L@ohos/data/unifiedDataChannel/unifiedDataChannel/Summary;", + "l:C{@ohos.data.unifiedDataChannel.unifiedDataChannel.Summary}", reinterpret_cast(OHOS::Ace::Ani::DragEventGetSummary) }, ani_native_function { @@ -491,22 +491,22 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_DragEvent_Set_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::DragEventSetPixelMap) }, ani_native_function { "_DragEvent_Set_ExtraInfo", - "JLstd/core/String;:V", + "lC{std.core.String}:", reinterpret_cast(OHOS::Ace::Ani::DragEventSetExtraInfo) }, ani_native_function { "_DragEvent_Set_CustomNode", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::DragEventSetCustomNode) }, ani_native_function { "_Drag_Set_AllowDrop_Null", - "J:V", + "l:", reinterpret_cast(OHOS::Ace::Ani::DragSetAllowDropNull) }, ani_native_function { @@ -591,17 +591,17 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_CreateViewStackProcessor", - ":J", + ":l", reinterpret_cast(OHOS::Ace::Ani::CreateViewStackProcessor) }, ani_native_function { "_PopViewStackProcessor", - ":J", + ":l", reinterpret_cast(OHOS::Ace::Ani::PopViewStackProcessor) }, ani_native_function { "_DeleteViewStackProcessor", - "J:V", + "l:", reinterpret_cast(OHOS::Ace::Ani::DeleteViewStackProcessor) }, ani_native_function { @@ -681,12 +681,12 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_StyledString_SetPixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::StyledStringModule::SetPixelMap) }, ani_native_function { "_StyledString_GetPixelMap", - "J:L@ohos/multimedia/image/image/PixelMap;", + "l:C{@ohos.multimedia.image.image.PixelMap}", reinterpret_cast(OHOS::Ace::Ani::StyledStringModule::GetPixelMap) }, ani_native_function { @@ -696,12 +696,12 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_ImageSpan_Set_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::SetImageSpanPixelMap) }, ani_native_function { "_ImageSpan_SetAlt_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::SetImageSpanAltPixelMap) }, ani_native_function { @@ -716,37 +716,37 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_RequireArkoalaNodeId", - "I:I", + "i:i", reinterpret_cast(OHOS::Ace::Ani::RequireArkoalaNodeId) }, ani_native_function { "_Video_Transfer_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::SetVideoPixelMap) }, ani_native_function { "_Shape_Transfer_PixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::SetShapePixelMap) }, ani_native_function { "_RichEditor_Transfer_PixelMap", - "L@ohos/multimedia/image/image/PixelMap;:J", + "C{@ohos.multimedia.image.image.PixelMap}:l", reinterpret_cast(OHOS::Ace::Ani::RichEditorTransferPixelMap) }, ani_native_function { "_PersistentStorage_Get", - "Lstd/core/String;Lstd/core/Int;:Lstd/core/String;", + "C{std.core.String}C{std.core.Int}:C{std.core.String}", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Get) }, ani_native_function { "_PersistentStorage_Set", - "Lstd/core/String;Lstd/core/String;Lstd/core/Int;:V", + "C{std.core.String}C{std.core.String}C{std.core.Int}:", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Set) }, ani_native_function { "_PersistentStorage_Has", - "Lstd/core/String;Lstd/core/Int;:Z", + "C{std.core.String}C{std.core.Int}:z", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Has) }, ani_native_function { @@ -756,62 +756,62 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_PersistentStorage_Delete", - "Lstd/core/String;Lstd/core/Int;:V", + "C{std.core.String}C{std.core.Int}:", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Delete) }, ani_native_function { "_Env_GetColorMode", - ":I", + ":i", reinterpret_cast(OHOS::Ace::Ani::Env_GetColorMode) }, ani_native_function { "_Env_GetFontScale", - ":F", + ":f", reinterpret_cast(OHOS::Ace::Ani::Env_GetFontScale) }, ani_native_function { "_Env_GetFontWeightScale", - ":F", + ":f", reinterpret_cast(OHOS::Ace::Ani::Env_GetFontWeightScale) }, ani_native_function { "_Env_GetAccessibilityEnabled", - ":Z", + ":z", reinterpret_cast(OHOS::Ace::Ani::Env_GetAccessibilityEnabled) }, ani_native_function { "_Env_GetLayoutDirection", - ":Lstd/core/String;", + ":C{std.core.String}", reinterpret_cast(OHOS::Ace::Ani::Env_GetLayoutDirection) }, ani_native_function { "_Env_GetLanguageCode", - ":Lstd/core/String;", + ":C{std.core.String}", reinterpret_cast(OHOS::Ace::Ani::Env_GetLanguageCode) }, ani_native_function { "_XComponent_SetXComponentOptions", - "JLarkui/component/xcomponent/XComponentOptionsInternal;:V", + "lC{arkui.component.xcomponent.XComponentOptionsInternal}:", reinterpret_cast(OHOS::Ace::Ani::SetXComponentOptions) }, ani_native_function { "_XComponent_SetXComponentParameters", - "JLarkui/component/xcomponent/XComponentParametersInternal;:V", + "lC{arkui.component.xcomponent.XComponentParametersInternal}:", reinterpret_cast(OHOS::Ace::Ani::SetXComponentParameters) }, ani_native_function { "_XComponent_SetNativeXComponentParameters", - "JI:V", + "li:", reinterpret_cast(OHOS::Ace::Ani::SetNativeXComponentParameters) }, ani_native_function { "_RemoveComponent_FromFrameNode", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::RemoveComponentFromFrameNode) }, ani_native_function { "_AddComponent_ToFrameNode", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::AddComponentToFrameNode) }, @@ -829,12 +829,12 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) ani_native_function { "_CheckIsUIThread", - "I:I", + "i:i", reinterpret_cast(OHOS::Ace::Ani::CheckIsUIThread) }, ani_native_function { "_IsDebugMode", - "I:I", + "i:i", reinterpret_cast(OHOS::Ace::Ani::IsDebugMode) }, ani_native_function { @@ -849,7 +849,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_SetParallelScoped", - "Z:V", + "z:", reinterpret_cast(OHOS::Ace::Ani::SetParallelScoped) }, ani_native_function { @@ -997,74 +997,74 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) nullptr, reinterpret_cast(OHOS::Ace::Ani::GetHoverEventPointer) }, - ani_native_function { + ani_native_function { "_CanvasRenderer_SetPixelMap", - "JL@ohos/multimedia/image/image/PixelMap;:V", + "lC{@ohos.multimedia.image.image.PixelMap}:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::SetPixelMap) }, ani_native_function { "_CanvasRenderer_GetPixelMap", - "JDDDD:L@ohos/multimedia/image/image/PixelMap;", + "ldddd:C{@ohos.multimedia.image.image.PixelMap}", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::GetPixelMap) }, ani_native_function { "_CanvasRenderer_DrawPixelMap0", - "JL@ohos/multimedia/image/image/PixelMap;DD:V", + "lC{@ohos.multimedia.image.image.PixelMap}dd:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::DrawPixelMap0) }, ani_native_function { "_CanvasRenderer_DrawPixelMap1", - "JL@ohos/multimedia/image/image/PixelMap;DDDD:V", + "lC{@ohos.multimedia.image.image.PixelMap}dddd:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::DrawPixelMap1) }, ani_native_function { "_CanvasRenderer_DrawPixelMap2", - "JL@ohos/multimedia/image/image/PixelMap;DDDDDDDD:V", + "lC{@ohos.multimedia.image.image.PixelMap}dddddddd:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::DrawPixelMap2) }, ani_native_function { "_ImageBitmap_Construct0", - "Lstd/core/String;I:J", + "C{std.core.String}i:l", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::ImageBitmapConstruct0) }, ani_native_function { "_ImageBitmap_Construct1", - "L@ohos/multimedia/image/image/PixelMap;I:J", + "C{@ohos.multimedia.image.image.PixelMap}i:l", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::ImageBitmapConstruct1) }, ani_native_function { "_CanvasRenderer_GetCanvasDensity", - "J:D", + "l:d", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::GetCanvasDensity) }, ani_native_function { "_GetSystemDensity", - ":D", + ":d", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::GetSystemDensity) }, ani_native_function { "_CanvasRenderer_GetImageData", - "JDDDD:Lescompat/Uint8ClampedArray;", + "ldddd:C{escompat.Uint8ClampedArray}", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::GetImageData) }, ani_native_function { "_CanvasRenderer_PutImageData0", - "JLescompat/Uint8ClampedArray;DDII:V", + "lC{escompat.Uint8ClampedArray}ddii:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::PutImageData0) }, ani_native_function { "_CanvasRenderer_PutImageData1", - "JLescompat/Uint8ClampedArray;DDIIDDDD:V", + "lC{escompat.Uint8ClampedArray}ddiidddd:", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::PutImageData1) }, ani_native_function { "_DrawingRenderingContext_GetCanvas", - "J:L@ohos/graphics/drawing/drawing/Canvas;", + "l:C{@ohos.graphics.drawing.drawing.Canvas}", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::GetDrawingCanvas) }, ani_native_function { "_CanvasRenderingContext_GetCanvasId", - "J:I", + "l:i", reinterpret_cast(OHOS::Ace::Ani::CanvasModule::GetCanvasId) }, ani_native_function { @@ -1208,12 +1208,12 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_SyntaxItem_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ConstructSyntaxItem) }, ani_native_function { "_ForEachNode_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ConstructForEachNode) }, ani_native_function { diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/module_linux.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/module_linux.cpp index c5f77aa41bbfdedd0769c60d8f0cd5dff37cfeb2..893f7362c1303c9b178a9f8c464fad81197a612d 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/module_linux.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/module_linux.cpp @@ -40,7 +40,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) } ani_class cls; - auto ani_status = env->FindClass("Larkui/ani/arkts/ArkUIAniModule/ArkUIAniModule;", &cls); + auto ani_status = env->FindClass("arkui.ani.arkts.ArkUIAniModule.ArkUIAniModule", &cls); if (ani_status != ANI_OK) { return ANI_ERROR; } @@ -73,62 +73,62 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_Common_Sync_InstanceId", - "I:V", + "i:", reinterpret_cast(OHOS::Ace::Ani::SyncInstanceId) }, ani_native_function { "_Common_Restore_InstanceId", - ":V", + ":", reinterpret_cast(OHOS::Ace::Ani::RestoreInstanceId) }, ani_native_function { "_Common_Get_Current_InstanceId", - ":I", + ":i", reinterpret_cast(OHOS::Ace::Ani::GetCurrentInstanceId) }, ani_native_function { "_Common_GetFocused_InstanceId", - ":I", + ":i", reinterpret_cast(OHOS::Ace::Ani::GetFocusedInstanceId) }, ani_native_function { "_CustomNode_Construct", - "ILarkui/ArkCustomComponent/ArkCustomComponent;:J", + "iC{arkui.ArkCustomComponent.ArkCustomComponent}:l", reinterpret_cast(OHOS::Ace::Ani::ConstructCustomNode) }, ani_native_function { "_LazyForEachNode_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ConstructLazyForEachNode) }, ani_native_function { "_BuilderProxyNode_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::BuilderProxyNodeConstruct) }, ani_native_function { "_ContentSlot_construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ContentSlotConstruct) }, ani_native_function { "_ContentSlotInterface_setContentSlotOptions", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::SetContentSlotOptions) }, ani_native_function { "_SetDrawCallback", - "JLstd/core/Function1;:V", + "lC{std.core.Function1}:", reinterpret_cast(OHOS::Ace::Ani::SetDrawCallback) }, ani_native_function { "_SetDrawModifier", - "JILarkui/component/common/DrawModifier;:V", + "liC{arkui.component.common.DrawModifier}:", reinterpret_cast(OHOS::Ace::Ani::SetDrawModifier) }, ani_native_function { "_Invalidate", - "J:V", + "l:", reinterpret_cast(OHOS::Ace::Ani::Invalidate) }, ani_native_function { @@ -138,12 +138,12 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_SetWaterFlowSection", - "JLarkui/component/waterFlow/WaterFlowSections;:V", + "lC{arkui.component.waterFlow.WaterFlowSections}:", reinterpret_cast(OHOS::Ace::Ani::SetWaterFlowSection) }, ani_native_function { "_SetListChildrenMainSize", - "JLarkui/component/common/ChildrenMainSize;:V", + "lC{arkui.component.common.ChildrenMainSize}:", reinterpret_cast(OHOS::Ace::Ani::SetListChildrenMainSize) }, ani_native_function { @@ -158,17 +158,17 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_CreateViewStackProcessor", - ":J", + ":l", reinterpret_cast(OHOS::Ace::Ani::CreateViewStackProcessor) }, ani_native_function { "_PopViewStackProcessor", - ":J", + ":l", reinterpret_cast(OHOS::Ace::Ani::PopViewStackProcessor) }, ani_native_function { "_DeleteViewStackProcessor", - "J:V", + "l:", reinterpret_cast(OHOS::Ace::Ani::DeleteViewStackProcessor) }, ani_native_function { @@ -183,22 +183,22 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_RequireArkoalaNodeId", - "I:I", + "i:i", reinterpret_cast(OHOS::Ace::Ani::RequireArkoalaNodeId) }, ani_native_function { "_PersistentStorage_Get", - "Lstd/core/String;:Lstd/core/String;", + "C{std.core.String}:C{std.core.String}", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Get) }, ani_native_function { "_PersistentStorage_Set", - "Lstd/core/String;Lstd/core/String;:V", + "C{std.core.String}C{std.core.String}:", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Set) }, ani_native_function { "_PersistentStorage_Has", - "Lstd/core/String;:Z", + "C{std.core.String}:z", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Has) }, ani_native_function { @@ -208,72 +208,72 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_PersistentStorage_Delete", - "Lstd/core/String;:V", + "C{std.core.String}:", reinterpret_cast(OHOS::Ace::Ani::PersistentStorage_Delete) }, ani_native_function { "_Env_GetColorMode", - ":I", + ":i", reinterpret_cast(OHOS::Ace::Ani::Env_GetColorMode) }, ani_native_function { "_Env_GetFontScale", - ":F", + ":f", reinterpret_cast(OHOS::Ace::Ani::Env_GetFontScale) }, ani_native_function { "_Env_GetFontWeightScale", - ":F", + ":f", reinterpret_cast(OHOS::Ace::Ani::Env_GetFontWeightScale) }, ani_native_function { "_Env_GetAccessibilityEnabled", - ":Z", + ":z", reinterpret_cast(OHOS::Ace::Ani::Env_GetAccessibilityEnabled) }, ani_native_function { "_Env_GetLayoutDirection", - ":Lstd/core/String;", + ":C{std.core.String}", reinterpret_cast(OHOS::Ace::Ani::Env_GetLayoutDirection) }, ani_native_function { "_Env_GetLanguageCode", - ":Lstd/core/String;", + ":C{std.core.String}", reinterpret_cast(OHOS::Ace::Ani::Env_GetLanguageCode) }, ani_native_function { "_XComponent_SetXComponentOptions", - "JLarkui/component/xcomponent/XComponentOptionsInternal;:V", + "lC{arkui.component.xcomponent.XComponentOptionsInternal}:", reinterpret_cast(OHOS::Ace::Ani::SetXComponentOptions) }, ani_native_function { "_XComponent_SetXComponentParameters", - "JLarkui/component/xcomponent/XComponentParametersInternal;:V", + "lC{arkui.component.xcomponent.XComponentParametersInternal}:", reinterpret_cast(OHOS::Ace::Ani::SetXComponentParameters) }, ani_native_function { "_XComponent_SetNativeXComponentParameters", - "JI:V", + "li:", reinterpret_cast(OHOS::Ace::Ani::SetNativeXComponentParameters) }, ani_native_function { "_RemoveComponent_FromFrameNode", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::RemoveComponentFromFrameNode) }, ani_native_function { "_AddComponent_ToFrameNode", - "JJ:V", + "ll:", reinterpret_cast(OHOS::Ace::Ani::AddComponentToFrameNode) }, ani_native_function { "_CheckIsUIThread", - "I:I", + "i:i", reinterpret_cast(OHOS::Ace::Ani::CheckIsUIThread) }, ani_native_function { "_IsDebugMode", - "I:I", + "i:i", reinterpret_cast(OHOS::Ace::Ani::IsDebugMode) }, ani_native_function { @@ -288,7 +288,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_SetParallelScoped", - "Z:V", + "z:", reinterpret_cast(OHOS::Ace::Ani::SetParallelScoped) }, ani_native_function { @@ -338,12 +338,12 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) }, ani_native_function { "_SyntaxItem_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ConstructSyntaxItem) }, ani_native_function { "_ForEachNode_Construct", - "I:J", + "i:l", reinterpret_cast(OHOS::Ace::Ani::ConstructForEachNode) } }; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/search/search_module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/search/search_module.cpp index 0c7e0dc24863f981f51f66be888f96d3921d3749..f1908919bc8cfad07757f1f2041510ca20d9cf44 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/search/search_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/search/search_module.cpp @@ -31,7 +31,7 @@ void SetSearchIconSymbol(ani_env* env, [[maybe_unused]] ani_object obj, ani_long } ani_class cls; - static const char *className = "Larkui/SymbolGlyphModifier/SymbolGlyphModifier;"; + static const char *className = "arkui.SymbolGlyphModifier.SymbolGlyphModifier"; auto ani_status = env->FindClass(className, &cls); if (ani_status != ANI_OK) { HILOGE("SearchIcon findClass failed, className: %{public}s", className); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/ui_extension/native_dynamic_module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/ui_extension/native_dynamic_module.cpp index 1d7c749d2628b32ac27dc748a746267a1fcb9bcc..5f48cfcd7ac63832e303fce5a5a3cabfc9a036cf 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/ui_extension/native_dynamic_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/ui_extension/native_dynamic_module.cpp @@ -39,7 +39,7 @@ ani_status NativeDynamicModule::BindNativeDynamicComponent(ani_env *env) { ani_class cls; static const char *className = - "Larkui/ani/arkts/ui_extension/ArkUIAniDynamicModal/ArkUIAniDynamicModal;"; + "arkui.ani.arkts.ui_extension.ArkUIAniDynamicModal.ArkUIAniDynamicModal"; auto ani_status = env->FindClass(className, &cls); if (ani_status != ANI_OK) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_DYNAMIC_COMPONENT, @@ -80,7 +80,7 @@ ani_status NativeDynamicModule::SetDynamicOption( } std::string optionClassName = - "Larkui/ani/arkts/ui_extension/ArkUIAniDynamicModal/ArkUIAniDynamicOptions;"; + "arkui.ani.arkts.ui_extension.ArkUIAniDynamicModal.ArkUIAniDynamicOptions"; if (!AniUtils::CheckType(env, obj, optionClassName)) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_DYNAMIC_COMPONENT, "CheckType %{public}s failed when SetDynamicOption", diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/ui_extension/native_ui_extension.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/ui_extension/native_ui_extension.cpp index 1ed648b7339655a73159e045caa37c21afe168c8..7115dcf438956547be28368a00ed1f61c62053e9 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/ui_extension/native_ui_extension.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/ui_extension/native_ui_extension.cpp @@ -68,7 +68,7 @@ ani_status NativeUiExtension::BindNativeUiExtensionComponent(ani_env *env) { ani_class cls; static const char *className = - "Larkui/ani/arkts/ui_extension/ArkUIAniUiextensionModal/ArkUIAniUiextensionModal;"; + "arkui.ani.arkts.ui_extension.ArkUIAniUiextensionModal.ArkUIAniUiextensionModal"; auto ani_status = env->FindClass(className, &cls); if (ani_status != ANI_OK) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_UIEXTENSIONCOMPONENT, @@ -115,7 +115,7 @@ ani_status NativeUiExtension::BindNativeUiExtensionComponent(ani_env *env) ani_status NativeUiExtension::BindNativeUiExtensionProxy(ani_env *env) { static const char *className = - "Larkui/ani/arkts/ui_extension/ArkUIAniUiextensionModal/ArkUIAniUiextensionProxyModal;"; + "arkui.ani.arkts.ui_extension.ArkUIAniUiextensionModal.ArkUIAniUiextensionProxyModal"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_UIEXTENSIONCOMPONENT, @@ -150,7 +150,7 @@ ani_status NativeUiExtension::SetUiextensionOption( } std::string optionClassName = - "Larkui/ani/arkts/ui_extension/ArkUIAniUiextensionModal/ArkUIAniUIExtensionOptions;"; + "arkui.ani.arkts.ui_extension.ArkUIAniUiextensionModal.ArkUIAniUIExtensionOptions"; if (!AniUtils::CheckType(env, obj, optionClassName)) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_UIEXTENSIONCOMPONENT, "CheckType %{public}s failed when SetUiextensionOption", @@ -216,7 +216,7 @@ ani_status NativeUiExtension::SetUiextensionWant( } std::string wantClassName = - "L@ohos/app/ability/Want/Want;"; + "@ohos.app.ability.Want.Want"; if (!AniUtils::CheckType(env, obj, wantClassName)) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_UIEXTENSIONCOMPONENT, "CheckType failed when SetUiextensionWant"); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/utils/ani_utils.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/utils/ani_utils.cpp index cf8777633a04279ecbd9a930ee91873eba3570fd..19554a0d033e000a2f70ed044547eae092878749 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/utils/ani_utils.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/utils/ani_utils.cpp @@ -23,13 +23,13 @@ namespace OHOS::Ace::Ani { ani_object AniUtils::CreateDouble(ani_env *env, double value) { CHECK_NULL_RETURN(env, nullptr); - static const char *className = "Lstd/core/Double;"; + static const char *className = "std.core.Double"; ani_class persion_cls; if (ANI_OK != env->FindClass(className, &persion_cls)) { return nullptr; } ani_method infoCtor; - if (ANI_OK != env->Class_FindMethod(persion_cls, "", "D:V", &infoCtor)) { + if (ANI_OK != env->Class_FindMethod(persion_cls, "", "d:", &infoCtor)) { return nullptr; } ani_object personInfoObj; @@ -42,13 +42,13 @@ ani_object AniUtils::CreateDouble(ani_env *env, double value) ani_object AniUtils::CreateLong(ani_env *env, ani_long value) { CHECK_NULL_RETURN(env, nullptr); - static const char *className = "Lstd/core/Long;"; + static const char *className = "std.core.Long"; ani_class long_cls; if (ANI_OK != env->FindClass(className, &long_cls)) { return nullptr; } ani_method longCtor; - if (ANI_OK != env->Class_FindMethod(long_cls, "", "J:V", &longCtor)) { + if (ANI_OK != env->Class_FindMethod(long_cls, "", "l:", &longCtor)) { return nullptr; } ani_object longObj; @@ -150,7 +150,7 @@ bool AniUtils::IsString(ani_env* env, ani_object obj) { CHECK_NULL_RETURN(env, false); ani_class stringClass; - env->FindClass("Lstd/core/String;", &stringClass); + env->FindClass("std.core.String", &stringClass); ani_boolean isString; env->Object_InstanceOf(obj, stringClass, &isString); @@ -161,7 +161,7 @@ bool AniUtils::IsNumber(ani_env* env, ani_object obj) { CHECK_NULL_RETURN(env, false); ani_class numberClass; - env->FindClass("Lstd/core/Double;", &numberClass); + env->FindClass("std.core.Double", &numberClass); ani_boolean isNumber; env->Object_InstanceOf(obj, numberClass, &isNumber); @@ -171,7 +171,7 @@ bool AniUtils::IsNumber(ani_env* env, ani_object obj) bool AniUtils::IsFunction(ani_env* env, ani_object obj) { ani_class funcClass; - if ((ANI_OK != env->FindClass("Lstd/core/Function0;", &funcClass))) { + if ((ANI_OK != env->FindClass("std.core.Function0", &funcClass))) { return false; } ani_boolean result; @@ -229,11 +229,11 @@ ani_object WrapBusinessError(ani_env* env, const char *msg, ani_int code) return nullptr; } - if ((status = env->FindClass("Lescompat/Error;", &cls)) != ANI_OK) { + if ((status = env->FindClass("escompat.Error", &cls)) != ANI_OK) { return nullptr; } - if ((status = env->Class_FindMethod(cls, "", "DLstd/core/String;Lescompat/ErrorOptions;:V", &method)) != + if ((status = env->Class_FindMethod(cls, "", "dC{std.core.String}C{escompat.ErrorOptions}:", &method)) != ANI_OK) { return nullptr; } @@ -249,11 +249,11 @@ ani_ref AniUtils::CreateBusinessError(ani_env* env, const char *msg, ani_int cod { ani_class cls; ani_status status = ANI_OK; - if ((status = env->FindClass("L@ohos/base/BusinessError;", &cls)) != ANI_OK) { + if ((status = env->FindClass("C{@ohos.base.BusinessError}", &cls)) != ANI_OK) { return nullptr; } ani_method ctor; - if ((status = env->Class_FindMethod(cls, "", "ILescompat/Error;:V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "iC{escompat.Error}:", &ctor)) != ANI_OK) { return nullptr; } ani_object error = WrapBusinessError(env, msg, code); @@ -308,7 +308,7 @@ bool AniUtils::GetBigIntValue(ani_env* env, ani_object object, int64_t& longValu CHECK_NULL_RETURN(env, false); auto status = ANI_OK; ani_long value; - if ((status = env->Object_CallMethodByName_Long(object, "unboxed", ":J", &value)) != ANI_OK) { + if ((status = env->Object_CallMethodByName_Long(object, "unboxed", ":l", &value)) != ANI_OK) { return false; } longValue = value; @@ -349,14 +349,14 @@ bool AniUtils::GetOptionalDouble(ani_env* env, ani_ref value, double& result) ani_object AniUtils::CreateDoubleObject(ani_env* env, double value) { ani_status state; - static const char* className = "Lstd/core/Double;"; + static const char* className = "std.core.Double"; ani_class persion_cls; if ((state = env->FindClass(className, &persion_cls)) != ANI_OK) { HILOGE("FindClass std/core/Double failed, %{public}d", state); return nullptr; } ani_method personInfoCtor; - if ((state = env->Class_FindMethod(persion_cls, "", "D:V", &personInfoCtor)) != ANI_OK) { + if ((state = env->Class_FindMethod(persion_cls, "", "d:", &personInfoCtor)) != ANI_OK) { HILOGE("Class_FindMethod Double ctor failed, %{public}d", state); return nullptr; } @@ -388,12 +388,12 @@ int32_t AniUtils::CreateAniBoolean(ani_env* env, bool value, ani_object& result) { ani_status state; ani_class booleanClass; - if ((state = env->FindClass("Lstd/core/Boolean;", &booleanClass)) != ANI_OK) { + if ((state = env->FindClass("std.core.Boolean", &booleanClass)) != ANI_OK) { HILOGE("FindClass std/core/Boolean failed, %{public}d", state); return static_cast(state); } ani_method booleanClassCtor; - if ((state = env->Class_FindMethod(booleanClass, "", "Z:V", &booleanClassCtor)) != ANI_OK) { + if ((state = env->Class_FindMethod(booleanClass, "", "z:", &booleanClassCtor)) != ANI_OK) { HILOGE("Class_FindMethod Boolean ctor failed, %{public}d", state); return static_cast(state); } @@ -408,13 +408,14 @@ int32_t AniUtils::CreateAniBoolean(ani_env* env, bool value, ani_object& result) int32_t AniUtils::GetNearestNonBootRuntimeLinker(ani_env* env, ani_ref& result) { ani_module stdCoreModule; - auto state = env->FindModule("Lstd/core;", &stdCoreModule); + auto state = env->FindModule("std.core", &stdCoreModule); if (state != ANI_OK) { HILOGE("Find module core failed, %{public}d", state); return static_cast(state); } ani_function fn; - state = env->Module_FindFunction(stdCoreModule, "getNearestNonBootRuntimeLinker", ":Lstd/core/RuntimeLinker;", &fn); + state = + env->Module_FindFunction(stdCoreModule, "getNearestNonBootRuntimeLinker", ":C{std.core.RuntimeLinker}", &fn); if (state != ANI_OK) { HILOGE("Find function getNearestNonBootRuntimeLinker failed, %{public}d", state); return static_cast(state); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/water_flow/water_flow_module.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/water_flow/water_flow_module.cpp index b97dbf0ac9f5f3d305eb77078fdbcdd58a8228e9..3ca21caab7d3c10435457968ab7082fb93beb435 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/water_flow/water_flow_module.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/water_flow/water_flow_module.cpp @@ -226,7 +226,7 @@ void SetWaterFlowSection(ani_env* env, [[maybe_unused]] ani_object aniClass, ani } ani_class waterflowSections; - if (env->FindClass("Larkui/component/waterFlow/WaterFlowSections;", &waterflowSections) != ANI_OK) { + if (env->FindClass("arkui.component.waterFlow.WaterFlowSections", &waterflowSections) != ANI_OK) { return; } ani_boolean isSections; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/web/web_module_methods.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/web/web_module_methods.cpp index dd9e8d33f77fc385a23bd6bf9ab97c86c7aeb525..a6d72509ae91e6723cff3521e805d51bc7e1c5a9 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/web/web_module_methods.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/web/web_module_methods.cpp @@ -44,7 +44,7 @@ static void GetCommonFunc(ani_vm* vm, ani_ref savePtr, ani_long nativePtr = 0; ani_env* envTemp = GetAniEnv(vm); if (!envTemp || envTemp->Object_CallMethodByName_Long( - reinterpret_cast(object), "innerGetThisVar", ":J", &nativePtr) != ANI_OK) { + reinterpret_cast(object), "innerGetThisVar", ":l", &nativePtr) != ANI_OK) { return 0; } return static_cast(nativePtr); @@ -76,7 +76,7 @@ void SetWebOptions(ani_env* env, ani_class aniClass, ani_long node, ani_object o auto setWebIdFunc = [vm, object = savePtr](int32_t nwebId) { ani_env* envTemp = GetAniEnv(vm); if (!envTemp || envTemp->Object_CallMethodByName_Void( - reinterpret_cast(object), "_setNWebId", "I:V", static_cast(nwebId)) != ANI_OK) { + reinterpret_cast(object), "_setNWebId", "i:", static_cast(nwebId)) != ANI_OK) { return; } }; @@ -88,7 +88,7 @@ void SetWebOptions(ani_env* env, ani_class aniClass, ani_long node, ani_object o } if (envTemp->String_NewUTF8(hapPath.c_str(), hapPath.size(), &aniHapPath) != ANI_OK || envTemp->Object_CallMethodByName_Void( - reinterpret_cast(object), "_setHapPath", "Lstd/core/String;:V", aniHapPath) != ANI_OK) { + reinterpret_cast(object), "_setHapPath", "C{std.core.String}:", aniHapPath) != ANI_OK) { envTemp->GlobalReference_Delete(object); return; } @@ -124,7 +124,7 @@ void SetWebControllerControllerHandler(ani_env* env, ani_class aniClass, ani_lon ani_int nwebId; ani_env* envTemp = GetAniEnv(vm); if (!envTemp || envTemp->Object_CallMethodByName_Int( - reinterpret_cast(object), "innerGetWebId", ":I", &nwebId) != ANI_OK) { + reinterpret_cast(object), "innerGetWebId", ":i", &nwebId) != ANI_OK) { return -1; } return static_cast(nwebId); @@ -135,7 +135,7 @@ void SetWebControllerControllerHandler(ani_env* env, ani_class aniClass, ani_lon return; } envTemp->Object_CallMethodByName_Void( - reinterpret_cast(object), "innerCompleteWindowNew", "I:V", static_cast(parentId)); + reinterpret_cast(object), "innerCompleteWindowNew", "i:", static_cast(parentId)); }; std::function getNativePtrFunc = nullptr; std::function releaseRefFunc = nullptr; diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/xcomponent/xcomponent_module_methods.cpp b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/xcomponent/xcomponent_module_methods.cpp index f9ee98d605d45cf8170a517bf7c25289b4717238..1cdf289f42ef1a33ea402806da1af5fb352cc750 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/xcomponent/xcomponent_module_methods.cpp +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native/xcomponent/xcomponent_module_methods.cpp @@ -53,13 +53,13 @@ ani_string CreateSurfaceIdAni(ani_env* env, const std::string& surfaceId) ani_object CreateSurfaceRectAni(ani_env* env, float width, float height, float offsetX, float offsetY) { CHECK_NULL_RETURN(env, nullptr); - static const char* className = "Larkui/component/xcomponent/SurfaceRectAniInternal;"; + static const char* className = "arkui.component.xcomponent.SurfaceRectAniInternal"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { return nullptr; } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", "DDDD:V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", "dddd:", &ctor)) { return nullptr; } ani_object surfaceRectRef; @@ -230,7 +230,7 @@ void* GetControllerPeerPointer(ani_env* env, ani_object params) } ani_long controllerPtr; if (ANI_OK != env->Object_CallMethodByName_Long( - static_cast(controllerPtrRef), "longValue", ":J", &controllerPtr)) { + static_cast(controllerPtrRef), "longValue", ":l", &controllerPtr)) { return nullptr; } return reinterpret_cast(controllerPtr); @@ -271,7 +271,7 @@ void SetXComponentOptions(ani_env* env, [[maybe_unused]] ani_object aniClass, an if (!IsUndefined(env, screenIdRef)) { ani_long screenId; env->Object_CallMethodByName_Long( - static_cast(screenIdRef), "longValue", ":J", &screenId); + static_cast(screenIdRef), "longValue", ":l", &screenId); xcomponentModifier->setScreenId(arkNode, screenId); } } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/interop/src/cpp/ani/convertors-ani.h b/frameworks/bridge/arkts_frontend/koala_projects/interop/src/cpp/ani/convertors-ani.h index dc996bd8e180f27c51b036bf879c8812d7112aec..21211c2edd70ca684ebbe831aafb72d9540dcd0e 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/interop/src/cpp/ani/convertors-ani.h +++ b/frameworks/bridge/arkts_frontend/koala_projects/interop/src/cpp/ani/convertors-ani.h @@ -439,7 +439,7 @@ public: } #define KOALA_ANI_INTEROP_MODULE_CLASSPATH(module, classpath) \ static void __init_classpath_##module() { \ - AniExports::getInstance()->setClasspath(KOALA_QUOTE(module), "L" classpath ";"); \ + AniExports::getInstance()->setClasspath(KOALA_QUOTE(module), classpath); \ } \ namespace { \ struct __Init_classpath_##module { \ @@ -455,7 +455,7 @@ public: #define KOALA_ANI_INTEROP_MODULE_CLASSPATH(module, classpath) \ __attribute__((constructor)) \ static void __init_ani_classpath_##module() { \ - AniExports::getInstance()->setClasspath(KOALA_QUOTE(module), "L" classpath ";"); \ + AniExports::getInstance()->setClasspath(KOALA_QUOTE(module), classpath); \ } #endif diff --git a/interfaces/ets/ani/componentSnapshot/src/componentSnapshot.cpp b/interfaces/ets/ani/componentSnapshot/src/componentSnapshot.cpp index 88c25164c36971d06c4c21d83b59e5fa83ce7f1d..3660f77124a335cb9960cbb08cd29feea195df9e 100644 --- a/interfaces/ets/ani/componentSnapshot/src/componentSnapshot.cpp +++ b/interfaces/ets/ani/componentSnapshot/src/componentSnapshot.cpp @@ -81,7 +81,7 @@ static ani_ref CreateStsError(ani_env* env, ani_int code, const std::string& msg TAG_LOGE(OHOS::Ace::AceLogTag::ACE_COMPONENT_SNAPSHOT, "FindClass failed %{public}d", status); } ani_method ctor; - if ((status = env->Class_FindMethod(cls, "", "ILescompat/Error;:V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "iC{escompat.Error}:", &ctor)) != ANI_OK) { TAG_LOGE(OHOS::Ace::AceLogTag::ACE_COMPONENT_SNAPSHOT, "Class_FindMethod failed %{public}d", status); } ani_object error = WrapStsError(env, msg); diff --git a/interfaces/ets/ani/observer/src/observer.cpp b/interfaces/ets/ani/observer/src/observer.cpp index 591725af787eb9dbdef7438321dcf5ec3d0294f0..7be43f3111548193f4784ad8fcf441043b44876c 100644 --- a/interfaces/ets/ani/observer/src/observer.cpp +++ b/interfaces/ets/ani/observer/src/observer.cpp @@ -31,8 +31,8 @@ constexpr char ANI_NAVDESTINATION_STATE_TYPE[] = "@ohos.arkui.observer.uiObserve constexpr char ANI_NAVDESTINATION_MODE_TYPE[] = "arkui.component.navDestination.NavDestinationMode"; constexpr char NAVDESTINATION_UPDATE[] = "navDestinationUpdate"; constexpr char ROUTER_UPDATE[] = "routerPageUpdate"; -constexpr char ANI_ROUTER_INFO_CLS[] = "L@ohos/arkui/observer/uiObserver/RouterPageInfo;"; -constexpr char ANI_ROUTER_STATE_TYPE[] = "L@ohos/arkui/observer/uiObserver/RouterPageState;"; +constexpr char ANI_ROUTER_INFO_CLS[] = "@ohos.arkui.observer.uiObserver.RouterPageInfo"; +constexpr char ANI_ROUTER_STATE_TYPE[] = "@ohos.arkui.observer.uiObserver.RouterPageState"; constexpr char NAVDESTINATION_PARAM_WITHID[] = "C{std.core.String}C{@ohos.arkui.observer.uiObserver.NavDestinationSwitchObserverOptions}C{std.core.Object}:"; } // namespace @@ -637,10 +637,10 @@ public: env->Object_SetPropertyByName_Ref(res, "state", routerStateItem); ani_class uiContextUtil; - env->FindClass("Larkui/handwritten/UIContextUtil/UIContextUtil;", &uiContextUtil); + env->FindClass("arkui.handwritten.UIContextUtil.UIContextUtil", &uiContextUtil); ani_static_method getUiContext; env->Class_FindStaticMethod( - uiContextUtil, "getOrCreateUIContextById", "I:L@ohos/arkui/UIContext/UIContext;", &getUiContext); + uiContextUtil, "getOrCreateUIContextById", "i:C{@ohos.arkui.UIContext.UIContext}", &getUiContext); ani_int instanceId = Container::CurrentIdSafelyWithCheck(); ani_ref uiContext; env->Class_CallStaticMethod_Ref(uiContextUtil, getUiContext, &uiContext, instanceId); diff --git a/interfaces/ets/ani/promptaction/src/prompt_action_utils.cpp b/interfaces/ets/ani/promptaction/src/prompt_action_utils.cpp index 448849c1d782c6e937b2507d18de8becba676cec..b24b6849a01b43a8335dbb3b666dff0b3dc13ff7 100644 --- a/interfaces/ets/ani/promptaction/src/prompt_action_utils.cpp +++ b/interfaces/ets/ani/promptaction/src/prompt_action_utils.cpp @@ -61,13 +61,13 @@ ani_error GetErrorObject(ani_env *env, const std::string &errMsg, int32_t code) { CHECK_NULL_RETURN(env, nullptr); ani_class errClass; - ani_status status = env->FindClass("L@ohos/base/BusinessError;", &errClass); + ani_status status = env->FindClass("@ohos.base.BusinessError", &errClass); if (status != ANI_OK) { TAG_LOGE(AceLogTag::ACE_OVERLAY, "find class failed. status: %{public}d", status); return nullptr; } ani_method ctor; - status = env->Class_FindMethod(errClass, "", ":V", &ctor); + status = env->Class_FindMethod(errClass, "", ":", &ctor); if (status != ANI_OK) { TAG_LOGE(AceLogTag::ACE_OVERLAY, "cannot find constructor for class. status: %{public}d", status); return nullptr;