openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-26 16:31:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source 
Signed-off-by: guojin31 <guojin31@huawei.com>
This commit is contained in:
guojin31 2024-11-04 10:49:45 +08:00
parent dbd0aacf49
commit 867468edce
4 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/adapter/settings_data_provider/common/include/settings_data_utils.h
View File

@ -35,6 +35,7 @@ constexpr const char *SETTING_COLUMN_VALUE = "VALUE";
const std::string SETTING_URI_PROXY = "datashare:///com.ohos.settingsdata/entry/settingsdata/"
"SETTINGSDATA?Proxy=true";
const std::string SETTINGS_DATA_EXT_URI = "datashare:///com.ohos.settingsdata.DataAbility";
const std::string SETTINGS_USER_DATA_URI = "datashare:///com.ohos.settingsdata/entry/settingsdata/USER_SETTINGSDATA_";
struct UserImeConfig : public Serializable {
std::string userId;
std::vector<std::string> identities;
@ -51,7 +52,7 @@ public:
std::shared_ptr<DataShare::DataShareHelper> CreateDataShareHelper(const std::string &uriProxy);
int32_t CreateAndRegisterObserver(const std::string &key, SettingsDataObserver::CallbackFunc func);
int32_t GetStringValue(const std::string &uriProxy, const std::string &key, std::string &value);
int32_t SetStringValue(const std::string &uriProxy, const std::string &key, const std::string &value);
bool SetStringValue(const std::string &uriProxy, const std::string &key, const std::string &value);
bool ReleaseDataShareHelper(std::shared_ptr<DataShare::DataShareHelper> &helper);
Uri GenerateTargetUri(const std::string &uriProxy, const std::string &key);
bool EnableIme(int32_t userId, const std::string &bundleName);

5
services/adapter/settings_data_provider/common/src/settings_data_utils.cpp
View File

@ -131,7 +131,7 @@ Uri SettingsDataUtils::GenerateTargetUri(const std::string &uriProxy, const std:
return uri;
}
int32_t SettingsDataUtils::SetStringValue(const std::string &uriProxy, const std::string &key, const std::string &value)
bool SettingsDataUtils::SetStringValue(const std::string &uriProxy, const std::string &key, const std::string &value)
{
IMSA_HILOGD("start.");
auto helper = CreateDataShareHelper(uriProxy);
@ -234,8 +234,7 @@ bool SettingsDataUtils::EnableIme(int32_t userId, const std::string &bundleName)
value = SetSettingValues(settingValue, bundleName);
}
IMSA_HILOGI("value: %{public}s", value.c_str());
auto ret = SetStringValue(SETTING_URI_PROXY, settingKey, value);
return ret;
return SetStringValue(SETTING_URI_PROXY, settingKey, value);
}
std::vector<std::string> SettingsDataUtils::split(const std::string &text, char delim)

6
services/adapter/settings_data_provider/include/enable_ime_data_parser.h
View File

@ -89,8 +89,10 @@ private:
EnableImeDataParser() = default;
~EnableImeDataParser();
int32_t UpdateEnableData(int32_t userId, const std::string &key);
int32_t CoverGlobalTable(const std::string &uriProxy, const std::string &key, std::string &valueStr);
std::string ParseEnableValueUserId(const std::string &valueStr);
void CoverGlobalEnableTable(const std::string &valueStr);
std::string GetUserEnableTable(int32_t userId);
std::string GetEanbleIme(int32_t userId, const std::string &globalStr);
std::string GetGlobalTableUserId(const std::string &valueStr);
int32_t GetEnableImeFromCache(std::vector<std::string> &enableVec);
bool ParseEnableIme(const std::string &valueStr, int32_t userId, std::vector<std::string> &enableVec);
bool ParseEnableKeyboard(const std::string &valueStr, int32_t userId, std::vector<std::string> &enableVec);

83
services/adapter/settings_data_provider/src/enable_ime_data_parser.cpp
View File

