xiemeng / xiemeng_intex_write_tool · Commits

Commit a5f48b9375544998c5a9a3018a5bf5a4bad72ecf

Authored by xiemeng
1 parent 083fc126

细节优化

Inline Side-by-side
Showing 7 changed files with 36 additions and 53 deletions
... ... @@ -151,10 +151,6 @@ UINT SNBase::ThreadStaticEntryPoint(LPVOID pThis)
151 151
152 152 void SNBase::SetProgress()
153 153 {
154   - m_iProcessRange = 1000;
155   - m_Process->SetRange(0, m_iProcessRange);
156   - m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(0, 0, 255));
157   - UpdateProgress(0.01);
158 154 }
159 155
160 156 int SNBase::UpdateUIMsg(const char * strMsg, ...)
... ... @@ -229,13 +225,6 @@ void SNBase::UpdateMainDlgUI(bool bEnable, WriteNvram_Status_e eWriteStatus)
229 225
230 226 void SNBase::UpdateProgress(double dPercent)
231 227 {
232   - if (dPercent >= 1)
233   - {
234   - dPercent = 1;
235   - }
236   -
237   - int curPos = (int)(dPercent * m_iProcessRange);
238   - m_Process->SetPos(curPos);
239 228 }
240 229
241 230 void SNBase::PopupMsgBox(const char* strTilte, UINT uType, const char* strMsg, ...)
... ... @@ -1216,8 +1205,8 @@ void SNBase::SNThread_Init()
1216 1205 //Get main dialog handle
1217 1206 //g_pMainDlg = (CSNWriterDlg*)g_MainDlgHandle;
1218 1207
1219   - m_Process = &(g_pMainDlg->m_ProgressSN);
1220   - SetProgress();
  1208 + // m_Process = &(g_pMainDlg->m_ProgressSN);
  1209 + //SetProgress();
1221 1210
1222 1211 m_bNeedBackupIMEI = false;
1223 1212 memset(m_strBackupIMEI, 0, IMEI_ARRAY_LEN);
... ... @@ -1257,4 +1246,5 @@ void SNBase::SNThread_Start()
1257 1246 void SNBase::SNThread_Stop()
1258 1247 {
1259 1248 g_iMetaStopFlag = BOOT_STOP;
  1249 + g_pMainDlg->myloglist.ResetContent();
1260 1250 }
... ...
... ... @@ -4264,6 +4264,8 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4264 4264 else if (!bSkipScanData && scanDlg.DoModal() != IDOK)
4265 4265 break;
4266 4266 iTestCount++;
  4267 + g_pMainDlg->SetTimer(1,1000,NULL);
  4268 + g_pMainDlg->myloglist.ResetContent();
4267 4269
4268 4270 DebugOnOff(true);
4269 4271 MTRACE(g_hEBOOT_DEBUG, "------------------------------------ START -------------------------------------");
... ... @@ -4402,15 +4404,15 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4402 4404 {
4403 4405 case 0:
4404 4406 bAnyOperationFail = true;
4405   - UpdateUIMsg("QC untest");
  4407 + UpdateUIMsg("QC1 untest");
4406 4408 goto End;
4407 4409 break;
4408 4410 case 1:
4409   - UpdateUIMsg("QC test pass");
  4411 + UpdateUIMsg("QC1 test pass");
4410 4412 break;
4411 4413 default:
4412 4414 bAnyOperationFail = true;
4413   - UpdateUIMsg("QC test fail");
  4415 + UpdateUIMsg("QC1 test fail");
4414 4416 goto End;
4415 4417 break;
4416 4418 }
... ... @@ -4501,7 +4503,7 @@ End:
4501 4503
4502 4504 if (bAnyOperationFail)
4503 4505 {
4504   - m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
  4506 + //m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
4505 4507 UpdateUICountResult(FAIL);
4506 4508 }
4507 4509 else
... ... @@ -4537,6 +4539,8 @@ End:
4537 4539 }
4538 4540 g_sMetaComm.sWriteOption.bWriteBarcode = bWriteBarcode;
4539 4541 g_sMetaComm.sWriteOption.bWriteIMEI = bWriteIMEI;
  4542 + g_pMainDlg->KillTimer(1);
  4543 + g_pMainDlg->GetDlgItem(IDC_MAINUI_TIME_COUNT)->SetWindowText("0 Sec");
