diff --git a/frameworks/ets/ani/include/sts_slot.h b/frameworks/ets/ani/include/sts_slot.h index 2c4da3de6ef8f6a2398637633471154a34ceb0b2..7552abfb7f6915be6e4afbe60d59a15870bdcabf 100644 --- a/frameworks/ets/ani/include/sts_slot.h +++ b/frameworks/ets/ani/include/sts_slot.h @@ -25,7 +25,7 @@ using SlotType = OHOS::Notification::NotificationConstant::SlotType; using SlotLevel = OHOS::Notification::NotificationSlot::NotificationLevel; using NotificationSlot = OHOS::Notification::NotificationSlot; -constexpr const char* NOTIFICATION_SOLT_CLASSNAME = "Lnotification/notificationSlot/NotificationSlotInner;"; +constexpr const char* NOTIFICATION_SOLT_CLASSNAME = "C{notification.notificationSlot.NotificationSlotInner}"; bool SetOptionalFieldSlotType(ani_env *env, const ani_class cls, ani_object &object, const std::string fieldName, const SlotType value); bool SetOptionalFieldSlotLevel(ani_env *env, const ani_class cls, ani_object &object, const std::string fieldName, @@ -40,4 +40,4 @@ bool UnwrapNotificationSlotArrayByAniObj(ani_env *env, ani_object notificationSl std::vector &slots); } // namespace NotificationSts } // OHOS -#endif \ No newline at end of file +#endif diff --git a/frameworks/ets/ani/src/manager/ani_manager.cpp b/frameworks/ets/ani/src/manager/ani_manager.cpp index 7cecd702155edb49de00b2480c098c4eb3328a38..7ca642f981aee367981dd411b8f2c789bc871796 100644 --- a/frameworks/ets/ani/src/manager/ani_manager.cpp +++ b/frameworks/ets/ani/src/manager/ani_manager.cpp @@ -77,7 +77,7 @@ static std::array kitManagerFunctions = { ani_native_function {"nativeSetNotificationEnable", nullptr, reinterpret_cast(AniSetNotificationEnable)}, ani_native_function {"nativeRequestEnableNotification", - "Lapplication/UIAbilityContext/UIAbilityContext;:Lstd/core/Promise;", + "C{application.UIAbilityContext.UIAbilityContext}:C{std.core.Promise}", reinterpret_cast(AniRequestEnableNotification)}, ani_native_function {"nativePublishAsBundle", nullptr, reinterpret_cast(AniPublishAsBundle)}, ani_native_function {"nativePublishAsBundleWithBundleOption", nullptr, @@ -96,12 +96,12 @@ static std::array kitManagerFunctions = { reinterpret_cast(AniIsSupportDoNotDisturbMode)}, ani_native_function {"nativeGetDoNotDisturbProfile", nullptr, reinterpret_cast(AniGetDoNotDisturbProfile)}, ani_native_function {"nativeOn", - "Lstd/core/String;" - "Lstd/core/Function1;" - "Lnotification/notificationRequest/NotificationCheckRequest;" - ":I", + "C{std.core.String}" + "C{std.core.Function1}" + "C{notification.notificationRequest.NotificationCheckRequest}" + ":i", reinterpret_cast(AniOn)}, - ani_native_function {"nativeOff", "Lstd/core/String;Lstd/core/Function1;:I", reinterpret_cast(AniOff)}, + ani_native_function {"nativeOff", "C{std.core.String}C{std.core.Function1}:i", reinterpret_cast(AniOff)}, ani_native_function {"nativeGetAllNotificationEnabledBundles", nullptr, reinterpret_cast(AniGetAllNotificationEnabledBundles)}, ani_native_function {"nativeIsNotificationEnabledSync", nullptr, @@ -133,7 +133,7 @@ static std::array kitManagerFunctions = { ani_native_function {"nativeGetSlotNumByBundle", nullptr, reinterpret_cast(AniGetSlotNumByBundle)}, ani_native_function {"nativeOpenNotificationSettings", - "Lapplication/UIAbilityContext/UIAbilityContext;:Lstd/core/Promise;", + "C{application.UIAbilityContext.UIAbilityContext}:C{std.core.Promise}", reinterpret_cast(AniOpenNotificationSettings)}, ani_native_function {"nativesetTargetDeviceStatus", nullptr, reinterpret_cast(AniSetTargetDeviceStatus)}, @@ -175,7 +175,7 @@ void AniNotificationManagerRegistryInit(ani_env *env) ANS_LOGD("ResetError failed"); } ani_namespace ns; - status = env->FindNamespace("L@ohos/notificationManager/notificationManager;", &ns); + status = env->FindNamespace("C{@ohos.notificationManager.notificationManager}", &ns); if (status != ANI_OK) { ANS_LOGE("FindNamespace notificationManager failed status : %{public}d", status); return; @@ -209,4 +209,4 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) ANS_LOGD("ANI_Constructor finish"); return ANI_OK; } -} \ No newline at end of file +} diff --git a/frameworks/ets/ani/src/sts_action_button.cpp b/frameworks/ets/ani/src/sts_action_button.cpp index 26968f75212054c1f282168c47704b7abc5b803d..8023433f37f77ca61b2b5e37d0ef7c40e2247fce 100644 --- a/frameworks/ets/ani/src/sts_action_button.cpp +++ b/frameworks/ets/ani/src/sts_action_button.cpp @@ -209,7 +209,7 @@ ani_object WrapNotificationActionButton(ani_env* env, ani_object iconButtonObject = nullptr; ani_class iconButtonCls = nullptr; if (!CreateClassObjByClassName(env, - "Lnotification/notificationActionButton/NotificationActionButtonInner;", iconButtonCls, iconButtonObject)) { + "C{notification.notificationActionButton.NotificationActionButtonInner}", iconButtonCls, iconButtonObject)) { ANS_LOGE("WrapNotificationActionButton : CreateClassObjByClassName failed"); return nullptr; } @@ -246,7 +246,7 @@ ani_status GetNotificationActionButtonArray(ani_env *env, ani_object param, for (int i = 0; i < static_cast(length); i++) { ani_ref buttonRef; if (ANI_OK != (status = env->Object_CallMethodByName_Ref(static_cast(arrayObj), - "$_get", "I:Lstd/core/Object;", &buttonRef, (ani_int)i))) { + "$_get", "i:C{std.core.Object}", &buttonRef, (ani_int)i))) { ANS_LOGE("GetActionButtonArray: get ref failed, status = %{public}d, index = %{public}d", status, i); return status; } @@ -287,7 +287,7 @@ ani_object GetAniArrayNotificationActionButton(ani_env* env, ANS_LOGE("GetAniArrayActionButton: item is nullptr"); return nullptr; } - if (ANI_OK != env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, item)) { + if (ANI_OK != env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, item)) { ANS_LOGE("GetAniArrayActionButton: Object_CallMethodByName_Void failed"); return nullptr; } @@ -297,4 +297,4 @@ ani_object GetAniArrayNotificationActionButton(ani_env* env, return arrayObj; } } -} \ No newline at end of file +} diff --git a/frameworks/ets/ani/src/sts_bundle_option.cpp b/frameworks/ets/ani/src/sts_bundle_option.cpp index edcf1645495710ae8de1fadee5032a3bfba7660f..64c93f13e31069d3fc25d6fb87d66c9db919c829 100644 --- a/frameworks/ets/ani/src/sts_bundle_option.cpp +++ b/frameworks/ets/ani/src/sts_bundle_option.cpp @@ -66,7 +66,7 @@ ani_object GetAniArrayBundleOption(ani_env* env, ANS_LOGE("GetAniArrayActionButton: item is nullptr"); return nullptr; } - if (ANI_OK != env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, item)) { + if (ANI_OK != env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, item)) { ANS_LOGE("GetAniArrayActionButton: Object_CallMethodByName_Void failed"); return nullptr; } @@ -95,7 +95,7 @@ bool UnwrapArrayBundleOption(ani_env *env, for (int32_t i = 0; i < static_cast(length); i++) { ani_ref optionRef; status = env->Object_CallMethodByName_Ref(static_cast(arrayObj), - "$_get", "I:Lstd/core/Object;", &optionRef, i); + "$_get", "i:C{std.core.Object}", &optionRef, i); if (status != ANI_OK) { ANS_LOGE("UnwrapArrayBundleOption: get bundleOptionRef failed, status = %{public}d", status); return false; @@ -120,7 +120,7 @@ bool WrapBundleOption(ani_env* env, } ani_class bundleCls = nullptr; if (!CreateClassObjByClassName(env, - "Lnotification/NotificationCommonDef/BundleOptionInner;", bundleCls, bundleObject) + "C{notification.NotificationCommonDef.BundleOptionInner}", bundleCls, bundleObject) || bundleCls == nullptr || bundleObject == nullptr) { ANS_LOGE("WrapBundleOption: create BundleOption failed"); return false; @@ -139,4 +139,4 @@ bool WrapBundleOption(ani_env* env, return true; } } -} \ No newline at end of file +} diff --git a/frameworks/ets/ani/src/sts_common.cpp b/frameworks/ets/ani/src/sts_common.cpp index a061a9efbe37163505dfbe397682c65b4be91ad6..8cfd2ca39e7df1844b68c38bf2672a47b008fab9 100644 --- a/frameworks/ets/ani/src/sts_common.cpp +++ b/frameworks/ets/ani/src/sts_common.cpp @@ -19,9 +19,9 @@ namespace OHOS { namespace NotificationSts { -constexpr const char* CLASSNAME_BOOLEAN = "Lstd/core/Boolean;"; -constexpr const char* CLASSNAME_DOUBLE = "Lstd/core/Double;"; -constexpr const char* CLASSNAME_INT = "Lstd/core/Int;"; +constexpr const char* CLASSNAME_BOOLEAN = "C{std.core.Boolean}"; +constexpr const char* CLASSNAME_DOUBLE = "C{std.core.Double}"; +constexpr const char* CLASSNAME_INT = "C{std.core.Int}"; std::string GetResizeStr(std::string instr, int32_t length) { return instr.length() <= length ? instr : instr.substr(0, length); @@ -92,7 +92,7 @@ bool GetStringArrayByAniObj(ani_env *env, const ani_object ani_obj, std::vector< for (int i = 0; i < int(length); i++) { ani_ref stringEntryRef; status = env->Object_CallMethodByName_Ref(ani_obj, - "$_get", "I:Lstd/core/Object;", &stringEntryRef, (ani_int)i); + "$_get", "i:C{std.core.Object}", &stringEntryRef, (ani_int)i); if (status != ANI_OK) { ANS_LOGE("status : %{public}d", status); return false; @@ -260,7 +260,7 @@ ani_status GetPropertyStringArray(ani_env *env, ani_object param, const char *na for (int i = 0; i < static_cast(length); i++) { ani_ref stringEntryRef; status = env->Object_CallMethodByName_Ref(static_cast(arrayObj), - "$_get", "I:Lstd/core/Object;", &stringEntryRef, (ani_int)i); + "$_get", "i:C{std.core.Object}", &stringEntryRef, (ani_int)i); if (status != ANI_OK) { ANS_LOGE("status : %{public}d, index: %{public}d", status, i); return status; @@ -296,7 +296,7 @@ ani_status GetPropertyNumberArray(ani_env *env, ani_object param, const char *na for (int i = 0; i < static_cast(length); i++) { ani_ref numEntryRef; status = env->Object_CallMethodByName_Ref(static_cast(arrayObj), - "$_get", "I:Lstd/core/Object;", &numEntryRef, (ani_int)i); + "$_get", "i:C{std.core.Object}", &numEntryRef, (ani_int)i); if (status != ANI_OK) { ANS_LOGI("status : %{public}d, index: %{public}d", status, i); return status; @@ -332,7 +332,7 @@ ani_object GetAniStringArrayByVectorString(ani_env *env, std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", + ani_status status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", i, aniStr); if (status != ANI_OK) { ANS_LOGE("Object_CallMethodByName_Void failed %{public}d", status); @@ -444,7 +444,7 @@ ani_object CreateBoolean(ani_env *env, bool value) return nullptr; } ani_method personInfoCtor; - if ((status = env->Class_FindMethod(persion_cls, "", "Z:V", &personInfoCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(persion_cls, "", "z:", &personInfoCtor)) != ANI_OK) { ANS_LOGE("status : %{public}d", status); return nullptr; } @@ -469,7 +469,7 @@ ani_object CreateDouble(ani_env *env, double value) return nullptr; } ani_method doubleCtor; - if ((status = env->Class_FindMethod(doubleCls, "", "D:V", &doubleCtor)) != ANI_OK) { + if ((status = env->Class_FindMethod(doubleCls, "", "d:", &doubleCtor)) != ANI_OK) { ANS_LOGE("status : %{public}d", status); return nullptr; } @@ -489,12 +489,12 @@ ani_object newArrayClass(ani_env *env, int length) return nullptr; } ani_class arrayCls = nullptr; - if (ANI_OK != env->FindClass("Lescompat/Array;", &arrayCls)) { - ANS_LOGE("FindClass Lescompat/Array; Failed"); + if (ANI_OK != env->FindClass("C{escompat.Array}", &arrayCls)) { + ANS_LOGE("FindClass C{escompat.Array} Failed"); return nullptr; } ani_method arrayCtor; - if (ANI_OK != env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor)) { + if (ANI_OK != env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor)) { ANS_LOGE("Class_FindMethod Failed"); return nullptr; } @@ -516,7 +516,7 @@ ani_object newRecordClass(ani_env *env) } ani_status status = ANI_ERROR; ani_class recordCls; - if (ANI_OK != (status = env->FindClass("Lescompat/Record;", &recordCls))) { + if (ANI_OK != (status = env->FindClass("C{escompat.Record}", &recordCls))) { ANS_LOGE("newRecordClass fail, FindClass status = %{public}d", status); return nullptr; } @@ -550,7 +550,7 @@ ani_object ConvertArrayDoubleToAniObj(ani_env *env, const std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", i, intObj); + ani_status status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", i, intObj); if (status != ANI_OK) { ANS_LOGE("status : %{public}d", status); return nullptr; @@ -616,13 +616,13 @@ bool CreateDate(ani_env *env, int64_t time, ani_object &outObj) } ani_class cls; ani_status status; - if (ANI_OK != (status = env->FindClass("Lescompat/Date;", &cls))) { - ANS_LOGD("error. not find class name 'Lescompat/Date;'. status %{public}d", status); + if (ANI_OK != (status = env->FindClass("C{escompat.Date}", &cls))) { + ANS_LOGD("error. not find class name 'C{escompat.Date}'. status %{public}d", status); return false; } ani_method ctor; if (ANI_OK != (status = env->Class_FindMethod( - cls, "", "X{C{escompat.Date}C{std.core.Numeric}C{std.core.String}}:V", &ctor))) { + cls, "", "X{C{escompat.Date}C{std.core.Numeric}C{std.core.String}}:", &ctor))) { ANS_LOGD("error. not find method name ''. status %{public}d", status); return false; } @@ -647,7 +647,7 @@ ani_object CreateInt(ani_env *env, int32_t value) return nullptr; } ani_method ctor; - if ((status = env->Class_FindMethod(cls, "", "I:V", &ctor)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", "i:", &ctor)) != ANI_OK) { ANS_LOGE("Class_FindMethod '%{public}s' faild. status %{public}d", CLASSNAME_INT, status); return nullptr; } @@ -740,4 +740,4 @@ bool SetPropertyByRef(ani_env *env, ani_object object, const char *name, ani_ref } } // namespace NotificationSts -} // OHOS \ No newline at end of file +} // OHOS diff --git a/frameworks/ets/ani/src/sts_convert_other.cpp b/frameworks/ets/ani/src/sts_convert_other.cpp index f85af200b84a6ffc29b7f2a864ba8f943e344028..b92b2b7d467cfae7dd073036b3738c835482e6b0 100644 --- a/frameworks/ets/ani/src/sts_convert_other.cpp +++ b/frameworks/ets/ani/src/sts_convert_other.cpp @@ -128,7 +128,7 @@ ani_status GetPixelMapArrayByRef(ani_env *env, ani_ref param, std::vector(length); i++) { ani_ref pixelMapRef; status = env->Object_CallMethodByName_Ref(static_cast(param), - "$_get", "I:Lstd/core/Object;", &pixelMapRef, (ani_int)i); + "$_get", "i:C{std.core.Object}", &pixelMapRef, (ani_int)i); if (status != ANI_OK) { ANS_LOGE("GetPixelMapArrayByRef:status : %{public}d, index: %{public}d", status, i); pixelMaps.clear(); @@ -193,7 +193,7 @@ ani_status GetResourceArray(ani_env *env, for (int i = 0; i < static_cast(length); i++) { ani_ref iconRef; status = env->Object_CallMethodByName_Ref(static_cast(arrayObj), - "$_get", "I:Lstd/core/Object;", &iconRef, (ani_int)i); + "$_get", "i:C{std.core.Object}", &iconRef, (ani_int)i); if (status != ANI_OK) { res.clear(); ANS_LOGE("GetResourceArray: status = %{public}d, index = %{public}d", status, i); @@ -221,7 +221,7 @@ ani_status GetKeyString(ani_env *env, ani_object obj, int index, ani_string &str ani_status status = ANI_ERROR; ani_ref stringEntryRef; status = env->Object_CallMethodByName_Ref(obj, - "$_get", "I:Lstd/core/Object;", &stringEntryRef, (ani_int)index); + "$_get", "i:C{std.core.Object}", &stringEntryRef, (ani_int)index); if (status != ANI_OK) { ANS_LOGE("status : %{public}d, index: %{public}d", status, index); return status; @@ -308,7 +308,7 @@ ani_status GetMapOfPictureInfo(ani_env *env, ani_object obj, } ani_status status = ANI_ERROR; ani_class cls = nullptr; - if (ANI_OK != (status = env->FindClass("Lnotification/notificationContent/RecordTools;", &cls))) { + if (ANI_OK != (status = env->FindClass("C{notification.notificationContent.RecordTools}", &cls))) { ANS_LOGE("GetMapOfPictureInfo : FindClass status = %{public}d", status); return status; } @@ -349,7 +349,7 @@ ani_object GetAniResource(ani_env *env, const std::shared_ptrObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", + ani_status status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", i, pixelMapObject); if (status != ANI_OK) { ANS_LOGE("GetAniArrayPixelMap : Object_CallMethodByName_Void failed %{public}d", status); @@ -424,7 +424,7 @@ ani_object GetAniArrayResource(ani_env *env, ANS_LOGE("GetAniArrayResource : resourceObject is nullPtr"); return nullptr; } - ani_status status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", + ani_status status = env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", i, resourceObject); if (status != ANI_OK) { ANS_LOGE("GetAniArrayResource : Object_CallMethodByName_Void failed %{public}d", status); @@ -461,7 +461,7 @@ bool GetAniPictrueInfo(ani_env *env, std::mapObject_CallMethodByName_Void(pictureInfoObj, - "$_set", "Lstd/core/Object;Lstd/core/Object;:V", aniKey, aniPictrueArray)) { + "$_set", "C{std.core.Object}C{std.core.Object}:", aniKey, aniPictrueArray)) { ANS_LOGE("GetAniPictrueInfo : Object_CallMethodByName_Void failed"); return false; } @@ -494,12 +494,12 @@ ani_object GetAniWantAgentArray(ani_env *env, std::vectorFindClass("Lescompat/Array;", &arrayCls))) { + if (ANI_OK != (status = env->FindClass("C{escompat.Array}", &arrayCls))) { ANS_LOGE("GetAniWantAgentArray : FindClass status = %{public}d", status); return nullptr; } ani_method arrayCtor; - if (ANI_OK != (status = env->Class_FindMethod(arrayCls, "", "I:V", &arrayCtor))) { + if (ANI_OK != (status = env->Class_FindMethod(arrayCls, "", "i:", &arrayCtor))) { ANS_LOGE("GetAniWantAgentArray : Class_FindMethod status = %{public}d", status); return nullptr; } @@ -512,7 +512,7 @@ ani_object GetAniWantAgentArray(ani_env *env, std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, item)) { + || ANI_OK != env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, item)) { ANS_LOGE("GetAniWantAgentArray : set WantAgent failed"); return nullptr; } @@ -522,4 +522,4 @@ ani_object GetAniWantAgentArray(ani_env *env, std::vector(length); i++) { ani_ref optionRef; status = env->Object_CallMethodByName_Ref(arrayObj, "$_get", - "I:Lstd/core/Object;", &optionRef, (ani_int)i); + "i:C{std.core.Object}", &optionRef, (ani_int)i); if (status != ANI_OK) { ANS_LOGE("UnwrapArrayDoNotDisturbProfile: status : %{public}d, index: %{public}d", status, i); return false; @@ -113,7 +113,7 @@ bool WrapProfileTrustList(ani_env* env, sptr pr return false; } if (ANI_OK != (status = env->Object_CallMethodByName_Void(arrayObj, "$_set", - "ILstd/core/Object;:V", index, bundleObj))) { + "iC{std.core.Object}:", index, bundleObj))) { ANS_LOGE("WrapProfileTrustList set object faild. index %{public}d status %{public}d", index, status); return false; @@ -137,7 +137,7 @@ bool WrapDoNotDisturbProfile(ani_env* env, sptr ANS_LOGE("WrapDoNotDisturbProfile: Invalid input parameters"); return false; } - const char* className = "L@ohos/notificationManager/notificationManager/DoNotDisturbProfileInner;"; + const char* className = "C{@ohos.notificationManager.notificationManager.DoNotDisturbProfileInner}"; if (!CreateClassObjByClassName(env, className, cls, outObj) || outObj == nullptr) { ANS_LOGE("WrapDoNotDisturbProfile: Failed to create profile class object"); return false; @@ -158,4 +158,4 @@ bool WrapDoNotDisturbProfile(ani_env* env, sptr return true; } } // namespace NotificationSts -} // OHOS \ No newline at end of file +} // OHOS diff --git a/frameworks/ets/ani/src/sts_notification_content.cpp b/frameworks/ets/ani/src/sts_notification_content.cpp index 75118f8c260877572145a79a642204d4f89281aa..39123cb79ad680cceac50a325b696becce23e98c 100644 --- a/frameworks/ets/ani/src/sts_notification_content.cpp +++ b/frameworks/ets/ani/src/sts_notification_content.cpp @@ -99,7 +99,7 @@ bool LiveViewStatusCToEts(ani_env *env, LiveViewStatus liveViewStatus, ani_enum_ STSLiveViewStatus stsLiveViewStatus = STSLiveViewStatus::LIVE_VIEW_CREATE; if (!StsLiveViewStatusUtils::CToSts(liveViewStatus, stsLiveViewStatus) || !EnumConvertNativeToAni(env, - "Lnotification/notificationContent/#LiveViewStatus", stsLiveViewStatus, enumItem)) { + "C{notification.notificationContent.#LiveViewStatus}", stsLiveViewStatus, enumItem)) { ANS_LOGE("LiveViewStatusCToEts failed"); return false; } @@ -117,7 +117,7 @@ bool LiveViewTypesCToEts(ani_env *env, LiveViewTypes liveViewTypes, ani_enum_ite { ANS_LOGD("LiveViewTypesCToEts call"); return EnumConvertNativeToAni(env, - "Lnotification/notificationContent/#LiveViewTypes", liveViewTypes, enumItem); + "C{notification.notificationContent.#LiveViewTypes}", liveViewTypes, enumItem); } void UnWarpNotificationProgress(ani_env *env, ani_object obj, NotificationProgress ¬ificationProgress) @@ -161,7 +161,7 @@ bool WarpNotificationProgress(ani_env *env, const NotificationProgress &progress } ani_class progressClass = nullptr; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationProgressInner;", progressClass, progressObject) + "C{notification.notificationContent.NotificationProgressInner}", progressClass, progressObject) || progressObject == nullptr) { ANS_LOGE("WarpNotificationProgress: create class failed"); return false; @@ -232,7 +232,7 @@ bool WarpNotificationTime(ani_env *env, const NotificationTime &time, bool isIni } ani_class timeClass = nullptr; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationTimeInner;", timeClass, timeObject) + "C{notification.notificationContent.NotificationTimeInner}", timeClass, timeObject) || timeObject == nullptr) { ANS_LOGE("WarpNotificationTime: create class failed"); return false; @@ -333,7 +333,7 @@ ani_status GetIconButtonArray(ani_env *env, for (int i = 0; i < static_cast(length); i++) { ani_ref buttonRef; status = env->Object_CallMethodByName_Ref(static_cast(arrayObj), - "$_get", "I:Lstd/core/Object;", &buttonRef, (ani_int)i); + "$_get", "i:C{std.core.Object}", &buttonRef, (ani_int)i); if (status != ANI_OK) { ANS_LOGI("status : %{public}d, index: %{public}d", status, i); return status; @@ -400,7 +400,7 @@ bool WarpNotificationLocalLiveViewButton( } ani_class buttonClass = nullptr; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationButtonInner;", buttonClass, buttonObject) + "C{notification.notificationContent.NotificationButtonInner}", buttonClass, buttonObject) || buttonObject == nullptr) { ANS_LOGE("WarpNotificationLocalLiveViewButton: create class failed"); return false; @@ -573,7 +573,7 @@ ani_object WarpNotificationIconButton(ani_env *env, const NotificationIconButton ani_class iconButtonCls = nullptr; ani_object iconButtonObject = nullptr; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationIconButtonInner;", iconButtonCls, iconButtonObject) + "C{notification.notificationContent.NotificationIconButtonInner}", iconButtonCls, iconButtonObject) || iconButtonObject == nullptr) { ANS_LOGE("WarpNotificationIconButton: create class failed"); return nullptr; @@ -633,7 +633,7 @@ ani_object GetAniIconButtonArray(ani_env *env, const std::vectorObject_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, item)) { + if (ANI_OK != env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, item)) { ANS_LOGE("GetAniIconButtonArray: add item failed"); return nullptr; } @@ -652,7 +652,7 @@ bool WarpNotificationCapsule(ani_env *env, const NotificationCapsule &capsule, a } ani_class capsuleClass = nullptr; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationCapsuleInner;", capsuleClass, capsuleObject) + "C{notification.notificationContent.NotificationCapsuleInner}", capsuleClass, capsuleObject) || capsuleObject == nullptr) { ANS_LOGE("GetAniIconButtonArray: create class failed"); return false; @@ -1182,7 +1182,7 @@ bool SetNotificationNormalContent( ani_class contentCls; ani_object contentObj; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationBasicContentInner;", contentCls, contentObj) + "C{notification.notificationContent.NotificationBasicContentInner}", contentCls, contentObj) || contentCls == nullptr || contentObj == nullptr) { ANS_LOGE("SetNotificationNormalContent: create class failed"); return false; @@ -1214,7 +1214,7 @@ bool SetNotificationLongTextContent( ani_class contentCls; ani_object contentObj; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationLongTextContentInner;", contentCls, contentObj) + "C{notification.notificationContent.NotificationLongTextContentInner}", contentCls, contentObj) || contentObj == nullptr) { ANS_LOGE("SetNotificationLongTextContent: create class failed"); return false; @@ -1254,7 +1254,7 @@ bool SetNotificationPictureContent( ani_class contentCls; ani_object contentObj; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationPictureContentInner;", contentCls, contentObj) + "C{notification.notificationContent.NotificationPictureContentInner}", contentCls, contentObj) || contentObj == nullptr) { ANS_LOGE("SetNotificationPictureContent: create class failed"); return false; @@ -1292,7 +1292,7 @@ bool SetNotificationMultiLineContent( ani_class contentCls; ani_object contentObj; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationMultiLineContentInner;", contentCls, contentObj) + "C{notification.notificationContent.NotificationMultiLineContentInner}", contentCls, contentObj) || contentObj == nullptr) { ANS_LOGE("SetNotificationMultiLineContent: create class failed"); return false; @@ -1431,7 +1431,7 @@ bool SetNotificationLocalLiveViewContent( ani_class contentCls; ani_object contentObj; if (!CreateClassObjByClassName(env, - "Lnotification/notificationContent/NotificationSystemLiveViewContentInner;", contentCls, contentObj) + "C{notification.notificationContent.NotificationSystemLiveViewContentInner}", contentCls, contentObj) || contentObj == nullptr) { ANS_LOGE("SetNotificationMultiLineContent: create class failed"); return false; @@ -1509,7 +1509,7 @@ bool SetNotificationLiveViewContent( } ani_class contentCls; ani_object contentObj; - if (!CreateClassObjByClassName(env, "Lnotification/notificationContent/NotificationLiveViewContentInner;", + if (!CreateClassObjByClassName(env, "C{notification.notificationContent.NotificationLiveViewContentInner}", contentCls, contentObj) || contentObj == nullptr) { ANS_LOGE("SetNotificationLiveViewContent: create class failed"); return false; @@ -1529,7 +1529,7 @@ bool SetNotificationContent(ani_env* env, std::shared_ptr n return false; } ani_class ncCls; - if (!CreateClassObjByClassName(env, "Lnotification/notificationContent/NotificationContentInner;", + if (!CreateClassObjByClassName(env, "C{notification.notificationContent.NotificationContentInner}", ncCls, ncObj) || ncObj == nullptr) { ANS_LOGE("SetNotificationContent: create class failed"); return false; diff --git a/frameworks/ets/ani/src/sts_notification_flag.cpp b/frameworks/ets/ani/src/sts_notification_flag.cpp index ef7771fbd600ce262ffe4e62c5fb918533cef25d..74287f9bfa6f6f7611f0883db943dc2bcdad1ccc 100644 --- a/frameworks/ets/ani/src/sts_notification_flag.cpp +++ b/frameworks/ets/ani/src/sts_notification_flag.cpp @@ -27,7 +27,7 @@ bool WarpNotificationFlags(ani_env* env, const std::shared_ptr(flags->IsSoundEnabled()); ani_enum_item enumItem = nullptr; - if (!EnumConvertNativeToAni(env, "Lnotification/notificationFlags/NotificationFlagStatus;", + if (!EnumConvertNativeToAni(env, "C{notification.notificationFlags.NotificationFlagStatus}", soundEnabled, enumItem)) { ANS_LOGE("EnumConvertNativeToAni 'soundEnabled' faild"); return false; @@ -46,7 +46,7 @@ bool WarpNotificationFlags(ani_env* env, const std::shared_ptr(flags->IsVibrationEnabled()); - if (!EnumConvertNativeToAni(env, "Lnotification/notificationFlags/NotificationFlagStatus;", + if (!EnumConvertNativeToAni(env, "C{notification.notificationFlags.NotificationFlagStatus}", vibrationEnabled, enumItem)) { ANS_LOGE("EnumConvertNativeToAni 'vibrationEnabled' faild"); return false; @@ -63,4 +63,4 @@ bool WarpNotificationFlags(ani_env* env, const std::shared_ptr buttonO ani_object optObj = nullptr; ani_class optCls = nullptr; if (!CreateClassObjByClassName(env, - "L@ohos/notificationManager/notificationManager/ButtonOptionsInner;", optCls, optObj) || optObj == nullptr) { + "C{@ohos.notificationManager.notificationManager.ButtonOptionsInner}", optCls, optObj) || optObj == nullptr) { ANS_LOGE("WarpNotificationButtonOption: create class failed"); return nullptr; } @@ -537,13 +537,13 @@ bool WarpNotificationDoNotDisturbDate( } ani_class cls; ani_enum_item stsEnumValue; - const char *className = "L@ohos/notificationManager/notificationManager/DoNotDisturbDateInner;"; + const char *className = "C{@ohos.notificationManager.notificationManager.DoNotDisturbDateInner}"; if (!CreateClassObjByClassName(env, className, cls, outObj) || outObj == nullptr) { ANS_LOGE("WarpNotificationDoNotDisturbDate: create class faild"); return false; } if (!EnumConvertNativeToAni( - env, "L@ohos/notificationManager/notificationManager/DoNotDisturbType;", + env, "C{@ohos.notificationManager.notificationManager.DoNotDisturbType}", date->GetDoNotDisturbType(), stsEnumValue)) { ANS_LOGE("EnumConvert_NativeToSts faild"); return false; @@ -576,7 +576,7 @@ bool SetCheckInfoContentType(ani_env *env, ani_object &obj, const std::string &n ANS_LOGE("CToSts 'contentType' faild."); return false; } - if (!EnumConvertNativeToAni(env, "L@ohos/notificationManager/notificationManager/ContentType;", stsType, item)) { + if (!EnumConvertNativeToAni(env, "C{@ohos.notificationManager.notificationManager.ContentType}", stsType, item)) { ANS_LOGE("EnumConvertNativeToAni 'contentType' faild."); return false; } @@ -599,7 +599,7 @@ bool SetCheckInfoSlotType(ani_env *env, ani_object &obj, const std::string &name ANS_LOGE("CToSts 'slotType' faild."); return false; } - if (!EnumConvertNativeToAni(env, "L@ohos/notificationManager/notificationManager/SlotType;", stsType, item)) { + if (!EnumConvertNativeToAni(env, "C{@ohos.notificationManager.notificationManager.SlotType}", stsType, item)) { ANS_LOGE("EnumConvertNativeToAni 'slotType' faild."); return false; } @@ -701,7 +701,7 @@ bool WarpNotificationCheckInfo( return false; } if (!CreateClassObjByClassName( - env, "L@ohos/notificationManager/notificationManager/NotificationCheckInfoInner;", cls, obj)) { + env, "C{@ohos.notificationManager.notificationManager.NotificationCheckInfoInner}", cls, obj)) { ANS_LOGE("WarpNotificationCheckInfo create faild"); return false; } @@ -767,4 +767,4 @@ bool UnWarpNotificationDoNotDisturbDate( return true; } } // namespace NotificationSts -} // OHOS \ No newline at end of file +} // OHOS diff --git a/frameworks/ets/ani/src/sts_request.cpp b/frameworks/ets/ani/src/sts_request.cpp index ed343a70577483391da6f524c4f08835dc21c234..1c6ee7fc8c1345782032b235847dce201742841c 100644 --- a/frameworks/ets/ani/src/sts_request.cpp +++ b/frameworks/ets/ani/src/sts_request.cpp @@ -97,7 +97,7 @@ bool WarpNotificationUnifiedGroupInfo(ani_env* env, } ani_class groupInfoCls = nullptr; if ((!CreateClassObjByClassName(env, - "Lnotification/notificationRequest/UnifiedGroupInfoInner;", groupInfoCls, groupInfoObject)) + "C{notification.notificationRequest.UnifiedGroupInfoInner}", groupInfoCls, groupInfoObject)) || groupInfoCls == nullptr || groupInfoObject == nullptr) { ANS_LOGE("WarpNotificationUnifiedGroupInfo: create class failed"); return false; @@ -1112,7 +1112,7 @@ bool WarpNotificationRequest(ani_env *env, const OHOS::Notification::Notificatio return false; } if (!CreateClassObjByClassName(env, - "Lnotification/notificationRequest/NotificationRequestInner;", cls, outAniObj)) { + "C{notification.notificationRequest.NotificationRequestInner}", cls, outAniObj)) { ANS_LOGE("WarpNotificationRequest: create class failed"); return false; } @@ -1160,7 +1160,7 @@ ani_object GetAniNotificationRequestArray(ani_env *env, std::vectorObject_CallMethodByName_Void( - arrayObj, "$_set", "ILstd/core/Object;:V", index, requestObj)) { + arrayObj, "$_set", "iC{std.core.Object}:", index, requestObj)) { ANS_LOGE("Object_CallMethodByName_Void faild. index %{public}d", index); return nullptr; } @@ -1187,7 +1187,7 @@ ani_object GetAniNotificationRequestArrayByNotifocations(ani_env *env, std::vect return nullptr; } if (ANI_OK - != env->Object_CallMethodByName_Void(arrayObj, "$_set", "ILstd/core/Object;:V", index, requestObj)) { + != env->Object_CallMethodByName_Void(arrayObj, "$_set", "iC{std.core.Object}:", index, requestObj)) { ANS_LOGE("Object_CallMethodByName_Void faild. index %{public}d", index); return nullptr; } @@ -1317,4 +1317,4 @@ bool UnWarpNotificationFilter(ani_env *env, ani_object obj, LiveViewFilter& filt return true; } } // namespace NotificationSts -} // OHOS \ No newline at end of file +} // OHOS diff --git a/frameworks/ets/ani/src/sts_slot.cpp b/frameworks/ets/ani/src/sts_slot.cpp index 88af70b02bbc72c1645d8a28f39728aa6b152bba..f8c62bacfe930eb6f3d9da6c0c3a04ca456c02e9 100644 --- a/frameworks/ets/ani/src/sts_slot.cpp +++ b/frameworks/ets/ani/src/sts_slot.cpp @@ -203,7 +203,7 @@ bool WrapNotificationSlotArray(ani_env *env, const std::vectorObject_CallMethodByName_Void(outAniObj, "$_set", "ILstd/core/Object;:V", index, infoObj)) { + if (ANI_OK != env->Object_CallMethodByName_Void(outAniObj, "$_set", "iC{std.core.Object}:", index, infoObj)) { ANS_LOGE("set Faild. index = %{public}d", index); return false; } @@ -313,7 +313,7 @@ bool UnwrapNotificationSlotArrayByAniObj(ani_env *env, ani_object notificationSl for (int i = 0; i < int(length); i++) { ani_ref notificationSlotEntryRef; status = env->Object_CallMethodByName_Ref(notificationSlotArrayObj, - "$_get", "I:Lstd/core/Object;", ¬ificationSlotEntryRef, (ani_int)i); + "$_get", "i:C{std.core.Object}", ¬ificationSlotEntryRef, (ani_int)i); if (status != ANI_OK) { ANS_LOGE("Object_CallMethodByName_Ref faild. status : %{public}d", status); } diff --git a/frameworks/ets/ani/src/sts_sorting.cpp b/frameworks/ets/ani/src/sts_sorting.cpp index 9d238ce92ed7662c566e4dd373696cb0eafc0b0b..73d7ddcc629649568d7af681a90ce655c9f8067b 100644 --- a/frameworks/ets/ani/src/sts_sorting.cpp +++ b/frameworks/ets/ani/src/sts_sorting.cpp @@ -32,7 +32,7 @@ bool WarpNotificationSorting(ani_env *env, Notification::NotificationSorting &so ANS_LOGE("invalid parameter value"); return false; } - if (!CreateClassObjByClassName(env, "Lnotification/notificationSorting/NotificationSortingInner;", cls, obj)) { + if (!CreateClassObjByClassName(env, "C{notification.notificationSorting.NotificationSortingInner}", cls, obj)) { ANS_LOGE("Create obj faild. NotificationSortingInner"); return false; } diff --git a/frameworks/ets/ani/src/sts_sorting_map.cpp b/frameworks/ets/ani/src/sts_sorting_map.cpp index 67e99b3410ab48e87d9c289bfcf43872b69acef3..9084156491f9ebba676e8ee961f677a76a9ac245 100644 --- a/frameworks/ets/ani/src/sts_sorting_map.cpp +++ b/frameworks/ets/ani/src/sts_sorting_map.cpp @@ -44,7 +44,7 @@ bool GetKeySToRecode(ani_env *env, const std::shared_ptr return false; } if (ANI_OK != (status = env->Object_CallMethodByName_Void( - recordObj, "$_set", "Lstd/core/Object;Lstd/core/Object;:V", keyString, sortingObj))) { + recordObj, "$_set", "C{std.core.Object}C{std.core.Object}:", keyString, sortingObj))) { ANS_LOGE("set key value faild. key: %{public}s status %{public}d", it.c_str(), status); return false; } @@ -65,12 +65,12 @@ bool WarpNotificationSortingMap(ani_env *env, } if (!CreateClassObjByClassName(env, - "Lnotification/notificationSortingMap/NotificationSortingMapInner;", cls, outObj)) { + "C{notification.notificationSortingMap.NotificationSortingMapInner}", cls, outObj)) { ANS_LOGE("CreateClassObjByClassName faild."); return false; } - if (!CreateClassObjByClassName(env, "Lescompat/Record;", recordCls, recordObj) || recordObj == nullptr) { + if (!CreateClassObjByClassName(env, "C{escompat.Record}", recordCls, recordObj) || recordObj == nullptr) { ANS_LOGE("Create recordObj faild."); return false; } @@ -97,4 +97,4 @@ bool WarpNotificationSortingMap(ani_env *env, return true; } } // namespace NotificationSts -} // OHOS \ No newline at end of file +} // OHOS diff --git a/frameworks/ets/ani/src/sts_subscribe.cpp b/frameworks/ets/ani/src/sts_subscribe.cpp index 8ed278ad28cb4a9c4bbb570e161f967acd3f66a8..9aca8ec783cf6fd27bb423b8af06c5f1f7c261d7 100644 --- a/frameworks/ets/ani/src/sts_subscribe.cpp +++ b/frameworks/ets/ani/src/sts_subscribe.cpp @@ -405,7 +405,7 @@ bool StsSubscriberInstance::HasOnBatchCancelCallback() ANS_LOGD("AttachCurrentThread error. result: %{public}d.", aniResult); return false; } - + ani_ref fn_ref; aniResult = etsEnv->Object_GetFieldByName_Ref(static_cast(ref_), "onBatchCancel", &fn_ref); if (ANI_OK != aniResult) { @@ -744,7 +744,7 @@ bool UnWarpNotificationKey(ani_env *env, const ani_object obj, NotificationKey & ani_boolean isUndefined = ANI_TRUE; ani_double idDouble = 0.0; if (!GetDoubleValueByClassName(env, obj, - "L@ohos/notificationSubscribe/notificationSubscribe/NotificationKeyInner;", "id", idDouble)) { + "C{@ohos.notificationSubscribe.notificationSubscribe.NotificationKeyInner}", "id", idDouble)) { ANS_LOGD("GetDoubleValueByClassName id fail"); return false; } diff --git a/frameworks/ets/ani/src/sts_subscriber.cpp b/frameworks/ets/ani/src/sts_subscriber.cpp index 19c966c1548e0bbbf8a47d1130841e07ca7ca1b6..b8fbf3e27ec496a4cd36da81f93246686a624e67 100644 --- a/frameworks/ets/ani/src/sts_subscriber.cpp +++ b/frameworks/ets/ani/src/sts_subscriber.cpp @@ -101,7 +101,7 @@ bool SetVibrationValues(ani_env *env, const std::shared_ptr &re } for (size_t i = 0; i < vibrationValues.size(); i++) { status = env->Object_CallMethodByName_Void( - vibrationValuesObj, "$_set", "ID:V", i, static_cast(vibrationValues[i])); + vibrationValuesObj, "$_set", "id:", i, static_cast(vibrationValues[i])); if (status != ANI_OK) { ANS_LOGE("faild. status : %{public}d", status); return false; @@ -129,7 +129,7 @@ bool WarpSubscribeCallbackData( return false; } if (!CreateClassObjByClassName( - env, "Lnotification/notificationSubscriber/SubscribeCallbackDataInner;", cls, outObj)) { + env, "C{notification.notificationSubscriber.SubscribeCallbackDataInner}", cls, outObj)) { ANS_LOGE("CreateClassObjByClassName faild"); return false; } @@ -190,7 +190,7 @@ bool WarpSubscribeCallbackDataArray( return false; } if (ANI_OK != (status = env->Object_CallMethodByName_Void( - outObj, "$_set", "ILstd/core/Object;:V", i, obj))) { + outObj, "$_set", "iC{std.core.Object}:", i, obj))) { ANS_LOGE("set object faild. status %{public}d", status); return false; } @@ -208,7 +208,7 @@ bool WarpEnabledNotificationCallbackData( } ani_class cls; ani_status status; - const char *className = "Lnotification/notificationSubscriber/EnabledNotificationCallbackDataInner;"; + const char *className = "C{notification.notificationSubscriber.EnabledNotificationCallbackDataInner}"; if (!CreateClassObjByClassName(env, className, cls, outObj)) { ANS_LOGE("CreateClassObjByClassName faild"); return false; @@ -239,7 +239,7 @@ bool WarpBadgeNumberCallbackData( } ani_class cls; ani_object instanceKeyObj; - const char *className = "Lnotification/notificationSubscriber/BadgeNumberCallbackDataInner;"; + const char *className = "C{notification.notificationSubscriber.BadgeNumberCallbackDataInner}"; if (!CreateClassObjByClassName(env, className, cls, outObj)) { ANS_LOGE("CreateClassObjByClassName faild"); return false; diff --git a/frameworks/ets/ani/src/sts_template.cpp b/frameworks/ets/ani/src/sts_template.cpp index 6c4f5fc4f82603fe295482d3f16f9245913db28a..00e58d3ee3000454af3a2eddf82ebdf1e11aad2a 100644 --- a/frameworks/ets/ani/src/sts_template.cpp +++ b/frameworks/ets/ani/src/sts_template.cpp @@ -31,7 +31,7 @@ ani_status UnwrapNotificationTemplate(ani_env *env, ani_object aniObj, Notificat } ani_status status = ANI_ERROR; ani_ref nameRef; - if (ANI_OK != (status = env->Object_CallMethodByName_Ref(aniObj, "name", ":Lstd/core/String;", &nameRef))) { + if (ANI_OK != (status = env->Object_CallMethodByName_Ref(aniObj, "name", ":C{std.core.String}", &nameRef))) { ANS_LOGE("Object_CallMethodByName_Ref faild. status %{public}d", status); return status; } @@ -65,7 +65,7 @@ ani_object WrapNotificationTemplate(ani_env* env, const std::shared_ptrFindNamespace(npName, &np)) { ANS_LOGD("Not found '%{public}s'", npName); @@ -160,4 +160,4 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) *result = ANI_VERSION_1; return ANI_OK; } -} \ No newline at end of file +}