UI优化

@@ -222,7 +222,8 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
 		break;
 	case CANCEL:
 	case NORMAL:
-		g_pMainDlg->myctrlbit.ShowWindow(SW_HIDE);
+		g_pMainDlg->myctrlbit.ShowWindow(SW_SHOW);
+		g_pMainDlg->myctrlbit.SetBitmap(g_pMainDlg->m_hBitmapnormal);
 		break;
 	}
 

@@ -521,6 +521,10 @@ SOURCE=".\res\SN Writer.ico"
 
 SOURCE=".\SN Writer.rc"
 # End Source File
+# Begin Source File
+
+SOURCE=.\res\WAIT.bmp
+# End Source File
 # End Group
 # Begin Source File
 

@@ -212,38 +212,38 @@ CAPTION "SN Writer"
 FONT 9, "΢ÈíÑźÚ"
 BEGIN
     EDITTEXT        IDC_IMEI1_FROM_SCAN,44,15,109,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_IMEI2_FROM_SCAN,44,33,109,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "Start",IDC_BTN_START,173,20,99,25,BS_CENTER | 
+    EDITTEXT        IDC_IMEI2_FROM_SCAN,44,30,109,12,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "Start",IDC_BTN_START,173,21,99,24,BS_CENTER | 
                     BS_VCENTER | NOT WS_TABSTOP
     LISTBOX         IDC_LOG_LIST,0,118,293,133,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_HSCROLL
-    LTEXT           "",IDC_STATIC_IMEI1,46,65,109,12,SS_SUNKEN
-    LTEXT           "",IDC_STATIC_IMEI2,46,84,109,12,SS_CENTERIMAGE | 
+    LTEXT           "",IDC_STATIC_IMEI1,46,58,109,12,SS_SUNKEN
+    LTEXT           "",IDC_STATIC_IMEI2,46,72,109,12,SS_CENTERIMAGE | 
                     SS_SUNKEN
     DEFPUSHBUTTON   "",IDC_BTN_SYSCONFIG,262,62,9,8,NOT WS_VISIBLE | NOT 
                     WS_TABSTOP
     DEFPUSHBUTTON   "",IDC_BTN_QUIT,262,71,9,8,NOT WS_VISIBLE | NOT 
                     WS_TABSTOP
-    LTEXT           "Total:",IDC_STATIC,7,105,22,8
-    LTEXT           "Pass:",IDC_STATIC_PASS,68,105,21,10
-    LTEXT           "Fail:",IDC_STATIC,129,105,18,10
+    LTEXT           "Total:",IDC_STATIC,7,107,22,8
+    LTEXT           "Pass:",IDC_STATIC_PASS,68,107,21,10
+    LTEXT           "Fail:",IDC_STATIC,129,107,18,10
     COMBOBOX        IDC_COMBO_COMPORT,262,83,16,51,CBS_DROPDOWNLIST | 
                     CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
-    CONTROL         133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,167,53,93,45
+    CONTROL         133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,164,49,93,45
     GROUPBOX        "IMEI form Scan",IDC_STATIC,0,2,282,45
-    LTEXT           "",IDC_COUNT_TOTAL,32,105,29,8,SS_SUNKEN
-    LTEXT           "",IDC_COUNT_PASS,90,105,32,8,SS_SUNKEN
-    LTEXT           "",IDC_COUNT_FAIL,145,105,37,8,SS_SUNKEN
+    LTEXT           "",IDC_COUNT_TOTAL,32,107,29,8,SS_SUNKEN
+    LTEXT           "",IDC_COUNT_PASS,90,107,32,8,SS_SUNKEN
+    LTEXT           "",IDC_COUNT_FAIL,145,107,37,8,SS_SUNKEN
     LTEXT           "IMEI1",IDC_STATIC_1,8,15,20,12,SS_CENTERIMAGE
-    LTEXT           "IMEI2",IDC_STATIC_2,8,33,20,12,SS_CENTERIMAGE
-    GROUPBOX        "IMEI from phone",IDC_STATIC,2,53,158,49
-    LTEXT           "IMEI1",IDC_STATIC,10,65,20,12,SS_CENTERIMAGE
-    LTEXT           "IMEI2",IDC_STATIC,10,84,20,12,SS_CENTERIMAGE
+    LTEXT           "IMEI2",IDC_STATIC_2,8,30,20,12,SS_CENTERIMAGE
+    GROUPBOX        "IMEI from phone",IDC_STATIC,2,48,158,38
+    LTEXT           "IMEI1",IDC_STATIC,10,58,20,12,SS_CENTERIMAGE
+    LTEXT           "IMEI2",IDC_STATIC,10,72,20,12,SS_CENTERIMAGE
     DEFPUSHBUTTON   "",IDOK,270,69,9,8,NOT WS_VISIBLE | NOT WS_TABSTOP
-    CTEXT           "Static",IDC_STATIC_TIMECOUNT,191,104,106,12,
-                    SS_CENTERIMAGE
+    CTEXT           "",IDC_STATIC_TIMECOUNT,191,104,106,12,SS_CENTERIMAGE
     CONTROL         "Factory reset ",IDC_CHECK_RST,"Button",BS_AUTOCHECKBOX,
                     170,8,98,10
