Echo / InterlockingTool · Commits

Commit cb2101e78ef81d4ec3004dca14ba581e44909ec7

Authored by xiemeng
1 parent b42d9236

优化界面

Inline Side-by-side
Showing 10 changed files with 613 additions and 67 deletions
@@ -160,12 +160,14 @@ int SNBase::UpdateUIMsg(const char * strMsg, ...) @@ -160,12 +160,14 @@ int SNBase::UpdateUIMsg(const char * strMsg, ...)
160 { 160 {
161 int iRet = 0; 161 int iRet = 0;
162 char szBuf[256] = ""; 162 char szBuf[256] = "";
  163 + CString atime;
163 va_list varg; 164 va_list varg;
164 165
165 va_start(varg, strMsg); 166 va_start(varg, strMsg);
166 iRet = vsprintf(szBuf, strMsg, varg); 167 iRet = vsprintf(szBuf, strMsg, varg);
167 va_end(varg); 168 va_end(varg);
168 - g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(strMsg)); 169 + atime.Format("[%2dS]",g_pMainDlg->mytimecount);
  170 + g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(atime+strMsg));
169 171
170 return iRet; 172 return iRet;
171 } 173 }
@@ -361,52 +363,35 @@ bool SNBase::Check_some_barcode(const char* strBarcode) @@ -361,52 +363,35 @@ bool SNBase::Check_some_barcode(const char* strBarcode)
361 if (strBarcode[55] == '1') 363 if (strBarcode[55] == '1')
362 { 364 {
363 g_pMainDlg->myrslt_smt= _T("PASS"); 365 g_pMainDlg->myrslt_smt= _T("PASS");
364 - UpdateUIMsg("ATA test has passed"); 366 + UpdateUIMsg("MMI test PASS");
365 } 367 }
366 else if (strBarcode[55] == '0') 368 else if (strBarcode[55] == '0')
367 { 369 {
368 - g_pMainDlg->myrslt_smt= _T("Fail");  
369 - UpdateUIMsg("ATA test failed"); 370 + g_pMainDlg->myrslt_smt= _T("FAIL");
  371 + UpdateUIMsg("MMI test FAIL");
370 } 372 }
371 else 373 else
372 { 374 {
373 - g_pMainDlg->myrslt_smt= _T("UnTested");  
374 - UpdateUIMsg("ATA test UnTested"); 375 + g_pMainDlg->myrslt_smt= _T("UnTested");
  376 + UpdateUIMsg("MMI test UnTest");
375 } 377 }
376 378
377 379
378 - if (strBarcode[60] == '1' && strBarcode[61] == '0') //Calibration Pass  
379 - {  
380 - // g_pMainDlg->myrslt_cft= _T("10");  
381 - UpdateUIMsg("Calibration has been successful");  
382 - }  
383 - else if (strBarcode[60] == '0' && strBarcode[61] == '1')//Calibration Fail  
384 - {  
385 - // g_pMainDlg->myrslt_cft= _T("UnTested");  
386 - UpdateUIMsg("Not yet calibrated");  
387 - }  
388 -  
389 - if (strBarcode[62] == 'P' ) //Final Test Pass  
390 - {  
391 - //g_pMainDlg->myrslt_cft = g_pMainDlg->myrslt_cft+ _T("P");  
392 - UpdateUIMsg("Comprehensive test pass");  
393 - }  
394 - else  
395 - {  
396 - UpdateUIMsg("Comprehensive test failed");  
397 - }  
398 380
399 if(strBarcode[60] == '1' && strBarcode[61] == '0' && strBarcode[62] == 'P') 381 if(strBarcode[60] == '1' && strBarcode[61] == '0' && strBarcode[62] == 'P')
400 { 382 {
401 g_pMainDlg->myrslt_cft =_T("PASS"); 383 g_pMainDlg->myrslt_cft =_T("PASS");
  384 + UpdateUIMsg("CFT test PASS");
402 } 385 }
403 else if(strBarcode[60] == '0' && strBarcode[61] == '1' && strBarcode[62] == 'F') 386 else if(strBarcode[60] == '0' && strBarcode[61] == '1' && strBarcode[62] == 'F')
404 { 387 {
405 - g_pMainDlg->myrslt_cft =_T("Fail"); 388 + g_pMainDlg->myrslt_cft =_T("FAIL");
  389 + UpdateUIMsg("CFT test FAIL");
406 } 390 }
407 else 391 else
408 { 392 {
409 - g_pMainDlg->myrslt_cft =_T("UnTested"); 393 + g_pMainDlg->myrslt_cft =_T("UnTested");
  394 + UpdateUIMsg("CFT test UnTest");
410 } 395 }
411 396
412 return true; 397 return true;
@@ -153,11 +153,8 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -153,11 +153,8 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
153 META_RESULT MetaResult = META_SUCCESS; 153 META_RESULT MetaResult = META_SUCCESS;
154 MULTIIMEI_OPTION_e multiIMEIOption = SINGLE_MD_SINGLE_IMEI; 154 MULTIIMEI_OPTION_e multiIMEIOption = SINGLE_MD_SINGLE_IMEI;
155 155
156 - int iRet = 0;  
157 - int iRet2 = 0;  
158 - int option = 0;  
159 - double fBeginProcess = 0.25;  
160 - double fStep = 0.04; 156 + int iRet = 0,iRet1 = 0,iRet2 = 0,iRetcft = 0,option = 0;
  157 + double fBeginProcess = 0.25,fStep = 0.04;