4540 4544
4541 4545 if (g_sMetaComm.bSwithTool)
4542 4546 DisableUSBSwitch();
... ...
... ... @@ -15,8 +15,6 @@
15 15 #define IDD_CHANGE_PASSWD_DIALOG 143
16 16 #define IDD_FILE_LOAD_DIALOG 144
17 17 #define IDD_AUTOGEN_DIALOG 146
18   -#define IDB_BITMAP_LOGO 148
19   -#define IDI_ICON1 154
20 18 #define IDD_ENCRYPTION_DIALOG 155
21 19 #define IDB_BITMAP_NORMAL 162
22 20 #define IDC_COUNT_TOTAL 1000
... ... @@ -34,9 +32,6 @@
34 32 #define IDC_BTN_MD1 1012
35 33 #define IDC_BTN_MD2 1013
36 34 #define IDC_BTN_AP 1014
37   -#define IDC_SECURITY_USB 1017
38   -#define IDC_SWITCHTOOL_CHECK 1018
39   -#define IDC_DUALTALK_CHECK 1019
40 35 #define IDC_WRITE_BARC_CHECK 1021
41 36 #define IDC_WRITE_IMEI_CHECK 1022
42 37 #define IDC_WRITE_WIFI_CHECK 1023
... ... @@ -96,7 +91,6 @@
96 91 #define IDC_SCAN_MSG 1072
97 92 #define IDC_STATIC_PASS 1073
98 93 #define IDC_ETHERNET_MAC_DATA 1074
99   -#define IDC_OPERATE_INFO 1075
100 94 #define IDC_DRMKEY_MCID_HEADER_SCAN 1076
101 95 #define IDC_DRMKEY_MCID_DATA 1077
102 96 #define IDC_BTN_INDITE 1078
... ... @@ -159,9 +153,9 @@
159 153 #define IDC_ETHERNET_NEXT_STR 1131
160 154 #define IDC_WIFI_AUTOGEN_STEP 1132
161 155 #define IDC_ETHERNET_AUTOGEN_STEP 1134
162   -#define IDC_MAINUI_TEMP2 1135
163 156 #define IDC_AUTOGEN_ETHERNET_CHECK 1136
164 157 #define IDC_MAINUI_TEMP1 1137
  158 +#define IDC_MAINUI_TIME_COUNT 1137
165 159 #define IDC_DRMKEY_MCID_START_STR 1138
166 160 #define IDC_DRMKEY_MCID_END_STR 1139
167 161 #define IDC_BARC_STATIC 1140
... ... @@ -169,7 +163,6 @@
169 163 #define IDC_BT_STATIC 1142
170 164 #define IDC_DRMKEY_MCID_AUTOGEN_STEP 1143
171 165 #define IDC_WIFI_STATIC 1144
172   -#define IDC_EXTERN_MD_DOWNLOAD 1145
173 166 #define IDC_AUTOGEN_DRMKEY_MCID_CHECK 1146
174 167 #define IDC_PWD_DATA 1147
175 168 #define IDC_IMEI_1_STATIC 1148
... ... @@ -193,10 +186,7 @@
193 186 #define IDC_LOCK_OTP 1166
194 187 #define IDC_STR_SWVERSION 1167
195 188 #define IDC_STATIC_SWVER 1169
196   -#define IDC_COMBO2 1172
197   -#define IDC_BUTTONAP 1174
198 189 #define IDC_LIST_LOG 1175
199   -#define IDC_BUTTONBP 1176
200 190 #define IDR_OPTION_SWITCHTOOL 32772
201 191 #define IDR_OPTION_EXTMODEM 32773
202 192 #define IDR_OPTION_SECURITY_USB 32774
... ...
... ... @@ -66,7 +66,7 @@ LINK32=link.exe
66 66 # PROP Use_MFC 6
67 67 # PROP Use_Debug_Libraries 1
68 68 # PROP Output_Dir "Output"
69   -# PROP Intermediate_Dir "Output"
  69 +# PROP Intermediate_Dir "Debug"
