From 9beeebdba14f14ca470d98a12e7e7eb648749f86 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Tue, 15 Apr 2025 11:44:06 +0800 Subject: [PATCH] FIX: show the new version jira: [STUDIO-11558] Change-Id: I70fcb2fb8700ddcf08c922895a93c126f17a632e --- src/slic3r/GUI/DeviceManager.cpp | 3 +++ src/slic3r/GUI/UpgradePanel.cpp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index f9e04ea6e..c8c766ce8 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -3392,6 +3392,9 @@ int MachineObject::parse_json(std::string payload, bool key_field_only) ver_info.sw_ver = (*it)["sw_ver"].get(); if ((*it).contains("sw_new_ver")) ver_info.sw_new_ver = (*it)["sw_new_ver"].get(); + if ((*it).contains("visible") && (*it).contains("new_ver")) { + ver_info.sw_new_ver = (*it)["new_ver"].get(); + } if ((*it).contains("sn")) ver_info.sn = (*it)["sn"].get(); if ((*it).contains("hw_ver")) diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index d7a9408b4..4c28a9712 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -880,6 +880,10 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj) } } } + else if (!it->second.sw_new_ver.empty() && (it->second.sw_new_ver != it->second.sw_ver)) { + amspanel->m_ams_new_version_img->Show(); + ams_ver = wxString::Format("%s->%s", it->second.sw_ver, it->second.sw_new_ver); + } else { std::string ams_idx = (boost::format("ams/%1%") % ams_id).str(); auto ver_item = obj->new_ver_list.find(ams_idx);