ENH: modify device upgrade page

Change-Id: I16c91c6e7b9c4c44307425e343b260ed873a695d
(cherry picked from commit 01efa8bcc05ef7fa50968fd36d1f3a592d35cccf)
(cherry picked from commit 63ce7de0879517c5dd5a7aac6e01425dc74638de)
This commit is contained in:
liz.li 2023-08-07 15:40:54 +08:00 committed by Lane.Wei
parent aca41cd20d
commit e8fa82cde9
2 changed files with 183 additions and 83 deletions

View file

@ -29,6 +29,8 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin
wxBoxSizer *m_main_left_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *m_main_left_sizer = new wxBoxSizer(wxVERTICAL);
// ota
wxBoxSizer *m_ota_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_ota_sizer = new wxBoxSizer(wxHORIZONTAL);
m_printer_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(200), FromDIP(200))); m_printer_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(200), FromDIP(200)));
@ -95,11 +97,10 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin
m_staticline->Show(false); m_staticline->Show(false);
m_main_left_sizer->Add(m_staticline, 0, wxEXPAND | wxLEFT, FromDIP(40)); m_main_left_sizer->Add(m_staticline, 0, wxEXPAND | wxLEFT, FromDIP(40));
// ams
m_ams_sizer = new wxBoxSizer(wxHORIZONTAL); m_ams_sizer = new wxBoxSizer(wxHORIZONTAL);
m_ams_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(200), FromDIP(200))); m_ams_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(200), FromDIP(200)));
m_ams_img->SetBitmap(m_img_monitor_ams.bmp()); m_ams_img->SetBitmap(m_img_monitor_ams.bmp());
m_ams_sizer->Add(m_ams_img, 0, wxALIGN_TOP | wxALL, FromDIP(5)); m_ams_sizer->Add(m_ams_img, 0, wxALIGN_TOP | wxALL, FromDIP(5));
@ -135,12 +136,31 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin
//Hide ams //Hide ams
show_ams(false, true); show_ams(false, true);
//
m_extra_ams_sizer = new wxBoxSizer(wxHORIZONTAL);
m_extra_ams_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(200), FromDIP(200)));
m_extra_ams_img->SetBitmap(m_img_extra_ams.bmp());
m_extra_ams_sizer->Add(m_extra_ams_img, 0, wxALIGN_TOP | wxALL, FromDIP(5));
wxBoxSizer* extra_ams_content_sizer = new wxBoxSizer(wxVERTICAL);
extra_ams_content_sizer->Add(0, 40, 0, wxEXPAND, FromDIP(5));
m_extra_ams_panel = new ExtraAmsPanel(this);
m_extra_ams_panel->m_staticText_ams->SetLabel("F1");
extra_ams_content_sizer->Add(m_extra_ams_panel, 0, wxEXPAND, 0);
m_extra_ams_sizer->Add(extra_ams_content_sizer, 1, wxEXPAND, 0);
m_main_left_sizer->Add(m_extra_ams_sizer, 0, wxEXPAND, 0);
show_extra_ams(false, true);
m_staticline2 = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL); m_staticline2 = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL);
m_staticline2->SetBackgroundColour(wxColour(206, 206, 206)); m_staticline2->SetBackgroundColour(wxColour(206, 206, 206));
//m_staticline2->Show(false);
m_main_left_sizer->Add(m_staticline2, 0, wxEXPAND | wxLEFT, FromDIP(40)); m_main_left_sizer->Add(m_staticline2, 0, wxEXPAND | wxLEFT, FromDIP(40));
// ext
m_ext_sizer = new wxBoxSizer(wxHORIZONTAL); m_ext_sizer = new wxBoxSizer(wxHORIZONTAL);
m_ext_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(200), FromDIP(200))); m_ext_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(200), FromDIP(200)));
@ -158,6 +178,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin
m_main_left_sizer->Add(m_ext_sizer, 0, wxEXPAND, 0); m_main_left_sizer->Add(m_ext_sizer, 0, wxEXPAND, 0);
m_main_sizer->Add(m_main_left_sizer, 1, wxEXPAND, 0); m_main_sizer->Add(m_main_left_sizer, 1, wxEXPAND, 0);
wxBoxSizer *m_main_right_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *m_main_right_sizer = new wxBoxSizer(wxVERTICAL);
@ -288,6 +309,7 @@ void MachineInfoPanel::init_bitmaps()
m_img_printer = ScalableBitmap(this, "printer_thumbnail", 160); m_img_printer = ScalableBitmap(this, "printer_thumbnail", 160);
m_img_monitor_ams = ScalableBitmap(this, "monitor_upgrade_ams", 200); m_img_monitor_ams = ScalableBitmap(this, "monitor_upgrade_ams", 200);
m_img_ext = ScalableBitmap(this, "monitor_upgrade_ext", 200); m_img_ext = ScalableBitmap(this, "monitor_upgrade_ext", 200);
m_img_extra_ams = ScalableBitmap(this, "monitor_upgrade_ams", 200);
upgrade_green_icon = ScalableBitmap(this, "monitor_upgrade_online", 5); upgrade_green_icon = ScalableBitmap(this, "monitor_upgrade_online", 5);
upgrade_gray_icon = ScalableBitmap(this, "monitor_upgrade_offline", 5); upgrade_gray_icon = ScalableBitmap(this, "monitor_upgrade_offline", 5);
upgrade_yellow_icon = ScalableBitmap(this, "monitor_upgrade_busy", 5); upgrade_yellow_icon = ScalableBitmap(this, "monitor_upgrade_busy", 5);
@ -451,7 +473,7 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
bool has_hub_model = false; bool has_hub_model = false;
//hub //hub
if (!obj->online_ahb || obj->module_vers.find("ahb") == obj->module_vers.end()) if (!obj->online_ahb || obj->module_vers.find("ahb") == obj->module_vers.end())
m_ahb_panel->Hide(); m_ahb_panel->Hide();
else { else {
has_hub_model = true; has_hub_model = true;
@ -531,105 +553,143 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
//ams //ams
if (obj->ams_exist_bits != 0) { if (obj->ams_exist_bits != 0) {
show_ams(true); std::string extra_ams_str = (boost::format("ams_extra_ams/%1%") % 0).str();
std::map<int, MachineObject::ModuleVersionInfo> ver_list = obj->get_ams_version(); auto extra_ams_it = obj->module_vers.find(extra_ams_str);
if (extra_ams_it != obj->module_vers.end()) {
wxString sn_text = extra_ams_it->second.sn;
sn_text = sn_text.MakeUpper();
AmsPanelHash::iterator iter = m_amspanel_list.begin(); wxString ver_text = extra_ams_it->second.sw_ver;
for (auto i = 0; i < m_amspanel_list.GetCount(); i++) { bool has_new_version = false;
AmsPanel *amspanel = m_amspanel_list[i]; auto new_extra_ams_ver = obj->new_ver_list.find(extra_ams_str);
amspanel->Hide(); if (new_extra_ams_ver != obj->new_ver_list.end())
has_new_version = true;
extra_ams_it->second.sw_new_ver;
if (has_new_version) {
m_extra_ams_panel->m_ams_new_version_img->Show();
ver_text = wxString::Format("%s->%s", new_extra_ams_ver->second.sw_ver, new_extra_ams_ver->second.sw_new_ver);
}
else {
m_extra_ams_panel->m_ams_new_version_img->Hide();
ver_text = wxString::Format("%s(%s)", extra_ams_it->second.sw_ver, _L("Latest version"));
}
m_extra_ams_panel->m_staticText_ams_sn_val->SetLabelText(sn_text);
m_extra_ams_panel->m_staticText_ams_ver_val->SetLabelText(ver_text);
show_ams(false);
show_extra_ams(true);
} }
else {
show_extra_ams(false);
show_ams(true);
std::map<int, MachineObject::ModuleVersionInfo> ver_list = obj->get_ams_version();
AmsPanelHash::iterator iter = m_amspanel_list.begin();
for (auto i = 0; i < m_amspanel_list.GetCount(); i++) {
AmsPanel* amspanel = m_amspanel_list[i];
amspanel->Hide();
}
auto ams_index = 0; auto ams_index = 0;
for (std::map<std::string, Ams *>::iterator iter = obj->amsList.begin(); iter != obj->amsList.end(); iter++) { for (std::map<std::string, Ams*>::iterator iter = obj->amsList.begin(); iter != obj->amsList.end(); iter++) {
wxString ams_name; wxString ams_name;
wxString ams_sn; wxString ams_sn;
wxString ams_ver; wxString ams_ver;
AmsPanel *amspanel = m_amspanel_list[ams_index]; AmsPanel* amspanel = m_amspanel_list[ams_index];
amspanel->Show(); amspanel->Show();
auto it = ver_list.find(atoi(iter->first.c_str())); auto it = ver_list.find(atoi(iter->first.c_str()));
auto ams_id = std::stoi(iter->second->id); auto ams_id = std::stoi(iter->second->id);
wxString ams_text = wxString::Format("AMS%s", std::to_string(ams_id + 1)); wxString ams_text = wxString::Format("AMS%s", std::to_string(ams_id + 1));
ams_name = ams_text; ams_name = ams_text;
if (it == ver_list.end()) { if (it == ver_list.end()) {
// hide this ams // hide this ams
ams_sn = "-"; ams_sn = "-";
ams_ver = "-";
} else {
// update ams img
if (m_obj->upgrade_display_state == (int)MachineObject::UpgradingDisplayState::UpgradingInProgress) {
ams_ver = "-"; ams_ver = "-";
amspanel->m_ams_new_version_img->Hide();
} }
else { else {
if (obj->new_ver_list.empty() && !obj->m_new_ver_list_exist) { // update ams img
if (obj->upgrade_new_version if (m_obj->upgrade_display_state == (int)MachineObject::UpgradingDisplayState::UpgradingInProgress) {
&& obj->ams_new_version_number.compare(it->second.sw_ver) != 0) { ams_ver = "-";
amspanel->m_ams_new_version_img->Show(); amspanel->m_ams_new_version_img->Hide();
}
else {
if (obj->new_ver_list.empty() && !obj->m_new_ver_list_exist) {
if (obj->upgrade_new_version
&& obj->ams_new_version_number.compare(it->second.sw_ver) != 0) {
amspanel->m_ams_new_version_img->Show();
if (obj->ams_new_version_number.empty()) { if (obj->ams_new_version_number.empty()) {
ams_ver = wxString::Format("%s", it->second.sw_ver); ams_ver = wxString::Format("%s", it->second.sw_ver);
} else { }
ams_ver = wxString::Format("%s->%s", it->second.sw_ver, obj->ams_new_version_number); else {
ams_ver = wxString::Format("%s->%s", it->second.sw_ver, obj->ams_new_version_number);
}
} }
} else { else {
amspanel->m_ams_new_version_img->Hide(); amspanel->m_ams_new_version_img->Hide();
if (obj->ams_new_version_number.empty()) { if (obj->ams_new_version_number.empty()) {
wxString ver_text = wxString::Format("%s", it->second.sw_ver); wxString ver_text = wxString::Format("%s", it->second.sw_ver);
ams_ver = ver_text; ams_ver = ver_text;
} else { }
wxString ver_text = wxString::Format("%s(%s)", it->second.sw_ver, _L("Latest version")); else {
ams_ver = ver_text; wxString ver_text = wxString::Format("%s(%s)", it->second.sw_ver, _L("Latest version"));
ams_ver = ver_text;
}
} }
} }
} else { else {
std::string ams_idx = (boost::format("ams/%1%") % ams_id).str(); std::string ams_idx = (boost::format("ams/%1%") % ams_id).str();
auto ver_item = obj->new_ver_list.find(ams_idx); auto ver_item = obj->new_ver_list.find(ams_idx);
if (ver_item == obj->new_ver_list.end()) { if (ver_item == obj->new_ver_list.end()) {
amspanel->m_ams_new_version_img->Hide();
wxString ver_text = wxString::Format("%s(%s)", it->second.sw_ver, _L("Latest version"));
ams_ver = ver_text;
} else {
if (ver_item->second.sw_new_ver != ver_item->second.sw_ver) {
amspanel->m_ams_new_version_img->Show();
wxString ver_text = wxString::Format("%s->%s", ver_item->second.sw_ver, ver_item->second.sw_new_ver);
ams_ver = ver_text;
} else {
amspanel->m_ams_new_version_img->Hide(); amspanel->m_ams_new_version_img->Hide();
wxString ver_text = wxString::Format("%s(%s)", ver_item->second.sw_ver, _L("Latest version")); wxString ver_text = wxString::Format("%s(%s)", it->second.sw_ver, _L("Latest version"));
ams_ver = ver_text; ams_ver = ver_text;
}
else {
if (ver_item->second.sw_new_ver != ver_item->second.sw_ver) {
amspanel->m_ams_new_version_img->Show();
wxString ver_text = wxString::Format("%s->%s", ver_item->second.sw_ver, ver_item->second.sw_new_ver);
ams_ver = ver_text;
}
else {
amspanel->m_ams_new_version_img->Hide();
wxString ver_text = wxString::Format("%s(%s)", ver_item->second.sw_ver, _L("Latest version"));
ams_ver = ver_text;
}
} }
} }
} }
// update ams sn
if (it->second.sn.empty()) {
ams_sn = "-";
}
else {
wxString sn_text = it->second.sn;
ams_sn = sn_text.MakeUpper();
}
} }
// update ams sn amspanel->m_staticText_ams->SetLabelText(ams_name);
if (it->second.sn.empty()) { amspanel->m_staticText_ams_sn_val->SetLabelText(ams_sn);
ams_sn = "-"; amspanel->m_staticText_ams_ver_val->SetLabelText(ams_ver);
} else {
wxString sn_text = it->second.sn; ams_index++;
ams_sn = sn_text.MakeUpper();
}
} }
amspanel->m_staticText_ams->SetLabelText(ams_name);
amspanel->m_staticText_ams_sn_val->SetLabelText(ams_sn);
amspanel->m_staticText_ams_ver_val->SetLabelText(ams_ver);
ams_index++;
} }
} else { } else {
if (!has_hub_model) { show_ams(false); } if (!has_hub_model) { show_ams(false); }
show_extra_ams(false);
} }
//ext //ext
auto ext_module = obj->module_vers.find("ext"); auto ext_module = obj->module_vers.find("ext");
if (ext_module == obj->module_vers.end()) if (ext_module == obj->module_vers.end())
@ -749,6 +809,16 @@ void MachineInfoPanel::show_ext(bool show, bool force_update)
m_last_ext_show = show; m_last_ext_show = show;
} }
void MachineInfoPanel::show_extra_ams(bool show, bool force_update) {
if (m_last_extra_ams_show != show || force_update) {
m_extra_ams_img->Show(show);
m_extra_ams_sizer->Show(show);
m_staticline->Show(show);
BOOST_LOG_TRIVIAL(trace) << "upgrade: show_extra_ams = " << show;
}
m_last_extra_ams_show = show;
}
void MachineInfoPanel::on_sys_color_changed() void MachineInfoPanel::on_sys_color_changed()
{ {
if (m_obj) { if (m_obj) {
@ -1154,5 +1224,16 @@ bool UpgradePanel::Show(bool show)
m_ext_new_version_img->SetBitmap(upgrade_green_icon.bmp()); m_ext_new_version_img->SetBitmap(upgrade_green_icon.bmp());
} }
ExtraAmsPanel::ExtraAmsPanel(wxWindow* parent,
wxWindowID id /*= wxID_ANY*/,
const wxPoint& pos /*= wxDefaultPosition*/,
const wxSize& size /*= wxDefaultSize*/,
long style /*= wxTAB_TRAVERSAL*/,
const wxString& name /*= wxEmptyString*/)
: AmsPanel(parent, id, pos, size, style)
{
}
} }
} }

