细节优化

xiemeng
1 parent 083fc126
Showing 7 changed files with 36 additions and 53 deletions
Execute/SNbase.cpp
Execute/SPexc.cpp
Resource.h
SN Writer.dsp
SN Writer.rc
SN WriterDlg.cpp
SN WriterDlg.h
--- a/Execute/SNbase.cpp
View file @a5f48b9
+++ b/Execute/SNbase.cpp
View file @a5f48b9
@@ -151,10 +151,6 @@ UINT SNBase::ThreadStaticEntryPoint(LPVOID pThis)
 void SNBase::SetProgress()
 {
-    m_iProcessRange = 1000;
-    m_Process->SetRange(0, m_iProcessRange);
-    m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(0, 0, 255));
-    UpdateProgress(0.01);
 }
 int SNBase::UpdateUIMsg(const char * strMsg, ...)
@@ -229,13 +225,6 @@ void SNBase::UpdateMainDlgUI(bool bEnable, WriteNvram_Status_e eWriteStatus)
 void SNBase::UpdateProgress(double dPercent)
 {
-    if (dPercent >= 1)
-    {
-        dPercent = 1;
-    }
-
-    int curPos = (int)(dPercent * m_iProcessRange);
-    m_Process->SetPos(curPos);
 }
 void SNBase::PopupMsgBox(const char* strTilte, UINT uType, const char* strMsg, ...)
@@ -1216,8 +1205,8 @@ void SNBase::SNThread_Init()
     //Get main dialog handle
     //g_pMainDlg = (CSNWriterDlg*)g_MainDlgHandle;
-    m_Process = &(g_pMainDlg->m_ProgressSN);
-    SetProgress();
+ //   m_Process = &(g_pMainDlg->m_ProgressSN);
+    //SetProgress();
     m_bNeedBackupIMEI = false;
     memset(m_strBackupIMEI, 0, IMEI_ARRAY_LEN);
@@ -1257,4 +1246,5 @@ void SNBase::SNThread_Start()
 void SNBase::SNThread_Stop()
 {
     g_iMetaStopFlag = BOOT_STOP;
+	g_pMainDlg->myloglist.ResetContent();
 }
--- a/Execute/SPexc.cpp
View file @a5f48b9
+++ b/Execute/SPexc.cpp
View file @a5f48b9
@@ -4264,6 +4264,8 @@ void SmartPhoneSN::ThreadMainEntryPoint()
         else if (!bSkipScanData && scanDlg.DoModal() != IDOK)
             break;
         iTestCount++;
+		g_pMainDlg->SetTimer(1,1000,NULL);
+		g_pMainDlg->myloglist.ResetContent();
         DebugOnOff(true);
         MTRACE(g_hEBOOT_DEBUG, "------------------------------------ START -------------------------------------");
@@ -4402,15 +4404,15 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 				{
 				case 0:
 					bAnyOperationFail = true;
-					UpdateUIMsg("QC untest");
+					UpdateUIMsg("QC1 untest");
 					goto End;
 					break;
 				case 1:
-					UpdateUIMsg("QC test pass");
+					UpdateUIMsg("QC1 test pass");
 					break;
 				default:
 					bAnyOperationFail = true;
-					UpdateUIMsg("QC test fail");
+					UpdateUIMsg("QC1 test fail");
 					goto End;
 					break;
 				}
@@ -4501,7 +4503,7 @@ End:
             if (bAnyOperationFail)
             {
-                m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
+                //m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
                 UpdateUICountResult(FAIL);
             }
             else
@@ -4537,6 +4539,8 @@ End:
     }
     g_sMetaComm.sWriteOption.bWriteBarcode = bWriteBarcode;
     g_sMetaComm.sWriteOption.bWriteIMEI = bWriteIMEI;
+	g_pMainDlg->KillTimer(1);
+	g_pMainDlg->GetDlgItem(IDC_MAINUI_TIME_COUNT)->SetWindowText("0 Sec");
     if (g_sMetaComm.bSwithTool)
         DisableUSBSwitch();
--- a/Resource.h
View file @a5f48b9
+++ b/Resource.h
View file @a5f48b9
@@ -15,8 +15,6 @@
 #define IDD_CHANGE_PASSWD_DIALOG        143
 #define IDD_FILE_LOAD_DIALOG            144
 #define IDD_AUTOGEN_DIALOG              146
-#define IDB_BITMAP_LOGO                 148
-#define IDI_ICON1                       154
 #define IDD_ENCRYPTION_DIALOG           155
 #define IDB_BITMAP_NORMAL               162
 #define IDC_COUNT_TOTAL                 1000
@@ -34,9 +32,6 @@
 #define IDC_BTN_MD1                     1012
 #define IDC_BTN_MD2                     1013
 #define IDC_BTN_AP                      1014
