3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 23:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: x1 tunnel mqtt version compatible

Browse source 
Change-Id: Iecaada75a625adad8ef4b61a3dae99afb441451a
This commit is contained in:
chunmao.guo 2023-06-28 17:14:37 +08:00 • committed by Lane.Wei
parent ff45fc536a
commit 8060299515
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/DeviceManager.cpp
View file

@ -1398,8 +1398,8 @@ void MachineObject::parse_version_func()
} }
is_support_remote_tunnel = true; is_support_remote_tunnel = true;
is_support_tunnel_mqtt = (ota_version->second.sw_ver.compare("01.04.01.04") >= 0 is_support_tunnel_mqtt = (ota_version->second.sw_ver.compare("01.05.06.06") >= 0
|| (rv1126_version != module_vers.end() && rv1126_version->second.sw_ver.compare("00.00.20.30") >= 0)); || (rv1126_version != module_vers.end() && rv1126_version->second.sw_ver.compare("00.00.21.20") >= 0));
} }
local_camera_proto = local_rtsp_url.empty() ? -1 : local_rtsp_url == "disable" ? 0 local_camera_proto = local_rtsp_url.empty() ? -1 : local_rtsp_url == "disable" ? 0
: boost::algorithm::starts_with(local_rtsp_url, "rtsps") ? 2 : 3; : boost::algorithm::starts_with(local_rtsp_url, "rtsps") ? 2 : 3;

6
src/slic3r/GUI/MediaPlayCtrl.cpp
View file

@ -150,8 +150,6 @@ void MediaPlayCtrl::Play()
m_last_state = MEDIASTATE_INITIALIZING; m_last_state = MEDIASTATE_INITIALIZING;
m_button_play->SetIcon("media_stop"); m_button_play->SetIcon("media_stop");
SetStatus(_L("Initializing..."));
NetworkAgent *agent = wxGetApp().getAgent(); NetworkAgent *agent = wxGetApp().getAgent();
std::string agent_version = agent ? agent->get_version() : ""; std::string agent_version = agent ? agent->get_version() : "";
if (m_lan_proto > 0 && (m_lan_mode ||!m_remote_support) && !m_disable_lan && !m_lan_ip.empty()) { if (m_lan_proto > 0 && (m_lan_mode ||!m_remote_support) && !m_disable_lan && !m_lan_ip.empty()) {
@ -162,6 +160,7 @@ void MediaPlayCtrl::Play()
m_url = "bambu:///rtsps___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?device=" + m_machine + "&version=" + agent_version; m_url = "bambu:///rtsps___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?device=" + m_machine + "&version=" + agent_version;
else if (m_lan_proto == 3) else if (m_lan_proto == 3)
m_url = "bambu:///rtsp___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?device=" + m_machine + "&version=" + agent_version; m_url = "bambu:///rtsp___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?device=" + m_machine + "&version=" + agent_version;
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl camera_url: " << m_url;
m_last_state = MEDIASTATE_LOADING; m_last_state = MEDIASTATE_LOADING;
SetStatus(_L("Loading...")); SetStatus(_L("Loading..."));
if (wxGetApp().app_config->get("internal_developer_mode") == "true") { if (wxGetApp().app_config->get("internal_developer_mode") == "true") {
@ -199,6 +198,8 @@ void MediaPlayCtrl::Play()
} }
m_failed_code = 0; m_failed_code = 0;
SetStatus(_L("Initializing..."));
if (agent) { if (agent) {
agent->get_camera_url(m_machine, [this, m = m_machine, v = agent_version](std::string url) { agent->get_camera_url(m_machine, [this, m = m_machine, v = agent_version](std::string url) {
if (boost::algorithm::starts_with(url, "bambu:///")) { if (boost::algorithm::starts_with(url, "bambu:///")) {
@ -301,6 +302,7 @@ void MediaPlayCtrl::Stop(wxString const &msg)
void MediaPlayCtrl::TogglePlay() void MediaPlayCtrl::TogglePlay()
{ {
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::TogglePlay";
if (m_last_state != MEDIASTATE_IDLE) { if (m_last_state != MEDIASTATE_IDLE) {
m_next_retry = wxDateTime(); m_next_retry = wxDateTime();
Stop(); Stop();