From 13842c74717d06a02dc6f0728b5d117fc162142b Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Tue, 27 May 2025 14:19:00 +0800 Subject: [PATCH] =?UTF-8?q?0411=E5=9B=9E=E5=90=88=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzezhong --- .../src/sts_ability_delegator.cpp | 2 +- .../include/sts_ui_extension_context.h | 2 +- .../src/sts_ui_extension_context.cpp | 8 +- .../ets/application/ApplicationContext.ets | 4 +- .../ets/ets/application/BaseContext.ets | 2 +- frameworks/ets/ets/application/Context.ets | 2 - .../ability_runtime/sts_ability_context.cpp | 4 +- frameworks/native/appkit/BUILD.gn | 2 +- .../app/sts_ability_stage_context.cpp | 4 +- .../context/application_context_manager.cpp | 26 ++--- ...ontext_utils.cpp => ets_context_utils.cpp} | 108 +++++++++++++----- .../native/appkit/app/ohos_application.cpp | 25 ++-- .../include/ani_base_context.h | 8 +- .../context/application_context_manager.h | 10 +- ...ts_context_utils.h => ets_context_utils.h} | 6 +- 15 files changed, 127 insertions(+), 86 deletions(-) rename frameworks/native/appkit/ability_runtime/context/{sts_context_utils.cpp => ets_context_utils.cpp} (57%) rename interfaces/kits/native/appkit/ability_runtime/context/{sts_context_utils.h => ets_context_utils.h} (85%) diff --git a/frameworks/ets/ani/ability_delegator/src/sts_ability_delegator.cpp b/frameworks/ets/ani/ability_delegator/src/sts_ability_delegator.cpp index 4a28dcb75b4..857957ea837 100644 --- a/frameworks/ets/ani/ability_delegator/src/sts_ability_delegator.cpp +++ b/frameworks/ets/ani/ability_delegator/src/sts_ability_delegator.cpp @@ -23,7 +23,7 @@ #include "sts_error_utils.h" #include "ani_enum_convert.h" #include "sts_ability_monitor.h" -#include "sts_context_utils.h" +#include "ets_context_utils.h" #include namespace OHOS { namespace AbilityDelegatorSts { diff --git a/frameworks/ets/ani/ui_extension_ability/include/sts_ui_extension_context.h b/frameworks/ets/ani/ui_extension_ability/include/sts_ui_extension_context.h index 6440b894601..00a976baa8e 100644 --- a/frameworks/ets/ani/ui_extension_ability/include/sts_ui_extension_context.h +++ b/frameworks/ets/ani/ui_extension_ability/include/sts_ui_extension_context.h @@ -33,7 +33,7 @@ ani_object CreateStsUIExtensionContext(ani_env *env, const std::shared_ptr &application); void StsCreatExtensionContext(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, - void* applicationCtxRef, std::shared_ptr context); + std::shared_ptr context); void BindExtensionInfo(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, std::shared_ptr context, std::shared_ptr abilityInfo); diff --git a/frameworks/ets/ani/ui_extension_ability/src/sts_ui_extension_context.cpp b/frameworks/ets/ani/ui_extension_ability/src/sts_ui_extension_context.cpp index 08bd284212b..749d3db927e 100644 --- a/frameworks/ets/ani/ui_extension_ability/src/sts_ui_extension_context.cpp +++ b/frameworks/ets/ani/ui_extension_ability/src/sts_ui_extension_context.cpp @@ -17,7 +17,7 @@ #include "ui_extension_context.h" #include "ani_common_want.h" #include "ability_manager_client.h" -#include "sts_context_utils.h" +#include "ets_context_utils.h" #include "sts_error_utils.h" #include "sts_ui_extension_common.h" @@ -122,9 +122,9 @@ void BindExtensionInfo(ani_env* aniEnv, ani_class contextClass, ani_object conte } void StsCreatExtensionContext(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, - void* applicationCtxRef, std::shared_ptr context) + std::shared_ptr context) { - OHOS::AbilityRuntime::ContextUtil::StsCreatContext(aniEnv, contextClass, contextObj, applicationCtxRef, context); + OHOS::AbilityRuntime::ContextUtil::CreateEtsBaseContext(aniEnv, contextClass, contextObj, context); BindExtensionInfo(aniEnv, contextClass, contextObj, context, context->GetAbilityInfo()); } @@ -174,6 +174,6 @@ ani_object CreateStsUIExtensionContext(ani_env *env, TAG_LOGE(AAFwkTag::UI_EXT, "application null"); return nullptr; } - StsCreatExtensionContext(env, cls, contextObj, application->GetApplicationCtxObjRef(), context); + StsCreatExtensionContext(env, cls, contextObj, context); return contextObj; } diff --git a/frameworks/ets/ets/application/ApplicationContext.ets b/frameworks/ets/ets/application/ApplicationContext.ets index e1797fcc24c..3ab5c0b2eb1 100644 --- a/frameworks/ets/ets/application/ApplicationContext.ets +++ b/frameworks/ets/ets/application/ApplicationContext.ets @@ -19,8 +19,6 @@ export default class ApplicationContext extends Context { public native setSupportedProcessCacheSync(isSupported : boolean):void; setSupportedProcessCache(isSupported : boolean):void { - taskpool.execute((): void => { - this.setSupportedProcessCacheSync(isSupported); - }); + this.setSupportedProcessCacheSync(isSupported); } } \ No newline at end of file diff --git a/frameworks/ets/ets/application/BaseContext.ets b/frameworks/ets/ets/application/BaseContext.ets index 2e9e42158db..16d5fd10eab 100644 --- a/frameworks/ets/ets/application/BaseContext.ets +++ b/frameworks/ets/ets/application/BaseContext.ets @@ -15,5 +15,5 @@ export default class BaseContext { public nativeContext : long = 0; - public stageMode: boolean; + public stageMode: boolean = true; } \ No newline at end of file diff --git a/frameworks/ets/ets/application/Context.ets b/frameworks/ets/ets/application/Context.ets index 4283af9e961..e486b22bd4b 100644 --- a/frameworks/ets/ets/application/Context.ets +++ b/frameworks/ets/ets/application/Context.ets @@ -15,7 +15,6 @@ import BaseContext from 'application.BaseContext' import ApplicationContext from 'application.ApplicationContext' -import EventHub from 'application.EventHub'; import contextConstant from '@ohos.app.ability.contextConstant' import { ApplicationInfo } from 'bundleManager.ApplicationInfo' import resmgr from '@ohos.resourceManager' @@ -28,7 +27,6 @@ export class Context extends BaseContext { filesDir: string = ""; tempDir: string = ""; applicationInfo: ApplicationInfo; - eventHub: EventHub = new EventHub(); resourceManager: resmgr.ResourceManager; native constructor(); constructor(applicationInfo: ApplicationInfo, resourceManager: resmgr.ResourceManager) { diff --git a/frameworks/native/ability/native/ability_runtime/sts_ability_context.cpp b/frameworks/native/ability/native/ability_runtime/sts_ability_context.cpp index 480c7af5bd3..6e29b80d280 100644 --- a/frameworks/native/ability/native/ability_runtime/sts_ability_context.cpp +++ b/frameworks/native/ability/native/ability_runtime/sts_ability_context.cpp @@ -44,7 +44,7 @@ #include "uri.h" #include "want.h" #include "common_fun_ani.h" -#include "sts_context_utils.h" +#include "ets_context_utils.h" #include "sts_error_utils.h" namespace OHOS { @@ -624,7 +624,7 @@ ani_ref CreateStsAbilityContext( TAG_LOGE(AAFwkTag::UIABILITY, "null application"); return nullptr; } - ContextUtil::StsCreatContext(env, cls, contextObj, application->GetApplicationCtxObjRef(), context); + ContextUtil::CreateEtsBaseContext(env, cls, contextObj, context); if (!SetAbilityInfo(env, cls, contextObj, context)) { TAG_LOGE(AAFwkTag::UIABILITY, "SetAbilityInfo failed"); return nullptr; diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index 004054a63ef..cf201db2960 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -410,7 +410,7 @@ ohos_shared_library("app_context_utils") { "ability_runtime/context/js_application_context_utils.cpp", "ability_runtime/context/js_context_utils.cpp", "ability_runtime/context/js_resource_manager_utils.cpp", - "ability_runtime/context/sts_context_utils.cpp", + "ability_runtime/context/ets_context_utils.cpp", ] cflags = [] if (target_cpu == "arm") { diff --git a/frameworks/native/appkit/ability_runtime/app/sts_ability_stage_context.cpp b/frameworks/native/appkit/ability_runtime/app/sts_ability_stage_context.cpp index 0bd9f3d3ffa..d1c9083b9e5 100644 --- a/frameworks/native/appkit/ability_runtime/app/sts_ability_stage_context.cpp +++ b/frameworks/native/appkit/ability_runtime/app/sts_ability_stage_context.cpp @@ -19,7 +19,7 @@ #include "configuration_convertor.h" #include "ohos_application.h" #include "ani_common_configuration.h" -#include "sts_context_utils.h" +#include "ets_context_utils.h" namespace OHOS { namespace AbilityRuntime { @@ -89,7 +89,7 @@ ani_object STSAbilityStageContext::CreateStsAbilityStageContext(ani_env* env, st delete workContext; return nullptr; } - ContextUtil::StsCreatContext(env, abilityStageCtxCls, obj, app->GetApplicationCtxObjRef(), context); + ContextUtil::CreateEtsBaseContext(env, abilityStageCtxCls, obj, context); //set Config class auto configuration = context->GetConfiguration(); diff --git a/frameworks/native/appkit/ability_runtime/context/application_context_manager.cpp b/frameworks/native/appkit/ability_runtime/context/application_context_manager.cpp index b456b0d6229..6669cbb2c5a 100644 --- a/frameworks/native/appkit/ability_runtime/context/application_context_manager.cpp +++ b/frameworks/native/appkit/ability_runtime/context/application_context_manager.cpp @@ -89,13 +89,13 @@ void ApplicationContextManager::RemoveGlobalObject(napi_env env) } } -void ApplicationContextManager::AddStsGlobalObject(ani_env* env, +void ApplicationContextManager::AddEtsGlobalObject(ani_env* env, std::shared_ptr applicationContextObj) { - std::lock_guard lock(stsApplicationContextMutex_); - auto iter = stsApplicationContextMap_.find(env); - if (iter == stsApplicationContextMap_.end()) { - stsApplicationContextMap_[env] = applicationContextObj; + std::lock_guard lock(etsApplicationContextMutex_); + auto iter = etsApplicationContextMap_.find(env); + if (iter == etsApplicationContextMap_.end()) { + etsApplicationContextMap_[env] = applicationContextObj; return; } if (iter->second != nullptr) { @@ -105,20 +105,20 @@ void ApplicationContextManager::AddStsGlobalObject(ani_env* env, iter->second = applicationContextObj; } -std::shared_ptr ApplicationContextManager::GetStsGlobalObject(ani_env* env) +std::shared_ptr ApplicationContextManager::GetEtsGlobalObject(ani_env* env) { - std::lock_guard lock(stsApplicationContextMutex_); - return stsApplicationContextMap_[env]; + std::lock_guard lock(etsApplicationContextMutex_); + return etsApplicationContextMap_[env]; } -void ApplicationContextManager::RemoveStsGlobalObject(ani_env* env) +void ApplicationContextManager::RemoveEtsGlobalObject(ani_env* env) { - std::lock_guard lock(stsApplicationContextMutex_); - auto iter = stsApplicationContextMap_.find(env); - if (iter != stsApplicationContextMap_.end() && iter->second != nullptr) { + std::lock_guard lock(etsApplicationContextMutex_); + auto iter = etsApplicationContextMap_.find(env); + if (iter != etsApplicationContextMap_.end() && iter->second != nullptr) { iter->second.reset(); iter->second = nullptr; - stsApplicationContextMap_.erase(env); + etsApplicationContextMap_.erase(env); } } } // namespace AbilityRuntime diff --git a/frameworks/native/appkit/ability_runtime/context/sts_context_utils.cpp b/frameworks/native/appkit/ability_runtime/context/ets_context_utils.cpp similarity index 57% rename from frameworks/native/appkit/ability_runtime/context/sts_context_utils.cpp rename to frameworks/native/appkit/ability_runtime/context/ets_context_utils.cpp index dbb20f3ccde..f17a2d87fad 100644 --- a/frameworks/native/appkit/ability_runtime/context/sts_context_utils.cpp +++ b/frameworks/native/appkit/ability_runtime/context/ets_context_utils.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "sts_context_utils.h" +#include "ets_context_utils.h" #include "ani_common_util.h" #include "ani_enum_convert.h" @@ -27,25 +27,13 @@ namespace OHOS { namespace AbilityRuntime { namespace ContextUtil { -void BindApplicationCtx(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, - void* applicationCtxRef) -{ - // bind parent context field:applicationContext - ani_field applicationContextField; - if (aniEnv->Class_FindField(contextClass, "applicationContext", &applicationContextField) != ANI_OK) { - TAG_LOGE(AAFwkTag::APPKIT, "Class_FindField failed"); - return; - } - ani_ref applicationContextRef = reinterpret_cast(applicationCtxRef); - if (aniEnv->Object_SetField_Ref(contextObj, applicationContextField, applicationContextRef) != ANI_OK) { - TAG_LOGE(AAFwkTag::APPKIT, "Object_SetField_Ref failed"); - return; - } -} - +std::weak_ptr context_; void BindApplicationInfo(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, std::shared_ptr context) { + if (aniEnv == nullptr || context == nullptr) { + TAG_LOGE(AAFwkTag::APPKIT, "null aniEnv or null context"); + } ani_field applicationInfoField; if (ANI_OK != aniEnv->Class_FindField(contextClass, "applicationInfo", &applicationInfoField)) { TAG_LOGE(AAFwkTag::APPKIT, "find applicationInfo failed"); @@ -63,6 +51,9 @@ void BindApplicationInfo(ani_env* aniEnv, ani_class contextClass, ani_object con void BindResourceManager(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, std::shared_ptr context) { + if (aniEnv == nullptr || context == nullptr) { + TAG_LOGE(AAFwkTag::APPKIT, "null aniEnv or null context"); + } ani_field resourceManagerField; if (ANI_OK != aniEnv->Class_FindField(contextClass, "resourceManager", &resourceManagerField)) { TAG_LOGE(AAFwkTag::APPKIT, "find resourceManager failed"); @@ -80,10 +71,12 @@ void BindResourceManager(ani_env* aniEnv, ani_class contextClass, ani_object con void BindParentProperty(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, std::shared_ptr context) { + if (aniEnv == nullptr || context == nullptr) { + TAG_LOGE(AAFwkTag::APPKIT, "null aniEnv or null context"); + } BindApplicationInfo(aniEnv, contextClass, contextObj, context); BindResourceManager(aniEnv, contextClass, contextObj, context); - // bind parent context property ani_field areaField; if (ANI_OK != aniEnv->Class_FindField(contextClass, "area", &areaField)) { TAG_LOGE(AAFwkTag::APPKIT, "find area failed"); @@ -126,22 +119,83 @@ void BindParentProperty(ani_env* aniEnv, ani_class contextClass, ani_object cont } } -void StsCreatContext(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, - void* applicationCtxRef, std::shared_ptr context) +void CreateEtsBaseContext(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, + std::shared_ptr context) { - BindApplicationCtx(aniEnv, contextClass, contextObj, applicationCtxRef); + context_ = context; + if (aniEnv == nullptr) { + TAG_LOGE(AAFwkTag::APPKIT, "null aniEnv"); + } BindParentProperty(aniEnv, contextClass, contextObj, context); } +ani_object GetApplicationContext(ani_env* env, const std::shared_ptr applicationContext) +{ + if (env == nullptr) { + TAG_LOGE(AAFwkTag::APPKIT, "null env"); + } + ani_class applicationContextCls = nullptr; + if (env->FindClass("Lapplication/ApplicationContext/ApplicationContext;", &applicationContextCls) != ANI_OK) { + TAG_LOGE(AAFwkTag::APPKIT, "FindClass ApplicationContext failed"); + return {}; + } + ani_method contextCtorMethod = nullptr; + if (env->Class_FindMethod(applicationContextCls, "", ":V", &contextCtorMethod) != ANI_OK) { + TAG_LOGE(AAFwkTag::APPKIT, "Class_FindMethod ctor failed"); + return {}; + } + ani_object applicationContextObject = nullptr; + if (env->Object_New(applicationContextCls, contextCtorMethod, &applicationContextObject) != ANI_OK) { + TAG_LOGE(AAFwkTag::APPKIT, "Object_New failed"); + return {}; + } + ani_field contextField; + if (env->Class_FindField(applicationContextCls, "nativeContext", &contextField) != ANI_OK) { + TAG_LOGE(AAFwkTag::APPKIT, "Class_FindField failed"); + return {}; + } + auto workContext = new (std::nothrow) std::weak_ptr(applicationContext); + if (workContext == nullptr) { + TAG_LOGE(AAFwkTag::UIABILITY, "workContext nullptr"); + return {}; + } + ani_long nativeContextLong = (ani_long)workContext; + if (env->Object_SetField_Long(applicationContextObject, contextField, nativeContextLong) != ANI_OK) { + TAG_LOGE(AAFwkTag::APPKIT, "Object_SetField_Long failed"); + return {}; + } + auto etsReference = std::make_shared(); + etsReference->aniObj = applicationContextObject; + AbilityRuntime::ApplicationContextManager::GetApplicationContextManager().AddEtsGlobalObject(env, etsReference); + applicationContext->SetApplicationInfoUpdateFlag(false); + return applicationContextObject; +} + ani_object GetApplicationContextSync([[maybe_unused]]ani_env *env, [[maybe_unused]]ani_object aniObj) { - auto appContextObj = ApplicationContextManager::GetApplicationContextManager().GetStsGlobalObject(env); - if (appContextObj != nullptr) { - TAG_LOGE(AAFwkTag::APPKIT, "appContextObj is not nullptr"); - return appContextObj->aniObj; + if (env == nullptr) { + TAG_LOGE(AAFwkTag::APPKIT, "null env"); + } + auto context = context_.lock(); + if (!context) { + TAG_LOGW(AAFwkTag::APPKIT, "null context"); + ThrowStsError(env, (int32_t)AbilityErrorCode::ERROR_CODE_INVALID_PARAM); + return {}; + } + auto applicationContext = context->GetApplicationContext(); + if (applicationContext == nullptr) { + TAG_LOGE(AAFwkTag::APPKIT, "null applicationContext"); + ThrowStsError(env, (int32_t)AbilityErrorCode::ERROR_CODE_INVALID_PARAM); + return {}; + } + if (!applicationContext->GetApplicationInfoUpdateFlag()) { + auto appContextObj = ApplicationContextManager::GetApplicationContextManager().GetEtsGlobalObject(env); + if (appContextObj != nullptr) { + TAG_LOGE(AAFwkTag::APPKIT, "appContextObj is not nullptr"); + return appContextObj->aniObj; + } } - ThrowStsInvalidParamError(env, "appContextObj null"); - return {}; + return GetApplicationContext(env, applicationContext); } } } // namespace AbilityRuntime diff --git a/frameworks/native/appkit/app/ohos_application.cpp b/frameworks/native/appkit/app/ohos_application.cpp index 3d1a604f993..165c0f800ae 100644 --- a/frameworks/native/appkit/app/ohos_application.cpp +++ b/frameworks/native/appkit/app/ohos_application.cpp @@ -48,7 +48,7 @@ #include "window.h" #endif #include "ani.h" -#include "sts_context_utils.h" +#include "ets_context_utils.h" #include "sts_runtime.h" #include "sts_error_utils.h" @@ -56,8 +56,8 @@ namespace OHOS { namespace AppExecFwk { namespace { constexpr const char* PERSIST_DARKMODE_KEY = "persist.ace.darkmode"; - constexpr const char* STS_APPLICATION_CONTEXT_CLASS_NAME = "Lapplication/ApplicationContext/ApplicationContext;"; - constexpr const char* STS_CONTEXT_CLASS_NAME = "Lapplication/Context/Context;"; + constexpr const char* ETS_APPLICATION_CONTEXT_CLASS_NAME = "Lapplication/ApplicationContext/ApplicationContext;"; + constexpr const char* ETS_CONTEXT_CLASS_NAME = "Lapplication/Context/Context;"; } REGISTER_APPLICATION(OHOSApplication, OHOSApplication) constexpr int32_t APP_ENVIRONMENT_OVERWRITE = 1; @@ -225,7 +225,7 @@ static void SetSupportedProcessCacheSync([[maybe_unused]]ani_env *env, [[maybe_u { TAG_LOGD(AAFwkTag::APPKIT, "called"); ani_class applicationContextCls = nullptr; - if (env->FindClass(STS_APPLICATION_CONTEXT_CLASS_NAME, &applicationContextCls) != ANI_OK) { + if (env->FindClass(ETS_APPLICATION_CONTEXT_CLASS_NAME, &applicationContextCls) != ANI_OK) { TAG_LOGE(AAFwkTag::APPKIT, "FindClass ApplicationContext failed"); AbilityRuntime::ThrowStsInvalidParamError(env, "FindClass failed"); return; @@ -256,7 +256,7 @@ void OHOSApplication::InitAniApplicationContext() auto& runtime = GetRuntime(AbilityRuntime::APPLICAITON_CODE_LANGUAGE_ARKTS_1_2); auto aniEnv = static_cast(*runtime).GetAniEnv(); ani_class applicationContextCls = nullptr; - if (aniEnv->FindClass(STS_APPLICATION_CONTEXT_CLASS_NAME, &applicationContextCls) != ANI_OK) { + if (aniEnv->FindClass(ETS_APPLICATION_CONTEXT_CLASS_NAME, &applicationContextCls) != ANI_OK) { TAG_LOGE(AAFwkTag::APPKIT, "FindClass ApplicationContext failed"); return; } @@ -287,16 +287,9 @@ void OHOSApplication::InitAniApplicationContext() TAG_LOGE(AAFwkTag::APPKIT, "Object_SetField_Long failed"); return; } - ani_ref applicationContextObjectRef = nullptr; - if (aniEnv->GlobalReference_Create(applicationContextObject, &applicationContextObjectRef) != ANI_OK) { - TAG_LOGE(AAFwkTag::APPKIT, "GlobalReference_Create failed"); - return; - } - auto stsReference = std::make_shared(); - stsReference->aniObj = applicationContextObject; - AbilityRuntime::ApplicationContextManager::GetApplicationContextManager().AddStsGlobalObject(aniEnv, stsReference); - applicationContextObjRef_ = reinterpret_cast(applicationContextObjectRef); - abilityRuntimeContext_->SetApplicationCtxObjRef(applicationContextObjRef_); + auto etsReference = std::make_shared(); + etsReference->aniObj = applicationContextObject; + AbilityRuntime::ApplicationContextManager::GetApplicationContextManager().AddEtsGlobalObject(aniEnv, etsReference); } void OHOSApplication::InitAniContext() @@ -305,7 +298,7 @@ void OHOSApplication::InitAniContext() auto& runtime = GetRuntime(AbilityRuntime::APPLICAITON_CODE_LANGUAGE_ARKTS_1_2); auto aniEnv = static_cast(*runtime).GetAniEnv(); ani_class contextCls = nullptr; - if (aniEnv->FindClass(STS_CONTEXT_CLASS_NAME, &contextCls) != ANI_OK) { + if (aniEnv->FindClass(ETS_CONTEXT_CLASS_NAME, &contextCls) != ANI_OK) { TAG_LOGE(AAFwkTag::APPKIT, "FindClass Context failed"); return; } diff --git a/interfaces/inner_api/ani_base_context/include/ani_base_context.h b/interfaces/inner_api/ani_base_context/include/ani_base_context.h index caf033ae2f6..bcd903b6116 100644 --- a/interfaces/inner_api/ani_base_context/include/ani_base_context.h +++ b/interfaces/inner_api/ani_base_context/include/ani_base_context.h @@ -34,17 +34,17 @@ namespace AbilityRuntime { /** * @brief Get "stageMode" value of object. * - * @param env NAPI environment. + * @param env ANI environment. * @param object Native value contains "stageMode" object. * @param stageMode The value of "stageMode" object. - * @return napi_status + * @return ani_status */ ani_status IsStageContext(ani_env* env, ani_object object, ani_boolean& stageMode); /** * @brief Get stage mode context. * - * @param env NAPI environment. + * @param env ANI environment. * @param object Native value of context. * @return The stage mode context. */ @@ -54,7 +54,7 @@ namespace AbilityRuntime { /** * @brief Get current ability. * - * @param env NAPI environment. + * @param env ANI environment. * @return The pointer of current ability. */ AppExecFwk::Ability* GetCurrentAbility(ani_env* env); diff --git a/interfaces/kits/native/appkit/ability_runtime/context/application_context_manager.h b/interfaces/kits/native/appkit/ability_runtime/context/application_context_manager.h index 576fc7a4b41..0b4d56755e0 100644 --- a/interfaces/kits/native/appkit/ability_runtime/context/application_context_manager.h +++ b/interfaces/kits/native/appkit/ability_runtime/context/application_context_manager.h @@ -43,11 +43,11 @@ public: void RemoveGlobalObject(napi_env env); - void AddStsGlobalObject(ani_env* env, std::shared_ptr applicationContextObj); + void AddEtsGlobalObject(ani_env* env, std::shared_ptr applicationContextObj); - std::shared_ptr GetStsGlobalObject(ani_env* env); + std::shared_ptr GetEtsGlobalObject(ani_env* env); - void RemoveStsGlobalObject(ani_env* env); + void RemoveEtsGlobalObject(ani_env* env); private: ApplicationContextManager(); @@ -55,9 +55,9 @@ private: ~ApplicationContextManager(); std::unordered_map> applicationContextMap_; - std::unordered_map> stsApplicationContextMap_; + std::unordered_map> etsApplicationContextMap_; std::mutex applicationContextMutex_; - std::mutex stsApplicationContextMutex_; + std::mutex etsApplicationContextMutex_; }; } // namespace AbilityRuntime } // namespace OHOS diff --git a/interfaces/kits/native/appkit/ability_runtime/context/sts_context_utils.h b/interfaces/kits/native/appkit/ability_runtime/context/ets_context_utils.h similarity index 85% rename from interfaces/kits/native/appkit/ability_runtime/context/sts_context_utils.h rename to interfaces/kits/native/appkit/ability_runtime/context/ets_context_utils.h index e2ec8580878..2fc944d217c 100644 --- a/interfaces/kits/native/appkit/ability_runtime/context/sts_context_utils.h +++ b/interfaces/kits/native/appkit/ability_runtime/context/ets_context_utils.h @@ -22,8 +22,6 @@ namespace OHOS { namespace AbilityRuntime { namespace ContextUtil { -void BindApplicationCtx(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, - void* applicationCtxRef); void SetArea([[maybe_unused]]ani_env *env, [[maybe_unused]]ani_object aniObj, ani_int value); @@ -38,8 +36,8 @@ void BindResourceManager(ani_env* aniEnv, ani_class contextClass, ani_object con void BindParentProperty(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, std::shared_ptr context); -void StsCreatContext(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, - void* applicationCtxRef, std::shared_ptr context); +void CreateEtsBaseContext(ani_env* aniEnv, ani_class contextClass, ani_object contextObj, + std::shared_ptr context); ani_object GetApplicationContextSync([[maybe_unused]]ani_env *env, [[maybe_unused]]ani_object aniObj); } -- Gitee