Echo / InterlockingTool · Commits

Commit 457582ed8cb2ba613a543ee42818be3dee2bee53

Authored by xiemeng
1 parent fe8649ad

删除冗余控件 

优化部分代码
Inline Side-by-side
Showing 11 changed files with 139 additions and 680 deletions
... ... @@ -932,10 +932,8 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
932 932 EnableStartBTN(false);
933 933
934 934 SNThread_Init();
935   - UpdateProgress(0.05);
936 935
937 936 SetupMetaModeParameters();
938   - UpdateProgress(0.10);
939 937
940 938 EnableStartBTN(true);
941 939
... ... @@ -946,7 +944,6 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
946 944 UpdateUIMsg("EnterModemMeta() : MetaResult = %s", ResultToString(MetaResult));
947 945 goto End;
948 946 }
949   - UpdateProgress(0.15);
950 947
951 948 UpdateUIMsg("Start load and init database...");
952 949 MetaResult = LoadModemDatabase(0);
... ... @@ -957,7 +954,6 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
957 954 PopupMsgBox("Error", MB_OK|MB_ICONERROR, "LoadModemDatabase() : MetaResult = %s", ResultToString(MetaResult));
958 955 goto End;
959 956 }
960   - UpdateProgress(0.20);
961 957
962 958 /*
963 959 META_MISC_GetRID_r(m_hMauiMetaHandle, 5000, (unsigned char*)strChipID,16);
... ... @@ -969,7 +965,6 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
969 965 */
970 966
971 967 EnableStartBTN(false);
972   - UpdateProgress(0.22);
973 968 UpdateUIMsg("Start loop write data to nvram...");
974 969 MetaResult = WriteNvramLoop();
975 970 if (MetaResult != META_SUCCESS)
... ... @@ -981,14 +976,13 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
981 976 End:
982 977 if (m_bStopBeforeUSBInsert == true)
983 978 {
984   - UpdateProgress(0.0);
985 979 UpdateUIMsg("...");
986 980 }
987 981 else
988 982 {
989 983 if (bAnyOperationFail)
990 984 {
991   - m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
  985 +// m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
992 986 UpdateUICountResult(FAIL);
993 987 }
994 988 else
... ... @@ -1006,7 +1000,6 @@ End:
1006 1000
1007 1001 ExitModemMeta();
1008 1002
1009   - UpdateProgress(1.0);
1010 1003 }
1011 1004
1012 1005 EnableStartBTN(true);
... ...
... ... @@ -151,10 +151,9 @@ 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);
  154 +//m_iProcessRange = 1000;
  155 +//m_Process->SetRange(0, m_iProcessRange);
  156 +//m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(0, 0, 255));
158 157 }
159 158
160 159 int SNBase::UpdateUIMsg(const char * strMsg, ...)
... ... @@ -166,8 +165,7 @@ int SNBase::UpdateUIMsg(const char * strMsg, ...)
166 165 va_start(varg, strMsg);
167 166 iRet = vsprintf(szBuf, strMsg, varg);
168 167 va_end(varg);
169   -
170   - g_pMainDlg->myloglist.AddString(strMsg);
  168 + g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(strMsg));
171 169
172 170 return iRet;
173 171 }
... ... @@ -211,8 +209,23 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
211 209 g_pMainDlg->SetDlgItemText(IDC_RSLT_CFT, g_pMainDlg->myrslt_cft);
212 210 g_pMainDlg->SetDlgItemText(IDC_RSLT_SMT, g_pMainDlg->myrslt_smt);
213 211 g_pMainDlg->SetDlgItemText(IDC_RSLT_QC, g_pMainDlg->myrslt_qc);
214   - g_pMainDlg->SetDlgItemText(IDC_RSLT_WRITE_IMEI, g_pMainDlg->myrslt_imei);
215 212 #endif
  213 + switch (eWriteStatus)
  214 + {
  215 + case FAIL:
  216 + g_pMainDlg->myctrlbit.ShowWindow(SW_SHOW);
  217 + g_pMainDlg->myctrlbit.SetBitmap(g_pMainDlg->m_hBitmapFail);
  218 + break;
  219 + case PASS:
  220 + g_pMainDlg->myctrlbit.ShowWindow(SW_SHOW);
  221 + g_pMainDlg->myctrlbit.SetBitmap(g_pMainDlg->m_hBitmapPass);
  222 + break;
  223 + case CANCEL:
  224 + case NORMAL:
  225 + g_pMainDlg->myctrlbit.ShowWindow(SW_HIDE);
  226 + break;
  227 + }
  228 +
216 229
217 230 UpdateMainDlgUI(true, eWriteStatus);
218 231 }
... ... @@ -236,16 +249,6 @@ void SNBase::UpdateMainDlgUI(bool bEnable, WriteNvram_Status_e eWriteStatus)
236 249
237 250 }
238 251
239   -void SNBase::UpdateProgress(double dPercent)
240   -{
241   - if (dPercent >= 1)
242   - {
243   - dPercent = 1;
244   - }
245   -
246   - int curPos = (int)(dPercent * m_iProcessRange);
247   - m_Process->SetPos(curPos);
248   -}
249 252
250 253 void SNBase::PopupMsgBox(const char* strTilte, UINT uType, const char* strMsg, ...)
251 254 {
... ... @@ -1279,8 +1282,8 @@ void SNBase::SNThread_Init()
1279 1282 //Get main dialog handle
1280 1283 //g_pMainDlg = (CSNWriterDlg*)g_MainDlgHandle;
1281 1284
1282   - m_Process = &(g_pMainDlg->m_ProgressSN);
1283   - SetProgress();
  1285 +// m_Process = &(g_pMainDlg->m_ProgressSN);
  1286 +// SetProgress();
1284 1287
1285 1288 m_bNeedBackupIMEI = false;
1286 1289 memset(m_strBackupIMEI, 0, IMEI_ARRAY_LEN);
... ...
... ... @@ -98,7 +98,6 @@ protected:
98 98 virtual META_RESULT WriteNvramLoop() = 0;
99 99
100 100 virtual META_RESULT LoadModemDatabase(int MDindex) = 0;
101   - virtual void UpdateProgress(double dPercent);
102 101 virtual void SetProgress();
103 102
104 103 virtual META_RESULT ConductBarcodeData(char *pOutData, unsigned short RID_para, char *pInDatabuf, int bufSize);
... ... @@ -138,7 +137,7 @@ public:
138 137 void EnableStartBTN(bool bEnable = true);
139 138
140 139 protected:
141   - CProgressCtrl *m_Process;
  140 +// CProgressCtrl *m_Process;
142 141 UINT m_iProcessRange;
143 142 bool m_bBackupNvramSuccess;
144 143 };
... ...
... ... @@ -215,596 +215,55 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
215 215 case SP_IMEI_RD_STAGE:
216 216 {
217 217 CString str_imei;
218   - int a_imei_ary[16];
219   - int a_imei_ary2[16];
  218 + char a_imei_ary[16];
  219 + char a_imei_ary2[16];
220 220 char tmpBuf1[20] = {0};
221 221 char tmpBuf2[20] = {0};
222   -
  222 +
223 223 iRet = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf1, 1);
224 224 iRet2 = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf2, 2);
225   -
226   - if(tmpBuf1[0]== -1)
227   - {
228   - iRet = META_FAILED;
229   -
230   - }
231   -
232   - if(tmpBuf2[0]== -1)
233   - {
234   - iRet2 =META_FAILED;
235   - }
236   -
237   - if (iRet == META_SUCCESS || iRet2 == META_SUCCESS)
238   - {
239   - UpdateUIMsg("IMEI read successfully "+str_imei);
240   - }
241   - else
242   - {
243   - UpdateUIMsg("IMEI failed to read");
244   - }
245   -
246   -
247   -
  225 +
  226 + if(tmpBuf1[0]== -1) iRet = META_FAILED;
  227 + if(tmpBuf2[0]== -1) iRet2 =META_FAILED;
  228 +
  229 +
