xiemeng / xiemeng_intex_write_tool · Commits

Commit 4f1a50f315c146c3e6b31ef05415525d68d1ffa7

Authored by xiemeng
1 parent 5f79e84a

界面优化

Inline Side-by-side
Showing 5 changed files with 39 additions and 34 deletions
@@ -998,7 +998,7 @@ bool SPScertInit(const char *strSPScertFilePath) @@ -998,7 +998,7 @@ bool SPScertInit(const char *strSPScertFilePath)
998 998
999 E_TARGET_TYPE GetTargetType() 999 E_TARGET_TYPE GetTargetType()
1000 { 1000 {
1001 - return g_sMetaComm.eTargetType; 1001 + return SMART_PHONE;//g_sMetaComm.eTargetType;
1002 } 1002 }
1003 1003
1004 bool CheckFileSize( const char *strFilePath, const long fileSize ) 1004 bool CheckFileSize( const char *strFilePath, const long fileSize )
@@ -158,13 +158,15 @@ int SNBase::UpdateUIMsg(const char * strMsg, ...) @@ -158,13 +158,15 @@ int SNBase::UpdateUIMsg(const char * strMsg, ...)
158 int iRet = 0; 158 int iRet = 0;
159 char szBuf[256] = ""; 159 char szBuf[256] = "";
160 va_list varg; 160 va_list varg;
  161 + CString atime;
161 162
162 va_start(varg, strMsg); 163 va_start(varg, strMsg);
163 iRet = vsprintf(szBuf, strMsg, varg); 164 iRet = vsprintf(szBuf, strMsg, varg);
164 va_end(varg); 165 va_end(varg);
  166 + atime.Format("[%2dS]",g_pMainDlg->mytimecount);
165 167
166 // g_pMainDlg->SetDlgItemText(IDC_OPERATE_INFO, szBuf); 168 // g_pMainDlg->SetDlgItemText(IDC_OPERATE_INFO, szBuf);
167 - g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(szBuf)); 169 + g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(atime+szBuf));
168 170
169 return iRet; 171 return iRet;
170 } 172 }
@@ -4178,7 +4178,7 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4178,7 +4178,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4178 && g_sMetaComm.sWriteOption.bWriteHdcp == false 4178 && g_sMetaComm.sWriteOption.bWriteHdcp == false
4179 && g_sMetaComm.sWriteOption.bInstallHdcpData == false) 4179 && g_sMetaComm.sWriteOption.bInstallHdcpData == false)
4180 { 4180 {
4181 - PopupMsgBox("Warning", MB_OK | MB_ICONWARNING, "At least select one write option!!"); 4181 + PopupMsgBox("Warning", MB_OK | MB_ICONWARNING, "At least select one write option!!\nplease click config button");
4182 return; 4182 return;
4183 } 4183 }
4184 else 4184 else
@@ -152,38 +152,37 @@ BEGIN @@ -152,38 +152,37 @@ BEGIN
152 LTEXT "......",IDC_PWD_MSG,7,50,273,23 152 LTEXT "......",IDC_PWD_MSG,7,50,273,23
153 END 153 END
154 154
155 -IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 335, 193 155 +IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 299, 145
156 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 156 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
157 WS_SYSMENU 157 WS_SYSMENU
158 EXSTYLE WS_EX_APPWINDOW 158 EXSTYLE WS_EX_APPWINDOW
159 CAPTION "SN Writer(TOPWELL)" 159 CAPTION "SN Writer(TOPWELL)"
160 FONT 10, "System" 160 FONT 10, "System"
161 BEGIN 161 BEGIN
162 - LTEXT "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT  
163 - EDITTEXT IDC_COUNT_TOTAL,33,122,22,13,ES_AUTOHSCROLL | 162 + LTEXT "ComPort:",IDC_STATIC,5,15,34,9,0,WS_EX_RIGHT
  163 + EDITTEXT IDC_COUNT_TOTAL,185,13,22,13,ES_AUTOHSCROLL |