View file

@ -52,6 +52,16 @@ public:
void msw_rescale(); void msw_rescale();
}; };
class ExtraAmsPanel : public AmsPanel
{
public:
ExtraAmsPanel(wxWindow* parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL,
const wxString& name = wxEmptyString);
};
WX_DEFINE_ARRAY(AmsPanel*, AmsPanelHash); WX_DEFINE_ARRAY(AmsPanel*, AmsPanelHash);
@ -74,6 +84,8 @@ protected:
wxStaticBitmap *m_ams_img; wxStaticBitmap *m_ams_img;
AmsPanel* m_ahb_panel; AmsPanel* m_ahb_panel;
wxStaticLine* m_staticline2; wxStaticLine* m_staticline2;
ExtraAmsPanel* m_extra_ams_panel;
wxStaticBitmap* m_extra_ams_img;
wxStaticBitmap* m_ext_img; wxStaticBitmap* m_ext_img;
ExtensionPanel* m_ext_panel; ExtensionPanel* m_ext_panel;
@ -87,6 +99,10 @@ protected:
bool m_last_ext_show = true; bool m_last_ext_show = true;
wxBoxSizer* m_ext_sizer; wxBoxSizer* m_ext_sizer;
/* extra_ams info */
bool m_last_extra_ams_show = true;
wxBoxSizer* m_extra_ams_sizer;
/* upgrade widgets */ /* upgrade widgets */
wxBoxSizer* m_upgrading_sizer; wxBoxSizer* m_upgrading_sizer;
wxStaticText * m_staticText_upgrading_info; wxStaticText * m_staticText_upgrading_info;
@ -97,10 +113,12 @@ protected:
Button * m_button_upgrade_firmware; Button * m_button_upgrade_firmware;
wxPanel* create_caption_panel(wxWindow *parent); wxPanel* create_caption_panel(wxWindow *parent);
AmsPanelHash m_amspanel_list; AmsPanelHash m_amspanel_list;
std::vector<ExtraAmsPanel*> m_extra_ams_panel_list;
ScalableBitmap m_img_ext; ScalableBitmap m_img_ext;
ScalableBitmap m_img_monitor_ams; ScalableBitmap m_img_monitor_ams;
ScalableBitmap m_img_extra_ams;
ScalableBitmap m_img_printer; ScalableBitmap m_img_printer;
ScalableBitmap upgrade_gray_icon; ScalableBitmap upgrade_gray_icon;
ScalableBitmap upgrade_green_icon; ScalableBitmap upgrade_green_icon;
@ -134,6 +152,7 @@ public:
void show_status(int status, std::string upgrade_status_str = ""); void show_status(int status, std::string upgrade_status_str = "");
void show_ams(bool show = false, bool force_update = false); void show_ams(bool show = false, bool force_update = false);
void show_ext(bool show = false, bool force_update = false); void show_ext(bool show = false, bool force_update = false);
void show_extra_ams(bool show = false, bool force_update = false);
void on_upgrade_firmware(wxCommandEvent &event); void on_upgrade_firmware(wxCommandEvent &event);
void on_consisitency_upgrade_firmware(wxCommandEvent &event); void on_consisitency_upgrade_firmware(wxCommandEvent &event);
@ -152,12 +171,12 @@ public:
}panel_type; }panel_type;
}; };
enum UpgradeMode { //enum UpgradeMode {
umPushUpgrading, // umPushUpgrading,
umSelectOtaVerUpgrading, // umSelectOtaVerUpgrading,
umSelectAmsVerUpgrading, // umSelectAmsVerUpgrading,
}; //};
static UpgradeMode upgrade_mode; //static UpgradeMode upgrade_mode;
class UpgradePanel : public wxPanel class UpgradePanel : public wxPanel
{ {