From 6d4f0ec1142844da61986ef2b529d987d68bffa4 Mon Sep 17 00:00:00 2001 From: LY Date: Tue, 19 Dec 2023 00:55:05 +0000 Subject: [PATCH 1/9] test Signed-off-by: LY --- .../js/napi/inner/napi_common/napi_common_configuration.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp b/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp index 10c097a103..fba564aa47 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp @@ -51,6 +51,8 @@ napi_value WrapConfiguration(napi_env env, const AppExecFwk::Configuration &conf env, ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE))); SetPropertyValueByPropertyName(env, jsObject, "colorMode", jsValue); + SetPropertyValueByPropertyName(env, jsObject, "timeFormat", jsValue); + int32_t displayId = ConvertDisplayId(configuration.GetItem(ConfigurationInner::APPLICATION_DISPLAYID)); std::string direction = configuration.GetItem(displayId, ConfigurationInner::APPLICATION_DIRECTION); From a6993445453d563d21275cb5772e0022f7e5f1c8 Mon Sep 17 00:00:00 2001 From: LY Date: Wed, 20 Dec 2023 06:39:36 +0000 Subject: [PATCH 2/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0timeFormat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: LY --- .../js/napi/inner/napi_common/napi_common_configuration.cpp | 2 -- frameworks/native/runtime/js_data_struct_converter.cpp | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp b/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp index fba564aa47..10c097a103 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_configuration.cpp @@ -51,8 +51,6 @@ napi_value WrapConfiguration(napi_env env, const AppExecFwk::Configuration &conf env, ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE))); SetPropertyValueByPropertyName(env, jsObject, "colorMode", jsValue); - SetPropertyValueByPropertyName(env, jsObject, "timeFormat", jsValue); - int32_t displayId = ConvertDisplayId(configuration.GetItem(ConfigurationInner::APPLICATION_DISPLAYID)); std::string direction = configuration.GetItem(displayId, ConfigurationInner::APPLICATION_DIRECTION); diff --git a/frameworks/native/runtime/js_data_struct_converter.cpp b/frameworks/native/runtime/js_data_struct_converter.cpp index 4ee3bbe818..530ead9faa 100644 --- a/frameworks/native/runtime/js_data_struct_converter.cpp +++ b/frameworks/native/runtime/js_data_struct_converter.cpp @@ -91,7 +91,10 @@ napi_value CreateJsConfiguration(napi_env env, const AppExecFwk::Configuration& napi_set_named_property(env, object, "language", CreateJsValue(env, configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_LANGUAGE))); - napi_set_named_property(env, object, "colorMode", CreateJsValue(env, + napi_set_named_property(env, object, "colorMode1", CreateJsValue(env, + ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE)))); + + napi_set_named_property(env, object, "timeFormat", CreateJsValue(env, ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE)))); int32_t displayId = ConvertDisplayId(configuration.GetItem(ConfigurationInner::APPLICATION_DISPLAYID)); From 2ed0de33977a4a5dc0bd08d0080d4e600cade264 Mon Sep 17 00:00:00 2001 From: LY Date: Wed, 20 Dec 2023 08:06:19 +0000 Subject: [PATCH 3/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0timeFormat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: LY --- frameworks/native/runtime/js_data_struct_converter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/native/runtime/js_data_struct_converter.cpp b/frameworks/native/runtime/js_data_struct_converter.cpp index 530ead9faa..7d73e51c1a 100644 --- a/frameworks/native/runtime/js_data_struct_converter.cpp +++ b/frameworks/native/runtime/js_data_struct_converter.cpp @@ -91,11 +91,11 @@ napi_value CreateJsConfiguration(napi_env env, const AppExecFwk::Configuration& napi_set_named_property(env, object, "language", CreateJsValue(env, configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_LANGUAGE))); - napi_set_named_property(env, object, "colorMode1", CreateJsValue(env, + napi_set_named_property(env, object, "colorMode", CreateJsValue(env, ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE)))); napi_set_named_property(env, object, "timeFormat", CreateJsValue(env, - ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE)))); + 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); From 60e295f96385b71ba677e80914d96c2c58943ada Mon Sep 17 00:00:00 2001 From: LY Date: Wed, 20 Dec 2023 09:30:01 +0000 Subject: [PATCH 4/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0timeFormat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: LY --- frameworks/native/runtime/js_data_struct_converter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/runtime/js_data_struct_converter.cpp b/frameworks/native/runtime/js_data_struct_converter.cpp index 7d73e51c1a..26d11b3ef7 100644 --- a/frameworks/native/runtime/js_data_struct_converter.cpp +++ b/frameworks/native/runtime/js_data_struct_converter.cpp @@ -95,7 +95,7 @@ napi_value CreateJsConfiguration(napi_env env, const AppExecFwk::Configuration& ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE)))); napi_set_named_property(env, object, "timeFormat", CreateJsValue(env, - ConvertTimeFormat(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_HOUR)))); + configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_HOUR))); int32_t displayId = ConvertDisplayId(configuration.GetItem(ConfigurationInner::APPLICATION_DISPLAYID)); std::string direction = configuration.GetItem(displayId, ConfigurationInner::APPLICATION_DIRECTION); From 491ddd50b635d417e04dbf42a0a73a30b464fcc6 Mon Sep 17 00:00:00 2001 From: LY Date: Thu, 21 Dec 2023 01:16:18 +0000 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0timeFormat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: LY --- frameworks/native/runtime/js_data_struct_converter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/native/runtime/js_data_struct_converter.cpp b/frameworks/native/runtime/js_data_struct_converter.cpp index 26d11b3ef7..fb0ed2dc3f 100644 --- a/frameworks/native/runtime/js_data_struct_converter.cpp +++ b/frameworks/native/runtime/js_data_struct_converter.cpp @@ -94,8 +94,8 @@ napi_value CreateJsConfiguration(napi_env env, const AppExecFwk::Configuration& napi_set_named_property(env, object, "colorMode", CreateJsValue(env, ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE)))); - napi_set_named_property(env, object, "timeFormat", CreateJsValue(env, - configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_HOUR))); + 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); From 13eac46ea6e92d5a0198f31af4528e5ad671cdb2 Mon Sep 17 00:00:00 2001 From: LY Date: Thu, 21 Dec 2023 01:17:40 +0000 Subject: [PATCH 6/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0timeFormat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: LY --- frameworks/native/runtime/js_data_struct_converter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/runtime/js_data_struct_converter.cpp b/frameworks/native/runtime/js_data_struct_converter.cpp index fb0ed2dc3f..205ac54c72 100644 --- a/frameworks/native/runtime/js_data_struct_converter.cpp +++ b/frameworks/native/runtime/js_data_struct_converter.cpp @@ -95,7 +95,7 @@ napi_value CreateJsConfiguration(napi_env env, const AppExecFwk::Configuration& ConvertColorMode(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE)))); napi_set_named_property(env, object, "time24", CreateJsValue(env, - ConvertTimeFormat(configuration.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_HOUR))); + 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); From a56f4223c94dd6ad971bdd125dcc76dba8ad188f Mon Sep 17 00:00:00 2001 From: LY Date: Thu, 21 Dec 2023 04:03:50 +0000 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: LY --- .../configuration_constant_module.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp b/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp index 3347a2a6c7..e807c9b72b 100644 --- a/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp +++ b/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp @@ -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), }; From 40304d684d0e92c98a8c37bfdd5e9bbcd0fbbc86 Mon Sep 17 00:00:00 2001 From: LY Date: Tue, 26 Dec 2023 01:26:06 +0000 Subject: [PATCH 8/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: LY --- frameworks/js/napi/configuration_constant/BUILD.gn | 2 +- .../configuration_constant_module.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frameworks/js/napi/configuration_constant/BUILD.gn b/frameworks/js/napi/configuration_constant/BUILD.gn index e2dc085756..86fe1ab215 100644 --- a/frameworks/js/napi/configuration_constant/BUILD.gn +++ b/frameworks/js/napi/configuration_constant/BUILD.gn @@ -32,7 +32,7 @@ ohos_shared_library("configurationconstant_napi") { } ohos_shared_library("configurationconstant") { - include_dirs = [] + include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] sources = [ "configuration_constant_module.cpp" ] diff --git a/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp b/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp index e807c9b72b..42d022998e 100644 --- a/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp +++ b/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp @@ -16,6 +16,7 @@ #include "res_common.h" #include "napi/native_api.h" #include "napi/native_common.h" +#include "i18n_res.h" namespace OHOS { namespace AAFwk { @@ -51,9 +52,9 @@ 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)); + NAPI_CALL(env, SetEnumItem(env, object, "HOUR_NOT_SET", Global::I18n::HOUR_NOT_SET)); + NAPI_CALL(env, SetEnumItem(env, object, "HOUR_12", Global::I18n::HOUR_12)); + NAPI_CALL(env, SetEnumItem(env, object, "HOUR_24", Global::I18n::HOUR_24)); return object; } From b21d48c03bcc4f0148e364564ff988283a8ac2e1 Mon Sep 17 00:00:00 2001 From: LY Date: Tue, 26 Dec 2023 07:36:20 +0000 Subject: [PATCH 9/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: LY --- frameworks/js/napi/configuration_constant/BUILD.gn | 2 +- .../configuration_constant_module.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frameworks/js/napi/configuration_constant/BUILD.gn b/frameworks/js/napi/configuration_constant/BUILD.gn index 86fe1ab215..e2dc085756 100644 --- a/frameworks/js/napi/configuration_constant/BUILD.gn +++ b/frameworks/js/napi/configuration_constant/BUILD.gn @@ -32,7 +32,7 @@ ohos_shared_library("configurationconstant_napi") { } ohos_shared_library("configurationconstant") { - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [] sources = [ "configuration_constant_module.cpp" ] diff --git a/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp b/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp index 42d022998e..e807c9b72b 100644 --- a/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp +++ b/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp @@ -16,7 +16,6 @@ #include "res_common.h" #include "napi/native_api.h" #include "napi/native_common.h" -#include "i18n_res.h" namespace OHOS { namespace AAFwk { @@ -52,9 +51,9 @@ 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::I18n::HOUR_NOT_SET)); - NAPI_CALL(env, SetEnumItem(env, object, "HOUR_12", Global::I18n::HOUR_12)); - NAPI_CALL(env, SetEnumItem(env, object, "HOUR_24", Global::I18n::HOUR_24)); + 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; }