openharmony/distributedhardware_distributed_input
1
0
Fork 0
mirror of https://github.com/openharmony/distributedhardware_distributed_input.git synced 2026-07-20 21:41:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Description:fix kbd bug

Browse Source 
Match-id-64d7495f47fe4ae2522932535868557b8a54d543
This commit is contained in:
xxxx
2022-12-12 14:53:58 +08:00
parent 20288670b0
commit 0a5e92d66e
48 changed files with 442 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/src/dinput_utils_tool.cpp
+22 -11
View File
@@ -32,10 +32,6 @@
namespace OHOS {
namespace DistributedHardware {
namespace DistributedInput {
namespace {
const char *const DESCRIPTOR = "descriptor";
}
DevInfo GetLocalDeviceInfo()
{
DevInfo devInfo{"", "", 0};
@@ -134,20 +130,35 @@ bool IsInt32(const nlohmann::json& jsonObj, const std::string& key)
return res;
}
bool IsUint32(const nlohmann::json& jsonObj, const std::string& key)
bool IsUInt16(const nlohmann::json& jsonObj, const std::string& key)
{
bool res = jsonObj.contains(key) && jsonObj[key].is_number_unsigned() && jsonObj[key] <= UINT16_MAX;
DHLOGI("the key %s in json is %s", key.c_str(), res ? "valid" : "invalid");
return res;
}
bool IsUInt32(const nlohmann::json& jsonObj, const std::string& key)
{
bool res = jsonObj.contains(key) && jsonObj[key].is_number_unsigned() && jsonObj[key] <= UINT32_MAX;
DHLOGI("the key %s in json is %s", key.c_str(), res ? "valid" : "invalid");
return res;
}
bool IsUint64(const nlohmann::json& jsonObj, const std::string& key)
bool IsUInt64(const nlohmann::json& jsonObj, const std::string& key)
{
bool res = jsonObj.contains(key) && jsonObj[key].is_number_unsigned() && jsonObj[key] <= UINT64_MAX;
DHLOGI("the key %s in json is %s", key.c_str(), res ? "valid" : "invalid");
return res;
}
bool IsArray(const nlohmann::json& jsonObj, const std::string& key)
{
bool res = jsonObj.contains(key) && jsonObj[key].is_array();
DHLOGI("the key %s in json is %s", key.c_str(), res ? "valid" : "invalid");
return res;
}
std::string GetNodeDesc(std::string parameters)
{
nlohmann::json parObj = nlohmann::json::parse(parameters, nullptr, false);
@@ -159,11 +170,11 @@ std::string GetNodeDesc(std::string parameters)
std::string physicalPath = "N/A";
int32_t classes = -1;
if (parObj.find("name") != parObj.end() && parObj.find("physicalPath") != parObj.end() &&
parObj.find("classes") != parObj.end()) {
nodeName = parObj.at("name").get<std::string>();
physicalPath = parObj.at("physicalPath").get<std::string>();
classes = parObj.at("classes").get<int32_t>();
if (parObj.find(DEVICE_NAME) != parObj.end() && parObj.find(PHYSICAL_PATH) != parObj.end() &&
parObj.find(CLASSES) != parObj.end()) {
nodeName = parObj.at(DEVICE_NAME).get<std::string>();
physicalPath = parObj.at(PHYSICAL_PATH).get<std::string>();
classes = parObj.at(CLASSES).get<int32_t>();
}
return "{ nodeName: " + nodeName + ", physicalPath: " + physicalPath + ", classes: " +
std::to_string(classes) + " }";