70 70 # PROP Ignore_Export_Lib 0
71 71 # PROP Target_Dir ""
72 72 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
... ...
... ... @@ -170,20 +170,16 @@ BEGIN
170 170 LTEXT "Target Type:",IDC_STATIC,13,38,43,9,0,WS_EX_RIGHT
171 171 LTEXT "Total:",IDC_STATIC,6,125,20,10
172 172 LTEXT "Pass:",IDC_STATIC_PASS,6,140,21,10
173   - CONTROL "Progress1",IDC_PROGRESS_SN,"msctls_progress32",
174   - WS_BORDER,9,171,166,10
175 173 LTEXT "Fail:",IDC_STATIC,6,155,18,10
176 174 GROUPBOX "config",IDC_STATIC,0,0,178,95
177 175 COMBOBOX IDC_COMBO_COMPORT,61,19,87,51,CBS_DROPDOWNLIST |
178 176 CBS_SORT | WS_VSCROLL | WS_TABSTOP
179 177 COMBOBOX IDC_COMBO_TARGET_TYPE,61,35,87,63,CBS_DROPDOWNLIST |
180 178 CBS_SORT | WS_VSCROLL | WS_TABSTOP
181   - PUSHBUTTON "Button1",IDC_BTN_INDITE,68,116,108,50,BS_BITMAP |
  179 + PUSHBUTTON "Button1",IDC_BTN_INDITE,68,119,108,50,BS_BITMAP |
182 180 BS_FLAT
183   - CONTROL "°C",IDC_MAINUI_TEMP2,"Static",SS_LEFTNOWORDWRAP |
184   - WS_GROUP,42,108,16,9
185   - CONTROL "temp",IDC_MAINUI_TEMP1,"Static",SS_LEFTNOWORDWRAP |
186   - WS_GROUP,7,108,32,9,WS_EX_RIGHT
  181 + CONTROL "",IDC_MAINUI_TIME_COUNT,"Static",SS_LEFTNOWORDWRAP |
  182 + WS_GROUP,61,109,56,9,WS_EX_RIGHT | WS_EX_STATICEDGE
187 183 LTEXT "Static",IDC_STATIC_SWVER,6,74,166,11,0,WS_EX_STATICEDGE
188 184 LISTBOX IDC_LIST_LOG,180,4,152,168,LBS_NOINTEGRALHEIGHT |
189 185 WS_VSCROLL | WS_TABSTOP
... ...
... ... @@ -93,6 +93,7 @@ CSNWriterDlg::CSNWriterDlg(CWnd* pParent /*=NULL*/)
93 93 m_strTotal = _T("");
94 94 m_strPass = _T("");
95 95 m_strFail = _T("");
  96 + mytimecount = 0;
96 97 //}}AFX_DATA_INIT
97 98 // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
98 99 m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
... ... @@ -105,7 +106,6 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
105 106 DDX_Control(pDX, IDC_LIST_LOG, myloglist);
106 107 DDX_Control(pDX, IDC_COMBO_TARGET_TYPE, m_cTargetTypeBox);
107 108 DDX_Control(pDX, IDC_COMBO_COMPORT, m_cComPortBox);
108   - DDX_Control(pDX, IDC_PROGRESS_SN, m_ProgressSN);
109 109 DDX_Text(pDX, IDC_COUNT_TOTAL, m_strTotal);
110 110 DDX_Text(pDX, IDC_COUNT_PASS, m_strPass);
111 111 DDX_Text(pDX, IDC_COUNT_FAIL, m_strFail);
... ... @@ -128,7 +128,6 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
128 128
129 129 BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
130 130 //{{AFX_MSG_MAP(CSNWriterDlg)
131   - ON_WM_SYSCOMMAND()
132 131 ON_WM_PAINT()
133 132 ON_WM_QUERYDRAGICON()
134 133 ON_BN_CLICKED(IDC_BTN_START, OnBtnStart)
... ... @@ -161,7 +160,9 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
161 160 ON_COMMAND(IDR_OPTION_COMPOSITE_DEVICE, OnOptionCompositeDevice)
162 161 ON_COMMAND(IDR_BACKNV_TOPC, OnBacknvTopc)
163 162 ON_COMMAND(IDR_OEM_LOCK, OnFastbootOemLock)
164   - //}}AFX_MSG_MAP
  163 + ON_WM_SYSCOMMAND()
  164 + ON_WM_TIMER()
  165 + //}}AFX_MSG_MAP