164 ES_READONLY 164 ES_READONLY
165 - PUSHBUTTON "Config",IDC_BTN_SYSCONFIG,110,54,43,14  
166 - DEFPUSHBUTTON "Start",IDC_BTN_START,14,54,43,14  
167 - PUSHBUTTON "Quit",IDC_BTN_QUIT,62,54,43,14  
168 - EDITTEXT IDC_COUNT_PASS,33,137,22,13,ES_AUTOHSCROLL | ES_READONLY  
169 - EDITTEXT IDC_COUNT_FAIL,33,152,22,13,ES_AUTOHSCROLL | ES_READONLY  
170 - LTEXT "Target Type:",IDC_STATIC,13,38,43,9,0,WS_EX_RIGHT  
171 - LTEXT "Total:",IDC_STATIC,6,125,20,10  
172 - LTEXT "Pass:",IDC_STATIC_PASS,6,140,21,10  
173 - LTEXT "Fail:",IDC_STATIC,6,155,18,10  
174 - GROUPBOX "config",IDC_STATIC,0,0,178,95  
175 - COMBOBOX IDC_COMBO_COMPORT,61,19,87,51,CBS_DROPDOWNLIST | 165 + PUSHBUTTON "Config",IDC_BTN_SYSCONFIG,48,29,34,14
  166 + DEFPUSHBUTTON "Start",IDC_BTN_START,8,29,34,14
  167 + PUSHBUTTON "Quit",IDC_BTN_QUIT,88,29,34,14
  168 + EDITTEXT IDC_COUNT_PASS,185,29,22,13,ES_AUTOHSCROLL | ES_READONLY
  169 + EDITTEXT IDC_COUNT_FAIL,185,45,22,13,ES_AUTOHSCROLL | ES_READONLY
  170 + LTEXT "Total:",IDC_STATIC,157,16,20,10
  171 + LTEXT "Pass:",IDC_STATIC_PASS,158,32,21,10
  172 + LTEXT "Fail:",IDC_STATIC,158,48,18,10
  173 + GROUPBOX "config",IDC_STATIC,0,0,149,67
  174 + COMBOBOX IDC_COMBO_COMPORT,49,12,51,51,CBS_DROPDOWNLIST |
176 CBS_SORT | WS_VSCROLL | WS_TABSTOP 175 CBS_SORT | WS_VSCROLL | WS_TABSTOP
177 - COMBOBOX IDC_COMBO_TARGET_TYPE,61,35,87,63,CBS_DROPDOWNLIST |  
178 - CBS_SORT | WS_VSCROLL | WS_TABSTOP  
179 - PUSHBUTTON "Button1",IDC_BTN_INDITE,68,119,108,50,BS_BITMAP | 176 + COMBOBOX IDC_COMBO_TARGET_TYPE,4,133,16,63,CBS_DROPDOWNLIST |
  177 + CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
  178 + PUSHBUTTON "Button1",IDC_BTN_INDITE,209,12,76,50,BS_BITMAP |
180 BS_FLAT 179 BS_FLAT
181 - CONTROL "",IDC_MAINUI_TIME_COUNT,"Static",SS_LEFTNOWORDWRAP |  
182 - WS_GROUP,61,109,56,9,WS_EX_RIGHT | WS_EX_STATICEDGE  
183 - LTEXT "Static",IDC_STATIC_SWVER,6,74,166,11,0,WS_EX_STATICEDGE  
184 - LISTBOX IDC_LIST_LOG,180,4,152,168,LBS_NOINTEGRALHEIGHT | 180 + CTEXT "",IDC_MAINUI_TIME_COUNT,109,14,37,9,SS_CENTERIMAGE,
  181 + WS_EX_RIGHT
  182 + LTEXT "Static",IDC_STATIC_SWVER,6,49,138,11,0,WS_EX_STATICEDGE
  183 + LISTBOX IDC_LIST_LOG,1,69,297,62,LBS_NOINTEGRALHEIGHT |