248 230 if (iRet == META_SUCCESS || iRet2 == META_SUCCESS)
249 231 {
250   -
251   - memset(a_imei_ary,0,sizeof(int)*16);
252   - memset(a_imei_ary2,0,sizeof(int)*16);
253   -
254   - a_imei_ary[0] = (byte)(tmpBuf1[0])%16;
255   - a_imei_ary[1] = (byte)(tmpBuf1[0])/16;
256   - a_imei_ary[2] = (byte)(tmpBuf1[1])%16;
257   - a_imei_ary[3] = (byte)(tmpBuf1[1])/16;
258   - a_imei_ary[4] = (byte)(tmpBuf1[2])%16;
259   - a_imei_ary[5] = (byte)(tmpBuf1[2])/16;
260   - a_imei_ary[6] = (byte)(tmpBuf1[3])%16;
261   - a_imei_ary[7] = (byte)(tmpBuf1[3])/16;
262   - a_imei_ary[8] = (byte)(tmpBuf1[4])%16;
263   - a_imei_ary[9] = (byte)(tmpBuf1[4])/16;
264   - a_imei_ary[10] = (byte)(tmpBuf1[5])%16;
265   - a_imei_ary[11] = (byte)(tmpBuf1[5])/16;
266   - a_imei_ary[12] = (byte)(tmpBuf1[6])%16;
267   - a_imei_ary[13] = (byte)(tmpBuf1[6])/16;
268   - a_imei_ary[14] = (byte)(tmpBuf1[7])%16;
269   -
270   - a_imei_ary2[0] = (byte)(tmpBuf2[0])%16;
271   - a_imei_ary2[1] = (byte)(tmpBuf2[0])/16;
272   - a_imei_ary2[2] = (byte)(tmpBuf2[1])%16;
273   - a_imei_ary2[3] = (byte)(tmpBuf2[1])/16;
274   - a_imei_ary2[4] = (byte)(tmpBuf2[2])%16;
275   - a_imei_ary2[5] = (byte)(tmpBuf2[2])/16;
276   - a_imei_ary2[6] = (byte)(tmpBuf2[3])%16;
277   - a_imei_ary2[7] = (byte)(tmpBuf2[3])/16;
278   - a_imei_ary2[8] = (byte)(tmpBuf2[4])%16;
279   - a_imei_ary2[9] = (byte)(tmpBuf2[4])/16;
280   - a_imei_ary2[10] = (byte)(tmpBuf2[5])%16;
281   - a_imei_ary2[11] = (byte)(tmpBuf2[5])/16;
282   - a_imei_ary2[12] = (byte)(tmpBuf2[6])%16;
283   - a_imei_ary2[13] = (byte)(tmpBuf2[6])/16;
284   - a_imei_ary2[14] = (byte)(tmpBuf2[7])%16;
285   -
286   - str_imei.Format("%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d,%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d",
287   - a_imei_ary[0],a_imei_ary[1],a_imei_ary[2],a_imei_ary[3],a_imei_ary[4],
288   - a_imei_ary[5],a_imei_ary[6],a_imei_ary[7],a_imei_ary[8],a_imei_ary[9],
289   - a_imei_ary[10],a_imei_ary[11],a_imei_ary[12],a_imei_ary[13],a_imei_ary[14],
290   - a_imei_ary2[0],a_imei_ary2[1],a_imei_ary2[2],a_imei_ary2[3],a_imei_ary2[4],
291   - a_imei_ary2[5],a_imei_ary2[6],a_imei_ary2[7],a_imei_ary2[8],a_imei_ary2[9],
292   - a_imei_ary2[10],a_imei_ary2[11],a_imei_ary2[12],a_imei_ary2[13],a_imei_ary2[14]
293   - );
294   - /* for(int i=0;i<14;i++)
295   - {
296   -
297   -
298   - }*/
299   -
300   - //g_pMainDlg->myrslt_imei= _T("PASS");
301   -
  232 + memset(a_imei_ary,0,16);
  233 + memset(a_imei_ary2,0,16);
  234 + for (int loop = 0;loop<15;loop++)
  235 + {
  236 + if (loop%2 == 0)
  237 + {
  238 + a_imei_ary[loop] = 0x30 + (byte)(tmpBuf1[loop/2])%16;
  239 + a_imei_ary2[loop] = 0x30 + (byte)(tmpBuf2[loop/2])%16;
  240 + }
  241 + else
  242 + {
  243 + a_imei_ary[loop] = 0x30 + (byte)(tmpBuf1[loop/2])/16;
  244 + a_imei_ary2[loop] = 0x30 + (byte)(tmpBuf2[loop/2])/16;
  245 + }
  246 + }
  247 + a_imei_ary[15] = 0;
  248 + a_imei_ary2[15] = 0;
  249 + g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText(CString(a_imei_ary)+","+CString(a_imei_ary2));
  250 + UpdateUIMsg("IMEI read success!!!");
302 251 spNextStage = SP_END_STAGE;
303 252 }
304 253 else
305 254 {
306   - //g_pMainDlg->myrslt_imei= _T("Fail");
307   - UpdateUIMsg("IMEI failed to read");
  255 + g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("fail!!!");
  256 + UpdateUIMsg("IMEI read fail");
308 257 spNextStage = SP_END_STAGE;
309 258 }
310   -
311   - if(iRet == META_SUCCESS)
312   - {
313   - g_pMainDlg->myrslt_imei= _T("PASS");
314   - }
315   - else
316   - {
317   - g_pMainDlg->myrslt_imei= _T("Fail");
318   - }
319   -
320   - if(iRet2 == META_SUCCESS)
321   - {
322   - g_pMainDlg->myrslt_imei = g_pMainDlg->myrslt_imei+ _T(",PASS");
323   - }
324   - else
325   - {
326   - g_pMainDlg->myrslt_imei = g_pMainDlg->myrslt_imei+ _T(",Fail");
327   - }
328   -
329   -
330   - }
  259 + }