161 m_bBackupNvramSuccess = false; 158 m_bBackupNvramSuccess = false;
162 159
163 bool bCheckCalFlag = g_sMetaComm.bCheckCalFlag; 160 bool bCheckCalFlag = g_sMetaComm.bCheckCalFlag;
@@ -230,8 +227,8 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -230,8 +227,8 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
230 #endif 227 #endif
231 { 228 {
232 char tmpBuf[2048] = {0}; 229 char tmpBuf[2048] = {0};
233 - iRet = REQ_ReadModem_NVRAM_Start(WRITE_BARCODE, tmpBuf, 1);  
234 - if (iRet == META_SUCCESS) 230 + iRetcft = REQ_ReadModem_NVRAM_Start(WRITE_BARCODE, tmpBuf, 1);
  231 + if (iRetcft == META_SUCCESS)
235 { 232 {
236 bool bCheckPass = true; 233 bool bCheckPass = true;
237 bCheckPass = Check_some_barcode(tmpBuf); 234 bCheckPass = Check_some_barcode(tmpBuf);
@@ -241,13 +238,13 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -241,13 +238,13 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
241 } 238 }
242 else 239 else
243 { 240 {
244 - iRet = META_FAILED; 241 + iRetcft = META_FAILED;
245 spNextStage = SP_END_STAGE; 242 spNextStage = SP_END_STAGE;
246 } 243 }
247 } 244 }
248 else 245 else
249 { 246 {
250 - UpdateUIMsg("ERROR!! Read Barcode: MetaResult = %s", ResultToString(iRet)); 247 + UpdateUIMsg("ERROR!! Read Barcode: MetaResult = %s", ResultToString(iRetcft));
251 spNextStage = SP_END_STAGE; 248 spNextStage = SP_END_STAGE;
252 } 249 }
253 } 250 }
@@ -266,14 +263,14 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -266,14 +263,14 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
266 // CString IMEI1_validity; 263 // CString IMEI1_validity;
267 // CString IMEI2_validity; 264 // CString IMEI2_validity;
268 265
269 - iRet = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf1, 1); 266 + iRet1 = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf1, 1);
270 iRet2 = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf2, 2); 267 iRet2 = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf2, 2);
271 268
272 if(tmpBuf1[0]== -1) iRet = META_FAILED; 269 if(tmpBuf1[0]== -1) iRet = META_FAILED;
273 if(tmpBuf2[0]== -1) iRet2 =META_FAILED; 270 if(tmpBuf2[0]== -1) iRet2 =META_FAILED;
274 271
275 272
276 - if (iRet == META_SUCCESS || iRet2 == META_SUCCESS) 273 + if (iRet1 == META_SUCCESS || iRet2 == META_SUCCESS)
277 { 274 {
278 memset(a_imei_ary,0,16); 275 memset(a_imei_ary,0,16);
279 memset(a_imei_ary2,0,16); 276 memset(a_imei_ary2,0,16);
@@ -293,7 +290,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -293,7 +290,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
293 a_imei_ary[15] = 0; 290 a_imei_ary[15] = 0;
294 a_imei_ary2[15] = 0; 291 a_imei_ary2[15] = 0;
295 292
296 - if(iRet == META_SUCCESS && iRet2 == META_SUCCESS) 293 + if(iRet1 == META_SUCCESS && iRet2 == META_SUCCESS)
297 { 294 {
298 g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("PASS"); 295 g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("PASS");
299 UpdateUIMsg("IMEI read success!!!"); 296 UpdateUIMsg("IMEI read success!!!");
@@ -326,7 +323,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -326,7 +323,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
326 } 323 }
327 324
328 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::WriteNvramLoop() end..."); 325 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::WriteNvramLoop() end...");
329 - return (META_RESULT)iRet; 326 + return (META_RESULT)(iRet1||iRet2||iRetcft);
330 } 327 }
331 328
332 int SmartPhoneSN::GetSPModemInfo_Ex() 329 int SmartPhoneSN::GetSPModemInfo_Ex()
@@ -3890,7 +3887,7 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -3890,7 +3887,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3890 3887
3891 if (g_sMetaComm.bUsbEnable) 3888 if (g_sMetaComm.bUsbEnable)
3892 { 3889 {
3893 - UpdateUIMsg("Wait for usb insert..."); 3890 + UpdateUIMsg("please connect phone...");
3894 } 3891 }
3895 3892
3896 EnableStartBTN(true); 3893 EnableStartBTN(true);
@@ -4119,7 +4116,7 @@ End: @@ -4119,7 +4116,7 @@ End:
4119 UpdateUICountResult(FAIL); 4116 UpdateUICountResult(FAIL);
4120 g_pMainDlg->mytimecount = 0; 4117 g_pMainDlg->mytimecount = 0;
4121 g_pMainDlg->KillTimer(1); 4118 g_pMainDlg->KillTimer(1);
4122 - if (g_pMainDlg->MessageBox("Test Fail!!!,please connext next phone","",MB_OK) != IDOK) 4119 + if (g_pMainDlg->mytipsdlg.DoModal() != IDOK)
4123 { 4120 {
4124 break; 4121 break;
4125 } 4122 }
@@ -4138,7 +4135,7 @@ End: @@ -4138,7 +4135,7 @@ End:
4138 UpdateUICountResult(PASS); 4135 UpdateUICountResult(PASS);
4139 g_pMainDlg->mytimecount = 0; 4136 g_pMainDlg->mytimecount = 0;
4140 g_pMainDlg->KillTimer(1); 4137 g_pMainDlg->KillTimer(1);
4141 - if (g_pMainDlg->MessageBox("Test Success!!!,please connext next phone","",MB_OK) != IDOK) 4138 + if (g_pMainDlg->mytipsdlg.DoModal() != IDOK)
4142 { 4139 {
4143 break; 4140 break;
4144 } 4141 }
  1 +; CLW file contains information for the MFC ClassWizard
  2 +
  3 +[General Info]
  4 +Version=1
  5 +LastClass=CSNWriterDlg
  6 +LastTemplate=CDialog
  7 +NewFileInclude1=#include "stdafx.h"
  8 +NewFileInclude2=#include "sn writer.h"
  9 +LastPage=0
  10 +
  11 +ClassCount=5
  12 +Class1=Encryption
  13 +Class2=CSNWriterApp
  14 +Class3=CAboutDlg
  15 +Class4=CSNWriterDlg
  16 +
  17 +ResourceCount=11
  18 +Resource1=IDD_ABOUTSN_DIALOG (English (U.S.))
  19 +Resource2=IDD_SNWRITER_DIALOG (English (U.S.))
  20 +Resource3=IDD_FILE_LOAD_DIALOG (English (U.S.))
  21 +Resource4=IDR_SN_MENU (English (U.S.))
  22 +Resource5=IDD_SYSTEM_CONFIG_DIALOG (English (U.S.))
  23 +Resource6=IDD_AUTOGEN_DIALOG (English (U.S.))
  24 +Resource7=IDD_CHANGE_PASSWD_DIALOG (English (U.S.))
  25 +Resource8=IDD_SCANDATA_DIALOG (English (U.S.))
  26 +Resource9=IDD_ENCRYPTION_DIALOG (English (U.S.))
  27 +Resource10=IDD_IDENTIFY_VERIFY_DIALOG (English (U.S.))
  28 +Class5=Cdlg_tips
  29 +Resource11=IDD_DIALOG_TIPS
  30 +
  31 +[CLS:Encryption]
  32 +Type=0
  33 +BaseClass=CDialog
  34 +HeaderFile=Encryption.h
  35 +ImplementationFile=Encryption.cpp
  36 +
  37 +[CLS:CSNWriterApp]
  38 +Type=0
  39 +BaseClass=CWinApp
  40 +HeaderFile=SN Writer.h
  41 +ImplementationFile=SN Writer.cpp
  42 +
  43 +[CLS:CAboutDlg]
  44 +Type=0
  45 +BaseClass=CDialog
  46 +HeaderFile=SN WriterDlg.cpp
  47 +ImplementationFile=SN WriterDlg.cpp
  48 +LastObject=CAboutDlg
  49 +
  50 +[CLS:CSNWriterDlg]
  51 +Type=0
  52 +BaseClass=CDialog
  53 +HeaderFile=SN WriterDlg.h
  54 +ImplementationFile=SN WriterDlg.cpp
  55 +Filter=D
  56 +VirtualFilter=dWC
  57 +LastObject=IDC_BT_SAVE_SWVER
  58 +
  59 +[DLG:IDD_ENCRYPTION_DIALOG]
  60 +Type=1
  61 +Class=Encryption
  62 +
  63 +[DLG:IDD_ABOUTBOX]
  64 +Type=1
  65 +Class=CAboutDlg
  66 +
  67 +[DLG:IDD_SNWRITER_DIALOG]
  68 +Type=1
  69 +Class=CSNWriterDlg
  70 +
  71 +[DLG:IDD_SNWRITER_DIALOG (English (U.S.))]
  72 +Type=1
  73 +Class=CSNWriterDlg
  74 +ControlCount=34
  75 +Control1=IDC_EDT_VERSION,edit,1350631552
  76 +Control2=IDC_BT_SAVE_SWVER,button,1342242816
  77 +Control3=IDC_BTN_AP_PATH,button,1342177280
  78 +Control4=IDC_BTN_BP_PATH,button,1342177280
  79 +Control5=IDC_BTN_START,button,1342242817
  80 +Control6=IDC_BTN_SYSCONFIG,button,1073807361
  81 +Control7=IDC_BTN_QUIT,button,1342242817
  82 +Control8=IDC_STATIC,static,1342308352
  83 +Control9=IDC_STATIC_PASS,static,1342308352
  84 +Control10=IDC_STATIC,static,1342308352
  85 +Control11=IDC_COMBO_COMPORT,combobox,1344274691
  86 +Control12=IDC_STATIC,static,1342308352
  87 +Control13=IDC_STATIC,static,1342308352
  88 +Control14=IDC_STATIC,static,1342308352
  89 +Control15=IDC_STR_AP_PATH,edit,1350568064
  90 +Control16=IDC_STR_BP_PATH,edit,1350568064
  91 +Control17=IDC_STATIC,button,1342177287
  92 +Control18=IDC_BITMAP_RESAULT,static,1342177294
  93 +Control19=IDC_STATIC,static,1342308352
  94 +Control20=IDC_STATIC,static,1342308352
  95 +Control21=IDC_STATIC,static,1342308352
  96 +Control22=IDC_STATIC,static,1342308352
  97 +Control23=IDC_STATIC,static,1342308352
  98 +Control24=IDC_RSLT_CFT,edit,1350568064
  99 +Control25=IDC_RSLT_SMT,edit,1350568064
  100 +Control26=IDC_RSLT_QC,edit,1350568064
  101 +Control27=IDC_RSLT_WRITE_IMEI,edit,1350568064
  102 +Control28=IDC_STATIC,button,1342177287
  103 +Control29=IDC_LOG_LIST,listbox,1352663297
  104 +Control30=IDC_COUNT_TOTAL,static,1342308364
  105 +Control31=IDC_COUNT_PASS,static,1342308364
  106 +Control32=IDC_COUNT_FAIL,static,1342308364
  107 +Control33=IDC_RSLT_SW,static,1342308865
  108 +Control34=IDC_STATIC_TIMECOUNT,static,1342308865
  109 +
  110 +[MNU:IDR_SN_MENU (English (U.S.))]
  111 +Type=1
  112 +Class=?
  113 +Command1=IDR_FP_AUTH_FILE
  114 +Command2=IDR_SP_AUTH_FILE
  115 +Command3=IDR_OPTION_ALREADYINMETA
  116 +Command4=IDR_META_MODE
  117 +Command5=IDR_ATCMD_MODE
  118 +Command6=IDR_OPTION_SWITCHTOOL
  119 +Command7=IDR_OPTION_EXTMODEM
  120 +Command8=IDR_OPTION_SECURITY_USB
  121 +Command9=IDR_OPTION_USB_WITHOUT_BATTERY
  122 +Command10=IDR_OPTION_CHECK_CAL_FLAG
  123 +Command11=IDR_OPTION_CHECK_FT_FLAG
  124 +Command12=IDR_OPTION_SKIP_WRITE_PRODINFO
  125 +Command13=IDR_OPTION_COMPOSITE_DEVICE
  126 +Command14=IDR_BACKNV_TOPC
  127 +Command15=IDR_OEM_LOCK
  128 +Command16=IDR_OPTION_HDCP
  129 +Command17=IDR_OPTION_DRMKEY
  130 +Command18=IDR_OPTION_HDCPDATA
  131 +Command19=IDR_ENG_TO_OPERATER
  132 +Command20=IDR_CHANGE_PASSWD
  133 +Command21=IDR_ENABLE_AUTOGEN
  134 +Command22=IDR_CHECK_BTWIFI
  135 +Command23=IDR_OPERATOR_TO_ENG
  136 +Command24=IDR_ABOUT_SN
  137 +CommandCount=24
  138 +
  139 +[DLG:IDD_SYSTEM_CONFIG_DIALOG (English (U.S.))]
  140 +Type=1
  141 +Class=?
  142 +ControlCount=71
  143 +Control1=IDC_STATIC,button,1342177287
  144 +Control2=IDC_WRITE_BARC_CHECK,button,1342242819
  145 +Control3=IDC_WRITE_IMEI_CHECK,button,1342242819
  146 +Control4=IDC_WRITE_BT_CHECK,button,1342242819
  147 +Control5=IDC_WRITE_WIFI_CHECK,button,1342242819
  148 +Control6=IDC_WRITE_ETHERNET_MAC_CHECK,button,1342242819
  149 +Control7=IDC_WRITE_DRMKEY_MCID_CHECK,button,1342242819
  150 +Control8=IDC_WRITE_MEID_CHECK,button,1342242819
  151 +Control9=IDC_WRITE_ESN_CHECK,button,1342242819
  152 +Control10=IDC_WRITE_SERIAL_NO_CHECK,button,1342242819
  153 +Control11=IDC_STATIC,button,1342177287
  154 +Control12=IDC_IMEI_CHECKSUM,button,1342242819
  155 +Control13=IDC_IMEI_LOCK,button,1342242819
  156 +Control14=IDC_DUAL_IMEI,button,1342242819
  157 +Control15=IDC_DUAL_IMEI_SAME,button,1342242819
  158 +Control16=IDC_THREE_IMEI,button,1342242819
  159 +Control17=IDC_FOUR_IMEI,button,1342242819
  160 +Control18=IDC_CURRENT_TEMPERATURE,button,1342242819
  161 +Control19=IDC_TEMPERATURE,edit,1350631552
  162 +Control20=IDC_STATIC,static,1342308352
  163 +Control21=IDC_LOCK_OTP,button,1342242819
  164 +Control22=IDC_STATIC,button,1342177287
  165 +Control23=IDC_STATIC,static,1342308352
  166 +Control24=IDC_BARC_HEADER_STR,edit,1350631552
  167 +Control25=IDC_BARC_HEADER_CHECK,button,1342242819
  168 +Control26=IDC_STATIC,static,1342308352
  169 +Control27=IDC_BT_HEADER_STR,edit,1350631552
  170 +Control28=IDC_BT_HEADER_CHECK,button,1342242819
  171 +Control29=IDC_STATIC,static,1342308352
  172 +Control30=IDC_WIFI_HEADER_STR,edit,1350631552
  173 +Control31=IDC_WIFI_HEADER_CHECK,button,1342242819
  174 +Control32=IDC_STATIC,static,1342308352
  175 +Control33=IDC_IMEI_1_HEADER_STR,edit,1350631552
  176 +Control34=IDC_IMEI_1_HEADER_CHECK,button,1342242819
  177 +Control35=IDC_STATIC,static,1342308352
  178 +Control36=IDC_IMEI_2_HEADER_STR,edit,1350631552
  179 +Control37=IDC_IMEI_2_HEADER_CHECK,button,1342242819
  180 +Control38=IDC_STATIC,static,1342308352
  181 +Control39=IDC_IMEI_3_HEADER_STR,edit,1350631552
  182 +Control40=IDC_IMEI_3_HEADER_CHECK,button,1342242819
  183 +Control41=IDC_STATIC,static,1342308352
  184 +Control42=IDC_IMEI_4_HEADER_STR,edit,1350631552
  185 +Control43=IDC_IMEI_4_HEADER_CHECK,button,1342242819
  186 +Control44=IDC_STATIC,static,1342308352
  187 +Control45=IDC_SERIAL_NO_HEADER_STR,edit,1350631552
  188 +Control46=IDC_SERIAL_NO_HEADER_CHECK,button,1342242819
  189 +Control47=IDC_STATIC,static,1342308352
  190 +Control48=IDC_ETHERNET_HEADER_STR,edit,1350631552
  191 +Control49=IDC_ETHERNET_HEADER_CHECK,button,1342242819
  192 +Control50=IDC_STATIC,static,1342308352
  193 +Control51=IDC_DRMKEY_MCID_HEADER_STR,edit,1350631552
  194 +Control52=IDC_DRMKEY_MCID_HEADER_CHECK,button,1342242819
  195 +Control53=IDC_STATIC,static,1342308352
  196 +Control54=IDC_MEID_HEADER_STR,edit,1350631552
  197 +Control55=IDC_MEID_HEADER_CHECK,button,1342242819
  198 +Control56=IDC_STATIC,static,1342308352
  199 +Control57=IDC_ESN_HEADER_STR,edit,1350631552
  200 +Control58=IDC_ESN_HEADER_CHECK,button,1342242819
  201 +Control59=IDC_STATIC,button,1342177287
  202 +Control60=IDC_APDB_FROM_DUT_CHECK,button,1342242819
  203 +Control61=IDC_MDDB_FROM_DUT_CHECK,button,1342242819
  204 +Control62=IDC_MD_1_DBFILE_PATH,edit,1350633600
  205 +Control63=IDC_BTN_MD1,button,1342242816
  206 +Control64=IDC_MD_2_DBFILE_PATH,edit,1350633600
  207 +Control65=IDC_BTN_MD2,button,1342242816
  208 +Control66=IDC_AP_DBFILE_PATH,edit,1350633600
  209 +Control67=IDC_BTN_AP,button,1342242816
  210 +Control68=IDC_STATIC,static,1342308352
  211 +Control69=IDC_LOG_DIR,edit,1350633600
  212 +Control70=IDC_BTN_LOG,button,1342242816
  213 +Control71=IDC_BTN_SAVE,button,1342242816
  214 +
  215 +[DLG:IDD_ENCRYPTION_DIALOG (English (U.S.))]
  216 +Type=1
  217 +Class=?
  218 +ControlCount=5
  219 +Control1=IDOK,button,1342242817
  220 +Control2=IDCANCEL,button,1342242816
  221 +Control3=IDC_PWD_STATIC,static,1342308352
  222 +Control4=IDC_PWD_DATA,edit,1350631552
  223 +Control5=IDC_PWD_MSG,static,1342308352
  224 +
  225 +[DLG:IDD_SCANDATA_DIALOG (English (U.S.))]
  226 +Type=1
  227 +Class=?
  228 +ControlCount=41
  229 +Control1=IDC_STATIC,static,1342308352
  230 +Control2=IDC_STATIC,static,1342308352
  231 +Control3=IDC_BARC_STATIC,static,1342308352
  232 +Control4=IDC_BARCODE_DATA,edit,1350631552
  233 +Control5=IDC_BARC_HEADER_SCAN,static,1342308352
  234 +Control6=IDC_IMEI_1_STATIC,static,1342308352
  235 +Control7=IDC_IMEI_1_DATA,edit,1350631552
  236 +Control8=IDC_IMEI_1_HEADER_SCAN,static,1342308352
  237 +Control9=IDC_IMEI_2_STATIC,static,1342308352
  238 +Control10=IDC_IMEI_2_DATA,edit,1350631552
  239 +Control11=IDC_IMEI_2_HEADER_SCAN,static,1342308352
  240 +Control12=IDC_IMEI_3_STATIC,static,1342308352
  241 +Control13=IDC_IMEI_3_DATA,edit,1350631552
  242 +Control14=IDC_IMEI_3_HEADER_SCAN,static,1342308352
  243 +Control15=IDC_IMEI_4_STATIC,static,1342308352
  244 +Control16=IDC_IMEI_4_DATA,edit,1350631552
  245 +Control17=IDC_IMEI_4_HEADER_SCAN,static,1342308352
  246 +Control18=IDC_SERIAL_NO_STATIC,static,1342308352
  247 +Control19=IDC_SERIAL_NO_DATA,edit,1350631552
  248 +Control20=IDC_SERIAL_NO_HEADER_SCAN,static,1342308352
  249 +Control21=IDC_BT_STATIC,static,1342308352
  250 +Control22=IDC_BT_DATA,edit,1350631552
  251 +Control23=IDC_BT_HEADER_SCAN,static,1342308352
  252 +Control24=IDC_WIFI_STATIC,static,1342308352
  253 +Control25=IDC_WIFI_DATA,edit,1350631552
  254 +Control26=IDC_WIFI_HEADER_SCAN,static,1342308352
  255 +Control27=IDC_ETHERNET_STATIC,static,1342308352
  256 +Control28=IDC_ETHERNET_MAC_DATA,edit,1350631552
  257 +Control29=IDC_ETHERNET_HEADER_SCAN,static,1342308352
  258 +Control30=IDC_MCID_STATIC,static,1342308352
  259 +Control31=IDC_DRMKEY_MCID_DATA,edit,1350631552
  260 +Control32=IDC_DRMKEY_MCID_HEADER_SCAN,static,1342308352
  261 +Control33=IDC_MEID_STATIC,static,1342308352
  262 +Control34=IDC_MEID_DATA,edit,1350631552
  263 +Control35=IDC_MEID_HEADER_SCAN,static,1342308352
  264 +Control36=IDC_ESN_STATIC,static,1342308352
  265 +Control37=IDC_ESN_DATA,edit,1350631552
  266 +Control38=IDC_ESN_HEADER_SCAN,static,1342308352
  267 +Control39=IDC_SCAN_MSG,static,1342308352
  268 +Control40=IDC_BTN_SCAN_CANCEL,button,1342242816
  269 +Control41=IDC_BTN_SCAN_OK,button,1342242817
  270 +
  271 +[DLG:IDD_ABOUTSN_DIALOG (English (U.S.))]
  272 +Type=1
  273 +Class=?
  274 +ControlCount=5
  275 +Control1=IDOK,button,1342242817
  276 +Control2=IDC_SN_VERSION,static,1342308352
  277 +Control3=IDC_METADLL_VERSION,static,1342308352
  278 +Control4=IDC_SPMETADLL_VERSION,static,1342308352
  279 +Control5=IDC_STATIC,static,1342308352
  280 +
  281 +[DLG:IDD_IDENTIFY_VERIFY_DIALOG (English (U.S.))]
  282 +Type=1
  283 +Class=?
  284 +ControlCount=4
  285 +Control1=ID_BTN_VERIFY_OK,button,1342242817
  286 +Control2=ID_BTN_VERIFY_CANCEL,button,1342242816
  287 +Control3=IDC_STATIC,static,1342308352
  288 +Control4=IDC_EDIT_VERIFY_PASSWD,edit,1350631584
  289 +
  290 +[DLG:IDD_CHANGE_PASSWD_DIALOG (English (U.S.))]
  291 +Type=1
  292 +Class=?
  293 +ControlCount=8
  294 +Control1=ID_CHG_PASSWD_OK,button,1342242817
  295 +Control2=ID_CHG_PASSWD_CANCEL,button,1342242816
  296 +Control3=IDC_STATIC,static,1342308352
  297 +Control4=IDC_STATIC,static,1342308352
  298 +Control5=IDC_STATIC,static,1342308352
  299 +Control6=IDC_EDIT_OLD_PASSWD,edit,1350631584
  300 +Control7=IDC_EDIT_NEW_PASSWD,edit,1350631584
  301 +Control8=IDC_EDIT_CONFIRM_PASSWD,edit,1350631584
  302 +
  303 +[DLG:IDD_FILE_LOAD_DIALOG (English (U.S.))]
  304 +Type=1
  305 +Class=?
  306 +ControlCount=14
  307 +Control1=IDC_BTN_FILE_SEL_OK,button,1342242817
  308 +Control2=IDC_BTN_FILE_SEL_CANCEL,button,1342242816
  309 +Control3=IDC_FP_AUTH_FIEL_PATH,edit,1350633600
  310 +Control4=IDC_SP_AUTH_FIEL_PATH,edit,1350633600
  311 +Control5=IDC_DRMKEY_FIEL_PATH,edit,1350633600
  312 +Control6=IDC_HDCP_BIN_FIEL_PATH,edit,1350633600
  313 +Control7=IDC_HDCP_DATA_FIEL_PATH,edit,1350633600
  314 +Control8=IDC_HDCP_CEK_FIEL_PATH,edit,1350633600
  315 +Control9=IDC_BTN_SEL_FP_AUTH_FILE,button,1342242816
  316 +Control10=IDC_BTN_SEL_SP_AUTH_FILE,button,1342242816
  317 +Control11=IDC_BTN_SEL_HDCP_BIN_FILE,button,1342242816
  318 +Control12=IDC_BTN_SEL_HDCP_DATAFILE,button,1342242816
  319 +Control13=IDC_BTN_SEL_HDCP_CEK_FILE,button,1342242816
  320 +Control14=IDC_BTN_SEL_DRMKEY_FILE,button,1342242816
  321 +
  322 +[DLG:IDD_AUTOGEN_DIALOG (English (U.S.))]
  323 +Type=1
  324 +Class=?
  325 +ControlCount=66
  326 +Control1=IDC_AUTOGEN_BARC_CHECK,button,1342242819
  327 +Control2=IDC_AUTOGEN_IMEI_CHECK,button,1342242819
  328 +Control3=IDC_AUTOGEN_WIFI_CHECK,button,1342242819
  329 +Control4=IDC_AUTOGEN_BT_CHECK,button,1342242819
  330 +Control5=IDC_BARC_START_STR,edit,1350631552
  331 +Control6=IDC_BARC_END_STR,edit,1350631552
  332 +Control7=IDC_BARC_NEXT_STR,edit,1350631552
  333 +Control8=IDC_IMEI_START_STR,edit,1350631552
  334 +Control9=IDC_IMEI_END_STR,edit,1350631552
  335 +Control10=IDC_IMEI_NEXT_STR,edit,1350631552
  336 +Control11=IDC_BT_START_STR,edit,1350631552
  337 +Control12=IDC_BT_END_STR,edit,1350631552
  338 +Control13=IDC_BT_NEXT_STR,edit,1350631552
  339 +Control14=IDC_WIFI_START_STR,edit,1350631552
  340 +Control15=IDC_WIFI_END_STR,edit,1350631552
  341 +Control16=IDC_WIFI_NEXT_STR,edit,1350631552
  342 +Control17=IDC_BTN_AUTOGEN_OK,button,1342242817
  343 +Control18=IDC_BTN_AUTOGEN_CANCEL,button,1342242816
  344 +Control19=IDC_STATIC,button,1342177287
  345 +Control20=IDC_STATIC,button,1342177287
  346 +Control21=IDC_STATIC,button,1342177287
  347 +Control22=IDC_STATIC,button,1342177287
  348 +Control23=IDC_STATIC,button,1342177287
  349 +Control24=IDC_STATIC,static,1342308352
  350 +Control25=IDC_STATIC,static,1342308352
  351 +Control26=IDC_STATIC,static,1342308352
  352 +Control27=IDC_STATIC,static,1342308352
  353 +Control28=IDC_BARC_AUTOGEN_STEP,combobox,1344340226
  354 +Control29=IDC_STATIC,static,1342308352
  355 +Control30=IDC_STATIC,static,1342308352
  356 +Control31=IDC_STATIC,static,1342308352
  357 +Control32=IDC_STATIC,static,1342308352
  358 +Control33=IDC_IMEI_AUTOGEN_STEP,combobox,1344340226
  359 +Control34=IDC_STATIC,static,1342308352
  360 +Control35=IDC_STATIC,static,1342308352
  361 +Control36=IDC_STATIC,static,1342308352
  362 +Control37=IDC_STATIC,static,1342308352
  363 +Control38=IDC_BT_AUTOGEN_STEP,combobox,1344340226
  364 +Control39=IDC_STATIC,static,1342308352
  365 +Control40=IDC_STATIC,static,1342308352
  366 +Control41=IDC_STATIC,static,1342308352
  367 +Control42=IDC_STATIC,static,1342308352
  368 +Control43=IDC_WIFI_AUTOGEN_STEP,combobox,1344340226
  369 +Control44=IDC_ETHERNET_START_STR,edit,1350631552
  370 +Control45=IDC_ETHERNET_END_STR,edit,1350631552
  371 +Control46=IDC_ETHERNET_NEXT_STR,edit,1350631552
  372 +Control47=IDC_STATIC,button,1342177287
  373 +Control48=IDC_STATIC,static,1342308352
  374 +Control49=IDC_STATIC,static,1342308352
  375 +Control50=IDC_STATIC,static,1342308352
  376 +Control51=IDC_STATIC,static,1342308352
  377 +Control52=IDC_ETHERNET_AUTOGEN_STEP,combobox,1344340226
  378 +Control53=IDC_AUTOGEN_ETHERNET_CHECK,button,1342242819
  379 +Control54=IDC_DRMKEY_MCID_START_STR,edit,1350631552
  380 +Control55=IDC_DRMKEY_MCID_END_STR,edit,1350631552
  381 +Control56=IDC_DRMKEY_MCID_NEXT_STR,edit,1350631552
  382 +Control57=IDC_STATIC,button,1342177287
  383 +Control58=IDC_STATIC,static,1342308352
  384 +Control59=IDC_STATIC,static,1342308352
  385 +Control60=IDC_STATIC,static,1342308352
  386 +Control61=IDC_STATIC,static,1342308352
  387 +Control62=IDC_DRMKEY_MCID_AUTOGEN_STEP,combobox,1344340226
  388 +Control63=IDC_AUTOGEN_DRMKEY_MCID_CHECK,button,1342242819
  389 +Control64=IDC_DENARY_INCREASE,button,1342308361
  390 +Control65=IDC_HEX_INCREASE,button,1342177289
  391 +Control66=IDC_STATIC,button,1342177287
  392 +
  393 +[DLG:IDD_DIALOG_TIPS]
  394 +Type=1
  395 +Class=Cdlg_tips
  396 +ControlCount=3
  397 +Control1=IDOK,button,1342242817
  398 +Control2=IDCANCEL,button,1342242816
  399 +Control3=IDC_STATIC,static,1342308352
  400 +
  401 +[CLS:Cdlg_tips]
  402 +Type=0
  403 +HeaderFile=dlg_tips.h
  404 +ImplementationFile=dlg_tips.cpp
  405 +BaseClass=CDialog
  406 +Filter=D
  407 +VirtualFilter=dWC
  408 +LastObject=Cdlg_tips
  409 +