165 166 END_MESSAGE_MAP()
166 167
167 168 /////////////////////////////////////////////////////////////////////////////
... ... @@ -234,6 +235,7 @@ BOOL CSNWriterDlg::OnInitDialog()
234 235 g_pMainDlg = (CSNWriterDlg*)this;
235 236 ParameterInit();
236 237 SetDlgItemText(IDC_STATIC_SWVER,"please setting SW version");
  238 + SetDlgItemText(IDC_MAINUI_TIME_COUNT,"0 Sec");
237 239
238 240 return TRUE; // return TRUE unless you set the focus to a control
239 241 }
... ... @@ -413,8 +415,6 @@ void CSNWriterDlg::EnableUIItem()
413 415 m_SNMenu.GetSubMenu(3)->EnableMenuItem(0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
414 416 m_SNMenu.GetSubMenu(3)->EnableMenuItem(1, MF_ENABLED | MF_BYPOSITION);
415 417 }
416   - GetDlgItem(IDC_MAINUI_TEMP1)->ShowWindow(FALSE);
417   - GetDlgItem(IDC_MAINUI_TEMP2)->ShowWindow(FALSE);
418 418
419 419 SetDlgItemText(IDC_BTN_START, "Start");
420 420 }
... ... @@ -583,14 +583,9 @@ void CSNWriterDlg::OnPaint()
583 583
584 584 void CSNWriterDlg::ShowTemperatureOnUI()
585 585 {
586   - GetDlgItem(IDC_MAINUI_TEMP1)->ShowWindow(true);
587   - GetDlgItem(IDC_MAINUI_TEMP2)->ShowWindow(true);
588 586
589 587 m_MainUIT1.Format("%s", g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData);
590   - GetDlgItem(IDC_MAINUI_TEMP1)->SetWindowText(m_MainUIT1);
591 588
592   - //GetDlgItem(IDC_MAINUI_TEMP1)->SetFont(&m_font);
593   - //GetDlgItem(IDC_MAINUI_TEMP2)->SetFont(&m_font);
594 589 //m_font.DeleteObject();
595 590 }
596 591
... ... @@ -742,13 +737,6 @@ HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
742 737 {
743 738 HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
744 739
745   - // TODO: Change any attributes of the DC here
746   - if((IDC_MAINUI_TEMP1 == pWnd->GetDlgCtrlID())||(IDC_MAINUI_TEMP2 == pWnd->GetDlgCtrlID()))
747   - {
748   - pDC->SetTextColor(RGB(255,0,0));
749   - }
750   -
751   - // TODO: Return a different brush if the default is not desired
752 740 return hbr;
753 741 }
754 742
... ... @@ -1095,3 +1083,16 @@ void CSNWriterDlg::OnFastbootOemLock()
1095 1083 }
1096 1084
1097 1085 }
  1086 +
  1087 +void CSNWriterDlg::OnTimer(UINT nIDEvent)
  1088 +{
  1089 + CString astr_time;
  1090 + if (nIDEvent == 1)
  1091 + {
  1092 + mytimecount ++;
  1093 + astr_time.Format("%d Sec",mytimecount);
  1094 + SetDlgItemText(IDC_MAINUI_TIME_COUNT,astr_time);
  1095 +
  1096 + }
  1097 + CDialog::OnTimer(nIDEvent);
  1098 +}
... ...
... ... @@ -84,6 +84,7 @@ protected:
84 84 afx_msg void OnOptionCompositeDevice();
85 85 afx_msg void OnBacknvTopc();
86 86 afx_msg void OnFastbootOemLock();
  87 + afx_msg void OnTimer(UINT nIDEvent);
87 88 //}}AFX_MSG
88 89 DECLARE_MESSAGE_MAP()
89 90
... ... @@ -124,6 +125,7 @@ public:
124 125 HBITMAP m_hBitmapFail;
125 126 HBITMAP m_hBitmapnormal;
126 127 CFont m_font;
  128 + int mytimecount;
127 129 };
128 130
129 131 //{{AFX_INSERT_LOCATION}}
... ...
Please register or login to post a comment