Skip to content

Commit

Permalink
fix: adb config error of toolkit
Browse files Browse the repository at this point in the history
  • Loading branch information
MistEO committed Nov 28, 2023
1 parent 2ec7e11 commit c0e8a02
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions source/MaaToolKit/AdbDevice/DeviceMgrMacOS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ std::vector<Device> DeviceMgrMacOS::find_device_impl()
device.adb_path = path_to_utf8_string(adb_path);
device.adb_serial = ser;
// TODO: 根据设备情况使用不同的配置
device.adb_config = json::value().to_string();
device.adb_config = json::object().to_string();
device.adb_controller_type =
check_adb_controller_type(device.adb_path, device.adb_serial, device.adb_config);
result.emplace_back(std::move(device));
Expand All @@ -72,7 +72,7 @@ std::vector<Device> DeviceMgrMacOS::find_device_with_adb_impl(std::string_view a
device.name = adb_path;
device.adb_path = adb_path;
device.adb_serial = ser;
device.adb_config = json::value().to_string();
device.adb_config = json::object().to_string();
device.adb_controller_type = check_adb_controller_type(device.adb_path, device.adb_serial, device.adb_config);
result.emplace_back(std::move(device));
}
Expand Down
4 changes: 2 additions & 2 deletions source/MaaToolKit/AdbDevice/DeviceMgrWin32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ std::vector<Device> DeviceMgrWin32::find_device_impl()
device.adb_path = path_to_utf8_string(adb_path);
device.adb_serial = ser;
// TODO: 根据设备情况使用不同的配置
device.adb_config = json::value().to_string();
device.adb_config = json::object().to_string();
device.adb_controller_type =
check_adb_controller_type(device.adb_path, device.adb_serial, device.adb_config);
result.emplace_back(std::move(device));
Expand All @@ -101,7 +101,7 @@ std::vector<Device> DeviceMgrWin32::find_device_with_adb_impl(std::string_view a
device.name = adb_path;
device.adb_path = adb_path;
device.adb_serial = ser;
device.adb_config = json::value().to_string();
device.adb_config = json::object().to_string();
device.adb_controller_type = check_adb_controller_type(device.adb_path, device.adb_serial, device.adb_config);
result.emplace_back(std::move(device));
}
Expand Down

0 comments on commit c0e8a02

Please sign in to comment.