mirror of
https://github.com/QIDITECH/QIDIStudio.git
synced 2026-01-31 00:48:41 +03:00
fix some bug
This commit is contained in:
@@ -505,6 +505,8 @@ void MachineObject::reload_printer_settings()
|
|||||||
MachineObject::MachineObject(std::string name)
|
MachineObject::MachineObject(std::string name)
|
||||||
:dev_name(name)
|
:dev_name(name)
|
||||||
{
|
{
|
||||||
|
m_dev_info = DevInfo::Create(this);
|
||||||
|
m_dev_info->SetDevId("");
|
||||||
}
|
}
|
||||||
|
|
||||||
// y40
|
// y40
|
||||||
@@ -518,6 +520,8 @@ MachineObject::MachineObject(std::string name, std::string url, std::string ip,
|
|||||||
slice_info(nullptr),
|
slice_info(nullptr),
|
||||||
m_is_online(false)
|
m_is_online(false)
|
||||||
{
|
{
|
||||||
|
m_dev_info = DevInfo::Create(this);
|
||||||
|
m_dev_info->SetDevId("");
|
||||||
}
|
}
|
||||||
|
|
||||||
MachineObject::MachineObject(DeviceManager* manager, NetworkAgent* agent, std::string name, std::string id, std::string ip)
|
MachineObject::MachineObject(DeviceManager* manager, NetworkAgent* agent, std::string name, std::string id, std::string ip)
|
||||||
@@ -779,7 +783,9 @@ std::string MachineObject::get_lifecycle_type_str()
|
|||||||
|
|
||||||
bool MachineObject::is_in_upgrading() const
|
bool MachineObject::is_in_upgrading() const
|
||||||
{
|
{
|
||||||
return m_upgrade->IsUpgrading();
|
//y75
|
||||||
|
//return m_upgrade->IsUpgrading();
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string MachineObject::get_ota_version()
|
std::string MachineObject::get_ota_version()
|
||||||
|
|||||||
@@ -100,10 +100,10 @@ private:
|
|||||||
std::shared_ptr<int> m_token = std::make_shared<int>(1);
|
std::shared_ptr<int> m_token = std::make_shared<int>(1);
|
||||||
|
|
||||||
/* properties */
|
/* properties */
|
||||||
std::string dev_name;
|
std::string dev_name = "";
|
||||||
std::string dev_ip;
|
std::string dev_ip = "";
|
||||||
std::string access_code;
|
std::string access_code = "";
|
||||||
std::string user_access_code;
|
std::string user_access_code = "";
|
||||||
std::shared_ptr<DevInfo> m_dev_info;
|
std::shared_ptr<DevInfo> m_dev_info;
|
||||||
|
|
||||||
// type, time stamp, delay
|
// type, time stamp, delay
|
||||||
|
|||||||
Reference in New Issue
Block a user