Commit 927e6d47dedc36f0a3a9124bc5c7addbf5aedcc7

Authored by xiemeng
1 parent 3e979287

SN_Setup.ini中的版本号与system config中的版本号同步问题

Signed-off-by: xiedimeng <xm@topwelltec.com>
... ... @@ -215,6 +215,7 @@ BOOL CSystemConfig::OnInitDialog()
215 215 GetDlgItem(IDC_LOCK_OTP)->ShowWindow(SW_HIDE);
216 216 else
217 217 ((CButton *)GetDlgItem(IDC_LOCK_OTP))->SetCheck(g_sMetaComm.sIMEIOption.bLockOtp ? BST_CHECKED : BST_UNCHECKED);
  218 + myswversion = CString(g_sMetaComm.check_sw_ver);
218 219
219 220 UpdateConfigUIOption();
220 221
... ... @@ -874,6 +875,16 @@ BOOL CSystemConfig::DestroyWindow()
874 875 g_sMetaComm.sIMEIOption.bDualIMEI = true;
875 876 g_sMetaComm.sIMEIOption.iImeiNums = DUAL_IMEI;
876 877 }
  878 + if (myswversion == "")
  879 + {
  880 + strcpy(g_sMetaComm.check_sw_ver,"null");
  881 + }
  882 + else
  883 + {
  884 + memcpy(g_sMetaComm.check_sw_ver,myswversion.GetBuffer(myswversion.GetLength()),myswversion.GetLength());
  885 + }
  886 +
  887 +
877 888 SaveParaToSetupFile();
878 889
879 890 // release ToolTip Control
... ... @@ -891,6 +902,12 @@ void CSystemConfig::OnBtnSave()
891 902 {
892 903 g_sMetaComm.sIMEIOption.bLockOtp = ((CButton *)GetDlgItem(IDC_LOCK_OTP))->GetCheck() == BST_CHECKED;
893 904
  905 + if (myswversion == "null" ||myswversion == "")
  906 + {
  907 + MessageBox("please input SW version!!");
  908 + }
  909 +
  910 +
894 911 CDialog::OnOK();
895 912 }
896 913
... ...
... ... @@ -192,6 +192,7 @@
192 192 #define IDC_BTN_LOG 1165
193 193 #define IDC_LOCK_OTP 1166
194 194 #define IDC_STR_SWVERSION 1167
  195 +#define IDC_STATIC_SWVER 1169
195 196 #define IDR_OPTION_SWITCHTOOL 32772
196 197 #define IDR_OPTION_EXTMODEM 32773
197 198 #define IDR_OPTION_SECURITY_USB 32774
... ... @@ -223,7 +224,7 @@
223 224 #ifndef APSTUDIO_READONLY_SYMBOLS
224 225 #define _APS_NEXT_RESOURCE_VALUE 157
225 226 #define _APS_NEXT_COMMAND_VALUE 32798
226   -#define _APS_NEXT_CONTROL_VALUE 1168
  227 +#define _APS_NEXT_CONTROL_VALUE 1170
227 228 #define _APS_NEXT_SYMED_VALUE 101
228 229 #endif
229 230 #endif
... ...
... ... @@ -147,7 +147,7 @@ END
147 147 IDD_SYSTEM_CONFIG_DIALOG DIALOGEX 0, 0, 285, 379
148 148 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
149 149 CAPTION "System Config"
150   -FONT 4, "System"
  150 +FONT 4, "System", 0, 0, 0x1
151 151 BEGIN
152 152 GROUPBOX "Write Option",IDC_STATIC,8,3,100,117
153 153 CONTROL "Barcode",IDC_WRITE_BARC_CHECK,"Button",BS_AUTOCHECKBOX |
... ... @@ -275,7 +275,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
275 275 WS_SYSMENU
276 276 EXSTYLE WS_EX_APPWINDOW
277 277 CAPTION "SN Writer"
278   -FONT 10, "System", 0, 0, 0x1
  278 +FONT 10, "System"
279 279 BEGIN
280 280 LTEXT "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT
281 281 EDITTEXT IDC_COUNT_TOTAL,213,18,100,13,ES_AUTOHSCROLL |
... ... @@ -305,6 +305,7 @@ BEGIN
305 305 WS_GROUP,298,185,35,35
306 306 CONTROL "temp",IDC_MAINUI_TEMP1,"Static",SS_LEFTNOWORDWRAP |
307 307 WS_GROUP,239,185,56,35,WS_EX_RIGHT
  308 + LTEXT "Static",IDC_STATIC_SWVER,15,110,289,11
308 309 END
309 310
310 311 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
... ...
... ... @@ -224,6 +224,7 @@ BOOL CSNWriterDlg::OnInitDialog()
224 224 // Get main dialog handle
225 225 g_pMainDlg = (CSNWriterDlg*)this;
226 226 ParameterInit();
  227 + SetDlgItemText(IDC_STATIC_SWVER,"please setting SW version");
227 228
228 229 return TRUE; // return TRUE unless you set the focus to a control
229 230 }
... ... @@ -658,6 +659,14 @@ void CSNWriterDlg::OnBtnSysconfig()
658 659 // TODO: Add your control notification handler code here
659 660 CSystemConfig dlg;
660 661 dlg.DoModal();
  662 + if (dlg.myswversion == "")
  663 + {
  664 + SetDlgItemText(IDC_STATIC_SWVER,"The version number is empty!!!");
  665 + }
  666 + else
  667 + {
  668 + SetDlgItemText(IDC_STATIC_SWVER,dlg.myswversion);
  669 + }
661 670 }
662 671
663 672 void CSNWriterDlg::OnSelchangeComboComport()
... ...
Please register or login to post a comment