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

!7207 添加时制属性

Browse Source 
Merge pull request !7207 from LY/master
This commit is contained in:
openharmony_ci
2023-12-26 09:32:29 +00:00
committed by Gitee
parent 9bf99c8eda b21d48c03b
commit fa4597ccfa
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/js/napi/configuration_constant/configuration_constant_module.cpp
+16
View File
@@ -46,6 +46,18 @@ static napi_value InitColorModeObject(napi_env env)
return object;
}
static napi_value InitTimeFormatObject(napi_env env)
{
napi_value object;
NAPI_CALL(env, napi_create_object(env, &object));
NAPI_CALL(env, SetEnumItem(env, object, "HOUR_NOT_SET", Global::Resource::HOUR_NOT_SET));
NAPI_CALL(env, SetEnumItem(env, object, "HOUR_12", Global::Resource::HOUR_12));
NAPI_CALL(env, SetEnumItem(env, object, "HOUR_24", Global::Resource::HOUR_24));
return object;
}
static napi_value InitDirectionObject(napi_env env)
{
napi_value object;
@@ -82,6 +94,9 @@ static napi_value ConfigurationConstantInit(napi_env env, napi_value exports)
napi_value colorMode = InitColorModeObject(env);
NAPI_ASSERT(env, colorMode != nullptr, "failed to create color mode object");
napi_value time24 = InitTimeFormatObject(env);
NAPI_ASSERT(env, time24 != nullptr, "failed to create time format object");
napi_value direction = InitDirectionObject(env);
NAPI_ASSERT(env, direction != nullptr, "failed to create direction object");
@@ -90,6 +105,7 @@ static napi_value ConfigurationConstantInit(napi_env env, napi_value exports)
napi_property_descriptor exportObjs[] = {
DECLARE_NAPI_PROPERTY("ColorMode", colorMode),
DECLARE_NAPI_PROPERTY("Time24", time24),
DECLARE_NAPI_PROPERTY("Direction", direction),
DECLARE_NAPI_PROPERTY("ScreenDensity", screenDensity),
};
frameworks/native/runtime/js_data_struct_converter.cpp
+3
View File
@@ -93,6 +93,9 @@ napi_value CreateJsConfiguration(napi_env env, const AppExecFwk::Configuration&
configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_LANGUAGE)));
napi_set_named_property(env, object, "colorMode", CreateJsValue(env,
ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE))));
napi_set_named_property(env, object, "time24", CreateJsValue(env,
ConvertTimeFormat(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_HOUR))));
int32_t displayId = ConvertDisplayId(configuration.GetItem(ConfigurationInner::APPLICATION_DISPLAYID));
std::string direction = configuration.GetItem(displayId, ConfigurationInner::APPLICATION_DIRECTION);