331 260 break;
332 261
333 262
334 263
335   - case SP_BARCODE_MD_STAGE:
336   - if (g_sMetaComm.sWriteOption.bWriteIMEI)
337   - {
338   - if (mdNums == 1 && g_sMetaComm.sIMEIOption.iImeiNums == 1)
339   - {
340   - multiIMEIOption = SINGLE_MD_SINGLE_IMEI;
341   - }
342   - else if (mdNums == 1 && g_sMetaComm.sIMEIOption.iImeiNums >= 2)
343   - {
344   - multiIMEIOption = SINGLE_MD_MULTI_IMEI;
345   - }
346   - else if (mdNums == 2)
347   - {
348   - if (m_iC2kProject != 0 && g_sMetaComm.sIMEIOption.iImeiNums == 1)
349   - {
350   - multiIMEIOption = SINGLE_MD_SINGLE_IMEI;
351   - }
352   - if (m_iC2kProject != 0 && g_sMetaComm.sIMEIOption.iImeiNums >= 2 )
353   - {
354   - multiIMEIOption = SINGLE_MD_MULTI_IMEI;
355   - }
356   - if (g_sMetaComm.eTargetType == SMART_PHONE_DUALMODEM && g_sMetaComm.sIMEIOption.iImeiNums == 2)
357   - {
358   - multiIMEIOption = DUAL_MD_DUAL_IMEI;
359   - }
360   - }
361   - else
362   - {
363   - multiIMEIOption = MULTIIMEI_RESERVE;
364   - }
365   - }
366   - spNextStage = SP_IMEI_MD_STAGE;
367   -
368   - break;
369   -
370   - case SP_IMEI_MD_STAGE:
371   -
372   - bWriteModemFail = false;
373   - for (MDIndex = 0; MDIndex < mdNums && bWriteModemFail == false; MDIndex++)
374   - {
375   - //When MDIndex = 0, database already init by EnterModemMetaToInitModemDB() function
376   - //So just need to load MDIndex >= 1 MD database
377   - if (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0)
378   - {
379   - fBeginProcess += fStep;
380   - iRet = SwitchMDByIndex(MDIndex);
381   - if (iRet != META_SUCCESS)
382   - {
383   - UpdateUIMsg("ERROR!!SwitchMDByIndex[%d] : MetaResult = %s", MDIndex, ResultToString(iRet));
384   - bWriteModemFail = true;
385   - break;
386   - }
387   - else
388   - {
389   - fBeginProcess += fStep;
390   - iRet = LoadModemDatabase(MDIndex);
391   - if (iRet != META_SUCCESS)
392   - {
393   - UpdateUIMsg("ERROR!!LoadModemDatabase[%d] : MetaResult = %s", MDIndex, ResultToString(iRet));
394   - bWriteModemFail = true;
395   - break;
396   - }
397   - }
398   - }
399   -
400   - if (g_sMetaComm.sWriteOption.bWriteBarcode && (MDIndex == 0 || (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0)))
401   - {
402   - fBeginProcess += fStep;
403   - MTRACE(g_hEBOOT_DEBUG, "Barcode[%d] = \"%s\"", MDIndex, m_sScanData.strBarcode);
404   - iRet = REQ_WriteModem_NVRAM_Start(WRITE_BARCODE, m_sScanData.strBarcode, 1);
405   - if (iRet != META_SUCCESS)
406   - {
407   - UpdateUIMsg("ERROR!! Barcode[%d] : MetaResult = %s", MDIndex, ResultToString(iRet));
408   - bWriteModemFail = true;
409   - break;
410   - }
411   - }
412   -
413   - if (g_sMetaComm.sWriteOption.bWriteIMEI && (MDIndex == 0 || (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0)))
414   - {
415   - if (multiIMEIOption == SINGLE_MD_SINGLE_IMEI || multiIMEIOption == SINGLE_MD_MULTI_IMEI)
416   - {
417   - for (int i = 0; i < g_sMetaComm.sIMEIOption.iImeiNums; i++)
418   - {
419   - fBeginProcess += fStep;
420   - IMEI_index = i;
421   - MTRACE(g_hEBOOT_DEBUG, "IMEI[%d] = \"%s\"", i, m_sScanData.strIMEI[i]);
422   -
423   - iRet = REQ_WriteModem_NVRAM_Start(WRITE_IMEI, m_sScanData.strIMEI[i], i + 1);
424   - if (iRet != META_SUCCESS)
425   - {
426   - if (m_bNeedBackupIMEI)
427   - {
428   - strncpy(g_AutoGenData.sIMEI.Next, m_strBackupIMEI, strlen(m_strBackupIMEI));
429   - }
430   -
431   - UpdateUIMsg("ERROR!! IMEI[%d] : MetaResult = %s", i, ResultToString(iRet));
432   - bWriteModemFail = true;
433   - break;
434   - }
435   - }
436   - }
437   - else if (multiIMEIOption == DUAL_MD_DUAL_IMEI)
438   - {
439   - fBeginProcess += fStep;
440   - int i = 0;
441   - i = MDIndex;
442   - IMEI_index = MDIndex;
443   - if (m_bDSDAProject)
444   - {
445   - IMEI_index = 0;
446   - }
447   -
448   - MTRACE(g_hEBOOT_DEBUG, "IMEI[%d] = \"%s\"", i, m_sScanData.strIMEI[i]);
449   - iRet = REQ_WriteModem_NVRAM_Start(WRITE_IMEI, m_sScanData.strIMEI[i], IMEI_index + 1);
450   - if (iRet != META_SUCCESS)
451   - {
452   - if (m_bNeedBackupIMEI)
453   - {
454   - strncpy(g_AutoGenData.sIMEI.Next, m_strBackupIMEI, strlen(m_strBackupIMEI));
455   - }
456   -
457   - UpdateUIMsg("ERROR!! IMEI[%d] : MetaResult = %s", i, ResultToString(iRet));
458   - bWriteModemFail = true;
459   - break;
460   - }
461   - }
462   -
463   - if (iRet == META_SUCCESS)
464   - {
465   - if ((IMEI_index + 1) == g_sMetaComm.sIMEIOption.iImeiNums)
466   - {
467   - if (g_sMetaComm.sIMEIOption.bLockIMEI)
468   - {
469   - iRet = META_NVRAM_LockDown_r(m_hMauiMetaHandle, 5000);
470   - if (iRet != META_SUCCESS)
471   - {
472   - bWriteModemFail = true;
473   - break;
474   - }
475   - }
476   - }
477   - }
478   - else
479   - {
480   - bWriteModemFail = true;
481   - break;
482   - }
483   - }//end if(g_sMetaComm.sWriteOption.bWriteIMEI)
484   - }//end for(MDIndex = 0; MDIndex < mdNums; MDIndex++)
485   -
486   - // Backup imei to SDS
487   - if (!bWriteModemFail && m_bDSDAProject)
488   - {
489   - _BOOL BackupResult = DSDA_ExternalModemBackup();
490   - if (_TRUE != BackupResult)
491   - {
492   - UpdateUIMsg("ERROR!! Backup external modem fail!");
493   - spNextStage = SP_C2K_STAGE;
494   - break;
495   - }
496   - }
497   -
498   - if (bWriteModemFail == true)
499   - {
500   - spNextStage = SP_END_STAGE;
501   - }
502   - else
503   - {
504   - spNextStage = SP_C2K_STAGE;
505   - }
506   -
507   - break;
508   -
509   - case SP_C2K_STAGE:
510   - fBeginProcess += fStep;
511   - if (g_sMetaComm.sWriteOption.bWriteMeid || g_sMetaComm.sWriteOption.bWriteEsn)
512   - {
513   - if (m_iC2kProject != 0)
514   - iRet = EnterC2KGen90();
515   - else
516   - iRet = EnterC2KGen93();
517   -
518   - if (iRet != META_SUCCESS)
519   - {
520   - spNextStage = SP_END_STAGE;
521   - break;
522   - }
523   - }
524   - spNextStage = SP_MD2AP_STAGE;
525   - break;
526   -
527   - case SP_MD2AP_STAGE:
528   -
529   - if (g_sMetaComm.sIMEIOption.bLockOtp)
530   - {
531   - iRet = LockOTP();
532   - if (iRet != 0)
533   - {
534   - spNextStage = SP_END_STAGE;
535   - break;
536   - }
537   - }
538   -
539   - fBeginProcess += fStep;
540   - iRet = ModemSwithToAPMeta();
541   - if (iRet == META_SUCCESS)
542   - {
543   - spNextStage = SP_WRITE_TEMP_STAGE;
544   - }
545   - else
546   - {
547   - spNextStage = SP_END_STAGE;
548   - }
549   - break;
550   -
551   - case SP_WRITE_TEMP_STAGE:
552   - if (QuerySpeakerCalibrationSupport() == SPMETA_DLL::META_SUCCESS && g_sMetaComm.sIMEIOption.Temp_Option.bWriteTemperature) //Query support yes or no from target
553   - {
554   - fBeginProcess += fStep;
555   - float minTemp = 20.0;
556   - float maxTemp = 30.0;
557   - float curTemp = 0.0;
558   - curTemp = atof(g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData);
559   -
560   - MTRACE(g_hEBOOT_DEBUG, "CurTemperature = \"%s\"", g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData);
561   - if ((minTemp <= curTemp) && (curTemp <= maxTemp))
562   - {
563   - iRet = REQ_WriteAP_NVRAM_Start(WRITE_TEMPERATURE, g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData, 1);
564   - if (iRet == META_SUCCESS)
565   - {
566   - spNextStage = SP_BT_ADDRESS_STAGE;
567   - }
568   - else
569   - {
570   - UpdateUIMsg("ERROR!! Audio_Temperature : MetaResult = %s", ResultToString_SP(iRet));
571   - spNextStage = SP_END_STAGE;
572   - }
573   - }
574   - else
575   - {
576   - UpdateUIMsg("Warning: Temperature must be between 20.0~30.0, please reset current temperature!!");
577   - MTRACE(g_hEBOOT_DEBUG, "Warning: Temperature must be between 20.0~30.0, please reset current temperature!!");
578   - iRet = META_FAILED;
579   - spNextStage = SP_END_STAGE;
580   - }
581   - }
582   - else
583   - {
584   - spNextStage = SP_BT_ADDRESS_STAGE;
585   - }
586   - break;
587   -
588   - case SP_BT_ADDRESS_STAGE:
589   - if (g_sMetaComm.sWriteOption.bWriteBT)
590   - {
591   - fBeginProcess += fStep;
592   - MTRACE(g_hEBOOT_DEBUG, "BT = \"%s\"", m_sScanData.strBTAddr);
593   - iRet = REQ_WriteAP_NVRAM_Start(WRITE_BT, m_sScanData.strBTAddr, 1);
594   - if (iRet == META_SUCCESS)
595   - {
596   - spNextStage = SP_WIFI_ADDRESS_STAGE;
597   - }
598   - else
599   - {
600   - UpdateUIMsg("ERROR!! BT : MetaResult = %s", ResultToString_SP(iRet));
601   - spNextStage = SP_END_STAGE;
602   - }
603   - }
604   - else
605   - {
606   - spNextStage = SP_WIFI_ADDRESS_STAGE;
607   - }
608   - break;
609   -
610   - case SP_WIFI_ADDRESS_STAGE:
611   - if (g_sMetaComm.sWriteOption.bWriteWifi)
612   - {
613   - fBeginProcess += fStep;
614   - MTRACE(g_hEBOOT_DEBUG, "Wifi = \"%s\"", m_sScanData.strWifiAddr);
615   - iRet = REQ_WriteAP_NVRAM_Start(WRITE_WIFI, m_sScanData.strWifiAddr, 1);
616   - if (iRet == META_SUCCESS)
617   - {
618   - spNextStage = SP_ETHERNET_MAC_STAGE;
619   - }
620   - else
621   - {
622   - UpdateUIMsg("ERROR!! Wifi : MetaResult = %s", ResultToString_SP(iRet));
623   - spNextStage = SP_END_STAGE;
624   - }
625   - }
626   - else
627   - {
628   - spNextStage = SP_ETHERNET_MAC_STAGE;
629   - }
630   - break;
631   -
632   - case SP_ETHERNET_MAC_STAGE:
633   - if (g_sMetaComm.sWriteOption.bWriteEthernetMac)
634   - {
635   - fBeginProcess += fStep;
636   - MTRACE(g_hEBOOT_DEBUG, "Ethernet Mac = \"%s\"", m_sScanData.strEthernetMac);
637   - iRet = REQ_WriteAP_NVRAM_Start(WRITE_ETHERNET_MAC, m_sScanData.strEthernetMac, 1);
638   - if (iRet == META_SUCCESS)
639   - {
640   - spNextStage = SP_HDCP_STAGE;
641   - }
642   - else
643   - {
644   - UpdateUIMsg("ERROR!! Ethernet Mac : MetaResult = %s", ResultToString_SP(iRet));
645   - spNextStage = SP_END_STAGE;
646   - }
647   - }
648   - else
649   - {
650   - spNextStage = SP_HDCP_STAGE;
651   - }
652   - break;
653   -
654   - case SP_HDCP_STAGE:
655   - fBeginProcess += fStep;
656   - if (g_sMetaComm.sWriteOption.bWriteHdcp)
657   - {
658   - iRet = REQ_WriteHdcpBinToAPNvram_Start(g_sMetaComm.sLoadFile.strHdcpBinPath);
659   - if (iRet == META_SUCCESS)
660   - {
661   - spNextStage = SP_DRMKEY_STAGE;
662   - }
663   - else
664   - {
665   - UpdateUIMsg("ERROR!! Hdcp : MetaResult = %s", ResultToString_SP(iRet));
666   - spNextStage = SP_END_STAGE;
667   - }
668   - }
669   - else
670   - {
671   - spNextStage = SP_DRMKEY_STAGE;
672   - }
673   - break;
674   -
675   - case SP_DRMKEY_STAGE:
676   - fBeginProcess += fStep;
677   - if (g_sMetaComm.sWriteOption.bWriteDrm)
678   - {
679   - iRet = REQ_InstallDRMKey_Start();
680   - if (iRet == META_SUCCESS)
681   - {
682   - spNextStage = SP_HDCPDATA_INSTALL_STAGE;
683   - }
684   - else
685   - {
686   - UpdateUIMsg("ERROR!! DRMKey : MetaResult = %s", ResultToString_SP(iRet));
687   - spNextStage = SP_END_STAGE;
688   - }
689   - }
690   - else
691   - {
692   - spNextStage = SP_HDCPDATA_INSTALL_STAGE;
693   - }
694   - break;
695   -
696   - case SP_HDCPDATA_INSTALL_STAGE:
697   - fBeginProcess += fStep;
698   - if (g_sMetaComm.sWriteOption.bInstallHdcpData)
699   - {
700   - iRet = REQ_InstallHdcpData_Start(g_sMetaComm.sLoadFile.strHdcpDataPath, g_sMetaComm.sLoadFile.strHdcpCekPath);
701   - if (iRet == META_SUCCESS)
702   - {
703   - spNextStage = SP_DRMKEY_MCID_STAGE;
704   - }
705   - else
706   - {
707   - UpdateUIMsg("ERROR!! HdcpData : MetaResult = %s", ResultToString_SP(iRet));
708   - spNextStage = SP_END_STAGE;
709   - }
710   - }
711   - else
712   - {
713   - spNextStage = SP_DRMKEY_MCID_STAGE;
714   - }
715   - break;
716   -
717   - case SP_DRMKEY_MCID_STAGE:
718   - fBeginProcess += fStep;
719   - if (g_sMetaComm.sWriteOption.bWriteDrmkeyMCID)
720   - {
721   - iRet = REQ_WriteDRMKeyMCID_Start(m_sScanData.strDrmkeyMCID);
722   - if (iRet == META_SUCCESS)
723   - {
724   - spNextStage = SP_BACKUPNV_TO_PC_STAGE;
725   - }
726   - else
727   - {
728   - UpdateUIMsg("ERROR!! DRMKeyMCID : MetaResult = %s", ResultToString_SP(iRet));
729   - spNextStage = SP_END_STAGE;
730   - }
731   - }
732   - else
733   - {
734   - spNextStage = SP_BACKUPNV_TO_PC_STAGE;
735   - }
736   - break;
737   -
738   - case SP_BACKUPNV_TO_PC_STAGE:
739   - if (g_sMetaComm.bCheckBackNVtoPC)
740   - {
741   - fBeginProcess += fStep;
742   - char NumFile[100] = {0};
743   - iRet = GetNvramFileName(NumFile);
744   -
745   - if (iRet == META_SUCCESS)
746   - {
747   - iRet = REQ_BackupNvram2PC_Start(NumFile);
748   - if (iRet != META_SUCCESS)
749   - {
750   - UpdateUIMsg("ERROR!! REQ_BackupNvram2PC_Start : MetaResult = %s", ResultToString_SP(iRet));
751   - spNextStage = SP_END_STAGE;
752   - }
753   - else
754   - {
755   - spNextStage = SP_BACKUP_NVRAM_STAGE;
756   - }
757   - }
758   - else
759   - {
760   - spNextStage = SP_END_STAGE;
761   - }
762   - }
763   - else
764   - {
765   - spNextStage = SP_BACKUP_NVRAM_STAGE;
766   - }
767   - break;
768   -
769   - case SP_BACKUP_NVRAM_STAGE:
770   - {
771   - fBeginProcess += fStep;
772   -
773   - iRet = REQ_BackupNvram2BinRegion_Start();
774   - if (iRet != META_SUCCESS)
775   - {
776   - m_bBackupNvramSuccess = false;
777   - UpdateUIMsg("ERROR!! BackUP : MetaResult = %s", ResultToString_SP(iRet));
778   - spNextStage = SP_END_STAGE;
779   - }
780   - else
781   - {
782   - m_bBackupNvramSuccess = true;
783   - spNextStage = SP_PRODINFO_STAGE;
784   - }
785   -
786   - break;
787   - }
788 264
789   - case SP_PRODINFO_STAGE:
790   - {
791   - if (m_bWriteProdInfo && g_sMetaComm.bSkipWriteProdInfo == false)
792   - {
793   - MTRACE(g_hEBOOT_DEBUG, "Prod_Info = \"...\"");
794   - fBeginProcess += fStep;
795   - iRet = REQ_WriteAP_PRODINFO_Start();
796   - if (iRet != META_SUCCESS)
797   - {
798   - UpdateUIMsg("ERROR!! Prod_Info : MetaResult = %s", ResultToString_SP(iRet));
799   - }
800   - }
801   - spNextStage = SP_END_STAGE;
802   -
803   - break;
804   - }
805 265 }
806 266
807   - UpdateProgress(fBeginProcess);
808 267 spStage = spNextStage;
809 268 }
810 269
... ... @@ -4122,13 +3581,12 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::EnterAPMetaMode()
4122 3581
4123 3582 if (!g_sMetaComm.bAlreadyInMeata)
4124 3583 {
4125   - UpdateUIMsg("Start searching preloader com port and handshake...");
4126   - UpdateProgress(0.08);
  3584 + UpdateUIMsg("Start searching com port and handshake...");
4127 3585
4128 3586 bootResult = ConnectWithPreloader();
4129 3587 if (bootResult != 0)
4130 3588 {
4131   - UpdateUIMsg("Searching preloader com port and handshake Fail.");
  3589 + UpdateUIMsg("Searching com port and handshake Fail.");
4132 3590
4133 3591 spMetaResult = (SPMETA_DLL::META_RESULT)bootResult;
4134 3592 return spMetaResult;
... ... @@ -4141,21 +3599,18 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::EnterAPMetaMode()
4141 3599 else
4142 3600 {
4143 3601 UpdateUIMsg("Already in Meta Mode, bypass preloader com port handshake.");
4144   - UpdateProgress(0.08);
4145 3602 }
4146 3603
4147   - UpdateUIMsg("Start searching kernel com port and handshake...");
4148   - UpdateProgress(0.10);
  3604 + //UpdateUIMsg("Start searching kernel com port and handshake...");
4149 3605
4150 3606 bootResult = ConnectWithKernelPort_Ex();
4151   - UpdateProgress(0.12);
4152 3607 if (bootResult == 0)
4153 3608 {
4154   - UpdateUIMsg("Searching kernel com port and handshake OK.");
  3609 + UpdateUIMsg("Searching com port and handshake OK.");
4155 3610 }
4156 3611 else
4157 3612 {
4158   - UpdateUIMsg("Searching kernel com port and handshake Fail.");
  3613 + UpdateUIMsg("Searching com port and handshake Fail.");
4159 3614 }
4160 3615
4161 3616 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::EnterAPMetaMode() : Enter ap meta end.");
... ... @@ -4373,7 +3828,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4373 3828
4374 3829 UpdateUIMsg("Start load and init AP database...");
4375 3830
4376   - UpdateProgress(0.06);
4377 3831
4378 3832 if (g_sMetaComm.bUsbEnable)
4379 3833 {
... ... @@ -4381,6 +3835,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4381 3835 }
4382 3836
4383 3837 EnableStartBTN(true);
  3838 + g_pMainDlg->SetTimer(1,1000,NULL);
4384 3839
4385 3840 MetaResult = (META_RESULT)EnterAPMetaMode();
4386 3841 if (MetaResult != META_SUCCESS)
... ... @@ -4529,7 +3984,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4529 3984 {
4530 3985 UpdateUIMsg("Start switch to MD meta and init Modem database...");
4531 3986
4532   - UpdateProgress(0.14);
4533 3987
4534 3988 if (!g_sMetaComm.sDBFileOption.bDBInitModem_1 && g_sMetaComm.sDBFileOption.bMDDBFromDUT)
4535 3989 {
... ... @@ -4541,7 +3995,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4541 3995 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::GetMDDBFromDUT() : end.");
4542 3996 }
4543 3997
4544   - UpdateProgress(0.18);
4545 3998
4546 3999 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::ApSwithToModemMeta_Ex(): Switch to MODEM meta from AP meta start...");
4547 4000 MetaResult = APSwithToModemMeta_Ex();
... ... @@ -4565,7 +4018,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4565 4018 }
4566 4019 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::LoadModemDatabase(): end.");
4567 4020 }
4568   - UpdateProgress(0.22);
4569 4021
4570 4022 EnableStartBTN(false);
4571 4023 UpdateUIMsg("Start loop write data to nvram...");
... ... @@ -4579,7 +4031,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4579 4031 End:
4580 4032 if (m_bStopBeforeUSBInsert == true)
4581 4033 {
4582   - UpdateProgress(0.0);
4583 4034 UpdateUIMsg("...");
4584 4035 }
4585 4036 else
... ... @@ -4606,8 +4057,13 @@ End:
4606 4057
4607 4058 if (bAnyOperationFail)
4608 4059 {
4609   - m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
4610 4060 UpdateUICountResult(FAIL);
  4061 + g_pMainDlg->mytimecount = 0;
  4062 + g_pMainDlg->KillTimer(1);
  4063 + if (g_pMainDlg->MessageBox("Test Fail!!!,please connext next phone","",MB_OK) != IDOK)
  4064 + {
  4065 + break;
  4066 + }
4611 4067 }
4612 4068 else
4613 4069 {
... ... @@ -4621,9 +4077,14 @@ End:
4621 4077 }
4622 4078 #endif
4623 4079 UpdateUICountResult(PASS);
  4080 + g_pMainDlg->mytimecount = 0;
  4081 + g_pMainDlg->KillTimer(1);
  4082 + if (g_pMainDlg->MessageBox("Test Success!!!,please connext next phone","",MB_OK) != IDOK)
  4083 + {
  4084 + break;
  4085 + }
4624 4086 }
4625 4087
4626   - UpdateProgress(1.0);
4627 4088 }
4628 4089
4629 4090 EnableStartBTN(true);
... ... @@ -5070,7 +4531,6 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
5070 4531 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] can not find C2K modem.");
5071 4532 return META_FAILED;
5072 4533 }
5073   - UpdateProgress(0.14);
5074 4534
5075 4535
5076 4536 // init c2k
... ... @@ -5105,7 +4565,6 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
5105 4565 }
5106 4566 bInited = true; // inited
5107 4567 MTRACE (g_hEBOOT_DEBUG, "[C2K] META_C2K_Init() end...");
5108   - UpdateProgress(0.18);
5109 4568
5110 4569
5111 4570 // connect to c2k
... ... @@ -5146,16 +4605,13 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
5146 4605 {
5147 4606 UpdateUIMsg("META_C2K_LoadMessage_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
5148 4607 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_LoadMessage_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
5149   - UpdateProgress(1.00);
5150 4608 goto end;
5151 4609 }
5152 4610 UpdateUIMsg("META_C2K_LoadMessage_r() : successful!");
5153 4611 MTRACE (g_hEBOOT_DEBUG, "[C2K] META_C2K_LoadMessage_r() : successful!");
5154   - UpdateProgress(0.28);
5155 4612 }
5156 4613
5157 4614 UpdateUIMsg("Start connect with C2K Meta...");
5158   - UpdateProgress(0.34);
5159 4615
5160 4616 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_ConnectWithTarget_r() start...");
5161 4617 for (i = 0; i < 20; i++)
... ... @@ -5168,13 +4624,11 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
5168 4624 {
5169 4625 UpdateUIMsg("META_C2K_ConnectWithTarget_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
5170 4626 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_ConnectWithTarget_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
5171   - UpdateProgress(1.00);
5172 4627 goto end;
5173 4628 }
5174 4629 bConnected = true; // connected
5175 4630 UpdateUIMsg("META_C2K_ConnectWithTarget_r() : successful!");
5176 4631 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_ConnectWithTarget_r() : successful!");
5177   - UpdateProgress(0.48);
5178 4632
5179 4633
5180 4634 // handshake with c2k
... ... @@ -5188,10 +4642,8 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
5188 4642 {
5189 4643 UpdateUIMsg("META_C2K_LoopbackTest_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
5190 4644 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_LoopbackTest_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
5191   - UpdateProgress(1.00);
5192 4645 goto end;
5193 4646 }
5194   - UpdateProgress(0.60);
5195 4647
5196 4648
5197 4649 // task
... ... @@ -5212,13 +4664,11 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
5212 4664 DisconnectC2KMeta();
5213 4665 DeinitC2KMeta();
5214 4666
5215   - UpdateProgress(1.00);
5216 4667
5217 4668 goto end;
5218 4669 }
5219 4670 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_FlushNvram_r() : Flaush NVRAM to Flash FFS successful!");
5220 4671 #endif
5221   - UpdateProgress(0.85);
5222 4672
5223 4673 end:
5224 4674 // disconnect
... ... @@ -5291,7 +4741,6 @@ end:
5291 4741 UpdateUIMsg("[C2K] Write MEID fail.");
5292 4742 else if (g_sMetaComm.sWriteOption.bWriteEsn)
5293 4743 UpdateUIMsg("[C2K] Write ESN fail.");
5294   - UpdateProgress(1.00);
5295 4744 }
5296 4745
5297 4746 return ret_last;
... ... @@ -5397,7 +4846,6 @@ int SmartPhoneSN::WriteMEID()
5397 4846 return ret_meta;
5398 4847 }
5399 4848 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_WriteNvram_r() : Write MEID end.");
5400   - UpdateProgress(0.70);
5401 4849
5402 4850
5403 4851 UpdateUIMsg("Read MEID for check start...");
... ... @@ -5411,7 +4859,6 @@ int SmartPhoneSN::WriteMEID()
5411 4859 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_ReadNvram_r(): Read MEID fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
5412 4860 return ret_meta;
5413 4861 }
5414   - UpdateProgress(0.75);
5415 4862
5416 4863 MTRACE(g_hEBOOT_DEBUG, "[C2K] Write MEID :%s", g_sMetaComm.sScanData.strMeid);
5417 4864 MTRACE(g_hEBOOT_DEBUG, "[C2K] Read MEID :%s", data_meid.meid);
... ... @@ -5423,7 +4870,6 @@ int SmartPhoneSN::WriteMEID()
5423 4870 }
5424 4871 UpdateUIMsg("Checking MEID succesfully!");
5425 4872 MTRACE(g_hEBOOT_DEBUG, "[C2K] Checking MEID succesfully!");
5426   - UpdateProgress(0.80);
5427 4873
5428 4874 return META_SUCCESS;
5429 4875 }
... ... @@ -5453,7 +4899,6 @@ int SmartPhoneSN::WriteESN()
5453 4899 }
5454 4900 UpdateUIMsg("META_C2K_WriteNvram_r() : Write ESN succesful!");
5455 4901 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_WriteNvram_r() : Write ESN succesful!");
5456   - UpdateProgress(0.70);
5457 4902
5458 4903 UpdateUIMsg("Read ESN for check start...");
5459 4904 MTRACE(g_hEBOOT_DEBUG, "[C2K] Read ESN for check start...");
... ... @@ -5477,7 +4922,6 @@ int SmartPhoneSN::WriteESN()
5477 4922 }
5478 4923 UpdateUIMsg("Checking Esn Successfully!");
5479 4924 MTRACE(g_hEBOOT_DEBUG, "[C2K] Checking ESN successfully!");
5480   - UpdateProgress(0.80);
5481 4925
5482 4926 return META_SUCCESS;
5483 4927 }
... ...
No preview for this file type
No preview for this file type
... ... @@ -6,7 +6,8 @@
6 6 --------------------Configuration: SN Writer - Win32 Debug--------------------
7 7 </h3>
8 8 <h3>Command Lines</h3>
9   -Creating temporary file "C:\Users\echo\AppData\Local\Temp\RSP8602.tmp" with contents
  9 +Creating command line "rc.exe /l 0x409 /fo"Debug/SN Writer.res" /d "_DEBUG" /d "_AFXDLL" "D:\workspace\intex_tool\intex_imei_write_tool\SN Writer.rc""
  10 +Creating temporary file "D:\temp\RSP3D45.tmp" with contents