185 WS_VSCROLL | WS_TABSTOP 184 WS_VSCROLL | WS_TABSTOP
186 - GROUPBOX "Result",IDC_STATIC,0,101,177,92 185 + GROUPBOX "Result",IDC_STATIC,151,0,148,67
187 END 186 END
188 187
189 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316 188 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
@@ -395,7 +395,7 @@ void CSNWriterDlg::EnableUIItem() @@ -395,7 +395,7 @@ void CSNWriterDlg::EnableUIItem()
395 if (g_LoginIdentify == ENGINEER) 395 if (g_LoginIdentify == ENGINEER)
396 { 396 {
397 GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(TRUE); 397 GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(TRUE);
398 - GetDlgItem(IDC_COMBO_TARGET_TYPE)->EnableWindow(TRUE); 398 + GetDlgItem(IDC_COMBO_TARGET_TYPE)->ShowWindow(SW_HIDE);
399 399
400 m_SNMenu.EnableMenuItem(0, MF_ENABLED | MF_BYPOSITION); 400 m_SNMenu.EnableMenuItem(0, MF_ENABLED | MF_BYPOSITION);
401 m_SNMenu.EnableMenuItem(1, MF_ENABLED | MF_BYPOSITION); 401 m_SNMenu.EnableMenuItem(1, MF_ENABLED | MF_BYPOSITION);
@@ -407,7 +407,7 @@ void CSNWriterDlg::EnableUIItem() @@ -407,7 +407,7 @@ void CSNWriterDlg::EnableUIItem()
407 else 407 else
408 { 408 {
409 GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(FALSE); 409 GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(FALSE);
410 - GetDlgItem(IDC_COMBO_TARGET_TYPE)->EnableWindow(FALSE); 410 + GetDlgItem(IDC_COMBO_TARGET_TYPE)->ShowWindow(SW_HIDE);
411 m_SNMenu.EnableMenuItem(0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION); 411 m_SNMenu.EnableMenuItem(0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
412 m_SNMenu.EnableMenuItem(1, MF_GRAYED | MF_DISABLED | MF_BYPOSITION); 412 m_SNMenu.EnableMenuItem(1, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
413 m_SNMenu.EnableMenuItem(2, MF_GRAYED | MF_DISABLED | MF_BYPOSITION); 413 m_SNMenu.EnableMenuItem(2, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
@@ -422,7 +422,7 @@ void CSNWriterDlg::EnableUIItem() @@ -422,7 +422,7 @@ void CSNWriterDlg::EnableUIItem()
422 void CSNWriterDlg::DisableUIItem() 422 void CSNWriterDlg::DisableUIItem()
423 { 423 {
424 GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(FALSE); 424 GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(FALSE);
425 - GetDlgItem(IDC_COMBO_TARGET_TYPE)->EnableWindow(FALSE); 425 + GetDlgItem(IDC_COMBO_TARGET_TYPE)->ShowWindow(SW_HIDE);
426 GetDlgItem(IDC_COMBO_COMPORT)->EnableWindow(FALSE); 426 GetDlgItem(IDC_COMBO_COMPORT)->EnableWindow(FALSE);
427 m_SNMenu.EnableMenuItem( 0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION ); 427 m_SNMenu.EnableMenuItem( 0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION );
428 m_SNMenu.EnableMenuItem( 1, MF_GRAYED | MF_DISABLED | MF_BYPOSITION ); 428 m_SNMenu.EnableMenuItem( 1, MF_GRAYED | MF_DISABLED | MF_BYPOSITION );
@@ -544,12 +544,12 @@ void CSNWriterDlg::SetUIItem() @@ -544,12 +544,12 @@ void CSNWriterDlg::SetUIItem()
544 { 544 {
545 GetComPortDynamiclly(); 545 GetComPortDynamiclly();
546 546
547 - m_cTargetTypeBox.InsertString(FEATURE_PHONE, "Feature Phone");  
548 - m_cTargetTypeBox.InsertString(SMART_PHONE, "Smart Phone");  
549 - m_cTargetTypeBox.InsertString(SMART_PHONE_DUALMODEM, "SP DualModem");  
550 - m_cTargetTypeBox.InsertString(TABLET_WIFI_ONLY, "Tablet Wifi Only");  
551 - m_cTargetTypeBox.InsertString(RNDIG_DONGLE, "Rndis Dongle");  
552 - m_cTargetTypeBox.SetCurSel(g_sMetaComm.eTargetType); 547 +// m_cTargetTypeBox.InsertString(FEATURE_PHONE, "Feature Phone");
  548 +// m_cTargetTypeBox.InsertString(SMART_PHONE, "Smart Phone");
  549 +// m_cTargetTypeBox.InsertString(SMART_PHONE_DUALMODEM, "SP DualModem");
  550 +// m_cTargetTypeBox.InsertString(TABLET_WIFI_ONLY, "Tablet Wifi Only");
  551 +// m_cTargetTypeBox.InsertString(RNDIG_DONGLE, "Rndis Dongle");
  552 + m_cTargetTypeBox.SetCurSel(SMART_PHONE);
553 } 553 }
554 554
555 // If you add a minimize button to your dialog, you will need the code below 555 // If you add a minimize button to your dialog, you will need the code below
@@ -736,6 +736,10 @@ void CSNWriterDlg::OnSelchangeComboTargetType() @@ -736,6 +736,10 @@ void CSNWriterDlg::OnSelchangeComboTargetType()
736 HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) 736 HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
737 { 737 {
738 HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor); 738 HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
  739 + if((IDC_MAINUI_TIME_COUNT == pWnd->GetDlgCtrlID()))
  740 + {
  741 + pDC->SetTextColor(RGB(255,0,0));
  742 + }
739 743
740 return hbr; 744 return hbr;
741 } 745 }
Please register or login to post a comment