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

Signed-off-by: xiedimeng <xm@topwelltec.com>

@@ -215,6 +215,7 @@ BOOL CSystemConfig::OnInitDialog()
         GetDlgItem(IDC_LOCK_OTP)->ShowWindow(SW_HIDE);
         GetDlgItem(IDC_LOCK_OTP)->ShowWindow(SW_HIDE);
     else
     else
         ((CButton *)GetDlgItem(IDC_LOCK_OTP))->SetCheck(g_sMetaComm.sIMEIOption.bLockOtp ? BST_CHECKED : BST_UNCHECKED);
         ((CButton *)GetDlgItem(IDC_LOCK_OTP))->SetCheck(g_sMetaComm.sIMEIOption.bLockOtp ? BST_CHECKED : BST_UNCHECKED);
+	myswversion = CString(g_sMetaComm.check_sw_ver);
 
 
     UpdateConfigUIOption();
     UpdateConfigUIOption();
 
 
@@ -874,6 +875,16 @@ BOOL CSystemConfig::DestroyWindow()
         g_sMetaComm.sIMEIOption.bDualIMEI = true;
         g_sMetaComm.sIMEIOption.bDualIMEI = true;
         g_sMetaComm.sIMEIOption.iImeiNums = DUAL_IMEI;
         g_sMetaComm.sIMEIOption.iImeiNums = DUAL_IMEI;
     }
     }
+	if (myswversion == "")
+	{
+		strcpy(g_sMetaComm.check_sw_ver,"null");
+	} 
+	else
+	{
+		memcpy(g_sMetaComm.check_sw_ver,myswversion.GetBuffer(myswversion.GetLength()),myswversion.GetLength());
+	}
+
+	
     SaveParaToSetupFile();
     SaveParaToSetupFile();
 
 
     // release ToolTip Control
     // release ToolTip Control
@@ -891,6 +902,12 @@ void CSystemConfig::OnBtnSave()
 {
 {
     g_sMetaComm.sIMEIOption.bLockOtp = ((CButton *)GetDlgItem(IDC_LOCK_OTP))->GetCheck() == BST_CHECKED;
     g_sMetaComm.sIMEIOption.bLockOtp = ((CButton *)GetDlgItem(IDC_LOCK_OTP))->GetCheck() == BST_CHECKED;
 
 
+	if (myswversion == "null" ||myswversion == "")
+	{
+		MessageBox("please input SW version!!");
+	}
+
+
     CDialog::OnOK();
     CDialog::OnOK();
 }
 }
 
 

@@ -192,6 +192,7 @@
 #define IDC_BTN_LOG                     1165
 #define IDC_BTN_LOG                     1165
 #define IDC_LOCK_OTP                    1166
 #define IDC_LOCK_OTP                    1166
 #define IDC_STR_SWVERSION               1167
 #define IDC_STR_SWVERSION               1167
+#define IDC_STATIC_SWVER                1169
 #define IDR_OPTION_SWITCHTOOL           32772
 #define IDR_OPTION_SWITCHTOOL           32772
 #define IDR_OPTION_EXTMODEM             32773
 #define IDR_OPTION_EXTMODEM             32773
 #define IDR_OPTION_SECURITY_USB         32774
 #define IDR_OPTION_SECURITY_USB         32774
@@ -223,7 +224,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        157
 #define _APS_NEXT_RESOURCE_VALUE        157
 #define _APS_NEXT_COMMAND_VALUE         32798
 #define _APS_NEXT_COMMAND_VALUE         32798
-#define _APS_NEXT_CONTROL_VALUE         1168
+#define _APS_NEXT_CONTROL_VALUE         1170
 #define _APS_NEXT_SYMED_VALUE           101
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
 #endif
 #endif

@@ -147,7 +147,7 @@ END
 IDD_SYSTEM_CONFIG_DIALOG DIALOGEX 0, 0, 285, 379
 IDD_SYSTEM_CONFIG_DIALOG DIALOGEX 0, 0, 285, 379
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "System Config"
 CAPTION "System Config"
-FONT 4, "System"
+FONT 4, "System", 0, 0, 0x1
 BEGIN
 BEGIN
     GROUPBOX        "Write Option",IDC_STATIC,8,3,100,117
     GROUPBOX        "Write Option",IDC_STATIC,8,3,100,117
     CONTROL         "Barcode",IDC_WRITE_BARC_CHECK,"Button",BS_AUTOCHECKBOX | 
     CONTROL         "Barcode",IDC_WRITE_BARC_CHECK,"Button",BS_AUTOCHECKBOX | 
@@ -275,7 +275,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
     WS_SYSMENU
     WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "SN Writer"
 CAPTION "SN Writer"
-FONT 10, "System", 0, 0, 0x1
+FONT 10, "System"
 BEGIN
 BEGIN
     LTEXT           "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT
     LTEXT           "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT
     EDITTEXT        IDC_COUNT_TOTAL,213,18,100,13,ES_AUTOHSCROLL | 
     EDITTEXT        IDC_COUNT_TOTAL,213,18,100,13,ES_AUTOHSCROLL | 
@@ -305,6 +305,7 @@ BEGIN
                     WS_GROUP,298,185,35,35
                     WS_GROUP,298,185,35,35
     CONTROL         "temp",IDC_MAINUI_TEMP1,"Static",SS_LEFTNOWORDWRAP | 
     CONTROL         "temp",IDC_MAINUI_TEMP1,"Static",SS_LEFTNOWORDWRAP | 
                     WS_GROUP,239,185,56,35,WS_EX_RIGHT
                     WS_GROUP,239,185,56,35,WS_EX_RIGHT
+    LTEXT           "Static",IDC_STATIC_SWVER,15,110,289,11
 END
 END
 
 
 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316

@@ -224,6 +224,7 @@ BOOL CSNWriterDlg::OnInitDialog()
     // Get main dialog handle
     // Get main dialog handle
     g_pMainDlg = (CSNWriterDlg*)this;
     g_pMainDlg = (CSNWriterDlg*)this;
     ParameterInit();
     ParameterInit();
+	SetDlgItemText(IDC_STATIC_SWVER,"please setting SW version");
 
 
     return TRUE;  // return TRUE  unless you set the focus to a control
     return TRUE;  // return TRUE  unless you set the focus to a control
 }
 }
@@ -658,6 +659,14 @@ void CSNWriterDlg::OnBtnSysconfig()
     // TODO: Add your control notification handler code here
     // TODO: Add your control notification handler code here
     CSystemConfig dlg;
     CSystemConfig dlg;
     dlg.DoModal();
     dlg.DoModal();
+	if (dlg.myswversion == "")
+	{
+		SetDlgItemText(IDC_STATIC_SWVER,"The version number is empty!!!");
+	} 
+	else
+	{
+		SetDlgItemText(IDC_STATIC_SWVER,dlg.myswversion);
+	}
 }
 }
 
 
 void CSNWriterDlg::OnSelchangeComboComport()
 void CSNWriterDlg::OnSelchangeComboComport()