@@ -214,6 +214,10 @@ SOURCE=.\Form\AutoGen\autogendlg.cpp @@ -214,6 +214,10 @@ SOURCE=.\Form\AutoGen\autogendlg.cpp
214 # End Group 214 # End Group
215 # Begin Source File 215 # Begin Source File
216 216
  217 +SOURCE=.\dlg_tips.cpp
  218 +# End Source File
  219 +# Begin Source File
  220 +
217 SOURCE=.\Encryption.cpp 221 SOURCE=.\Encryption.cpp
218 # End Source File 222 # End Source File
219 # Begin Source File 223 # Begin Source File
@@ -467,6 +471,10 @@ SOURCE=.\Form\AutoGen\autogendlg.h @@ -467,6 +471,10 @@ SOURCE=.\Form\AutoGen\autogendlg.h
467 # End Group 471 # End Group
468 # Begin Source File 472 # Begin Source File
469 473
  474 +SOURCE=.\dlg_tips.h
  475 +# End Source File
  476 +# Begin Source File
  477 +
470 SOURCE=.\Encryption.h 478 SOURCE=.\Encryption.h
471 # End Source File 479 # End Source File
472 # Begin Source File 480 # Begin Source File
@@ -13,6 +13,53 @@ @@ -13,6 +13,53 @@
13 #undef APSTUDIO_READONLY_SYMBOLS 13 #undef APSTUDIO_READONLY_SYMBOLS
14 14
15 ///////////////////////////////////////////////////////////////////////////// 15 /////////////////////////////////////////////////////////////////////////////
  16 +// Chinese (P.R.C.) resources
  17 +
  18 +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
  19 +#ifdef _WIN32
  20 +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
  21 +#pragma code_page(936)
  22 +#endif //_WIN32
  23 +
  24 +/////////////////////////////////////////////////////////////////////////////
  25 +//
  26 +// Dialog
  27 +//
  28 +
  29 +IDD_DIALOG_TIPS DIALOGEX 0, 0, 108, 49
  30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  31 +FONT 16, "΢ÈíÑźÚ"
  32 +BEGIN
  33 + DEFPUSHBUTTON "OK",IDOK,3,39,29,9
  34 + PUSHBUTTON "Cancel",IDCANCEL,71,38,29,9
  35 + LTEXT "Complete!\nPlease disconnect the phone,\nThen click OK,\nThen connect to the next phone",
  36 + IDC_STATIC,0,0,108,35,0,WS_EX_DLGMODALFRAME
  37 +END
  38 +
  39 +
  40 +/////////////////////////////////////////////////////////////////////////////
  41 +//
  42 +// DESIGNINFO
  43 +//
  44 +
  45 +#ifdef APSTUDIO_INVOKED
  46 +GUIDELINES DESIGNINFO DISCARDABLE
  47 +BEGIN
  48 + IDD_DIALOG_TIPS, DIALOG
  49 + BEGIN
  50 + LEFTMARGIN, 7
  51 + RIGHTMARGIN, 101
  52 + TOPMARGIN, 7
  53 + BOTTOMMARGIN, 42
  54 + END
  55 +END
  56 +#endif // APSTUDIO_INVOKED
  57 +
  58 +#endif // Chinese (P.R.C.) resources
  59 +/////////////////////////////////////////////////////////////////////////////
  60 +
  61 +
  62 +/////////////////////////////////////////////////////////////////////////////