10 11 [
11 12 shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Security/lib/*.lib" "./mtklib/SNFstream/lib/*.lib" "./mtklib/DebugTrace/lib/*.lib" "./mtklib/usbswitchtool/lib/*.lib" /nologo /subsystem:windows /incremental:yes /pdb:"Output/SN Writer.pdb" /debug /machine:I386 /out:"Output/SN Writer.exe" /pdbtype:sept
12 13 .\Debug\Common.obj
... ... @@ -32,8 +33,9 @@ shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Secur
32 33 .\Debug\StdAfx.obj
33 34 ".\Debug\SN Writer.res"
34 35 ]
35   -Creating command line "link.exe @C:\Users\echo\AppData\Local\Temp\RSP8602.tmp"
  36 +Creating command line "link.exe @D:\temp\RSP3D45.tmp"
36 37 <h3>Output Window</h3>
  38 +Compiling resources...
37 39 Linking...
38 40
39 41
... ...
... ... @@ -268,56 +268,60 @@ BEGIN
268 268 LTEXT "......",IDC_PWD_MSG,7,50,273,23
269 269 END
270 270
271   -IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 486, 251
  271 +IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 486, 205
272 272 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
273 273 WS_SYSMENU
274 274 EXSTYLE WS_EX_CLIENTEDGE | WS_EX_APPWINDOW
275   -CAPTION "SN Writer"
  275 +CAPTION "c"
276 276 FONT 9, "΢ÈíÑźÚ"
277 277 BEGIN
278   - EDITTEXT IDC_COUNT_TOTAL,198,139,38,13,ES_AUTOHSCROLL |
279   - ES_READONLY
280   - DEFPUSHBUTTON "Config",IDC_BTN_SYSCONFIG,63,214,30,12
281   - DEFPUSHBUTTON "Start",IDC_BTN_START,11,214,30,12
282   - DEFPUSHBUTTON "Quit",IDC_BTN_QUIT,119,214,30,12
283   - EDITTEXT IDC_COUNT_PASS,198,163,38,13,ES_AUTOHSCROLL |
284   - ES_READONLY
285   - EDITTEXT IDC_COUNT_FAIL,198,187,38,13,ES_AUTOHSCROLL |
286   - ES_READONLY
287   - LTEXT "Total:",IDC_STATIC,166,139,27,10
288   - LTEXT "Pass:",IDC_STATIC_PASS,166,163,27,10
289   - CONTROL "Progress1",IDC_PROGRESS_SN,"msctls_progress32",
290   - WS_BORDER,2,229,268,10
291   - LTEXT "Fail:",IDC_STATIC,166,187,27,10
292   - COMBOBOX IDC_COMBO_COMPORT,180,209,34,51,CBS_DROPDOWNLIST |
293   - CBS_SORT | WS_VSCROLL | WS_TABSTOP
294   - LTEXT "SW Version",IDC_STATIC,6,12,48,9
295 278 EDITTEXT IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL
296 279 PUSHBUTTON "Save",IDC_BT_SAVE_SWVER,246,10,44,15
  280 + PUSHBUTTON "Select",IDC_BTN_AP_PATH,240,40,44,12,NOT WS_TABSTOP
  281 + PUSHBUTTON "Select",IDC_BTN_BP_PATH,240,55,44,12,NOT WS_TABSTOP
  282 + DEFPUSHBUTTON "Start",IDC_BTN_START,7,179,30,12
  283 + DEFPUSHBUTTON "Config",IDC_BTN_SYSCONFIG,9,196,6,6,NOT WS_VISIBLE
  284 + DEFPUSHBUTTON "Quit",IDC_BTN_QUIT,47,179,30,12
  285 + LTEXT "Total:",IDC_STATIC,6,160,27,10
  286 + LTEXT "Pass:",IDC_STATIC_PASS,88,160,27,10
  287 + LTEXT "Fail:",IDC_STATIC,166,160,27,10
  288 + COMBOBOX IDC_COMBO_COMPORT,37,193,34,51,CBS_DROPDOWNLIST |
  289 + CBS_SORT | WS_VSCROLL
  290 + LTEXT "SW Version",IDC_STATIC,6,12,48,9
297 291 LTEXT "BP DB",IDC_STATIC,14,55,20,9
298 292 LTEXT "AP DB",IDC_STATIC,14,41,20,9
299 293 EDITTEXT IDC_STR_AP_PATH,38,38,197,13,ES_AUTOHSCROLL |
300   - ES_READONLY
  294 + ES_READONLY | NOT WS_TABSTOP
301 295 EDITTEXT IDC_STR_BP_PATH,38,54,197,13,ES_AUTOHSCROLL |
302   - ES_READONLY
303   - PUSHBUTTON "Select",IDC_BTN_AP_PATH,240,40,44,12
304   - PUSHBUTTON "Select",IDC_BTN_BP_PATH,240,55,44,12
  296 + ES_READONLY | NOT WS_TABSTOP
305 297 GROUPBOX "",IDC_STATIC,6,28,285,44
306   - CONTROL 133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,154,84,93,45
  298 + CONTROL 133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,190,83,93,45
307 299 LTEXT "SW",IDC_STATIC,6,91,11,9
308 300 LTEXT "CFT",IDC_STATIC,5,115,12,9
309   - LTEXT "SMT MMI",IDC_STATIC,5,139,30,9
310   - LTEXT "IMEI",IDC_STATIC,5,187,32,9
311   - LTEXT "QC1",IDC_STATIC,5,163,13,9
312   - EDITTEXT IDC_RSLT_SW,47,91,104,15,ES_AUTOHSCROLL | ES_READONLY
313   - EDITTEXT IDC_RSLT_CFT,47,115,104,15,ES_AUTOHSCROLL | ES_READONLY
314   - EDITTEXT IDC_RSLT_SMT,47,139,104,13,ES_AUTOHSCROLL | ES_READONLY
315   - EDITTEXT IDC_RSLT_QC,47,163,82,15,ES_AUTOHSCROLL | ES_READONLY
316   - EDITTEXT IDC_RSLT_WRITE_IMEI,47,187,82,15,ES_AUTOHSCROLL |
317   - ES_READONLY
318   - GROUPBOX "Test Result",IDC_STATIC,2,78,285,131
319   - LISTBOX IDC_LOG_LIST,293,1,193,249,LBS_NOINTEGRALHEIGHT | NOT
320   - WS_BORDER | WS_VSCROLL | WS_TABSTOP
  301 + LTEXT "SMT MMI",IDC_STATIC,64,115,23,9
  302 + LTEXT "IMEI",IDC_STATIC,7,138,32,9
  303 + LTEXT "QC1",IDC_STATIC,120,115,13,9
  304 + EDITTEXT IDC_RSLT_CFT,35,115,24,15,ES_AUTOHSCROLL | ES_READONLY |
  305 + NOT WS_TABSTOP
  306 + EDITTEXT IDC_RSLT_SMT,90,115,24,13,ES_AUTOHSCROLL | ES_READONLY |
  307 + NOT WS_TABSTOP
  308 + EDITTEXT IDC_RSLT_QC,150,115,24,15,ES_AUTOHSCROLL | ES_READONLY |
  309 + NOT WS_TABSTOP
  310 + EDITTEXT IDC_RSLT_WRITE_IMEI,49,138,214,15,ES_AUTOHSCROLL |
  311 + ES_READONLY | NOT WS_TABSTOP
  312 + GROUPBOX "Test Result",IDC_STATIC,2,78,285,96
  313 + LISTBOX IDC_LOG_LIST,293,1,193,190,LBS_NOINTEGRALHEIGHT | NOT
  314 + WS_BORDER | WS_VSCROLL
  315 + CONTROL "",IDC_COUNT_TOTAL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
  316 + 44,160,30,8,WS_EX_STATICEDGE
  317 + CONTROL "",IDC_COUNT_PASS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
  318 + 115,160,29,8,WS_EX_STATICEDGE
  319 + CONTROL "",IDC_COUNT_FAIL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
  320 + 193,160,36,8,WS_EX_STATICEDGE
  321 + CTEXT "",IDC_RSLT_SW,35,91,148,11,SS_CENTERIMAGE,
  322 + WS_EX_STATICEDGE
  323 + LTEXT "",IDC_STATIC_TIMECOUNT,119,181,61,12,SS_CENTERIMAGE,
  324 + WS_EX_CLIENTEDGE
321 325 END
322 326
323 327 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
... ... @@ -557,7 +561,7 @@ BEGIN
557 561 BEGIN
558 562 RIGHTMARGIN, 178
559 563 TOPMARGIN, 7
560   - BOTTOMMARGIN, 239
  564 + BOTTOMMARGIN, 193
561 565 END
562 566
563 567 IDD_SCANDATA_DIALOG, DIALOG
... ...
... ... @@ -96,6 +96,7 @@ CSNWriterDlg::CSNWriterDlg(CWnd* pParent /*=NULL*/)
96 96 myrslt_cft = _T("");
97 97 myrslt_sw = _T("");
98 98 myrslt_imei = _T("");
  99 + mytimecount = 0;
