From b25b5f6b667ed0680829f058dbf5fd14441c9d6b Mon Sep 17 00:00:00 2001 From: s30030188 Date: Sat, 12 Jul 2025 15:47:37 +0800 Subject: [PATCH] langurage change arktsmode Signed-off-by: s30030188 --- .../ability/native/extension_ability_thread.cpp | 2 +- .../native/ability/native/ui_ability_thread.cpp | 4 ++-- .../ability_runtime/context/application_context.cpp | 3 ++- frameworks/native/appkit/app/main_thread.cpp | 12 ++++++------ frameworks/native/appkit/app/ohos_application.cpp | 10 +++++----- interfaces/inner_api/runtime/include/runtime.h | 4 ++-- interfaces/kits/native/appkit/app/ohos_application.h | 2 +- .../appkit/main_thread_test/main_thread_test.cpp | 8 ++++---- .../application_context_test.cpp | 6 +++--- utils/server/startup/src/startup_util.cpp | 2 +- 10 files changed, 27 insertions(+), 26 deletions(-) diff --git a/frameworks/native/ability/native/extension_ability_thread.cpp b/frameworks/native/ability/native/extension_ability_thread.cpp index 529323f391..e339f0cd55 100644 --- a/frameworks/native/ability/native/extension_ability_thread.cpp +++ b/frameworks/native/ability/native/extension_ability_thread.cpp @@ -252,7 +252,7 @@ void ExtensionAbilityThread::HandleAttach(const std::shared_ptrcodeLanguage); + abilityInfo->arkTSMode); if (extension == nullptr) { TAG_LOGE(AAFwkTag::EXT, "null extension"); return; diff --git a/frameworks/native/ability/native/ui_ability_thread.cpp b/frameworks/native/ability/native/ui_ability_thread.cpp index e20643c444..a18e6516a1 100644 --- a/frameworks/native/ability/native/ui_ability_thread.cpp +++ b/frameworks/native/ability/native/ui_ability_thread.cpp @@ -132,7 +132,7 @@ void UIAbilityThread::Attach(const std::shared_ptr // 2.new ability auto ability = AppExecFwk::AbilityLoader::GetInstance().GetUIAbilityByName( - abilityName, abilityRecord->GetAbilityInfo()->codeLanguage); + abilityName, abilityRecord->GetAbilityInfo()->arkTSMode); if (ability == nullptr) { TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; @@ -205,7 +205,7 @@ void UIAbilityThread::Attach(const std::shared_ptr // 2.new ability auto ability = AppExecFwk::AbilityLoader::GetInstance().GetUIAbilityByName( - abilityName, abilityRecord->GetAbilityInfo()->codeLanguage); + abilityName, abilityRecord->GetAbilityInfo()->arkTSMode); if (ability == nullptr) { TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; diff --git a/frameworks/native/appkit/ability_runtime/context/application_context.cpp b/frameworks/native/appkit/ability_runtime/context/application_context.cpp index 04d5e4cc7e..9bf0dfe046 100644 --- a/frameworks/native/appkit/ability_runtime/context/application_context.cpp +++ b/frameworks/native/appkit/ability_runtime/context/application_context.cpp @@ -915,7 +915,8 @@ napi_env ApplicationContext::GetMainNapiEnv() const TAG_LOGE(AAFwkTag::APPKIT, "null callback"); return nullptr; } - const std::unique_ptr &runtime = appGetSpecifiedRuntimeCallback_(AppExecFwk::Constants::CODE_LANGUAGE_1_1); + const std::unique_ptr &runtime = appGetSpecifiedRuntimeCallback_( + AppExecFwk::Constants::ARKTS_MODE_DYNAMIC); if (runtime == nullptr) { TAG_LOGE(AAFwkTag::APPKIT, "null runtime"); return nullptr; diff --git a/frameworks/native/appkit/app/main_thread.cpp b/frameworks/native/appkit/app/main_thread.cpp index e834473f12..0e475557fa 100644 --- a/frameworks/native/appkit/app/main_thread.cpp +++ b/frameworks/native/appkit/app/main_thread.cpp @@ -1845,7 +1845,7 @@ void MainThread::HandleLaunchApplication(const AppLaunchData &appLaunchData, con if (!isCJApp) { #endif if (application_ != nullptr) { - TAG_LOGD(AAFwkTag::APPKIT, "LoadAllExtensions lan:%{public}s", appInfo.codeLanguage.c_str()); + TAG_LOGD(AAFwkTag::APPKIT, "LoadAllExtensions lan:%{public}s", appInfo.arkTSMode.c_str()); LoadAllExtensions(); } if (!IsEtsAPP(appInfo)) { @@ -1866,7 +1866,7 @@ void MainThread::HandleLaunchApplication(const AppLaunchData &appLaunchData, con auto usertestInfo = appLaunchData.GetUserTestInfo(); if (usertestInfo) { if (!PrepareAbilityDelegator(usertestInfo, isStageBased, entryHapModuleInfo, bundleInfo.targetVersion, - appInfo.codeLanguage)) { + appInfo.arkTSMode)) { TAG_LOGE(AAFwkTag::APPKIT, "PrepareAbilityDelegator failed"); return; } @@ -4057,8 +4057,8 @@ void MainThread::HandleCacheProcess() void MainThread::SetRuntimeLang(ApplicationInfo &appInfo, AbilityRuntime::Runtime::Options &options) { - if (appInfo.codeLanguage == AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2 || - appInfo.codeLanguage == AbilityRuntime::CODE_LANGUAGE_ARKTS_HYBRID) { + if (appInfo.arkTSMode == AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2 || + appInfo.arkTSMode == AbilityRuntime::CODE_LANGUAGE_ARKTS_HYBRID) { options.lang = AbilityRuntime::Runtime::Language::ETS; } else { options.lang = AbilityRuntime::Runtime::Language::JS; @@ -4067,8 +4067,8 @@ void MainThread::SetRuntimeLang(ApplicationInfo &appInfo, AbilityRuntime::Runtim bool MainThread::IsEtsAPP(const ApplicationInfo &appInfo) { - return appInfo.codeLanguage == AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2 || - appInfo.codeLanguage == AbilityRuntime::CODE_LANGUAGE_ARKTS_HYBRID; + return appInfo.arkTSMode == AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2 || + appInfo.arkTSMode == AbilityRuntime::CODE_LANGUAGE_ARKTS_HYBRID; } void MainThread::HandleConfigByPlugin(Configuration &config, BundleInfo &bundleInfo) diff --git a/frameworks/native/appkit/app/ohos_application.cpp b/frameworks/native/appkit/app/ohos_application.cpp index bd2a91e2ca..7d524d51ca 100644 --- a/frameworks/native/appkit/app/ohos_application.cpp +++ b/frameworks/native/appkit/app/ohos_application.cpp @@ -382,7 +382,7 @@ void OHOSApplication::SetAppEnv(const std::vector& appEnvironmen void OHOSApplication::PreloadHybridModule(const HapModuleInfo &hapModuleInfo) const { - if (hapModuleInfo.codeLanguage != Constants::CODE_LANGUAGE_HYBRID) { + if (hapModuleInfo.moduleArkTSMode != Constants::ARKTS_MODE_HYBRID) { TAG_LOGD(AAFwkTag::APPKIT, "not hybrid runtime"); return; } @@ -455,7 +455,7 @@ std::shared_ptr OHOSApplication::AddAbilityStage( stageContext->SetResourceManager(rm); } - auto &runtimeStage = GetSpecifiedRuntime(hapModuleInfo->codeLanguage); + auto &runtimeStage = GetSpecifiedRuntime(hapModuleInfo->moduleArkTSMode); abilityStage = AbilityRuntime::AbilityStage::Create(runtimeStage, *hapModuleInfo); if (abilityStage == nullptr) { TAG_LOGE(AAFwkTag::APPKIT, "null abilityStage"); @@ -664,7 +664,7 @@ bool OHOSApplication::AddAbilityStage( stageContext->SetResourceManager(rm); } - auto &runtime = GetSpecifiedRuntime(moduleInfo->codeLanguage); + auto &runtime = GetSpecifiedRuntime(moduleInfo->moduleArkTSMode); auto abilityStage = AbilityRuntime::AbilityStage::Create(runtime, *moduleInfo); if (abilityStage == nullptr) { TAG_LOGE(AAFwkTag::APPKIT, "null abilityStage"); @@ -726,9 +726,9 @@ const std::unique_ptr &OHOSApplication::GetRuntime() co } const std::unique_ptr &OHOSApplication::GetSpecifiedRuntime( - const std::string &codeLanguage) const + const std::string &arkTSMode) const { - if (codeLanguage == AbilityRuntime::CODE_LANGUAGE_ARKTS_1_0 && + if (arkTSMode == AbilityRuntime::CODE_LANGUAGE_ARKTS_1_0 && runtime_ != nullptr && runtime_->GetLanguage() == AbilityRuntime::Runtime::Language::ETS) { return (static_cast(*runtime_)).GetJsRuntime(); diff --git a/interfaces/inner_api/runtime/include/runtime.h b/interfaces/inner_api/runtime/include/runtime.h index c13823388b..db92185746 100644 --- a/interfaces/inner_api/runtime/include/runtime.h +++ b/interfaces/inner_api/runtime/include/runtime.h @@ -28,8 +28,8 @@ class EventRunner; } // namespace AppExecFwk namespace AbilityRuntime { namespace { -const std::string CODE_LANGUAGE_ARKTS_1_0 = "1.1"; -const std::string CODE_LANGUAGE_ARKTS_1_2 = "1.2"; +const std::string CODE_LANGUAGE_ARKTS_1_0 = "dynamic"; +const std::string CODE_LANGUAGE_ARKTS_1_2 = "static"; const std::string CODE_LANGUAGE_ARKTS_HYBRID = "hybrid"; } // namespace diff --git a/interfaces/kits/native/appkit/app/ohos_application.h b/interfaces/kits/native/appkit/app/ohos_application.h index 67ac8a0228..6099ca7a85 100644 --- a/interfaces/kits/native/appkit/app/ohos_application.h +++ b/interfaces/kits/native/appkit/app/ohos_application.h @@ -181,7 +181,7 @@ public: * * @param runtime */ - const std::unique_ptr &GetSpecifiedRuntime(const std::string &codeLanguage) const; + const std::unique_ptr &GetSpecifiedRuntime(const std::string &arkTSMode) const; /* * diff --git a/test/unittest/appkit/main_thread_test/main_thread_test.cpp b/test/unittest/appkit/main_thread_test/main_thread_test.cpp index 3af9eb5f89..291197550f 100644 --- a/test/unittest/appkit/main_thread_test/main_thread_test.cpp +++ b/test/unittest/appkit/main_thread_test/main_thread_test.cpp @@ -2593,13 +2593,13 @@ HWTEST_F(MainThreadTest, HandleUpdatePluginInfoInstalled_0100, TestSize.Level1) /** * @tc.name: SetRuntimeLang_0100 - * @tc.desc: SetRuntimeLang codeLanguage 1.2, options.lang get ETS. + * @tc.desc: SetRuntimeLang arkTSMode 1.2, options.lang get ETS. * @tc.type: FUNC */ HWTEST_F(MainThreadTest, SetRuntimeLang_0100, TestSize.Level1) { ApplicationInfo appInfo; - appInfo.codeLanguage = AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2; + appInfo.arkTSMode = AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2; AbilityRuntime::Runtime::Options options; mainThread_->SetRuntimeLang(appInfo, options); EXPECT_EQ(options.lang, AbilityRuntime::Runtime::Language::ETS); @@ -2607,13 +2607,13 @@ HWTEST_F(MainThreadTest, SetRuntimeLang_0100, TestSize.Level1) /** * @tc.name: IsEtsAPP_0100 - * @tc.desc: IsEtsAPP return true if codeLanguage is CODE_LANGUAGE_ARKTS_1_2. + * @tc.desc: IsEtsAPP return true if arkTSMode is CODE_LANGUAGE_ARKTS_1_2. * @tc.type: FUNC */ HWTEST_F(MainThreadTest, IsEtsAPP_0100, TestSize.Level1) { ApplicationInfo appInfo; - appInfo.codeLanguage = AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2; + appInfo.arkTSMode = AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2; auto result = mainThread_->IsEtsAPP(appInfo); EXPECT_EQ(result, true); } diff --git a/test/unittest/application_context_test/application_context_test.cpp b/test/unittest/application_context_test/application_context_test.cpp index 0ecaa8e221..f33c591c23 100644 --- a/test/unittest/application_context_test/application_context_test.cpp +++ b/test/unittest/application_context_test/application_context_test.cpp @@ -1676,7 +1676,7 @@ HWTEST_F(ApplicationContextTest, GetMainNapiEnv_0200, TestSize.Level1) GTEST_LOG_(INFO) << "GetMainNapiEnv_0200 start"; AppGetSpecifiedRuntimeCallback appGetSpecifiedRuntimeCallback = [](const std::string &codeLanguage)-> const std::unique_ptr& { - EXPECT_EQ(codeLanguage, AppExecFwk::Constants::CODE_LANGUAGE_1_1); + EXPECT_EQ(codeLanguage, AppExecFwk::Constants::ARKTS_MODE_DYNAMIC); static std::unique_ptr runtime = nullptr; return runtime; }; @@ -1698,7 +1698,7 @@ HWTEST_F(ApplicationContextTest, GetMainNapiEnv_0300, TestSize.Level1) std::unique_ptr runtime = std::move(mockRuntime); AppGetSpecifiedRuntimeCallback appGetSpecifiedRuntimeCallback = [&runtime](const std::string &codeLanguage)-> const std::unique_ptr& { - EXPECT_EQ(codeLanguage, AppExecFwk::Constants::CODE_LANGUAGE_1_1); + EXPECT_EQ(codeLanguage, AppExecFwk::Constants::ARKTS_MODE_DYNAMIC); return runtime; }; context_->RegisterAppGetSpecifiedRuntime(appGetSpecifiedRuntimeCallback); @@ -1719,7 +1719,7 @@ HWTEST_F(ApplicationContextTest, GetMainNapiEnv_0400, TestSize.Level1) std::unique_ptr runtime = std::move(mockRuntime); AppGetSpecifiedRuntimeCallback appGetSpecifiedRuntimeCallback = [&runtime](const std::string &codeLanguage)-> const std::unique_ptr& { - EXPECT_EQ(codeLanguage, AppExecFwk::Constants::CODE_LANGUAGE_1_1); + EXPECT_EQ(codeLanguage, AppExecFwk::Constants::ARKTS_MODE_DYNAMIC); return runtime; }; context_->RegisterAppGetSpecifiedRuntime(appGetSpecifiedRuntimeCallback); diff --git a/utils/server/startup/src/startup_util.cpp b/utils/server/startup/src/startup_util.cpp index 54e590daaf..187dd24215 100644 --- a/utils/server/startup/src/startup_util.cpp +++ b/utils/server/startup/src/startup_util.cpp @@ -93,7 +93,7 @@ void StartupUtil::InitAbilityInfoFromExtension(AppExecFwk::ExtensionAbilityInfo abilityInfo.process = extensionInfo.process; abilityInfo.metadata = extensionInfo.metadata; abilityInfo.compileMode = extensionInfo.compileMode; - abilityInfo.codeLanguage = extensionInfo.codeLanguage; + abilityInfo.arkTSMode = extensionInfo.arkTSMode; abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; abilityInfo.extensionTypeName = extensionInfo.extensionTypeName; abilityInfo.isolationProcess = extensionInfo.isolationProcess;