16 // English (U.S.) resources 63 // English (U.S.) resources
17 64
18 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) 65 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
@@ -259,17 +306,17 @@ BEGIN @@ -259,17 +306,17 @@ BEGIN
259 LTEXT "......",IDC_PWD_MSG,7,50,273,23 306 LTEXT "......",IDC_PWD_MSG,7,50,273,23
260 END 307 END
261 308
262 -IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 486, 205 309 +IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 458, 205
263 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 310 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
264 WS_SYSMENU 311 WS_SYSMENU
265 -EXSTYLE WS_EX_CLIENTEDGE | WS_EX_APPWINDOW 312 +EXSTYLE WS_EX_APPWINDOW
266 CAPTION "c" 313 CAPTION "c"
267 FONT 9, "΢ÈíÑźÚ" 314 FONT 9, "΢ÈíÑźÚ"
268 BEGIN 315 BEGIN
269 - EDITTEXT IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL  
270 - PUSHBUTTON "Save",IDC_BT_SAVE_SWVER,246,10,44,15  
271 - PUSHBUTTON "Select",IDC_BTN_AP_PATH,240,40,44,12,NOT WS_TABSTOP  
272 - PUSHBUTTON "Select",IDC_BTN_BP_PATH,240,55,44,12,NOT WS_TABSTOP 316 + EDITTEXT IDC_EDT_VERSION,56,10,160,13,ES_AUTOHSCROLL
  317 + PUSHBUTTON "Save",IDC_BT_SAVE_SWVER,223,10,44,15
  318 + PUSHBUTTON "Select",IDC_BTN_AP_PATH,222,40,44,12,NOT WS_TABSTOP
  319 + PUSHBUTTON "Select",IDC_BTN_BP_PATH,222,55,44,12,NOT WS_TABSTOP
