Skip to content

Commit

Permalink
chore: 适配maa framework v1.6.0-beta.4
Browse files Browse the repository at this point in the history
  • Loading branch information
dongwlin committed Feb 20, 2024
1 parent d84eb4c commit 6902a45
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions source/cli/device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bool default_device_init(DeviceConfig& device)
MaaSize scanning_devices()
{
std::cout << "Scanning for Devices..." << std::endl;
auto device_size = MaaToolKitFindDevice();
auto device_size = MaaToolkitFindDevice();
if (device_size == 0) {
std::cout << "No Devices Found" << std::endl;
return 0;
Expand Down Expand Up @@ -44,11 +44,11 @@ bool select_device(std::string& name, std::string& SN, std::string& adb)
return true;
}
MaaSize device_index = number - 1;
name = MaaToolKitGetDeviceName(device_index);
SN = MaaToolKitGetDeviceAdbSerial(device_index);
adb = MaaToolKitGetDeviceAdbPath(device_index);
name = MaaToolkitGetDeviceName(device_index);
SN = MaaToolkitGetDeviceAdbSerial(device_index);
adb = MaaToolkitGetDeviceAdbPath(device_index);
AdbConfigCache adb_config_cache;
adb_config_cache.set_adb_config(name, SN, MaaToolKitGetDeviceAdbConfig(device_index));
adb_config_cache.set_adb_config(name, SN, MaaToolkitGetDeviceAdbConfig(device_index));
return true;
}

Expand All @@ -73,7 +73,7 @@ bool select_device_number(const MaaSize& device_size, MaaSize& number)
void print_device_list(const MaaSize& device_size)
{
for (MaaSize i = 0; i < device_size; i++) {
std::cout << " " << i + 1 << ". " << MaaToolKitGetDeviceName(i) << " (" << MaaToolKitGetDeviceAdbSerial(i)
std::cout << " " << i + 1 << ". " << MaaToolkitGetDeviceName(i) << " (" << MaaToolkitGetDeviceAdbSerial(i)
<< ")\n";
}
}
Expand Down
4 changes: 2 additions & 2 deletions source/cli/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ int main(int argc, char** argv)
return 0;
}

MaaToolKitInit();
MaaToolkitInit();

print_help();
print_version();
Expand Down Expand Up @@ -135,7 +135,7 @@ int main(int argc, char** argv)
MaaDestroy(maa_handle);
MaaResourceDestroy(resource_handle);
MaaControllerDestroy(controller_handle);
MaaToolKitUninit();
MaaToolkitUninit();
};

if (!MaaInited(maa_handle)) {
Expand Down

0 comments on commit 6902a45

Please sign in to comment.