diff --git a/src/slic3r/GUI/SSWCP.cpp b/src/slic3r/GUI/SSWCP.cpp index 94850e66c7..3cf3da2ea3 100644 --- a/src/slic3r/GUI/SSWCP.cpp +++ b/src/slic3r/GUI/SSWCP.cpp @@ -3201,8 +3201,10 @@ void SSWCP_MachineOption_Instance::sw_CameraStartMonitor() { int interval = m_param_data.count("interval") ? m_param_data["interval"].get() : 2; + bool expect_pw = m_param_data.count("expect_pw") ? m_param_data["expect_pw"].get() : false; + auto weak_self = std::weak_ptr(shared_from_this()); - host->async_camera_start(domain, interval, [weak_self](const json& response) { + host->async_camera_start(domain, interval, expect_pw, [weak_self](const json& response) { auto self = weak_self.lock(); if (self) { SSWCP_Instance::on_mqtt_msg_arrived(self, response); diff --git a/src/slic3r/Utils/MoonRaker.cpp b/src/slic3r/Utils/MoonRaker.cpp index 9c9be94399..9da55bca36 100644 --- a/src/slic3r/Utils/MoonRaker.cpp +++ b/src/slic3r/Utils/MoonRaker.cpp @@ -2267,7 +2267,7 @@ void Moonraker_Mqtt::async_machine_files_directory(const std::string& path, bool } } -void Moonraker_Mqtt::async_camera_start(const std::string& domain, int interval, std::function callback) { +void Moonraker_Mqtt::async_camera_start(const std::string& domain, int interval, bool expect_pw, std::function callback) { auto& wcp_loger = GUI::WCP_Logger::getInstance(); BOOST_LOG_TRIVIAL(warning) << "[Moonraker_Mqtt] 开始启动摄像头监控,域名: " << domain; wcp_loger.add_log("开始启动摄像头监控,域名: " + domain, false, "", "Moonraker_Mqtt", "info"); @@ -2276,6 +2276,7 @@ void Moonraker_Mqtt::async_camera_start(const std::string& domain, int interval, json params; params["domain"] = domain; params["interval"] = interval; + params["expect_pw"] = expect_pw; if (!send_to_request(method, params, true, callback, [callback, &wcp_loger]() { diff --git a/src/slic3r/Utils/MoonRaker.hpp b/src/slic3r/Utils/MoonRaker.hpp index dd0cc05d6f..784f682aac 100644 --- a/src/slic3r/Utils/MoonRaker.hpp +++ b/src/slic3r/Utils/MoonRaker.hpp @@ -93,7 +93,7 @@ public: virtual void async_server_client_manager_set_userinfo(const nlohmann::json& user, std::function) {} virtual void async_machine_files_directory(const std::string& path, bool extend, std::function) {} - virtual void async_camera_start(const std::string& domain, int interval, std::function) {} + virtual void async_camera_start(const std::string& domain, int interval, bool expect_pw, std::function) {} virtual void async_canmera_stop(const std::string& domain, std::function) {} @@ -254,7 +254,7 @@ public: virtual void async_machine_files_directory(const std::string& path, bool extend, std::function) override; - virtual void async_camera_start(const std::string& domain, int interval, std::function) override; + virtual void async_camera_start(const std::string& domain, int interval, bool expect_pw, std::function) override; virtual void async_canmera_stop(const std::string& domain, std::function) override; diff --git a/src/slic3r/Utils/PrintHost.hpp b/src/slic3r/Utils/PrintHost.hpp index 9b5bb68662..2ecb087ce0 100644 --- a/src/slic3r/Utils/PrintHost.hpp +++ b/src/slic3r/Utils/PrintHost.hpp @@ -129,7 +129,7 @@ public: virtual void async_server_client_manager_set_userinfo(const nlohmann::json& user, std::function) {} virtual void async_machine_files_directory(const std::string& path, bool extend, std::function) {} - virtual void async_camera_start(const std::string& domain, int interval, std::function) {} + virtual void async_camera_start(const std::string& domain, int interval, bool expect_pw, std::function) {} virtual void async_canmera_stop(const std::string& domain, std::function) {}