openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!15573 langurage change arktsmode

Browse Source 
Merge pull request !15573 from songjindian/arktsmode
This commit is contained in:
openharmony_ci
2025-07-17 09:53:10 +00:00
committed by Gitee
parent 997bbedb2d b25b5f6b66
commit afa2912e05
10 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/ability/native/extension_ability_thread.cpp
+1 -1
View File
@@ -252,7 +252,7 @@ void ExtensionAbilityThread::HandleAttach(const std::shared_ptr<AppExecFwk::OHOS
return;
}
auto extension = AppExecFwk::AbilityLoader::GetInstance().GetExtensionByName(abilityName,
abilityInfo->codeLanguage);
abilityInfo->arkTSMode);
if (extension == nullptr) {
TAG_LOGE(AAFwkTag::EXT, "null extension");
return;
frameworks/native/ability/native/ui_ability_thread.cpp
+2 -2
View File
@@ -132,7 +132,7 @@ void UIAbilityThread::Attach(const std::shared_ptr<AppExecFwk::OHOSApplication>
// 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<AppExecFwk::OHOSApplication>
// 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;
frameworks/native/appkit/ability_runtime/context/application_context.cpp
+2 -1
View File
@@ -915,7 +915,8 @@ napi_env ApplicationContext::GetMainNapiEnv() const
TAG_LOGE(AAFwkTag::APPKIT, "null callback");
return nullptr;
}
const std::unique_ptr<Runtime> &runtime = appGetSpecifiedRuntimeCallback_(AppExecFwk::Constants::CODE_LANGUAGE_1_1);
const std::unique_ptr<Runtime> &runtime = appGetSpecifiedRuntimeCallback_(
AppExecFwk::Constants::ARKTS_MODE_DYNAMIC);
if (runtime == nullptr) {
TAG_LOGE(AAFwkTag::APPKIT, "null runtime");
return nullptr;
frameworks/native/appkit/app/main_thread.cpp
+6 -6
View File
@@ -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)
frameworks/native/appkit/app/ohos_application.cpp
+5 -5
View File
@@ -382,7 +382,7 @@ void OHOSApplication::SetAppEnv(const std::vector<AppEnvironment>& 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<AbilityRuntime::Context> 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<AbilityRuntime::Runtime> &OHOSApplication::GetRuntime() co
}
const std::unique_ptr<AbilityRuntime::Runtime> &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<AbilityRuntime::ETSRuntime&>(*runtime_)).GetJsRuntime();
interfaces/inner_api/runtime/include/runtime.h
+2 -2
View File
@@ -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
interfaces/kits/native/appkit/app/ohos_application.h
+1 -1
View File
@@ -181,7 +181,7 @@ public:
*
* @param runtime
*/
const std::unique_ptr<AbilityRuntime::Runtime> &GetSpecifiedRuntime(const std::string &codeLanguage) const;
const std::unique_ptr<AbilityRuntime::Runtime> &GetSpecifiedRuntime(const std::string &arkTSMode) const;
/*
*
test/unittest/appkit/main_thread_test/main_thread_test.cpp
+4 -4
View File
@@ -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);
}
test/unittest/application_context_test/application_context_test.cpp
+3 -3
View File
@@ -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<AbilityRuntime::Runtime>& {
EXPECT_EQ(codeLanguage, AppExecFwk::Constants::CODE_LANGUAGE_1_1);
EXPECT_EQ(codeLanguage, AppExecFwk::Constants::ARKTS_MODE_DYNAMIC);
static std::unique_ptr<Runtime> runtime = nullptr;
return runtime;
};
@@ -1698,7 +1698,7 @@ HWTEST_F(ApplicationContextTest, GetMainNapiEnv_0300, TestSize.Level1)
std::unique_ptr<Runtime> runtime = std::move(mockRuntime);
AppGetSpecifiedRuntimeCallback appGetSpecifiedRuntimeCallback =
[&runtime](const std::string &codeLanguage)-> const std::unique_ptr<AbilityRuntime::Runtime>& {
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> runtime = std::move(mockRuntime);
AppGetSpecifiedRuntimeCallback appGetSpecifiedRuntimeCallback =
[&runtime](const std::string &codeLanguage)-> const std::unique_ptr<AbilityRuntime::Runtime>& {
EXPECT_EQ(codeLanguage, AppExecFwk::Constants::CODE_LANGUAGE_1_1);
EXPECT_EQ(codeLanguage, AppExecFwk::Constants::ARKTS_MODE_DYNAMIC);
return runtime;
};
context_->RegisterAppGetSpecifiedRuntime(appGetSpecifiedRuntimeCallback);
utils/server/startup/src/startup_util.cpp
+1 -1
View File
@@ -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;