273 DEFPUSHBUTTON "Start",IDC_BTN_START,7,179,30,12 320 DEFPUSHBUTTON "Start",IDC_BTN_START,7,179,30,12
274 DEFPUSHBUTTON "Config",IDC_BTN_SYSCONFIG,9,196,6,6,NOT WS_VISIBLE 321 DEFPUSHBUTTON "Config",IDC_BTN_SYSCONFIG,9,196,6,6,NOT WS_VISIBLE
275 DEFPUSHBUTTON "Quit",IDC_BTN_QUIT,47,179,30,12 322 DEFPUSHBUTTON "Quit",IDC_BTN_QUIT,47,179,30,12
@@ -281,11 +328,11 @@ BEGIN @@ -281,11 +328,11 @@ BEGIN
281 LTEXT "SW Version",IDC_STATIC,6,12,48,9 328 LTEXT "SW Version",IDC_STATIC,6,12,48,9
282 LTEXT "BP DB",IDC_STATIC,14,55,20,9 329 LTEXT "BP DB",IDC_STATIC,14,55,20,9
283 LTEXT "AP DB",IDC_STATIC,14,41,20,9 330 LTEXT "AP DB",IDC_STATIC,14,41,20,9
284 - EDITTEXT IDC_STR_AP_PATH,38,38,197,13,ES_AUTOHSCROLL | 331 + EDITTEXT IDC_STR_AP_PATH,38,38,179,13,ES_AUTOHSCROLL |
285 ES_READONLY | NOT WS_TABSTOP 332 ES_READONLY | NOT WS_TABSTOP
286 - EDITTEXT IDC_STR_BP_PATH,38,54,197,13,ES_AUTOHSCROLL | 333 + EDITTEXT IDC_STR_BP_PATH,38,54,179,13,ES_AUTOHSCROLL |
287 ES_READONLY | NOT WS_TABSTOP 334 ES_READONLY | NOT WS_TABSTOP
288 - GROUPBOX "",IDC_STATIC,6,28,285,44 335 + GROUPBOX "",IDC_STATIC,6,28,264,44
289 CONTROL 133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,158,112,93,45 336 CONTROL 133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,158,112,93,45
290 LTEXT "SW",IDC_STATIC,6,91,11,9 337 LTEXT "SW",IDC_STATIC,6,91,11,9
291 LTEXT "CFT",IDC_STATIC,5,115,12,9 338 LTEXT "CFT",IDC_STATIC,5,115,12,9
@@ -300,18 +347,18 @@ BEGIN @@ -300,18 +347,18 @@ BEGIN
300 NOT WS_TABSTOP 347 NOT WS_TABSTOP
301 EDITTEXT IDC_RSLT_WRITE_IMEI,102,141,37,12,ES_AUTOHSCROLL | 348 EDITTEXT IDC_RSLT_WRITE_IMEI,102,141,37,12,ES_AUTOHSCROLL |
302 ES_READONLY | NOT WS_TABSTOP 349 ES_READONLY | NOT WS_TABSTOP
303 - GROUPBOX "Test Result",IDC_STATIC,2,78,285,96  
304 - LISTBOX IDC_LOG_LIST,293,1,193,190,LBS_NOINTEGRALHEIGHT | NOT  
305 - WS_BORDER | WS_VSCROLL 350 + GROUPBOX "Test Result",IDC_STATIC,2,78,266,96
  351 + LISTBOX IDC_LOG_LIST,270,0,187,174,LBS_NOINTEGRALHEIGHT |
  352 + WS_VSCROLL
