QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-01-30 16:38:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix some bug

Browse Source
This commit is contained in:
wjyLearn
2026-01-23 11:55:27 +08:00
parent 1c2612e116
commit 43b1e29445
8 changed files with 137 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/slic3r/GUI/PrinterWebView.cpp
View File

@@ -332,10 +332,12 @@ void PrinterWebView::init_scroll_window(wxPanel* Panel) {
devicesizer->Add(label_boxsizer_online);
devicesizer->AddSpacer(7);
}
#if QDT_RELEASE_TO_PUBLIC
m_net_devices = wxGetApp().get_devices();
for (const auto& device : m_net_devices) {
AddNetButton(device);
}
#endif
}
//y40
if (webisNetMode == isNetWeb) {
@@ -475,7 +477,6 @@ void PrinterWebView::SetLoginStatus(bool status) {
{
s_lastDeviceCount = currentDeviceCount;
// <20><><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><DFB3>и<EFBFBD><D0B8><EFBFBD>UI
GUI::wxGetApp().CallAfter([this]() {
this->UpdateState();
this->SetPresetChanged(true);
@@ -488,14 +489,14 @@ void PrinterWebView::SetLoginStatus(bool status) {
}).detach();
#endif
} else {
#if QDT_RELEASE_TO_PUBLIC
std::vector<NetDevice> devices;
wxGetApp().set_devices(devices);
if (!wxGetApp().is_link_connect()) // <20><>link<6E><6B>¼<EFBFBD><C2BC>ʱ<EFBFBD><CAB1><EFBFBD>˳<EFBFBD><CBB3><EFBFBD>¼<EFBFBD><C2BC>Ҫ<EFBFBD>ر<EFBFBD>sse<73><65><EFBFBD><EFBFBD>
if (!wxGetApp().is_link_connect())
{
#if QDT_RELEASE_TO_PUBLIC
MakerHttpHandle::getInstance().closeSSEClient();
#endif
}
#endif
// y28
if(webisNetMode == isNetWeb)
webisNetMode = isDisconnect;
@@ -708,7 +709,7 @@ void PrinterWebView::updateDeviceConnectType(const std::string& device_id, const
if (machine_button == nullptr) {
return;
}
// cj_1 <20>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ð<EFBFBD>ť<EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// cj_1 <20>л<EFBFBD><D0BB><EFBFBD>ð<EFBFBD>ť<EFBFBD><C5A5>ʾ<EFBFBD><CABE>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD>
cancelAllDevButtonSelect();
clearStatusPanelData();
machine_button->SetIsSelected(true);
@@ -1107,7 +1108,9 @@ void PrinterWebView::onStatusPanelTask(wxCommandEvent& event)
m_device_manager->sendActionCommand(m_cur_deviceId, action_type);
}
} else {
}
#if QDT_RELEASE_TO_PUBLIC
else {
HttpData httpData;
json bodyJson;
bodyJson["serialNumber"] = m_cur_deviceId;
@@ -1153,6 +1156,7 @@ void PrinterWebView::onStatusPanelTask(wxCommandEvent& event)
return;
}
}
#endif
}
//cj_1
@@ -1186,6 +1190,7 @@ void PrinterWebView::onSetBoxTask(wxCommandEvent& event)
return;
}
#if QDT_RELEASE_TO_PUBLIC
HttpData httpData;
json bodyJson;
bodyJson["serialNumber"] = m_cur_deviceId;
@@ -1207,7 +1212,7 @@ void PrinterWebView::onSetBoxTask(wxCommandEvent& event)
std::cout << "http error" << isSucceed << std::endl;
return;
}
#endif
}
void PrinterWebView::onRefreshRfid(wxCommandEvent& event)
@@ -1225,6 +1230,7 @@ void PrinterWebView::onRefreshRfid(wxCommandEvent& event)
return;
}
#if QDT_RELEASE_TO_PUBLIC
//RFID_READ SLOT=slot3
HttpData httpData;
json bodyJson;
@@ -1245,7 +1251,7 @@ void PrinterWebView::onRefreshRfid(wxCommandEvent& event)
auto device = m_device_manager->getDevice(m_cur_deviceId);
return;
#endif
}
@@ -1458,22 +1464,22 @@ void PrinterWebView::OnScroll(wxScrollWinEvent& event)
}
std::string extractBetweenMarkers(const std::string& path) {
// <20><><EFBFBD><EFBFBD> "/gcodes" <20><>λ<EFBFBD><CEBB>
// <20><><EFBFBD><EFBFBD> "/gcodes" <20><>λ<EFBFBD><CEBB>
size_t startPos = path.find("/gcodes");
if (startPos == std::string::npos) {
return ""; // û<>ҵ<EFBFBD> /gcodes
return ""; // û<>ҵ<EFBFBD> /gcodes
}
// <20><> /gcodes <20><><EFBFBD>濪ʼ<E6BFAA><CABC><EFBFBD><EFBFBD><EFBFBD>ϳ<EFBFBD><CFB3>ȣ<EFBFBD>
startPos += 7; // "/gcodes" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>7
// <20><> /gcodes <20><><EFBFBD>濪ʼ<E6BFAA><CABC><EFBFBD><EFBFBD><EFBFBD>ϳ<EFBFBD><CFB3>ȣ<EFBFBD>
startPos += 7; // "/gcodes" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>7
// <20><><EFBFBD><EFBFBD> ".3mf" <20><>λ<EFBFBD><CEBB>
// <20><><EFBFBD><EFBFBD> ".3mf" <20><>λ<EFBFBD><CEBB>
size_t endPos = path.find(".3mf", startPos);
if (endPos == std::string::npos) {
return ""; // û<>ҵ<EFBFBD> .3mf
return ""; // û<>ҵ<EFBFBD> .3mf
}
// <20><>ȡ<EFBFBD>м䲿<D0BC><E4B2BF>
// <20><>ȡ<EFBFBD>м䲿<D0BC><E4B2BF>
return path.substr(startPos, endPos - startPos);
}
@@ -1510,7 +1516,7 @@ void PrinterWebView::OnScroll(wxScrollWinEvent& event)
std::string oldPrintFileName = device->m_print_filename;
device->updateByJsonData(status);
device->last_update = std::chrono::steady_clock::now();
//cj_1 <20><><EFBFBD><EFBFBD>ӡ<EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˣ<EFBFBD><CBA3><EFBFBD><EFBFBD>´<EFBFBD>ӡ<EFBFBD>̶<EFBFBD><CCB6><EFBFBD>Ϣ<EFBFBD><CFA2><EFBFBD>ļ<EFBFBD>ͼƬ<CDBC><C6AC><EFBFBD><EFBFBD>ӡ<EFBFBD><D3A1>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//cj_1 <20><><EFBFBD><EFBFBD>ӡ<EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˣ<EFBFBD><CBA3><EFBFBD><EFBFBD>´<EFBFBD>ӡ<EFBFBD>̶<EFBFBD><CCB6><EFBFBD>Ϣ<EFBFBD><CFA2><EFBFBD>ļ<EFBFBD>ͼƬ<CDBC><C6AC><EFBFBD><EFBFBD>ӡ<EFBFBD><D3A1>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if (oldPrintFileName != device->m_print_filename) {
std::string url = device->m_frp_url + "/api/qidiclient/files/list";
@@ -1723,7 +1729,7 @@ void PrinterWebView::bindTaskHandle()
return;
}
// <20><><EFBFBD><EFBFBD> key-value <20><>
// <20><><EFBFBD><EFBFBD> key-value <20><>
for (auto& pair : m_eventToTaskPath) {
const wxEventTypeTag< wxCommandEvent >eventType = pair.first;
t_status_page->Bind(eventType, &PrinterWebView::onStatusPanelTask, this);
@@ -1817,15 +1823,15 @@ std::string extractEndNumbers(const std::string& str) {
size_t endPos = str.find_last_not_of("0123456789");
if (endPos == std::string::npos) {
// <20>ַ<EFBFBD><D6B7><EFBFBD>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// <20>ַ<EFBFBD><D6B7><EFBFBD>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
return str;
}
else if (endPos == str.length() - 1) {
// <20><><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// <20><><EFBFBD>һ<EFBFBD><D2BB><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
return "";
}
else {
// <20><><EFBFBD><EFBFBD>ĩβ<C4A9><CEB2><EFBFBD><EFBFBD><EFBFBD>ֲ<EFBFBD><D6B2><EFBFBD>
// <20><><EFBFBD><EFBFBD>ĩβ<C4A9><CEB2><EFBFBD><EFBFBD><EFBFBD>ֲ<EFBFBD><D6B2><EFBFBD>
return str.substr(endPos + 1);
}
}

2
src/slic3r/GUI/PrinterWebView.hpp
View File

@@ -215,7 +215,9 @@ private:
std::map<wxEventType, std::string> m_localEventToTaskPath;
std::string m_userInfo;
#if QDT_RELEASE_TO_PUBLIC
std::vector<NetDevice> m_net_devices;
#endif
};

