diff --git a/napi/settings/napi_settings.cpp b/napi/settings/napi_settings.cpp index b8efeba8cb2e56891a66677cf44b650211de95a4..0a36524fc23a62c7da51df98724f6f47b597f92a 100644 --- a/napi/settings/napi_settings.cpp +++ b/napi/settings/napi_settings.cpp @@ -39,6 +39,7 @@ namespace Settings { const std::string SETTINGS_DATA_BASE_URI = "dataability:///com.ohos.settingsdata.DataAbility"; const std::string SETTINGS_DATA_FIELD_KEYWORD = "KEYWORD"; const std::string SETTINGS_DATA_FIELD_VALUE = "VALUE"; +const int USERID_HELPER_NUMBER = 100; enum CallType { INVALID_CALL, @@ -1634,6 +1635,9 @@ napi_value napi_can_show_floating(napi_env env, napi_callback_info info) // get uri for stage model std::string GetStageUriStr(std::string tableName, std::string IdStr, std::string keyStr) { + if (std::stoi(IdStr) < USERID_HELPER_NUMBER) { + IdStr = "100"; + } if (tableName == "global") { std::string retStr = "datashare:///com.ohos.settingsdata/entry/settingsdata/SETTINGSDATA?Proxy=true&key=" + keyStr; @@ -1657,6 +1661,9 @@ std::string GetStageUriStr(std::string tableName, std::string IdStr, std::string // get proxy uri std::string GetProxyUriStr(std::string tableName, std::string IdStr) { + if (std::stoi(IdStr) < USERID_HELPER_NUMBER) { + IdStr = "100"; + } if (tableName == "global") { // return global uri std::string retStr = "datashare:///com.ohos.settingsdata/entry/settingsdata/SETTINGSDATA?Proxy=true"; @@ -1759,6 +1766,13 @@ napi_value napi_set_value_sync_ext(bool stageMode, size_t argc, napi_env env, na delete asyncCallbackInfo; return result; } - +napi_value napi_register_key_observer(napi_env env, napi_callback_info info) +{ + return wrap_bool_to_js(env, true); +} +napi_value napi_unregister_key_observer(napi_env env, napi_callback_info info) +{ + return wrap_bool_to_js(env, true); +} } // namespace Settings } // namespace OHOS diff --git a/napi/settings/napi_settings.h b/napi/settings/napi_settings.h index 78b74466af2c6fd3a2f79881e11457881a35c5d6..ba6c17bc0e111d3ed98b31713e50ff6970df7b50 100644 --- a/napi/settings/napi_settings.h +++ b/napi/settings/napi_settings.h @@ -115,6 +115,8 @@ std::string GetProxyUriStr(std::string tableName, std::string IdStr); bool IsTableNameInvalid(std::string tableName); napi_value napi_get_value_sync_ext(bool stageMode, size_t argc, napi_env env, napi_value* args); napi_value napi_set_value_sync_ext(bool stageMode, size_t argc, napi_env env, napi_value* args); +napi_value napi_register_key_observer(napi_env env, napi_callback_info info); +napi_value napi_unregister_key_observer(napi_env env, napi_callback_info info); } // namespace Settings } // namespace OHOS #endif // NAPI_SETTINGS_H diff --git a/napi/settings/napi_settings_init.cpp b/napi/settings/napi_settings_init.cpp index 1245bcf078dd600bddf8341badeb57b39ab74fc8..173dba09eb5f473a0d4900f02683f7cd5294106c 100644 --- a/napi/settings/napi_settings_init.cpp +++ b/napi/settings/napi_settings_init.cpp @@ -19,12 +19,12 @@ namespace OHOS { namespace Settings { -class TableName +class DomainName { public: - static const std::string GLOBAL; - static const std::string SYSTEM; - static const std::string SECURE; + static const std::string DEVICE_SHARED; + static const std::string USER_PROPERTY; + static const std::string USER_SECURITY; }; class Date @@ -155,9 +155,9 @@ public: static const std::string SUSPEND_SOURCES_CFG; }; -const std::string TableName::GLOBAL = "global"; -const std::string TableName::SYSTEM = "system"; -const std::string TableName::SECURE = "secure"; +const std::string DomainName::DEVICE_SHARED = "global"; +const std::string DomainName::USER_PROPERTY = "system"; +const std::string DomainName::USER_SECURITY = "secure"; const std::string Date::DATE_FORMAT = "settings.date.date_format"; const std::string Date::TIME_FORMAT = "settings.date.time_format"; @@ -243,7 +243,7 @@ const std::string Wireless::OWNER_LOCKDOWN_WIFI_CFG = "settings.wireless.owner_l const std::string Power::SUSPEND_SOURCES_CFG = "settings.power.suspend_sources"; -const std::string TableName_CLASS_NAME = "tableName"; +const std::string TableName_CLASS_NAME = "domainName"; const std::string DATE_CLASS_NAME = "date"; const std::string DISPLAY_CLASS_NAME = "display"; const std::string GENERAL_CLASS_NAME = "general"; @@ -274,18 +274,18 @@ void InitTableNameMap(napi_env env, std::map ¶mMap) { napi_value varGlobal = nullptr; napi_create_string_utf8(env, - TableName::GLOBAL.c_str(), NAPI_AUTO_LENGTH, &varGlobal); - paramMap["GLOBAL"] = varGlobal; + DomainName::DEVICE_SHARED.c_str(), NAPI_AUTO_LENGTH, &varGlobal); + paramMap["DEVICE_SHARED"] = varGlobal; napi_value varSystem = nullptr; napi_create_string_utf8(env, - TableName::SYSTEM.c_str(), NAPI_AUTO_LENGTH, &varSystem); - paramMap["SYSTEM"] = varSystem; + DomainName::USER_PROPERTY.c_str(), NAPI_AUTO_LENGTH, &varSystem); + paramMap["USER_PROPERTY"] = varSystem; napi_value varSecure = nullptr; napi_create_string_utf8(env, - TableName::SECURE.c_str(), NAPI_AUTO_LENGTH, &varSecure); - paramMap["SECURE"] = varSecure; + DomainName::USER_SECURITY.c_str(), NAPI_AUTO_LENGTH, &varSecure); + paramMap["USER_SECURITY"] = varSecure; } void InitDateMap(napi_env env, std::map& paramMap) diff --git a/napi/settings/native_module.cpp b/napi/settings/native_module.cpp index edff997bf16d33e6b97ca0a634f1e32e099900a4..e064f40cba90d9e63f7b503876c2c386696272b1 100644 --- a/napi/settings/native_module.cpp +++ b/napi/settings/native_module.cpp @@ -40,6 +40,8 @@ static napi_value Init(napi_env env, napi_value exports) DECLARE_NAPI_FUNCTION("setValueSync", napi_set_value_sync), DECLARE_NAPI_FUNCTION("enableAirplaneMode", napi_enable_airplane_mode), DECLARE_NAPI_FUNCTION("canShowFloating", napi_can_show_floating), + DECLARE_NAPI_FUNCTION("registerKeyObserver", napi_register_key_observer), + DECLARE_NAPI_FUNCTION("unregisterKeyObserver", napi_unregister_key_observer), }; // init settings class