NEW: add N1/F1 related item at device upgrade page
jira: new cherry picked from branch master(cherry picked from commit 5a997ff51778ce5b48103c1263024f814acf66f7) Change-Id: I407eaaa1c5b4d59c72d94d9d3c743a18b8031cec
This commit is contained in:
parent
fd15ceb1fb
commit
3bc58e9362
|
@ -147,7 +147,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin
|
||||||
wxBoxSizer* extra_ams_content_sizer = new wxBoxSizer(wxVERTICAL);
|
wxBoxSizer* extra_ams_content_sizer = new wxBoxSizer(wxVERTICAL);
|
||||||
extra_ams_content_sizer->Add(0, 40, 0, wxEXPAND, FromDIP(5));
|
extra_ams_content_sizer->Add(0, 40, 0, wxEXPAND, FromDIP(5));
|
||||||
m_extra_ams_panel = new ExtraAmsPanel(this);
|
m_extra_ams_panel = new ExtraAmsPanel(this);
|
||||||
m_extra_ams_panel->m_staticText_ams->SetLabel("F1");
|
m_extra_ams_panel->m_staticText_ams->SetLabel("AMS Lite");
|
||||||
extra_ams_content_sizer->Add(m_extra_ams_panel, 0, wxEXPAND, 0);
|
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_extra_ams_sizer->Add(extra_ams_content_sizer, 1, wxEXPAND, 0);
|
||||||
|
@ -553,7 +553,7 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
|
||||||
|
|
||||||
//ams
|
//ams
|
||||||
if (obj->ams_exist_bits != 0) {
|
if (obj->ams_exist_bits != 0) {
|
||||||
std::string extra_ams_str = (boost::format("ams_extra_ams/%1%") % 0).str();
|
std::string extra_ams_str = (boost::format("ams_f1/%1%") % 0).str();
|
||||||
auto extra_ams_it = obj->module_vers.find(extra_ams_str);
|
auto extra_ams_it = obj->module_vers.find(extra_ams_str);
|
||||||
if (extra_ams_it != obj->module_vers.end()) {
|
if (extra_ams_it != obj->module_vers.end()) {
|
||||||
wxString sn_text = extra_ams_it->second.sn;
|
wxString sn_text = extra_ams_it->second.sn;
|
||||||
|
|
Loading…
Reference in New Issue