7
src/slic3r/GUI/QDSDeviceManager.cpp
View File

@@ -143,6 +143,7 @@ void QDSFilamentConfig::init()
void QDSFilamentConfig::initTypeName()
{
#if QDT_RELEASE_TO_PUBLIC
std::string resultBody = MakerHttpHandle::getInstance().httpGetTask(Environment::TESTENV, m_typeName.path);
if (resultBody == "") {
return;
@@ -172,10 +173,12 @@ void QDSFilamentConfig::initTypeName()
catch (...) {
}
#endif
}
void QDSFilamentConfig::initFilamentData(FilamentData& filamentData)
{
#if QDT_RELEASE_TO_PUBLIC
std::string resultBody = MakerHttpHandle::getInstance().httpGetTask(Environment::TESTENV, filamentData.path);
if (resultBody == "") {
return;
@@ -197,7 +200,7 @@ void QDSFilamentConfig::initFilamentData(FilamentData& filamentData)
catch (...) {
}
#endif
}
std::string QDSFilamentConfig::getData(FilamentData filamentData, int index)
@@ -1838,6 +1841,7 @@ void QDSDeviceManager::unSelected(){
}
//y76
#if QDT_RELEASE_TO_PUBLIC
void QDSDeviceManager::setNetDevices(std::vector<NetDevice> devices){
std::lock_guard<std::mutex> lock(manager_mutex_);
net_devices = devices;
@@ -1847,6 +1851,7 @@ std::vector<NetDevice> QDSDeviceManager::getNetDevices(){
std::lock_guard<std::mutex> lock(manager_mutex_);
return net_devices;
}
#endif
void QDSDeviceManager::upBoxInfoToBoxMsg(std::shared_ptr<QDSDevice>& device){
std::vector<int> slot_state(17);

5
src/slic3r/GUI/QDSDeviceManager.hpp
View File

@@ -245,8 +245,10 @@ public:
void setSelected(const std::string& device_id);
std::shared_ptr<QDSDevice> getSelectedDevice();
void unSelected();
#if QDT_RELEASE_TO_PUBLIC
void setNetDevices(std::vector<NetDevice> devices);
std::vector<NetDevice> getNetDevices();
#endif
void upBoxInfoToBoxMsg(std::shared_ptr<QDSDevice>& device);
private:
@@ -269,7 +271,10 @@ private:
std::mutex callback_mutex_;
std::unordered_map<std::string, std::shared_ptr<QDSDevice>> devices_;
std::unordered_map<std::string, std::shared_ptr<WebSocketConnect>> connections_;
#if QDT_RELEASE_TO_PUBLIC
std::vector<NetDevice> net_devices;
#endif
// WebSocket