juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-22 02:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: clean codes about device

Browse Source 
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
This commit is contained in:
xin.zhang
2025-08-01 17:34:35 +08:00
committed by Noisyfox
parent e17c8bfb80
commit 4a787f6ff8
115 changed files with 7238 additions and 5492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/GUI/BindDialog.cpp
View File

@@ -18,6 +18,8 @@
#include "Jobs/PlaterWorker.hpp"
#include "Widgets/WebView.hpp"
#include "DeviceCore/DevManager.h"
namespace Slic3r {
namespace GUI {
@@ -847,7 +849,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
EndModal(wxID_OK);
MessageDialog msg_wingow(nullptr, _L("Log in successful."), "", wxAPPLY | wxOK);
msg_wingow.ShowModal();
if(m_machine_info) wxGetApp().on_start_subscribe_again(m_machine_info->dev_id);
if(m_machine_info) wxGetApp().on_start_subscribe_again(m_machine_info->get_dev_id());
}
void BindMachineDialog::on_bind_printer(wxCommandEvent &event)
@@ -863,7 +865,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
if (m_machine_info == nullptr || m_machine_info == NULL) return;
//check dev_id
if (m_machine_info->dev_id.empty()) return;
if (m_machine_info->get_dev_id().empty()) return;
// update ota version
NetworkAgent* agent = wxGetApp().getAgent();
@@ -871,7 +873,8 @@ PingCodeBindDialog::~PingCodeBindDialog() {
agent->track_update_property("dev_ota_version", m_machine_info->get_ota_version());
m_simplebook->SetSelection(0);
auto m_bind_job = std::make_unique<BindJob>(m_machine_info->dev_id, m_machine_info->dev_ip, m_machine_info->bind_sec_link, m_machine_info->bind_ssdp_version);
auto m_bind_job = std::make_unique<BindJob>(
m_machine_info->get_dev_id(), m_machine_info->get_dev_ip(), m_machine_info->bind_sec_link, m_machine_info->bind_ssdp_version);
if (m_machine_info && (m_machine_info->get_printer_series() == PrinterSeries::SERIES_X1)) {
m_bind_job->set_improved(false);
@@ -921,7 +924,7 @@ void BindMachineDialog::on_show(wxShowEvent &event)
m_printer_img->Refresh();
m_printer_img->Show();
m_printer_name->SetLabelText(from_u8(m_machine_info->dev_name));
m_printer_name->SetLabelText(from_u8(m_machine_info->get_dev_name()));
if (wxGetApp().is_user_login()) {
wxString username_text = from_u8(wxGetApp().getAgent()->get_user_nickanme());
@@ -1099,16 +1102,16 @@ void UnBindMachineDialog::on_unbind_printer(wxCommandEvent &event)
}
m_machine_info->set_access_code("");
int result = wxGetApp().request_user_unbind(m_machine_info->dev_id);
int result = wxGetApp().request_user_unbind(m_machine_info->get_dev_id());
if (result == 0) {
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) return;
// clean local machine access code info
MachineObject* obj = dev->get_local_machine(m_machine_info->dev_id);
MachineObject* obj = dev->get_local_machine(m_machine_info->get_dev_id());
if (obj) {
obj->set_access_code("");
}
dev->erase_user_machine(m_machine_info->dev_id);
dev->erase_user_machine(m_machine_info->get_dev_id());
m_status_text->SetLabelText(_L("Log out successful."));
m_button_cancel->SetLabel(_L("Close"));
@@ -1138,7 +1141,7 @@ void UnBindMachineDialog::on_show(wxShowEvent &event)
m_printer_img->Refresh();
m_printer_img->Show();
m_printer_name->SetLabelText(from_u8(m_machine_info->dev_name));
m_printer_name->SetLabelText(from_u8(m_machine_info->get_dev_name()));
if (wxGetApp().is_user_login()) {