99 100 //}}AFX_DATA_INIT
100 101 // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
101 102 m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
... ... @@ -108,7 +109,6 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
108 109 DDX_Control(pDX, IDC_LOG_LIST, myloglist);
109 110 DDX_Control(pDX, IDC_BITMAP_RESAULT, myctrlbit);
110 111 DDX_Control(pDX, IDC_COMBO_COMPORT, m_cComPortBox);
111   - DDX_Control(pDX, IDC_PROGRESS_SN, m_ProgressSN);
112 112 DDX_Text(pDX, IDC_COUNT_TOTAL, m_strTotal);
113 113 DDX_Text(pDX, IDC_COUNT_PASS, m_strPass);
114 114 DDX_Text(pDX, IDC_COUNT_FAIL, m_strFail);
... ... @@ -169,6 +169,7 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
169 169 ON_BN_CLICKED(IDC_BTN_AP_PATH, OnBtnApPath)
170 170 ON_BN_CLICKED(IDC_BTN_BP_PATH, OnBtnBpPath)
171 171 ON_WM_SYSCOMMAND()
  172 + ON_WM_TIMER()
172 173 //}}AFX_MSG_MAP
173 174 END_MESSAGE_MAP()
174 175
... ... @@ -618,10 +619,13 @@ void CSNWriterDlg::OnBtnStart()
618 619 if (strText == "Start")
619 620 {
620 621 m_spSN.SNThread_Start();
  622 +// SetTimer(1,1000,NULL);
621 623 }
622 624 else if(strText == "Stop")
623 625 {
624 626 m_spSN.SNThread_Stop();
  627 + mytimecount = 0;
  628 + KillTimer(1);
625 629 EnableUIItem();
626 630 }
627 631 }
... ... @@ -1075,11 +1079,6 @@ void CSNWriterDlg::OnFastbootOemLock()
1075 1079 }
1076 1080
1077 1081 }
1078   -#ifdef __TOPWELL_QCTEST__
1079   -void CSNWriterDlg::OnOptionCheckQcFlag()
1080   -{
1081   -}
1082   -#endif
1083 1082
1084 1083 void CSNWriterDlg::OnBtSaveSwver()
1085 1084 {
... ... @@ -1127,3 +1126,15 @@ void CSNWriterDlg::OnBtnBpPath()
1127 1126 }
1128 1127
1129 1128
  1129 +
  1130 +void CSNWriterDlg::OnTimer(UINT nIDEvent)
  1131 +{
  1132 + CString astr_time;
  1133 + if (nIDEvent == 1)
  1134 + {
  1135 + mytimecount++;
  1136 + astr_time.Format("%d S",mytimecount);
  1137 + GetDlgItem(IDC_STATIC_TIMECOUNT)->SetWindowText(astr_time);
  1138 + }
  1139 + CDialog::OnTimer(nIDEvent);
  1140 +}