306 CONTROL "",IDC_COUNT_TOTAL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP, 353 CONTROL "",IDC_COUNT_TOTAL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
307 44,160,30,8,WS_EX_STATICEDGE 354 44,160,30,8,WS_EX_STATICEDGE
308 CONTROL "",IDC_COUNT_PASS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP, 355 CONTROL "",IDC_COUNT_PASS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
309 115,160,29,8,WS_EX_STATICEDGE 356 115,160,29,8,WS_EX_STATICEDGE
310 CONTROL "",IDC_COUNT_FAIL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP, 357 CONTROL "",IDC_COUNT_FAIL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
311 193,160,36,8,WS_EX_STATICEDGE 358 193,160,36,8,WS_EX_STATICEDGE
312 - CTEXT "",IDC_RSLT_SW,35,91,233,11,SS_CENTERIMAGE, 359 + CTEXT "",IDC_RSLT_SW,35,91,228,11,SS_CENTERIMAGE,
313 WS_EX_STATICEDGE 360 WS_EX_STATICEDGE
314 - LTEXT "",IDC_STATIC_TIMECOUNT,119,181,61,12,SS_CENTERIMAGE, 361 + CTEXT "",IDC_STATIC_TIMECOUNT,115,179,41,12,SS_CENTERIMAGE,
315 WS_EX_STATICEDGE 362 WS_EX_STATICEDGE
316 END 363 END
317 364
@@ -549,7 +596,7 @@ BEGIN @@ -549,7 +596,7 @@ BEGIN
549 596
550 IDD_SNWRITER_DIALOG, DIALOG 597 IDD_SNWRITER_DIALOG, DIALOG
551 BEGIN 598 BEGIN
552 - RIGHTMARGIN, 178 599 + RIGHTMARGIN, 150
553 TOPMARGIN, 7 600 TOPMARGIN, 7
554 BOTTOMMARGIN, 193 601 BOTTOMMARGIN, 193
555 END 602 END
@@ -729,13 +729,11 @@ HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) @@ -729,13 +729,11 @@ HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
729 { 729 {
730 HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor); 730 HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
731 731
732 - // TODO: Change any attributes of the DC here  
733 -// if((IDC_MAINUI_TEMP1 == pWnd->GetDlgCtrlID())||(IDC_MAINUI_TEMP2 == pWnd->GetDlgCtrlID()))  
734 -// {  
735 -// pDC->SetTextColor(RGB(255,0,0));  
736 -// } 732 + if((IDC_STATIC_TIMECOUNT == pWnd->GetDlgCtrlID()))
  733 + {
  734 + pDC->SetTextColor(RGB(255,0,0));
  735 + }
737 736
738 - // TODO: Return a different brush if the default is not desired  
739 return hbr; 737 return hbr;
740 } 738 }
741 739
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
17 #include "FPexc.h" 17 #include "FPexc.h"
18 #include "SPexc.h" 18 #include "SPexc.h"
19 //#include "ShadeButtonST.h" 19 //#include "ShadeButtonST.h"
  20 +#include "dlg_tips.h"
