From 77f32ab7dc9f64657cbacd325b81fc347326cb4e Mon Sep 17 00:00:00 2001 From: _ChingC Date: Mon, 29 Aug 2022 10:23:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=8F=90=E9=AB=98?= =?UTF-8?q?cmake=E6=9C=80=E4=BD=8E=E7=89=88=E6=9C=AC=E4=BB=A5=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E8=BF=87=E8=80=81=E7=9A=84policy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- src/MeoAssistant/Controller.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07afb3be80..56318a3ba9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.0) project(MaaAssistantArknights) option(BUILD_JNI "build jni" OFF) diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 3c156da544..53c63efb49 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -538,10 +538,10 @@ std::optional asst::Controller::try_to_init_socket(const std::st #endif bool server_start = false; - u_short port_result = 0; + uint16_t port_result = 0; - u_short max_port = try_port + try_times; - for (u_short port = try_port; port < max_port; ++port) { + uint16_t max_port = try_port + try_times; + for (uint16_t port = try_port; port < max_port; ++port) { if (need_exit()) { break; } @@ -948,7 +948,7 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a const auto adb_cfg = std::move(adb_ret.value()); std::string display_id; std::string nc_address = "10.0.2.2"; - u_short nc_port = 0; + uint16_t nc_port = 0; // 里面的值每次执行命令后可能更新，所以要用 lambda 拿最新的 auto cmd_replace = [&](const std::string& cfg_cmd) -> std::string {