ENH: delete useless function, delay start_device_subscribe after mqtt_connect called

jira: [STUDIO-13135]

Change-Id: Ibce80b043d08f6c1c7baa6611c3cfa2f0c85f2f5
(cherry picked from commit c2ff073525937fb571ea8d3bfae55231adaa691d)
This commit is contained in:
haolin.tian
2025-07-08 14:18:25 +08:00
committed by Noisyfox
parent 92a8b0b43e
commit d6e87fc0b7
7 changed files with 1 additions and 83 deletions

View File

@@ -6003,6 +6003,7 @@ std::string MachineObject::get_string_from_fantype(int type)
void MachineObject::nt_condition_local_tunnel()
{
return;
int full_msg_count_limit = 2;
if (!nt_try_local_tunnel && nt_cloud_full_msg_count == full_msg_count_limit) {
connect(Slic3r::GUI::wxGetApp().app_config->get("enable_ssl_for_mqtt") == "true" ? true : false);
@@ -7495,8 +7496,6 @@ bool DeviceManager::set_selected_machine(std::string dev_id, bool need_disconnec
if (last_selected->second->connection_type() == "lan") {
if (last_selected->second->is_connecting() && !need_disconnect)
return false;
if (!need_disconnect) {m_agent->disconnect_printer(); }
}
}
@@ -7514,7 +7513,6 @@ bool DeviceManager::set_selected_machine(std::string dev_id, bool need_disconnec
} else {
// lan mode printer reconnect printer
if (m_agent) {
if (!need_disconnect) {m_agent->disconnect_printer();}
it->second->reset();
#if !BBL_RELEASE_TO_PUBLIC
it->second->connect(Slic3r::GUI::wxGetApp().app_config->get("enable_ssl_for_mqtt") == "true" ? true : false);
@@ -7574,28 +7572,6 @@ MachineObject* DeviceManager::get_selected_machine()
return nullptr;
}
void DeviceManager::add_user_subscribe()
{
/* user machine */
std::vector<std::string> dev_list;
for (auto it = userMachineList.begin(); it != userMachineList.end(); it++) {
dev_list.push_back(it->first);
BOOST_LOG_TRIVIAL(trace) << "add_user_subscribe: " << it->first;
}
m_agent->add_subscribe(dev_list);
}
void DeviceManager::del_user_subscribe()
{
/* user machine */
std::vector<std::string> dev_list;
for (auto it = userMachineList.begin(); it != userMachineList.end(); it++) {
dev_list.push_back(it->first);
BOOST_LOG_TRIVIAL(trace) << "del_user_subscribe: " << it->first;
}
m_agent->del_subscribe(dev_list);
}
void DeviceManager::subscribe_device_list(std::vector<std::string> dev_list)
{
std::vector<std::string> unsub_list;

View File

@@ -1498,8 +1498,6 @@ public:
bool set_selected_machine(std::string dev_id, bool need_disconnect = false);
MachineObject* get_selected_machine();
void add_user_subscribe();
void del_user_subscribe();
void subscribe_device_list(std::vector<std::string> dev_list);

View File

@@ -1689,7 +1689,6 @@ void GUI_App::init_networking_callbacks()
m_agent->set_user_selected_machine(m_agent->get_user_selected_machine());
//subscribe device
if (m_agent->is_user_login()) {
m_agent->start_device_subscribe();
/*disconnect lan*/
DeviceManager* dev = this->getDeviceManager();
@@ -4343,7 +4342,6 @@ void GUI_App::on_user_login_handle(wxCommandEvent &evt)
int online_login = evt.GetInt();
m_agent->connect_server();
// get machine list
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) return;

View File

@@ -2339,27 +2339,6 @@ void SelectMachineDialog::Enable_Auto_Refill(bool enable)
m_ams_backup_tip->Refresh();
}
void SelectMachineDialog::connect_printer_mqtt()
{
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) return;
MachineObject* obj_ = dev->get_selected_machine();
if (obj_->connection_type() == "cloud") {
show_status(PrintDialogStatus::PrintStatusSending);
m_status_bar->disable_cancel_button();
m_status_bar->set_status_text(_L("Connecting to the printer. Unable to cancel during the connection process."));
#if !BBL_RELEASE_TO_PUBLIC
obj_->connect(wxGetApp().app_config->get("enable_ssl_for_mqtt") == "true" ? true : false);
#else
obj_->connect(obj_->local_use_ssl_for_mqtt);
#endif
}
else {
on_send_print();
}
}
static bool _HasExt(const std::vector<FilamentInfo> &ams_mapping_result) {
if (ams_mapping_result.empty()) {
return true;

View File

@@ -448,7 +448,6 @@ public:
void show_errors(wxString& info);
void on_ok_btn(wxCommandEvent& event);
void Enable_Auto_Refill(bool enable);
void connect_printer_mqtt();
void on_send_print();
void clear_ip_address_config(wxCommandEvent& e);
void on_refresh(wxCommandEvent& event);