From 3ef3de633854d11c9ed8a74e9c9dfb23d615d5b9 Mon Sep 17 00:00:00 2001 From: cxy251 Date: Sat, 12 Jul 2025 17:13:58 +0800 Subject: [PATCH 1/3] lostso Signed-off-by: cxy251 --- bundle.json | 7 +++++++ frameworks/native/ability/native/form_extension.cpp | 1 - .../native/form_runtime/sts_form_extension_instance.cpp | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index e039ef051df..76734b9fb4a 100644 --- a/bundle.json +++ b/bundle.json @@ -211,6 +211,13 @@ }, "name": "//foundation/ability/ability_runtime/frameworks/native/ability/native:cj_form_extension" }, + { + "header": { + "header_base": "//foundation/ability/ability_runtime/interfaces/kits/native/ability/native/form_runtime", + "header_files": [] + }, + "name": "//foundation/ability/ability_runtime/frameworks/native/ability/native:sts_form_extension" + }, { "header": { "header_base": "//foundation/ability/ability_runtime/frameworks/cj/ffi/context", diff --git a/frameworks/native/ability/native/form_extension.cpp b/frameworks/native/ability/native/form_extension.cpp index a27dbd641e3..d3389da2515 100644 --- a/frameworks/native/ability/native/form_extension.cpp +++ b/frameworks/native/ability/native/form_extension.cpp @@ -20,7 +20,6 @@ #include "form_runtime/sts_form_extension_instance.h" #include "form_runtime/cj_form_extension_instance.h" #include "form_runtime/js_form_extension.h" -#include "sts_form_extension.h" #include "hilog_tag_wrapper.h" #include "runtime.h" diff --git a/frameworks/native/ability/native/form_runtime/sts_form_extension_instance.cpp b/frameworks/native/ability/native/form_runtime/sts_form_extension_instance.cpp index 33391380ad3..af1257a409d 100644 --- a/frameworks/native/ability/native/form_runtime/sts_form_extension_instance.cpp +++ b/frameworks/native/ability/native/form_runtime/sts_form_extension_instance.cpp @@ -32,7 +32,7 @@ constexpr char STS_FORM_EXT_LIB_NAME[] = "libsts_form_extension.dylib"; constexpr char STS_FORM_EXT_LIB_NAME[] = "libsts_form_extension.z.so"; #endif -using CreateFunc = FormExtension *(*)(); +using CreateFunc = FormExtension *(*)(void*); static constexpr char STS_FORM_EXT_CREATE_FUNC[] = "OHOS_ABILITY_STSFormExtension"; #ifndef STS_EXPORT @@ -46,6 +46,7 @@ static constexpr char STS_FORM_EXT_CREATE_FUNC[] = "OHOS_ABILITY_STSFormExtensio FormExtension *CreateSTSFormExtension(const std::unique_ptr &runtime) { + std::unique_ptr* runtimePtr = const_cast*>(&runtime); void *handle = dlopen(STS_FORM_EXT_LIB_NAME, RTLD_LAZY); if (handle == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "open sts_form_extension library %{public}s failed, reason: %{public}sn", @@ -61,7 +62,7 @@ FormExtension *CreateSTSFormExtension(const std::unique_ptr &runtime) return new FormExtension(); } - auto instance = entry(); + auto instance = entry(reinterpret_cast(runtimePtr)); if (instance == nullptr) { dlclose(handle); TAG_LOGE(AAFwkTag::FORM_EXT, "get sts_form_extension instance in %{public}s failed", STS_FORM_EXT_LIB_NAME); -- Gitee From fe2dab6a78b50f1014c6e7d29abd681ee72fbb08 Mon Sep 17 00:00:00 2001 From: cxy251 Date: Mon, 14 Jul 2025 10:02:32 +0800 Subject: [PATCH 2/3] lostso Signed-off-by: cxy251 --- ..._form_extension.h => ets_form_extension.h} | 22 +-- ...context.h => ets_form_extension_context.h} | 12 +- ...m_extension.cpp => ets_form_extension.cpp} | 132 +++++++++--------- ...ext.cpp => ets_form_extension_context.cpp} | 20 +-- frameworks/native/ability/native/BUILD.gn | 8 +- ...ce.cpp => ets_form_extension_instance.cpp} | 32 ++--- ...stance.h => ets_form_extension_instance.h} | 8 +- 7 files changed, 117 insertions(+), 117 deletions(-) rename frameworks/ets/ani/form_extension_ability/include/{sts_form_extension.h => ets_form_extension.h} (83%) rename frameworks/ets/ani/form_extension_ability/include/{sts_form_extension_context.h => ets_form_extension_context.h} (75%) rename frameworks/ets/ani/form_extension_ability/src/{sts_form_extension.cpp => ets_form_extension.cpp} (84%) rename frameworks/ets/ani/form_extension_ability/src/{sts_form_extension_context.cpp => ets_form_extension_context.cpp} (83%) rename frameworks/native/ability/native/form_runtime/{sts_form_extension_instance.cpp => ets_form_extension_instance.cpp} (61%) rename interfaces/kits/native/ability/native/form_runtime/{sts_form_extension_instance.h => ets_form_extension_instance.h} (76%) diff --git a/frameworks/ets/ani/form_extension_ability/include/sts_form_extension.h b/frameworks/ets/ani/form_extension_ability/include/ets_form_extension.h similarity index 83% rename from frameworks/ets/ani/form_extension_ability/include/sts_form_extension.h rename to frameworks/ets/ani/form_extension_ability/include/ets_form_extension.h index e6287d44163..c516e0aaab3 100644 --- a/frameworks/ets/ani/form_extension_ability/include/sts_form_extension.h +++ b/frameworks/ets/ani/form_extension_ability/include/ets_form_extension.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef OHOS_ABILITY_RUNTIME_STS_FORM_EXTENSION_H -#define OHOS_ABILITY_RUNTIME_STS_FORM_EXTENSION_H +#ifndef OHOS_ABILITY_RUNTIME_ETS_FORM_EXTENSION_H +#define OHOS_ABILITY_RUNTIME_ETS_FORM_EXTENSION_H #include "ani.h" #include "ets_native_reference.h" @@ -26,12 +26,12 @@ namespace AbilityRuntime { class FormExtension; class ETSRuntime; -class STSFormExtension : public FormExtension { +class ETSFormExtension : public FormExtension { public: - static STSFormExtension *Create(const std::unique_ptr &runtime); - const ETSRuntime &GetSTSRuntime(); - explicit STSFormExtension(ETSRuntime &stsRuntime); - ~STSFormExtension() override; + static ETSFormExtension *Create(const std::unique_ptr &runtime); + const ETSRuntime &GetETSRuntime(); + explicit ETSFormExtension(ETSRuntime &etsRuntime); + ~ETSFormExtension() override; void Init(const std::shared_ptr &record, const std::shared_ptr &application, @@ -71,11 +71,11 @@ private: bool ConvertFromDataProxies(ani_env *env, ani_object arrayValue, std::vector &formDataProxies); std::string ANIUtils_ANIStringToStdString(ani_env *env, ani_string ani_str); ani_status ANIUtils_FormIdToAniString(ani_env *env, int64_t formId, ani_string &formIdStr); - std::unique_ptr stsObj_; - std::shared_ptr stsAbilityObj_; - ETSRuntime &stsRuntime_; + std::unique_ptr etsObj_; + std::shared_ptr etsAbilityObj_; + ETSRuntime &etsRuntime_; sptr providerRemoteObject_ = nullptr; }; // namespace AbilityRuntime } // namespace AbilityRuntime } // namespace OHOS -#endif // OHOS_ABILITY_RUNTIME_SIMULATOR_STS_ABILITY_CONTEXT_H +#endif // OHOS_ABILITY_RUNTIME_SIMULATOR_ETS_ABILITY_CONTEXT_H diff --git a/frameworks/ets/ani/form_extension_ability/include/sts_form_extension_context.h b/frameworks/ets/ani/form_extension_ability/include/ets_form_extension_context.h similarity index 75% rename from frameworks/ets/ani/form_extension_ability/include/sts_form_extension_context.h rename to frameworks/ets/ani/form_extension_ability/include/ets_form_extension_context.h index d8462fe0829..5aea2682767 100644 --- a/frameworks/ets/ani/form_extension_ability/include/sts_form_extension_context.h +++ b/frameworks/ets/ani/form_extension_ability/include/ets_form_extension_context.h @@ -13,23 +13,23 @@ * limitations under the License. */ -#ifndef OHOS_ABILITY_RUNTIME_STS_FORM_EXTENSION_CONTEXT_H -#define OHOS_ABILITY_RUNTIME_STS_FORM_EXTENSION_CONTEXT_H +#ifndef OHOS_ABILITY_RUNTIME_ETS_FORM_EXTENSION_CONTEXT_H +#define OHOS_ABILITY_RUNTIME_ETS_FORM_EXTENSION_CONTEXT_H #include "ani.h" #include "form_extension_context.h" namespace OHOS { namespace AbilityRuntime { -ani_ref CreateStsFormExtensionContext(ani_env *env, std::shared_ptr &context); +ani_ref CreateEtsFormExtensionContext(ani_env *env, std::shared_ptr &context); -class STSFormExtensionContext { +class ETSFormExtensionContext { public: - static ani_ref CreateStsExtensionContext(ani_env *env, const std::shared_ptr &context, + static ani_ref CreateEtsExtensionContext(ani_env *env, const std::shared_ptr &context, std::shared_ptr &abilityInfo); static ani_object SetFormExtensionContext(ani_env *env, const std::shared_ptr &context); }; } // namespace AbilityRuntime } // namespace OHOS -#endif // OHOS_ABILITY_RUNTIME_STS_FORM_EXTENSION_CONTEXT_H \ No newline at end of file +#endif // OHOS_ABILITY_RUNTIME_ETS_FORM_EXTENSION_CONTEXT_H \ No newline at end of file diff --git a/frameworks/ets/ani/form_extension_ability/src/sts_form_extension.cpp b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp similarity index 84% rename from frameworks/ets/ani/form_extension_ability/src/sts_form_extension.cpp rename to frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp index d9d97e57ab3..4f164d46e3e 100644 --- a/frameworks/ets/ani/form_extension_ability/src/sts_form_extension.cpp +++ b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "sts_form_extension.h" +#include "ets_form_extension.h" #include #include @@ -24,7 +24,7 @@ #include "form_provider_data.h" #include "form_runtime/form_extension_provider_client.h" #include "hilog_tag_wrapper.h" -#include "sts_form_extension_context.h" +#include "ets_form_extension_context.h" #include "connection_manager.h" namespace OHOS { @@ -35,43 +35,43 @@ constexpr const char* FORM_BINDING_DATA_CLASS_NAME = constexpr const char* RECORD_CLASS_NAME = "Lescompat/Record;"; } -extern "C" __attribute__((visibility("default"))) FormExtension *OHOS_ABILITY_STSFormExtension( +extern "C" __attribute__((visibility("default"))) FormExtension *OHOS_ABILITY_ETSFormExtension( const std::unique_ptr &runtime) { - return new STSFormExtension(static_cast(*runtime)); + return new ETSFormExtension(static_cast(*runtime)); } -STSFormExtension *STSFormExtension::Create(const std::unique_ptr &runtime) +ETSFormExtension *ETSFormExtension::Create(const std::unique_ptr &runtime) { TAG_LOGI(AAFwkTag::FORM_EXT, "call___%{public}d", runtime->GetLanguage()); - return new STSFormExtension(static_cast(*runtime)); + return new ETSFormExtension(static_cast(*runtime)); } -const ETSRuntime &STSFormExtension::GetSTSRuntime() +const ETSRuntime &ETSFormExtension::GetETSRuntime() { - return stsRuntime_; + return etsRuntime_; } -STSFormExtension::STSFormExtension(ETSRuntime &stsRuntime) : stsRuntime_(stsRuntime) {} +ETSFormExtension::ETSFormExtension(ETSRuntime &etsRuntime) : etsRuntime_(etsRuntime) {} -STSFormExtension::~STSFormExtension() +ETSFormExtension::~ETSFormExtension() { TAG_LOGI(AAFwkTag::FORM_EXT, "destructor"); - auto env = stsRuntime_.GetAniEnv(); + auto env = etsRuntime_.GetAniEnv(); if (env == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "env null"); return; } - if (stsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::FORM_EXT, "stsAbilityObj_ null"); + if (etsAbilityObj_ == nullptr) { + TAG_LOGE(AAFwkTag::FORM_EXT, "etsAbilityObj_ null"); return; } - if (stsAbilityObj_->aniRef) { - env->GlobalReference_Delete(stsAbilityObj_->aniRef); + if (etsAbilityObj_->aniRef) { + env->GlobalReference_Delete(etsAbilityObj_->aniRef); } } -void STSFormExtension::Init(const std::shared_ptr &record, +void ETSFormExtension::Init(const std::shared_ptr &record, const std::shared_ptr &application, std::shared_ptr &handler, const sptr &token) { @@ -101,7 +101,7 @@ void STSFormExtension::Init(const std::shared_ptr &record, TAG_LOGI(AAFwkTag::FORM_EXT, "Init End"); } -void STSFormExtension::GetSrcPath(std::string &srcPath) +void ETSFormExtension::GetSrcPath(std::string &srcPath) { if (!Extension::abilityInfo_->isModuleJson) { srcPath.append(Extension::abilityInfo_->package); @@ -124,33 +124,33 @@ void STSFormExtension::GetSrcPath(std::string &srcPath) } } -void STSFormExtension::UpdateFormExtensionObj( +void ETSFormExtension::UpdateFormExtensionObj( std::shared_ptr &abilityInfo, const std::string &moduleName, const std::string &srcPath) { TAG_LOGI(AAFwkTag::FORM_EXT, "UpdateFormExtensionObj call"); - stsAbilityObj_ = stsRuntime_.LoadModule(moduleName, srcPath, abilityInfo->hapPath, + etsAbilityObj_ = etsRuntime_.LoadModule(moduleName, srcPath, abilityInfo->hapPath, abilityInfo->compileMode == AppExecFwk::CompileMode::ES_MODULE, false, abilityInfo_->srcEntrance); - if (stsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::FORM_EXT, "null stsAbilityObj_"); + if (etsAbilityObj_ == nullptr) { + TAG_LOGE(AAFwkTag::FORM_EXT, "null etsAbilityObj_"); return; } TAG_LOGI(AAFwkTag::FORM_EXT, "UpdateFormExtensionObj End"); } -void STSFormExtension::BindContext(std::shared_ptr &abilityInfo, std::shared_ptr want, +void ETSFormExtension::BindContext(std::shared_ptr &abilityInfo, std::shared_ptr want, const std::string &moduleName, const std::string &srcPath) { TAG_LOGI(AAFwkTag::FORM_EXT, "BindContext call"); UpdateFormExtensionObj(abilityInfo, moduleName, srcPath); - auto env = stsRuntime_.GetAniEnv(); + auto env = etsRuntime_.GetAniEnv(); if (env == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "env null"); return; } - if (stsAbilityObj_ == nullptr || want == nullptr) { - TAG_LOGE(AAFwkTag::FORM_EXT, "null stsAbilityObj_ or abilityContext_ or want"); + if (etsAbilityObj_ == nullptr || want == nullptr) { + TAG_LOGE(AAFwkTag::FORM_EXT, "null etsAbilityObj_ or abilityContext_ or want"); return; } @@ -159,7 +159,7 @@ void STSFormExtension::BindContext(std::shared_ptr &abilityInfo, st TAG_LOGE(AAFwkTag::FORM_EXT, "get context error"); return; } - ani_ref contextObj = CreateStsFormExtensionContext(env, context); + ani_ref contextObj = CreateEtsFormExtensionContext(env, context); if (contextObj == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "Create context obj error"); return; @@ -171,18 +171,18 @@ void STSFormExtension::BindContext(std::shared_ptr &abilityInfo, st if ((status = env->GlobalReference_Create(contextObj, &contextGlobalRef)) != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "status : %{public}d", status); } - if ((status = env->Class_FindField(stsAbilityObj_->aniCls, "context", &field)) != ANI_OK) { + if ((status = env->Class_FindField(etsAbilityObj_->aniCls, "context", &field)) != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "status : %{public}d", status); } - if ((status = env->Object_SetField_Ref(stsAbilityObj_->aniObj, field, contextGlobalRef)) != ANI_OK) { + if ((status = env->Object_SetField_Ref(etsAbilityObj_->aniObj, field, contextGlobalRef)) != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "status : %{public}d", status); } TAG_LOGI(AAFwkTag::FORM_EXT, "BindContext End"); } -std::string STSFormExtension::ANIUtils_ANIStringToStdString(ani_env *env, ani_string ani_str) +std::string ETSFormExtension::ANIUtils_ANIStringToStdString(ani_env *env, ani_string ani_str) { TAG_LOGI(AAFwkTag::FORM_EXT, "ANIUtils_ANIStringToStdString Call"); ani_size strSize; @@ -206,7 +206,7 @@ std::string STSFormExtension::ANIUtils_ANIStringToStdString(ani_env *env, ani_st return content; } -bool STSFormExtension::ConvertFromDataProxies( +bool ETSFormExtension::ConvertFromDataProxies( ani_env *env, ani_object arrayValue, std::vector &formDataProxies) { TAG_LOGI(AAFwkTag::FORM_EXT, "ConvertFromDataProxies Call"); @@ -233,7 +233,7 @@ bool STSFormExtension::ConvertFromDataProxies( } ani_field key; - if ((status = env->Class_FindField(stsAbilityObj_->aniCls, "key", &key)) != ANI_OK) { + if ((status = env->Class_FindField(etsAbilityObj_->aniCls, "key", &key)) != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindField status : %{public}d", status); return false; } @@ -247,7 +247,7 @@ bool STSFormExtension::ConvertFromDataProxies( formDataProxy.key = ANIUtils_ANIStringToStdString(env, static_cast(keyRef)); ani_field subscriberId; - if ((status = env->Class_FindField(stsAbilityObj_->aniCls, "subscriberId", &subscriberId)) != ANI_OK) { + if ((status = env->Class_FindField(etsAbilityObj_->aniCls, "subscriberId", &subscriberId)) != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindField status : %{public}d", status); return false; } @@ -266,27 +266,27 @@ bool STSFormExtension::ConvertFromDataProxies( return true; } -sptr STSFormExtension::OnConnect(const OHOS::AAFwk::Want &want) +sptr ETSFormExtension::OnConnect(const OHOS::AAFwk::Want &want) { TAG_LOGD(AAFwkTag::FORM_EXT, "call"); Extension::OnConnect(want); if (providerRemoteObject_ == nullptr) { TAG_LOGD(AAFwkTag::FORM_EXT, "null providerRemoteObject"); sptr providerClient = new (std::nothrow) FormExtensionProviderClient(); - std::shared_ptr formExtension = - std::static_pointer_cast(shared_from_this()); + std::shared_ptr formExtension = + std::static_pointer_cast(shared_from_this()); providerClient->SetOwner(formExtension); providerRemoteObject_ = providerClient->AsObject(); } return providerRemoteObject_; } -OHOS::AppExecFwk::FormProviderInfo STSFormExtension::OnCreate(const OHOS::AAFwk::Want &want) +OHOS::AppExecFwk::FormProviderInfo ETSFormExtension::OnCreate(const OHOS::AAFwk::Want &want) { TAG_LOGI(AAFwkTag::FORM_EXT, "OnCreate call"); OHOS::AppExecFwk::FormProviderInfo formProviderInfo; - auto env = stsRuntime_.GetAniEnv(); + auto env = etsRuntime_.GetAniEnv(); if (env == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "env null"); return formProviderInfo; @@ -316,19 +316,19 @@ OHOS::AppExecFwk::FormProviderInfo STSFormExtension::OnCreate(const OHOS::AAFwk: return formProviderInfo; } -bool STSFormExtension::CallNativeFormMethod(ani_env *env, ani_object aniWant, ani_ref &nativeResult) +bool ETSFormExtension::CallNativeFormMethod(ani_env *env, ani_object aniWant, ani_ref &nativeResult) { ani_status status = ANI_OK; ani_method function; - if ((status = env->Class_FindMethod(stsAbilityObj_->aniCls, "onAddForm", + if ((status = env->Class_FindMethod(etsAbilityObj_->aniCls, "onAddForm", "L@ohos/app/ability/Want/Want;:L@ohos/app/form/formBindingData/formBindingData/FormBindingData;", &function))) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod status: %{public}d", status); return false; } - status = env->Object_CallMethod_Ref(stsAbilityObj_->aniObj, function, &nativeResult, aniWant); + status = env->Object_CallMethod_Ref(etsAbilityObj_->aniObj, function, &nativeResult, aniWant); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Object_CallMethod_Ref status: %{public}d", status); return false; @@ -337,7 +337,7 @@ bool STSFormExtension::CallNativeFormMethod(ani_env *env, ani_object aniWant, an return true; } -bool STSFormExtension::ExtractFormData(ani_env *env, ani_ref nativeResult, AppExecFwk::FormProviderData &formData, +bool ETSFormExtension::ExtractFormData(ani_env *env, ani_ref nativeResult, AppExecFwk::FormProviderData &formData, std::vector &formDataProxies) { ani_status status = ANI_OK; @@ -392,7 +392,7 @@ bool STSFormExtension::ExtractFormData(ani_env *env, ani_ref nativeResult, AppEx return true; } -ani_status STSFormExtension::ANIUtils_FormIdToAniString(ani_env *env, int64_t formId, ani_string &formIdStr) +ani_status ETSFormExtension::ANIUtils_FormIdToAniString(ani_env *env, int64_t formId, ani_string &formIdStr) { ani_status status = ANI_OK; std::string str = std::to_string(formId); @@ -405,10 +405,10 @@ ani_status STSFormExtension::ANIUtils_FormIdToAniString(ani_env *env, int64_t fo return status; } -void STSFormExtension::OnDestroy(const int64_t formId) +void ETSFormExtension::OnDestroy(const int64_t formId) { TAG_LOGI(AAFwkTag::FORM_EXT, "OnDestroy formId: %{public}" PRId64, formId); - auto env = stsRuntime_.GetAniEnv(); + auto env = etsRuntime_.GetAniEnv(); if (env == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "env null"); return; @@ -422,12 +422,12 @@ void STSFormExtension::OnDestroy(const int64_t formId) } ani_method function; - if ((status = env->Class_FindMethod(stsAbilityObj_->aniCls, "onRemoveForm", "Lstd/core/String;:V", &function))) { + if ((status = env->Class_FindMethod(etsAbilityObj_->aniCls, "onRemoveForm", "Lstd/core/String;:V", &function))) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod status : %{public}d", status); return; } - status = env->Object_CallMethod_Void(stsAbilityObj_->aniObj, function, formIdStr); + status = env->Object_CallMethod_Void(etsAbilityObj_->aniObj, function, formIdStr); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Object_New status : %{public}d", status); return; @@ -435,10 +435,10 @@ void STSFormExtension::OnDestroy(const int64_t formId) TAG_LOGI(AAFwkTag::FORM_EXT, "OnDestroy End"); } -void STSFormExtension::OnEvent(const int64_t formId, const std::string &message) +void ETETSFormExtension::OnEvent(const int64_t formId, const std::string &message) { TAG_LOGI(AAFwkTag::FORM_EXT, "OnEvent formId: %{public}" PRId64, formId); - auto env = stsRuntime_.GetAniEnv(); + auto env = etsRuntime_.GetAniEnv(); if (env == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "env null"); return; @@ -457,12 +457,12 @@ void STSFormExtension::OnEvent(const int64_t formId, const std::string &message) } ani_method function; if ((status = env->Class_FindMethod( - stsAbilityObj_->aniCls, "onFormEvent", "Lstd/core/String;Lstd/core/String;:V", &function))) { + etsAbilityObj_->aniCls, "onFormEvent", "Lstd/core/String;Lstd/core/String;:V", &function))) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod status : %{public}d", status); return; } - status = env->Object_CallMethod_Void(stsAbilityObj_->aniObj, function, formIdStr, aniMessage); + status = env->Object_CallMethod_Void(etsAbilityObj_->aniObj, function, formIdStr, aniMessage); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Object_New status : %{public}d", status); return; @@ -470,10 +470,10 @@ void STSFormExtension::OnEvent(const int64_t formId, const std::string &message) TAG_LOGI(AAFwkTag::FORM_EXT, "OnEvent End"); } -void STSFormExtension::OnUpdate(const int64_t formId, const AAFwk::WantParams &wantParams) +void ETSFormExtension::OnUpdate(const int64_t formId, const AAFwk::WantParams &wantParams) { TAG_LOGI(AAFwkTag::FORM_EXT, "OnUpdate formId: %{public}" PRId64, formId); - auto env = stsRuntime_.GetAniEnv(); + auto env = etsRuntime_.GetAniEnv(); if (env == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "env null"); return; @@ -490,12 +490,12 @@ void STSFormExtension::OnUpdate(const int64_t formId, const AAFwk::WantParams &w ani_method function; if ((status = env->Class_FindMethod( - stsAbilityObj_->aniCls, "onUpdateForm", "Lstd/core/String;Lescompat/Record;:V", &function))) { + etsAbilityObj_->aniCls, "onUpdateForm", "Lstd/core/String;Lescompat/Record;:V", &function))) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod status : %{public}d", status); return; } status = env->Object_CallMethod_Void( - stsAbilityObj_->aniObj, function, formIdStr, static_cast(aniWantParams)); + etsAbilityObj_->aniObj, function, formIdStr, static_cast(aniWantParams)); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Object_New status : %{public}d", status); return; @@ -503,10 +503,10 @@ void STSFormExtension::OnUpdate(const int64_t formId, const AAFwk::WantParams &w TAG_LOGI(AAFwkTag::FORM_EXT, "OnUpdate End"); } -void STSFormExtension::OnCastToNormal(const int64_t formId) +void ETSFormExtension::OnCastToNormal(const int64_t formId) { TAG_LOGI(AAFwkTag::FORM_EXT, "OnCastToNormal formId: %{public}" PRId64, formId); - auto env = stsRuntime_.GetAniEnv(); + auto env = etsRuntime_.GetAniEnv(); if (env == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "env null"); return; @@ -521,12 +521,12 @@ void STSFormExtension::OnCastToNormal(const int64_t formId) ani_method function; if ((status = env->Class_FindMethod( - stsAbilityObj_->aniCls, "onCastToNormalForm", "Lstd/core/String;:V", &function))) { + etsAbilityObj_->aniCls, "onCastToNormalForm", "Lstd/core/String;:V", &function))) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod status : %{public}d", status); return; } - status = env->Object_CallMethod_Void(stsAbilityObj_->aniObj, function, formIdStr); + status = env->Object_CallMethod_Void(etsAbilityObj_->aniObj, function, formIdStr); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Object_New status : %{public}d", status); return; @@ -534,11 +534,11 @@ void STSFormExtension::OnCastToNormal(const int64_t formId) TAG_LOGI(AAFwkTag::FORM_EXT, "OnCastToNormal End"); } -void STSFormExtension::OnVisibilityChange(const std::map &formEventsMap) +void ETSFormExtension::OnVisibilityChange(const std::map &formEventsMap) { TAG_LOGI(AAFwkTag::FORM_EXT, "OnVisibilityChange call"); - auto env = stsRuntime_.GetAniEnv(); + auto env = etsRuntime_.GetAniEnv(); if (env == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "env null"); return; @@ -546,7 +546,7 @@ void STSFormExtension::OnVisibilityChange(const std::map &form ani_method function; ani_status status = - env->Class_FindMethod(stsAbilityObj_->aniCls, "onChangeFormVisibility", "Lescompat/Record;:V", &function); + env->Class_FindMethod(etsAbilityObj_->aniCls, "onChangeFormVisibility", "Lescompat/Record;:V", &function); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod status: %{public}d", status); return; @@ -557,7 +557,7 @@ void STSFormExtension::OnVisibilityChange(const std::map &form TAG_LOGW(AAFwkTag::FORM_EXT, "formEventsMap empty"); } - status = env->Object_CallMethod_Void(stsAbilityObj_->aniObj, function, recordObject); + status = env->Object_CallMethod_Void(etsAbilityObj_->aniObj, function, recordObject); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Object_CallMethod_Void status: %{public}d", status); return; @@ -566,7 +566,7 @@ void STSFormExtension::OnVisibilityChange(const std::map &form TAG_LOGI(AAFwkTag::FORM_EXT, "OnVisibilityChange End"); } -bool STSFormExtension::CreateAndFillRecordObject(ani_env *env, const std::map &formEventsMap, +bool ETSFormExtension::CreateAndFillRecordObject(ani_env *env, const std::map &formEventsMap, ani_object &recordObject) { ani_status status = ANI_OK; @@ -626,11 +626,11 @@ bool STSFormExtension::CreateAndFillRecordObject(ani_env *env, const std::mapObject_GetFieldByName_Ref( - static_cast(stsAbilityObj_->aniRef), "onStop", &nameRef); + static_cast(etsAbilityObj_->aniRef), "onStop", &nameRef); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Object_GetFieldByName status: %{public}d", status); return; diff --git a/frameworks/ets/ani/form_extension_ability/src/sts_form_extension_context.cpp b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension_context.cpp similarity index 83% rename from frameworks/ets/ani/form_extension_ability/src/sts_form_extension_context.cpp rename to frameworks/ets/ani/form_extension_ability/src/ets_form_extension_context.cpp index b919ad62cda..7d07f76dd21 100644 --- a/frameworks/ets/ani/form_extension_ability/src/sts_form_extension_context.cpp +++ b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension_context.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "sts_form_extension_context.h" +#include "ets_form_extension_context.h" #include #include @@ -28,7 +28,7 @@ namespace { constexpr const char* FORM_EXTENSION_CONTEXT_CLASS_NAME = "Lapplication/FormExtensionContext/FormExtensionContext;"; } -ani_object STSFormExtensionContext::SetFormExtensionContext( +ani_object ETSFormExtensionContext::SetFormExtensionContext( ani_env *env, const std::shared_ptr &context) { TAG_LOGI(AAFwkTag::FORM_EXT, "SetFormExtensionContext call"); @@ -62,10 +62,10 @@ ani_object STSFormExtensionContext::SetFormExtensionContext( return contextObj; } -ani_ref STSFormExtensionContext::CreateStsExtensionContext(ani_env *env, +ani_ref ETSFormExtensionContext::CreateEtsExtensionContext(ani_env *env, const std::shared_ptr &context, std::shared_ptr &abilityInfo) { - TAG_LOGI(AAFwkTag::FORM_EXT, "CreateStsExtensionContext call"); + TAG_LOGI(AAFwkTag::FORM_EXT, "CreateEtsExtensionContext call"); if (env == nullptr) { TAG_LOGE(AAFwkTag::FORM_EXT, "env null"); return nullptr; @@ -80,18 +80,18 @@ ani_ref STSFormExtensionContext::CreateStsExtensionContext(ani_env *env, return nullptr; } - ani_object contextObj = STSFormExtensionContext::SetFormExtensionContext(env, context); + ani_object contextObj = ETSFormExtensionContext::SetFormExtensionContext(env, context); - TAG_LOGI(AAFwkTag::FORM_EXT, "CreateStsExtensionContext end"); + TAG_LOGI(AAFwkTag::FORM_EXT, "CreateEtsExtensionContext end"); return contextObj; } -ani_ref CreateStsFormExtensionContext(ani_env *env, std::shared_ptr &context) +ani_ref CreateEtsFormExtensionContext(ani_env *env, std::shared_ptr &context) { - TAG_LOGI(AAFwkTag::FORM_EXT, "CreateStsFormExtensionContext call"); + TAG_LOGI(AAFwkTag::FORM_EXT, "CreateEtsFormExtensionContext call"); auto abilityInfo = context->GetAbilityInfo(); - ani_ref object = STSFormExtensionContext::CreateStsExtensionContext(env, context, abilityInfo); - TAG_LOGI(AAFwkTag::FORM_EXT, "CreateStsFormExtensionContext end"); + ani_ref object = ETSFormExtensionContext::CreateEtsExtensionContext(env, context, abilityInfo); + TAG_LOGI(AAFwkTag::FORM_EXT, "CreateEtsFormExtensionContext end"); return object; } } // namespace AbilityRuntime diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 08f29ae030b..73281c759dc 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -1148,7 +1148,7 @@ ohos_shared_library("ability_thread") { part_name = "ability_runtime" } -ohos_shared_library("sts_form_extension") { +ohos_shared_library("ets_form_extension") { sanitize = { integer_overflow = true ubsan = true @@ -1171,8 +1171,8 @@ ohos_shared_library("sts_form_extension") { ] sources = [ - "${ability_runtime_path}/frameworks/ets/ani/form_extension_ability/src/sts_form_extension.cpp", - "${ability_runtime_path}/frameworks/ets/ani/form_extension_ability/src/sts_form_extension_context.cpp", + "${ability_runtime_path}/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp", + "${ability_runtime_path}/frameworks/ets/ani/form_extension_ability/src/ets_form_extension_context.cpp", ] deps = [ @@ -1231,7 +1231,7 @@ ohos_shared_library("form_extension") { "${ability_runtime_native_path}/ability/native/form_runtime/form_extension_provider_client.cpp", "${ability_runtime_native_path}/ability/native/form_runtime/js_form_extension.cpp", "${ability_runtime_native_path}/ability/native/form_runtime/js_form_extension_context.cpp", - "${ability_runtime_native_path}/ability/native/form_runtime/sts_form_extension_instance.cpp", + "${ability_runtime_native_path}/ability/native/form_runtime/ets_form_extension_instance.cpp", "${ability_runtime_native_path}/appkit/ability_runtime/form_extension_context.cpp", ] diff --git a/frameworks/native/ability/native/form_runtime/sts_form_extension_instance.cpp b/frameworks/native/ability/native/form_runtime/ets_form_extension_instance.cpp similarity index 61% rename from frameworks/native/ability/native/form_runtime/sts_form_extension_instance.cpp rename to frameworks/native/ability/native/form_runtime/ets_form_extension_instance.cpp index af1257a409d..42442d52f3a 100644 --- a/frameworks/native/ability/native/form_runtime/sts_form_extension_instance.cpp +++ b/frameworks/native/ability/native/form_runtime/ets_form_extension_instance.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "form_runtime/sts_form_extension_instance.h" +#include "form_runtime/ets_form_extension_instance.h" #include @@ -25,47 +25,47 @@ namespace OHOS { namespace AbilityRuntime { namespace { #if defined(WINDOWS_PLATFORM) -constexpr char STS_FORM_EXT_LIB_NAME[] = "libsts_form_extension.dll"; +constexpr char ETS_FORM_EXT_LIB_NAME[] = "libets_form_extension.dll"; #elif defined(MAC_PLATFORM) -constexpr char STS_FORM_EXT_LIB_NAME[] = "libsts_form_extension.dylib"; +constexpr char ETS_FORM_EXT_LIB_NAME[] = "libets_form_extension.dylib"; #else -constexpr char STS_FORM_EXT_LIB_NAME[] = "libsts_form_extension.z.so"; +constexpr char ETS_FORM_EXT_LIB_NAME[] = "libets_form_extension.z.so"; #endif using CreateFunc = FormExtension *(*)(void*); -static constexpr char STS_FORM_EXT_CREATE_FUNC[] = "OHOS_ABILITY_STSFormExtension"; +static constexpr char ETS_FORM_EXT_CREATE_FUNC[] = "OHOS_ABILITY_ETSFormExtension"; -#ifndef STS_EXPORT +#ifndef ETS_EXPORT #ifndef __WINDOWS__ -#define STS_EXPORT __attribute__((visibility("default"))) +#define ETS_EXPORT __attribute__((visibility("default"))) #else -#define STS_EXPORT __declspec(dllexport) +#define ETS_EXPORT __declspec(dllexport) #endif #endif } // namespace -FormExtension *CreateSTSFormExtension(const std::unique_ptr &runtime) +FormExtension *CreateETSFormExtension(const std::unique_ptr &runtime) { std::unique_ptr* runtimePtr = const_cast*>(&runtime); - void *handle = dlopen(STS_FORM_EXT_LIB_NAME, RTLD_LAZY); + void *handle = dlopen(ETS_FORM_EXT_LIB_NAME, RTLD_LAZY); if (handle == nullptr) { - TAG_LOGE(AAFwkTag::FORM_EXT, "open sts_form_extension library %{public}s failed, reason: %{public}sn", - STS_FORM_EXT_LIB_NAME, dlerror()); + TAG_LOGE(AAFwkTag::FORM_EXT, "open ets_form_extension library %{public}s failed, reason: %{public}sn", + ETS_FORM_EXT_LIB_NAME, dlerror()); return new FormExtension(); } - auto entry = reinterpret_cast(dlsym(handle, STS_FORM_EXT_CREATE_FUNC)); + auto entry = reinterpret_cast(dlsym(handle, ETS_FORM_EXT_CREATE_FUNC)); if (entry == nullptr) { dlclose(handle); - TAG_LOGE(AAFwkTag::FORM_EXT, "get sts_form_extension symbol %{public}s in %{public}s failed", - STS_FORM_EXT_CREATE_FUNC, STS_FORM_EXT_LIB_NAME); + TAG_LOGE(AAFwkTag::FORM_EXT, "get ets_form_extension symbol %{public}s in %{public}s failed", + ETS_FORM_EXT_CREATE_FUNC, ETS_FORM_EXT_LIB_NAME); return new FormExtension(); } auto instance = entry(reinterpret_cast(runtimePtr)); if (instance == nullptr) { dlclose(handle); - TAG_LOGE(AAFwkTag::FORM_EXT, "get sts_form_extension instance in %{public}s failed", STS_FORM_EXT_LIB_NAME); + TAG_LOGE(AAFwkTag::FORM_EXT, "get ets_form_extension instance in %{public}s failed", ETS_FORM_EXT_LIB_NAME); return new FormExtension(); } diff --git a/interfaces/kits/native/ability/native/form_runtime/sts_form_extension_instance.h b/interfaces/kits/native/ability/native/form_runtime/ets_form_extension_instance.h similarity index 76% rename from interfaces/kits/native/ability/native/form_runtime/sts_form_extension_instance.h rename to interfaces/kits/native/ability/native/form_runtime/ets_form_extension_instance.h index 45876558128..01c8e76623c 100644 --- a/interfaces/kits/native/ability/native/form_runtime/sts_form_extension_instance.h +++ b/interfaces/kits/native/ability/native/form_runtime/ets_form_extension_instance.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef OHOS_ABILITY_RUNTIME_STS_FORM_EXTENSION_EXTENSION_INSTANCE_H -#define OHOS_ABILITY_RUNTIME_STS_FORM_EXTENSION_EXTENSION_INSTANCE_H +#ifndef OHOS_ABILITY_RUNTIME_ETS_FORM_EXTENSION_EXTENSION_INSTANCE_H +#define OHOS_ABILITY_RUNTIME_ETS_FORM_EXTENSION_EXTENSION_INSTANCE_H #include @@ -24,9 +24,9 @@ namespace OHOS { namespace AbilityRuntime { class FormExtension; -FormExtension *CreateSTSFormExtension(const std::unique_ptr &runtime); +FormExtension *CreateETSFormExtension(const std::unique_ptr &runtime); } // namespace AbilityRuntime } // namespace OHOS -#endif // OHOS_ABILITY_RUNTIME_STS_FORM_EXTENSION_EXTENSION_INSTANCE_H \ No newline at end of file +#endif // OHOS_ABILITY_RUNTIME_ETS_FORM_EXTENSION_EXTENSION_INSTANCE_H \ No newline at end of file -- Gitee From c76da4539ce6faefada842d41d755a3234701124 Mon Sep 17 00:00:00 2001 From: cxy251 Date: Mon, 14 Jul 2025 10:06:59 +0800 Subject: [PATCH 3/3] lostso Signed-off-by: cxy251 --- frameworks/native/ability/native/form_extension.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/native/ability/native/form_extension.cpp b/frameworks/native/ability/native/form_extension.cpp index d3389da2515..65f62184c74 100644 --- a/frameworks/native/ability/native/form_extension.cpp +++ b/frameworks/native/ability/native/form_extension.cpp @@ -17,7 +17,7 @@ #include "configuration_utils.h" #include "form_extension_context.h" -#include "form_runtime/sts_form_extension_instance.h" +#include "form_runtime/ets_form_extension_instance.h" #include "form_runtime/cj_form_extension_instance.h" #include "form_runtime/js_form_extension.h" #include "hilog_tag_wrapper.h" @@ -38,7 +38,7 @@ FormExtension* FormExtension::Create(const std::unique_ptr& runtime) case Runtime::Language::CJ: return CreateCJFormExtension(); case Runtime::Language::ETS: - return CreateSTSFormExtension(runtime); + return CreateETSFormExtension(runtime); default: return new FormExtension(); } -- Gitee