openharmony/developtools_global_resource_tool
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_global_resource_tool.git synced 2026-07-19 19:33:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

!74 【master】告警规范处理

Browse Source 
Merge pull request !74 from fyz1019/master
This commit is contained in:
openharmony_ci
2023-01-31 05:56:05 +00:00
committed by Gitee
parent a08e3814ef 2128025349
commit 74c8bb4988
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resource_util.cpp
+4 -4
View File
@@ -294,7 +294,7 @@ string ResourceUtil::GetLocaleLimitkey(const KeyParam &KeyParam)
string ResourceUtil::GetDeviceTypeLimitkey(const KeyParam &KeyParam)
{
auto ret = find_if(g_deviceMap.begin(), g_deviceMap.end(), [KeyParam](const auto &iter) {
return KeyParam.value == static_cast<const int32_t>(iter.second);
return KeyParam.value == static_cast<const uint32_t>(iter.second);
});
if (ret == g_deviceMap.end()) {
return string();
@@ -305,7 +305,7 @@ string ResourceUtil::GetDeviceTypeLimitkey(const KeyParam &KeyParam)
string ResourceUtil::GetResolutionLimitkey(const KeyParam &KeyParam)
{
auto ret = find_if(g_resolutionMap.begin(), g_resolutionMap.end(), [KeyParam](const auto &iter) {
return KeyParam.value == static_cast<const int32_t>(iter.second);
return KeyParam.value == static_cast<const uint32_t>(iter.second);
});
if (ret == g_resolutionMap.end()) {
return string();
@@ -318,10 +318,10 @@ string ResourceUtil::GetKeyParamValue(const KeyParam &KeyParam)
string val;
switch (KeyParam.keyType) {
case KeyType::ORIENTATION:
val = KeyParam.value == static_cast<const int32_t>(OrientationType::VERTICAL) ? "vertical" : "horizontal";
val = KeyParam.value == static_cast<const uint32_t>(OrientationType::VERTICAL) ? "vertical" : "horizontal";
break;
case KeyType::NIGHTMODE:
val = KeyParam.value == static_cast<const int32_t>(NightMode::DARK) ? "dark" : "light";
val = KeyParam.value == static_cast<const uint32_t>(NightMode::DARK) ? "dark" : "light";
break;
case KeyType::DEVICETYPE:
val = GetDeviceTypeLimitkey(KeyParam);