-#define IDC_SECURITY_USB                1017
-#define IDC_SWITCHTOOL_CHECK            1018
-#define IDC_DUALTALK_CHECK              1019
 #define IDC_WRITE_BARC_CHECK            1021
 #define IDC_WRITE_IMEI_CHECK            1022
 #define IDC_WRITE_WIFI_CHECK            1023
@@ -96,7 +91,6 @@
 #define IDC_SCAN_MSG                    1072
 #define IDC_STATIC_PASS                 1073
 #define IDC_ETHERNET_MAC_DATA           1074
-#define IDC_OPERATE_INFO                1075
 #define IDC_DRMKEY_MCID_HEADER_SCAN     1076
 #define IDC_DRMKEY_MCID_DATA            1077
 #define IDC_BTN_INDITE                  1078
@@ -159,9 +153,9 @@
 #define IDC_ETHERNET_NEXT_STR           1131
 #define IDC_WIFI_AUTOGEN_STEP           1132
 #define IDC_ETHERNET_AUTOGEN_STEP       1134
-#define IDC_MAINUI_TEMP2                1135
 #define IDC_AUTOGEN_ETHERNET_CHECK      1136
 #define IDC_MAINUI_TEMP1                1137
+#define IDC_MAINUI_TIME_COUNT           1137
 #define IDC_DRMKEY_MCID_START_STR       1138
 #define IDC_DRMKEY_MCID_END_STR         1139
 #define IDC_BARC_STATIC                 1140
@@ -169,7 +163,6 @@
 #define IDC_BT_STATIC                   1142
 #define IDC_DRMKEY_MCID_AUTOGEN_STEP    1143
 #define IDC_WIFI_STATIC                 1144
-#define IDC_EXTERN_MD_DOWNLOAD          1145
 #define IDC_AUTOGEN_DRMKEY_MCID_CHECK   1146
 #define IDC_PWD_DATA                    1147
 #define IDC_IMEI_1_STATIC               1148
@@ -193,10 +186,7 @@
 #define IDC_LOCK_OTP                    1166
 #define IDC_STR_SWVERSION               1167
 #define IDC_STATIC_SWVER                1169
-#define IDC_COMBO2                      1172
-#define IDC_BUTTONAP                    1174
 #define IDC_LIST_LOG                    1175
-#define IDC_BUTTONBP                    1176
 #define IDR_OPTION_SWITCHTOOL           32772
 #define IDR_OPTION_EXTMODEM             32773
 #define IDR_OPTION_SECURITY_USB         32774
--- a/SN Writer.dsp
View file @a5f48b9
+++ b/SN Writer.dsp
View file @a5f48b9
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Use_MFC 6
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Output"
-# PROP Intermediate_Dir "Output"
+# PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
--- a/SN Writer.rc
View file @a5f48b9
+++ b/SN Writer.rc
View file @a5f48b9
@@ -170,20 +170,16 @@ BEGIN
     LTEXT           "Target Type:",IDC_STATIC,13,38,43,9,0,WS_EX_RIGHT
     LTEXT           "Total:",IDC_STATIC,6,125,20,10
     LTEXT           "Pass:",IDC_STATIC_PASS,6,140,21,10
-    CONTROL         "Progress1",IDC_PROGRESS_SN,"msctls_progress32",
-                    WS_BORDER,9,171,166,10
     LTEXT           "Fail:",IDC_STATIC,6,155,18,10
     GROUPBOX        "config",IDC_STATIC,0,0,178,95
     COMBOBOX        IDC_COMBO_COMPORT,61,19,87,51,CBS_DROPDOWNLIST | 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_COMBO_TARGET_TYPE,61,35,87,63,CBS_DROPDOWNLIST | 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Button1",IDC_BTN_INDITE,68,116,108,50,BS_BITMAP | 
+    PUSHBUTTON      "Button1",IDC_BTN_INDITE,68,119,108,50,BS_BITMAP | 
                     BS_FLAT
-    CONTROL         "°C",IDC_MAINUI_TEMP2,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,42,108,16,9
-    CONTROL         "temp",IDC_MAINUI_TEMP1,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,7,108,32,9,WS_EX_RIGHT
+    CONTROL         "",IDC_MAINUI_TIME_COUNT,"Static",SS_LEFTNOWORDWRAP | 
+                    WS_GROUP,61,109,56,9,WS_EX_RIGHT | WS_EX_STATICEDGE
     LTEXT           "Static",IDC_STATIC_SWVER,6,74,166,11,0,WS_EX_STATICEDGE
     LISTBOX         IDC_LIST_LOG,180,4,152,168,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_TABSTOP
