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

回退 'Pull Request !176 : fix:hilog改用宏接口'

Browse Source
This commit is contained in:
openharmony_ci
2024-03-22 11:35:24 +00:00
committed by Gitee
parent 4f07ed9dc2
commit 99c2df8a9e
90 changed files with 787 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/src/dinput_utils_tool.cpp
+13 -14
View File
@@ -61,7 +61,7 @@ DevInfo GetLocalDeviceInfo()
auto info = std::make_unique<NodeBasicInfo>();
auto ret = GetLocalNodeDeviceInfo(DINPUT_PKG_NAME.c_str(), info.get());
if (ret != 0) {
DHLOGE("GetLocalNodeDeviceInfo failed, errCode = %{public}d", ret);
DHLOGE("GetLocalNodeDeviceInfo failed, errCode = %d", ret);
return devInfo;
}
@@ -78,7 +78,7 @@ std::string GetLocalNetworkId()
if (localNetworkId.empty()) {
DHLOGE("local networkId is empty!");
}
DHLOGI("GetLocalNetworkId, device local networkId is %{public}s", GetAnonyString(localNetworkId).c_str());
DHLOGI("GetLocalNetworkId, device local networkId is %s", GetAnonyString(localNetworkId).c_str());
return localNetworkId;
}
@@ -299,12 +299,12 @@ int OpenInputDeviceFdByPath(const std::string &devicePath)
char canonicalDevicePath[PATH_MAX] = {0x00};
if (devicePath.length() == 0 || devicePath.length() >= PATH_MAX ||
realpath(devicePath.c_str(), canonicalDevicePath) == nullptr) {
DHLOGE("path check fail, error path: %{public}s", devicePath.c_str());
DHLOGE("path check fail, error path: %s", devicePath.c_str());
return -1;
}
struct stat s;
if ((stat(canonicalDevicePath, &s) == 0) && (s.st_mode & S_IFDIR)) {
DHLOGI("path: %{public}s is a dir.", devicePath.c_str());
DHLOGI("path: %s is a dir.", devicePath.c_str());
return -1;
}
int fd = open(canonicalDevicePath, O_RDWR | O_CLOEXEC);
@@ -313,11 +313,10 @@ int OpenInputDeviceFdByPath(const std::string &devicePath)
++count;
usleep(SLEEP_TIME_US);
fd = open(canonicalDevicePath, O_RDWR | O_CLOEXEC);
DHLOGE("could not open the path: %{public}s, errno: %{public}s; retry: %{public}d", devicePath.c_str(),
ConvertErrNo().c_str(), count);
DHLOGE("could not open the path: %s, errno: %s; retry: %d", devicePath.c_str(), ConvertErrNo().c_str(), count);
}
if (count >= MAX_RETRY_COUNT) {
DHLOGE("could not open the path: %{public}s, errno: %{public}s.", devicePath.c_str(), ConvertErrNo().c_str());
DHLOGE("could not open the path: %s, errno: %s.", devicePath.c_str(), ConvertErrNo().c_str());
CloseFd(fd);
return -1;
}
@@ -369,14 +368,14 @@ void RecordEventLog(const input_event &event)
eventType = "other type " + std::to_string(event.type);
break;
}
DHLOGD("5.E2E-Test Source write event into input driver, EventType: %{public}s, Code: %{public}d, "
"Value: %{public}d", eventType.c_str(), event.code, event.value);
DHLOGD("5.E2E-Test Source write event into input driver, EventType: %s, Code: %d, Value: %d",
eventType.c_str(), event.code, event.value);
}
void WriteEventToDevice(const int fd, const input_event &event)
{
if (write(fd, &event, sizeof(event)) < static_cast<ssize_t>(sizeof(event))) {
DHLOGE("could not inject event, fd: %{public}d", fd);
DHLOGE("could not inject event, fd: %d", fd);
return;
}
RecordEventLog(event);
@@ -386,23 +385,23 @@ void ResetVirtualDevicePressedKeys(const std::vector<std::string> &nodePaths)
{
unsigned long keyState[NLONGS(KEY_CNT)] = { 0 };
for (const auto &path : nodePaths) {
DHLOGI("Check and reset key state, path: %{public}s", path.c_str());
DHLOGI("Check and reset key state, path: %s", path.c_str());
std::vector<uint32_t> pressedKeys;
int fd = OpenInputDeviceFdByPath(path);
if (fd == -1) {
DHLOGE("Open virtual keyboard node failed, path: %{public}s", path.c_str());
DHLOGE("Open virtual keyboard node failed, path: %s", path.c_str());
continue;
}
int rc = ioctl(fd, EVIOCGKEY(sizeof(keyState)), keyState);
if (rc < 0) {
DHLOGE("Read all key state failed, rc: %{public}d, path: %{public}s", rc, path.c_str());
DHLOGE("Read all key state failed, rc: %d, path: %s", rc, path.c_str());
continue;
}
for (int32_t keyIndex = 0; keyIndex < KEY_MAX; keyIndex++) {
if (BitIsSet(keyState, keyIndex)) {
DHLOGI("key index: %{public}d pressed.", keyIndex);
DHLOGI("key index: %d pressed.", keyIndex);
pressedKeys.push_back(keyIndex);
}
}