20 21
21 class CSNWriterDlg : public CDialog 22 class CSNWriterDlg : public CDialog
22 { 23 {
@@ -129,6 +130,7 @@ public: @@ -129,6 +130,7 @@ public:
129 HBITMAP m_hBitmapFail; 130 HBITMAP m_hBitmapFail;
130 CFont m_font; 131 CFont m_font;
131 int mytimecount; 132 int mytimecount;
  133 + Cdlg_tips mytipsdlg;
132 }; 134 };
133 135
134 //{{AFX_INSERT_LOCATION}} 136 //{{AFX_INSERT_LOCATION}}
  1 +// dlg_tips.cpp : implementation file
  2 +//
  3 +
  4 +#include "stdafx.h"
  5 +#include "sn writer.h"
  6 +#include "dlg_tips.h"
  7 +
  8 +#ifdef _DEBUG
  9 +#define new DEBUG_NEW
  10 +#undef THIS_FILE
  11 +static char THIS_FILE[] = __FILE__;
  12 +#endif
  13 +
  14 +/////////////////////////////////////////////////////////////////////////////
  15 +// Cdlg_tips dialog
  16 +
  17 +
  18 +Cdlg_tips::Cdlg_tips(CWnd* pParent /*=NULL*/)
  19 + : CDialog(Cdlg_tips::IDD, pParent)
  20 +{
  21 + //{{AFX_DATA_INIT(Cdlg_tips)
  22 + // NOTE: the ClassWizard will add member initialization here
  23 + //}}AFX_DATA_INIT
  24 +}
  25 +
  26 +
  27 +void Cdlg_tips::DoDataExchange(CDataExchange* pDX)
  28 +{
  29 + CDialog::DoDataExchange(pDX);
  30 + //{{AFX_DATA_MAP(Cdlg_tips)
  31 + // NOTE: the ClassWizard will add DDX and DDV calls here
  32 + //}}AFX_DATA_MAP
  33 +}
  34 +
  35 +
  36 +BEGIN_MESSAGE_MAP(Cdlg_tips, CDialog)
  37 + //{{AFX_MSG_MAP(Cdlg_tips)
  38 + //}}AFX_MSG_MAP
  39 +END_MESSAGE_MAP()
  40 +
  41 +/////////////////////////////////////////////////////////////////////////////
  42 +// Cdlg_tips message handlers
  43 +
  44 +BOOL Cdlg_tips::OnInitDialog()
  45 +{
  46 + CRect arect;
  47 + CDialog::OnInitDialog();
  48 + GetWindowRect(&arect);
  49 + MoveWindow(arect.left+550,arect.top,arect.Width(),arect.Height());
  50 +
  51 +
  52 + return TRUE; // return TRUE unless you set the focus to a control
  53 + // EXCEPTION: OCX Property Pages should return FALSE
  54 +}
  1 +#if !defined(AFX_DLG_TIPS_H__59791518_E4B7_4356_BE85_6E2C6E03CC8A__INCLUDED_)
  2 +#define AFX_DLG_TIPS_H__59791518_E4B7_4356_BE85_6E2C6E03CC8A__INCLUDED_
  3 +
  4 +#if _MSC_VER > 1000
  5 +#pragma once
  6 +#endif // _MSC_VER > 1000
  7 +// dlg_tips.h : header file
  8 +//
  9 +
  10 +/////////////////////////////////////////////////////////////////////////////
  11 +// Cdlg_tips dialog
  12 +
  13 +class Cdlg_tips : public CDialog
  14 +{
  15 +// Construction
  16 +public:
  17 + Cdlg_tips(CWnd* pParent = NULL); // standard constructor
  18 +
  19 +// Dialog Data
  20 + //{{AFX_DATA(Cdlg_tips)
  21 + enum { IDD = IDD_DIALOG_TIPS };
  22 + // NOTE: the ClassWizard will add data members here
  23 + //}}AFX_DATA
  24 +
  25 +
  26 +// Overrides
  27 + // ClassWizard generated virtual function overrides
  28 + //{{AFX_VIRTUAL(Cdlg_tips)
  29 + protected:
  30 + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
  31 + //}}AFX_VIRTUAL
  32 +
  33 +// Implementation
  34 +protected:
  35 +
  36 + // Generated message map functions
  37 + //{{AFX_MSG(Cdlg_tips)
  38 + virtual BOOL OnInitDialog();
  39 + //}}AFX_MSG
  40 + DECLARE_MESSAGE_MAP()
  41 +};
  42 +
  43 +//{{AFX_INSERT_LOCATION}}
  44 +// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
  45 +
  46 +#endif // !defined(AFX_DLG_TIPS_H__59791518_E4B7_4356_BE85_6E2C6E03CC8A__INCLUDED_)
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
4 // 4 //
5 #define IDS_ABOUTBOX 101 5 #define IDS_ABOUTBOX 101
6 #define IDD_SNWRITER_DIALOG 102 6 #define IDD_SNWRITER_DIALOG 102
7 -//#define IDR_MAINFRAME 128  
8 #define IDD_SCANDATA_DIALOG 129 7 #define IDD_SCANDATA_DIALOG 129
9 #define IDD_SYSTEM_CONFIG_DIALOG 130 8 #define IDD_SYSTEM_CONFIG_DIALOG 130
10 #define IDB_BITMAP_FAIL 131 9 #define IDB_BITMAP_FAIL 131
@@ -19,6 +18,7 @@ @@ -19,6 +18,7 @@
19 #define IDB_BITMAP_LOGO 148 18 #define IDB_BITMAP_LOGO 148
20 #define IDI_ICON1 154 19 #define IDI_ICON1 154
21 #define IDD_ENCRYPTION_DIALOG 155 20 #define IDD_ENCRYPTION_DIALOG 155
  21 +#define IDD_DIALOG_TIPS 159
22 #define IDC_COUNT_TOTAL 1000 22 #define IDC_COUNT_TOTAL 1000
23 #define IDC_BTN_SYSCONFIG 1001 23 #define IDC_BTN_SYSCONFIG 1001
24 #define IDC_BTN_START 1002 24 #define IDC_BTN_START 1002
@@ -242,7 +242,7 @@ @@ -242,7 +242,7 @@
242 // 242 //
243 #ifdef APSTUDIO_INVOKED 243 #ifdef APSTUDIO_INVOKED
244 #ifndef APSTUDIO_READONLY_SYMBOLS 244 #ifndef APSTUDIO_READONLY_SYMBOLS
245 -#define _APS_NEXT_RESOURCE_VALUE 159 245 +#define _APS_NEXT_RESOURCE_VALUE 160
246 #define _APS_NEXT_COMMAND_VALUE 32798 246 #define _APS_NEXT_COMMAND_VALUE 32798
247 #define _APS_NEXT_CONTROL_VALUE 1177 247 #define _APS_NEXT_CONTROL_VALUE 1177
248 #define _APS_NEXT_SYMED_VALUE 101 248 #define _APS_NEXT_SYMED_VALUE 101
Please register or login to post a comment