... ...
... ... @@ -86,7 +86,6 @@ protected:
86 86 afx_msg void OnEnableAutogen();
87 87 afx_msg void OnOptionCheckCalFlag();
88 88 afx_msg void OnOptionCheckFtFlag();
89   - afx_msg void OnOptionCheckQcFlag();
90 89 afx_msg void OnOptionSkipWriteProdinfo();
91 90 afx_msg void OnCheckBtwifi();
92 91 afx_msg void OnOptionCompositeDevice();
... ... @@ -95,6 +94,7 @@ protected:
95 94 afx_msg void OnBtSaveSwver();
96 95 afx_msg void OnBtnApPath();
97 96 afx_msg void OnBtnBpPath();
  97 + afx_msg void OnTimer(UINT nIDEvent);
98 98 //}}AFX_MSG
99 99 DECLARE_MESSAGE_MAP()
100 100
... ... @@ -128,6 +128,7 @@ public:
128 128 HBITMAP m_hBitmapPass;
129 129 HBITMAP m_hBitmapFail;
130 130 CFont m_font;
  131 + int mytimecount;
131 132 };
132 133
133 134 //{{AFX_INSERT_LOCATION}}
... ...
... ... @@ -211,6 +211,8 @@
211 211 #define IDC_BTN_LOG 1165
212 212 #define IDC_LOCK_OTP 1166
213 213 #define IDC_LOG_LIST 1170
  214 +#define IDC_STATIC_TIMECOUNT 1173
  215 +#define IDC_DATETIMEPICKER2 1176
214 216 #define IDR_OPTION_SWITCHTOOL 32772
215 217 #define IDR_OPTION_EXTMODEM 32773
216 218 #define IDR_OPTION_SECURITY_USB 32774
... ... @@ -242,7 +244,7 @@
242 244 #ifndef APSTUDIO_READONLY_SYMBOLS
243 245 #define _APS_NEXT_RESOURCE_VALUE 158
244 246 #define _APS_NEXT_COMMAND_VALUE 32798
245   -#define _APS_NEXT_CONTROL_VALUE 1171
  247 +#define _APS_NEXT_CONTROL_VALUE 1177
246 248 #define _APS_NEXT_SYMED_VALUE 101
247 249 #endif
248 250 #endif
... ...
Please register or login to post a comment