@ -182,34 +182,49 @@ bool EnableImeDataParser::CheckTargetEnableName(const std::string &key, const st
return true;
}
int32_t EnableImeDataParser::CoverGlobalTable(
const std::string &uriProxy, const std::string &key, std::string &valueStr)
void EnableImeDataParser::CoverGlobalEnableTable(const std::string &valueStr)
{
int32_t ret;
if (!valueStr.empty()) {
std::string userId = ParseEnableValueUserId(valueStr);
if (userId != "") {
if (userId == std::to_string(currentUserId_)) {
return ErrorCode::NO_ERROR;
}
ret = SettingsDataUtils::GetInstance()->SetStringValue(uriProxy + userId + "?Proxy=true", key, valueStr);
if (ret != ErrorCode::NO_ERROR) {
IMSA_HILOGW("global cover user table failed");
}
SettingsDataUtils::GetInstance()->SetStringValue(SETTING_URI_PROXY, ENABLE_IME, valueStr);
}
std::string EnableImeDataParser::GetUserEnableTable(int32_t userId)
{
std::string valueStr;
int32_t ret = SettingsDataUtils::GetInstance()->GetStringValue(
SETTINGS_USER_DATA_URI + std::to_string(userId) + "?Proxy=true", ENABLE_IME, valueStr);
IMSA_HILOGI("get user enable table, userId = %{public}d, ret = %{public}d, valurStr = %{public}s",
userId, ret, valueStr.c_str());
if (valueStr.empty()) {
auto defaultIme = GetDefaultIme();
if (defaultIme != nullptr) {
valueStr =
"{\"enableImeList\" : {\"" + std::to_string(userId) + "\" : [\"" + defaultIme->name + "\"]}}";
}
}
ret = SettingsDataUtils::GetInstance()->GetStringValue(
uriProxy + std::to_string(currentUserId_) + "?Proxy=true", key, valueStr);
if (ret == ErrorCode::ERROR_KEYWORD_NOT_FOUND) {
IMSA_HILOGW("user table no keyword exist");
return ErrorCode::NO_ERROR;
return valueStr;
}
std::string EnableImeDataParser::GetEanbleIme(int32_t userId, const std::string &globalStr)
{
std::string enableStr = globalStr;
std::string globaleUserId;
if (enableStr.empty()) {
enableStr = GetUserEnableTable(currentUserId_);
CoverGlobalEnableTable(enableStr);
globaleUserId = std::to_string(currentUserId_);
} else {
globaleUserId = GetGlobalTableUserId(enableStr);
}
if (ret != ErrorCode::NO_ERROR || valueStr.empty()) {
IMSA_HILOGW("get current user table value failed, or valueStr is empty.");
return ErrorCode::ERROR_ENABLE_IME;
SettingsDataUtils::GetInstance()->SetStringValue(SETTINGS_USER_DATA_URI + globaleUserId + "?Proxy=true",
ENABLE_IME, enableStr);
if (globaleUserId != std::to_string(currentUserId_)) {
enableStr = GetUserEnableTable(currentUserId_);
CoverGlobalEnableTable(enableStr);
}
SettingsDataUtils::GetInstance()->SetStringValue(SETTING_URI_PROXY, key, valueStr);
return ErrorCode::NO_ERROR;
if (currentUserId_ != userId) {
enableStr = GetUserEnableTable(userId);
}
return enableStr;
}
int32_t EnableImeDataParser::GetEnableData(
@ -233,23 +248,9 @@ int32_t EnableImeDataParser::GetEnableData(
}
auto parseRet = false;
if (key == ENABLE_IME) {
std::string uriProxy = "datashare:///com.ohos.settingsdata/entry/settingsdata/USER_SETTINGSDATA_";
CoverGlobalTable(uriProxy, key, valueStr);
if (currentUserId_ != userId) {
ret = SettingsDataUtils::GetInstance()->GetStringValue(
uriProxy + std::to_string(userId) + "?Proxy=true", key, valueStr);
if (ret == ErrorCode::ERROR_KEYWORD_NOT_FOUND) {
IMSA_HILOGW("no keyword exist");
enableVec.clear();
return ErrorCode::NO_ERROR;
}
if (ret != ErrorCode::NO_ERROR || valueStr.empty()) {
IMSA_HILOGW("get user table value failed, or valueStr is empty.");
return ErrorCode::ERROR_ENABLE_IME;
}
} else if (valueStr.empty()) {
IMSA_HILOGW("get enable ime, value is empty");
enableVec.clear();
valueStr = GetEanbleIme(userId, valueStr);
if (valueStr.empty()) {
IMSA_HILOGW("valueStr is empty, userId = %{public}d", userId);
return ErrorCode::NO_ERROR;
}
parseRet = ParseEnableIme(valueStr, userId, enableVec);
@ -263,7 +264,7 @@ int32_t EnableImeDataParser::GetEnableData(
return parseRet ? ErrorCode::NO_ERROR : ErrorCode::ERROR_ENABLE_IME;
}
std::string EnableImeDataParser::ParseEnableValueUserId(const std::string &valueStr)
std::string EnableImeDataParser::GetGlobalTableUserId(const std::string &valueStr)
{
auto root = cJSON_Parse(valueStr.c_str());
auto subNode = Serializable::GetSubNode(root, "enableImeList");