+    LTEXT           "",IDC_STATIC_FINAL_INFO,0,89,251,16,SS_CENTERIMAGE
 END
 
 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
@@ -577,7 +577,8 @@ END
 //
 
 IDB_BITMAP_FAIL         BITMAP  MOVEABLE PURE   "res\\FAIL.bmp"
-IDB_BITMAP_PASS         BITMAP  MOVEABLE PURE   "res\\PASS.bmp"
+IDB_BITMAP_NORMAL       BITMAP  DISCARDABLE     "res\\WAIT.bmp"
+IDB_BITMAP_PASS         BITMAP  DISCARDABLE     "res\\PASS.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //

@@ -215,13 +215,15 @@ BOOL CSNWriterDlg::OnInitDialog()
 #ifdef __TOPWELL_QCTEST__
 	g_sMetaComm.bCheckQCFlag = true;
 #endif
-    m_font.CreatePointFont(380, "Arial");
+    m_font.CreatePointFont(200, "Arial");
+	GetDlgItem(IDC_STATIC_FINAL_INFO)->SetFont(&m_font);
 
     //m_hSNMenu = LoadMenu(AfxGetInstanceHandle(),MAKEINTRESOURCE(IDR_SN_MENU));
     ::SetMenu(this->GetSafeHwnd(),m_hSNMenu);
 
     m_hBitmapFail = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_FAIL));
     m_hBitmapPass = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_PASS));
+    m_hBitmapnormal = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_NORMAL));
 //    ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
 
 
@@ -239,7 +241,7 @@ BOOL CSNWriterDlg::OnInitDialog()
 	{
 		CDialog::OnCancel();
 	}
-	myctrlbit.ShowWindow(SW_HIDE);
+	myctrlbit.SetBitmap(m_hBitmapnormal);
 	m_cComPortBox.ShowWindow(SW_HIDE);
 
     return TRUE;  // return TRUE  unless you set the focus to a control
@@ -472,11 +474,12 @@ void CSNWriterDlg::UpdateOperateResult(WriteNvram_Status_e eWriteStatus)
         break;
 
     case NORMAL:
-		myctrlbit.ShowWindow(SW_HIDE);
+		myctrlbit.SetBitmap(m_hBitmapnormal);
         break;
 
     case CANCEL:
     default:
+		myctrlbit.SetBitmap(m_hBitmapnormal);
         //Do nothing
         break;
     }
@@ -611,6 +614,8 @@ void CSNWriterDlg::OnBtnStart()
 	myloglist.ResetContent();
 	GetDlgItem(IDC_STATIC_IMEI1)->SetWindowText("");
 	GetDlgItem(IDC_STATIC_IMEI2)->SetWindowText("");
+	GetDlgItem(IDC_STATIC_FINAL_INFO)->SetWindowText("");
+	myctrlbit.SetBitmap(m_hBitmapnormal);
 	if (myflag_reset)
 	{
 		if (myscanimei1 == "" || myscanimei2 == "")
@@ -737,11 +742,10 @@ HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
 {
     HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
 
-    // TODO: Change any attributes of the DC here
-//    if((IDC_MAINUI_TEMP1 == pWnd->GetDlgCtrlID())||(IDC_MAINUI_TEMP2 == pWnd->GetDlgCtrlID()))
-//    {
-//        pDC->SetTextColor(RGB(255,0,0));
-//    }
+    if((IDC_STATIC_FINAL_INFO == pWnd->GetDlgCtrlID())||(IDC_STATIC_TIMECOUNT == pWnd->GetDlgCtrlID()))
+    {
+        pDC->SetTextColor(RGB(255,0,0));
+    }
 
     // TODO: Return a different brush if the default is not desired
     return hbr;

@@ -129,6 +129,7 @@ private:
 public:
     HBITMAP m_hBitmapPass;
     HBITMAP m_hBitmapFail;
+    HBITMAP m_hBitmapnormal;
 	CFont m_font;
 	int mytime_count;
 };

@@ -20,6 +20,7 @@
 #define IDI_ICON1                       154
 #define IDD_ENCRYPTION_DIALOG           155
 #define IDD_FIRST_CHOOSE_DB             158
+#define IDB_BITMAP_NORMAL               160
 #define IDC_COUNT_TOTAL                 1000
 #define IDC_BTN_SYSCONFIG               1001
 #define IDC_BTN_START                   1002
@@ -225,6 +226,7 @@
 #define IDC_CHECK_RST                   1180
 #define IDC_STATIC_1                    1181
 #define IDC_STATIC_2                    1182
+#define IDC_STATIC_FINAL_INFO           1183
 #define IDR_OPTION_SWITCHTOOL           32772
 #define IDR_OPTION_EXTMODEM             32773
 #define IDR_OPTION_SECURITY_USB         32774
@@ -254,7 +256,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        160
+#define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         32798
 #define _APS_NEXT_CONTROL_VALUE         1183
 #define _APS_NEXT_SYMED_VALUE           101