diff --git a/frameworks/ets/ani/BUILD.gn b/frameworks/ets/ani/BUILD.gn index ec2da9c056294a5f5f342963997182f4340a9ec2..ad182c55a70ede1dfa3bc5931b075245c312e7d0 100644 --- a/frameworks/ets/ani/BUILD.gn +++ b/frameworks/ets/ani/BUILD.gn @@ -129,7 +129,7 @@ if (distributed_notification_service_disable_control) { "ability_runtime:runtime", "napi:ace_napi", "image_framework:image_native", - "image_framework:image_ani", + "image_framework:image_taihe", "resource_management:global_resmgr", "ability_runtime:ani_base_context", "ability_runtime:ability_context_native", @@ -214,7 +214,7 @@ ohos_shared_library("notification_subscribe_ani") { "ability_runtime:ani_common", "ability_runtime:ani_wantagent_common", "image_framework:image_native", - "image_framework:image_ani", + "image_framework:image_taihe", "resource_management:global_resmgr", ] diff --git a/frameworks/ets/ani/include/sts_common.h b/frameworks/ets/ani/include/sts_common.h index d242a27b4a577daee79af48263f16c51b3d95404..aa6600ef6fd278b8cf7e8438b2ce29f728cabe87 100644 --- a/frameworks/ets/ani/include/sts_common.h +++ b/frameworks/ets/ani/include/sts_common.h @@ -41,7 +41,7 @@ bool GetDateByObject(ani_env *env, ani_object timeObj, int64_t &time); ani_status GetAniStringByString(ani_env* env, const std::string str, ani_string &aniStr); ani_status GetStringByAniString(ani_env *env, ani_string str, std::string &res); bool GetStringArrayByAniObj(ani_env *env, const ani_object ani_obj, std::vector &stdVString); -ani_object GetAniStringArrayByVectorString(ani_env *env, std::vector &strs); +ani_object GetAniStringArrayByVectorString(ani_env *env, std::vector strs); ani_object newArrayClass(ani_env *env, int length); ani_object newRecordClass(ani_env *env); ani_object ConvertArrayDoubleToAniObj(ani_env *env, const std::vector values); @@ -73,8 +73,8 @@ bool SetOptionalFieldBoolean(ani_env *env, ani_class cls, ani_object &object, const std::string fieldName, bool value); bool SetOptionalFieldDouble(ani_env *env, ani_class cls, ani_object &object, const std::string fieldName, double value); -bool SetOptionalFieldArrayLong(ani_env *env, ani_class cls, ani_object &object, const std::string &fieldName, - const std::vector &values); +bool SetOptionalFieldArrayLong(ani_env *env, ani_class cls, ani_object &object, const std::string fieldName, + const std::vector values); // property bool SetPropertyOptionalByBoolean(ani_env *env, ani_object &object, const char *name, bool value); diff --git a/frameworks/ets/ani/include/sts_convert_other.h b/frameworks/ets/ani/include/sts_convert_other.h index 2c32dcb836ecd38d95d7353d4fc5b1749ac6042d..aec482f65097cd412fa21eda176364b5f351b772 100644 --- a/frameworks/ets/ani/include/sts_convert_other.h +++ b/frameworks/ets/ani/include/sts_convert_other.h @@ -43,11 +43,11 @@ bool GetAniPictrueInfo(ani_env *env, std::map>> pictureMap); + std::map>> &pictureMap); // vector to AniArray ani_object GetAniArrayPixelMap(ani_env *env, const std::vector> &pixelMaps); -ani_status UnwrapResource(ani_env *env, ani_object obj, ResourceManager::Resource resource); +ani_status UnwrapResource(ani_env *env, ani_object obj, ResourceManager::Resource &resource); ani_status GetResourceArray(ani_env *env, ani_object param, const char *name, std::vector &res); ani_object GetAniResource(ani_env *env, const std::shared_ptr &resource); diff --git a/frameworks/ets/ani/src/sts_common.cpp b/frameworks/ets/ani/src/sts_common.cpp index 0da585c0ea038176f8f7cde989374380e307ef26..d770dcbe01f40ad9065b02a91c5b94dd8a305eb8 100644 --- a/frameworks/ets/ani/src/sts_common.cpp +++ b/frameworks/ets/ani/src/sts_common.cpp @@ -192,7 +192,7 @@ ani_status GetPropertyDouble(ani_env *env, ani_object obj, const char *name, ANS_LOGE("Object_CallMethodByName_Boolean failed, status : %{public}d", status); return status; } - ANS_LOGD("Object_CallMethodByName_Double sucess, status: %{public}f", outvalue); + ANS_LOGD("Object_CallMethodByName_Double sucess"); return status; } @@ -216,7 +216,7 @@ ani_status GetPropertyInt(ani_env *env, ani_object obj, const char *name, ANS_LOGE("Object_CallMethodByName_Int failed, status : %{public}d", status); return status; } - ANS_LOGD("Object_CallMethodByName_Int sucess, status: %{public}d", outvalue); + ANS_LOGD("Object_CallMethodByName_Int sucess"); return status; } @@ -240,7 +240,7 @@ ani_status GetPropertyLong(ani_env *env, ani_object obj, const char *name, ANS_LOGE("Object_CallMethodByName_Boolean failed, status : %{public}d", status); return status; } - ANS_LOGD("Object_CallMethodByName_Long sucess, status: %{public}lld", outvalue); + ANS_LOGD("Object_CallMethodByName_Long sucess"); return status; } @@ -320,7 +320,6 @@ ani_status GetPropertyStringArray(ani_env *env, ani_object param, const char *na return status; } res.push_back(str); - ANS_LOGD("GetStdString index: %{public}d %{public}s", i, str.c_str()); } return status; } @@ -401,7 +400,7 @@ ani_status GetPropertyLongArray(ani_env *env, ani_object param, const char *name return status; } -ani_object GetAniStringArrayByVectorString(ani_env *env, std::vector &strs) +ani_object GetAniStringArrayByVectorString(ani_env *env, std::vector strs) { if (env == nullptr) { ANS_LOGE("GetAniStringArrayByVectorString fail, env is nullptr"); @@ -672,8 +671,8 @@ ani_object ConvertArrayLongToAniObj(ani_env *env, const std::vector &values) +bool SetOptionalFieldArrayLong(ani_env *env, ani_class cls, ani_object &object, const std::string fieldName, + const std::vector values) { if (env == nullptr || cls == nullptr || object == nullptr || fieldName.empty()) { ANS_LOGE("SetOptionalFieldArrayLong fail, has nullptr or fieldName is empty"); diff --git a/frameworks/ets/ani/src/sts_convert_other.cpp b/frameworks/ets/ani/src/sts_convert_other.cpp index 4d537c83a46d032658263be65e3a02b76bd3d85a..c05cdaf0a0bbf90bdd5841ec5034358b4b0f6e83 100644 --- a/frameworks/ets/ani/src/sts_convert_other.cpp +++ b/frameworks/ets/ani/src/sts_convert_other.cpp @@ -15,7 +15,7 @@ #include "sts_convert_other.h" #include "sts_common.h" -#include "pixel_map_ani.h" +#include "pixel_map_taihe_ani.h" namespace OHOS { namespace NotificationSts { @@ -43,7 +43,7 @@ std::shared_ptr UnwrapWantAgent(ani_env *env, ani_object agent) return wantAgentSp; } -ani_status UnwrapResource(ani_env *env, ani_object obj, ResourceManager::Resource resource) +ani_status UnwrapResource(ani_env *env, ani_object obj, ResourceManager::Resource &resource) { ANS_LOGD("UnwrapResource called"); if (env == nullptr || obj == nullptr) { @@ -84,7 +84,7 @@ ani_object CreateAniPixelMap(ani_env* env, std::shared_ptr pixelMap) ANS_LOGE("CreateAniPixelMap failed, has nullPtr"); return nullptr; } - return PixelMapAni::CreatePixelMap(env, pixelMap); + return PixelMapTaiheAni::CreateEtsPixelMap(env, pixelMap); } std::shared_ptr GetPixelMapFromEnvSp(ani_env* env, ani_object obj) @@ -94,20 +94,7 @@ std::shared_ptr GetPixelMapFromEnvSp(ani_env* env, ani_object obj) ANS_LOGE("GetPixelMapFromEnvSp failed, has nullPtr"); return nullptr; } - ani_status ret; - ani_long nativeObj {}; - if ((ret = env->Object_GetFieldByName_Long(obj, "nativeObj", &nativeObj)) != ANI_OK) { - ANS_LOGI("GetPixelMapFromEnvSp Object_GetField_Long fetch failed"); - return nullptr; - } - PixelMap* pixelmap = reinterpret_cast(nativeObj); - if (pixelmap == nullptr) { - ANS_LOGI("GetPixelMapFromEnvSp pixelmap nullptr"); - return nullptr; - } - std::shared_ptr pixelmapSp = std::make_shared(*pixelmap); - deletePoint(pixelmap); - return pixelmapSp; + return PixelMapTaiheAni::GetNativePixelMap(env, obj); } ani_status GetPixelMapArrayByRef(ani_env *env, ani_ref param, std::vector> &pixelMaps) @@ -299,7 +286,7 @@ ani_status GetPixelMapByRef( } ani_status GetMapOfPictureInfo(ani_env *env, ani_object obj, - std::map>> pictureMap) + std::map>> &pictureMap) { ANS_LOGD("GetMapOfPictureInfo call"); if (env == nullptr || obj == nullptr) { @@ -386,7 +373,7 @@ ani_object GetAniArrayPixelMap(ani_env *env, const std::vector void; \ No newline at end of file +export type BadgeEnabledChangedCallback = (data: EnabledNotificationCallbackData) => void;