--- a/SN WriterDlg.cpp
View file @a5f48b9
+++ b/SN WriterDlg.cpp
View file @a5f48b9
@@ -93,6 +93,7 @@ CSNWriterDlg::CSNWriterDlg(CWnd* pParent /*=NULL*/)
     m_strTotal = _T("");
     m_strPass = _T("");
     m_strFail = _T("");
+	mytimecount = 0;
     //}}AFX_DATA_INIT
     // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
     m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
@@ -105,7 +106,6 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_LIST_LOG, myloglist);
     DDX_Control(pDX, IDC_COMBO_TARGET_TYPE, m_cTargetTypeBox);
     DDX_Control(pDX, IDC_COMBO_COMPORT, m_cComPortBox);
-    DDX_Control(pDX, IDC_PROGRESS_SN, m_ProgressSN);
     DDX_Text(pDX, IDC_COUNT_TOTAL, m_strTotal);
     DDX_Text(pDX, IDC_COUNT_PASS, m_strPass);
     DDX_Text(pDX, IDC_COUNT_FAIL, m_strFail);
@@ -128,7 +128,6 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
 BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
     //{{AFX_MSG_MAP(CSNWriterDlg)
-    ON_WM_SYSCOMMAND()
     ON_WM_PAINT()
     ON_WM_QUERYDRAGICON()
     ON_BN_CLICKED(IDC_BTN_START, OnBtnStart)
@@ -161,7 +160,9 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
     ON_COMMAND(IDR_OPTION_COMPOSITE_DEVICE, OnOptionCompositeDevice)
     ON_COMMAND(IDR_BACKNV_TOPC, OnBacknvTopc)
     ON_COMMAND(IDR_OEM_LOCK, OnFastbootOemLock)
-    //}}AFX_MSG_MAP
+    ON_WM_SYSCOMMAND()
+	ON_WM_TIMER()
+	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
@@ -234,6 +235,7 @@ BOOL CSNWriterDlg::OnInitDialog()
     g_pMainDlg = (CSNWriterDlg*)this;
     ParameterInit();
 	SetDlgItemText(IDC_STATIC_SWVER,"please setting SW version");
+	SetDlgItemText(IDC_MAINUI_TIME_COUNT,"0 Sec");
     return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -413,8 +415,6 @@ void CSNWriterDlg::EnableUIItem()
         m_SNMenu.GetSubMenu(3)->EnableMenuItem(0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
         m_SNMenu.GetSubMenu(3)->EnableMenuItem(1, MF_ENABLED | MF_BYPOSITION);
     }
-    GetDlgItem(IDC_MAINUI_TEMP1)->ShowWindow(FALSE);
-    GetDlgItem(IDC_MAINUI_TEMP2)->ShowWindow(FALSE);
     SetDlgItemText(IDC_BTN_START, "Start");
 }
@@ -583,14 +583,9 @@ void CSNWriterDlg::OnPaint()
 void CSNWriterDlg::ShowTemperatureOnUI()
 {
-    GetDlgItem(IDC_MAINUI_TEMP1)->ShowWindow(true);
-    GetDlgItem(IDC_MAINUI_TEMP2)->ShowWindow(true);
     m_MainUIT1.Format("%s", g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData);
-    GetDlgItem(IDC_MAINUI_TEMP1)->SetWindowText(m_MainUIT1);
-    //GetDlgItem(IDC_MAINUI_TEMP1)->SetFont(&m_font);
-    //GetDlgItem(IDC_MAINUI_TEMP2)->SetFont(&m_font);
     //m_font.DeleteObject();
 }
@@ -742,13 +737,6 @@ 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));
-    }
-
-    // TODO: Return a different brush if the default is not desired
     return hbr;
 }
@@ -1095,3 +1083,16 @@ void CSNWriterDlg::OnFastbootOemLock()
     }
 }
+
+void CSNWriterDlg::OnTimer(UINT nIDEvent) 
+{
+	CString astr_time;
+	if (nIDEvent == 1)
+	{
+		mytimecount ++;
+		astr_time.Format("%d Sec",mytimecount);
+		SetDlgItemText(IDC_MAINUI_TIME_COUNT,astr_time);
+
+	}
+	CDialog::OnTimer(nIDEvent);
+}
--- a/SN WriterDlg.h
View file @a5f48b9
+++ b/SN WriterDlg.h
View file @a5f48b9
@@ -84,6 +84,7 @@ protected:
 	afx_msg void OnOptionCompositeDevice();
 	afx_msg void OnBacknvTopc();
 	afx_msg void OnFastbootOemLock();
+	afx_msg void OnTimer(UINT nIDEvent);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
@@ -124,6 +125,7 @@ public:
     HBITMAP m_hBitmapFail;
     HBITMAP m_hBitmapnormal;
 	CFont m_font;
+	int mytimecount;
 };
 //{{AFX_INSERT_LOCATION}}