xiemeng / xiemeng_intex_write_tool · Commits

Commit b9d9a4353eaeed0b59c4368dd40226cbe0313cd9

Authored by xiemeng
1 parent 072e6f01

更新, 但是有问题

Inline Side-by-side
Showing 7 changed files with 180 additions and 210 deletions
... ... @@ -155,11 +155,13 @@ int SNBase::UpdateUIMsg(const char * strMsg, ...)
155 155 int iRet = 0;
156 156 char szBuf[256] = "";
157 157 va_list varg;
  158 + CString atime;
158 159
159 160 va_start(varg, strMsg);
160 161 iRet = vsprintf(szBuf, strMsg, varg);
161 162 va_end(varg);
162   - g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(szBuf));
  163 + atime.Format("[%3ds]",g_pMainDlg->mytimecount);
  164 + g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(atime+szBuf));
163 165 return iRet;
164 166 }
165 167
... ... @@ -1185,6 +1187,7 @@ void SNBase::SNThread_Init()
1185 1187 //g_pMainDlg = (CSNWriterDlg*)g_MainDlgHandle;
1186 1188
1187 1189
  1190 + UpdateUIMsg("SNThread_Init");
1188 1191 m_bNeedBackupIMEI = false;
1189 1192 memset(m_strBackupIMEI, 0, IMEI_ARRAY_LEN);
1190 1193 memset(m_sIMEISV, 0, sizeof(IMEISV_struct_T)*MAX_IMEI_NUMS);
... ...
... ... @@ -145,8 +145,9 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
145 145 switch (spStage)
146 146 {
147 147 case SP_START_STAGE:
148   - if ((m_bWriteModemNvram || (bCheckCalFlag || bCheckFtFlag)) && mdNums >= 1)
  148 + if ((m_bWriteModemNvram ) && mdNums >= 1)
149 149 {
  150 + UpdateUIMsg("WriteNvramLoop SP_START_STAGE");
150 151 //Target in AP meta mode, need to switch Modem meta
151 152 if (m_eMetaMode == SP_AP_META)
152 153 {
... ... @@ -154,7 +155,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
154 155 }
155 156 else //Target already in modem meta mode
156 157 {
157   - spNextStage = SP_CHECK_CAL_FT_FLAG_STAGE;
  158 + spNextStage = SP_BARCODE_MD_STAGE;
158 159 }
159 160 }
160 161 else
... ... @@ -164,11 +165,12 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
164 165 break;
165 166
166 167 case SP_AP2MD_STAGE:
  168 + UpdateUIMsg("WriteNvramLoop SP_AP2MD_STAGE");
167 169 fBeginProcess += fStep;
168 170 iRet = APSwithToModemMeta_Ex();
169 171 if (iRet == META_SUCCESS)
170 172 {
171   - spNextStage = SP_CHECK_CAL_FT_FLAG_STAGE;
  173 + spNextStage = SP_BARCODE_MD_STAGE;
172 174 }
173 175 else
174 176 {
... ... @@ -177,33 +179,34 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
177 179 }
178 180 break;
179 181
180   - case SP_CHECK_CAL_FT_FLAG_STAGE:
181   - {
182   - char tmpBuf[2048] = {0};
183   - iRet = REQ_ReadModem_NVRAM_Start(WRITE_BARCODE, tmpBuf, 1);
184   - if (iRet == META_SUCCESS)
185   - {
186   - bool bCheckPass = true;
187   - bCheckPass = CheckCalFinalTestStatus(tmpBuf);
188   - if (bCheckPass == true)
189   - {
190   - spNextStage = SP_BARCODE_MD_STAGE;
191   - }
192   - else
193   - {
194   - iRet = META_FAILED;
195   - spNextStage = SP_END_STAGE;
196   - }
197   - }
198   - else
199   - {
200   - UpdateUIMsg("ERROR!! Read Barcode: MetaResult = %s", ResultToString(iRet));
201   - spNextStage = SP_END_STAGE;
202   - }
203   - }
204   - break;
  182 +// case SP_CHECK_CAL_FT_FLAG_STAGE:
  183 +// {
  184 +// char tmpBuf[2048] = {0};
  185 +// iRet = REQ_ReadModem_NVRAM_Start(WRITE_BARCODE, tmpBuf, 1);
  186 +// if (iRet == META_SUCCESS)
  187 +// {
  188 +// bool bCheckPass = true;
  189 +// bCheckPass = CheckCalFinalTestStatus(tmpBuf);
  190 +// if (bCheckPass == true)
  191 +// {
  192 +// spNextStage = SP_BARCODE_MD_STAGE;
  193 +// }
  194 +// else
  195 +// {
  196 +// iRet = META_FAILED;
  197 +// spNextStage = SP_END_STAGE;
  198 +// }
  199 +// }
  200 +// else
  201 +// {
  202 +// UpdateUIMsg("ERROR!! Read Barcode: MetaResult = %s", ResultToString(iRet));
  203 +// spNextStage = SP_END_STAGE;
  204 +// }
  205 +// }
  206 +// break;
205 207
206 208 case SP_BARCODE_MD_STAGE:
  209 + UpdateUIMsg("WriteNvramLoop SP_BARCODE_MD_STAGE");
207 210 if (g_sMetaComm.sWriteOption.bWriteIMEI)
208 211 {
209 212 if (mdNums == 1 && g_sMetaComm.sIMEIOption.iImeiNums == 1)
... ... @@ -239,6 +242,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
239 242 break;
240 243
241 244 case SP_IMEI_MD_STAGE:
  245 + UpdateUIMsg("WriteNvramLoop SP_IMEI_MD_STAGE");
242 246
243 247 bWriteModemFail = false;
244 248 for (MDIndex = 0; MDIndex < mdNums && bWriteModemFail == false; MDIndex++)
... ... @@ -268,10 +272,11 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
268 272 }
269 273 }
270 274
271   - if (g_sMetaComm.sWriteOption.bWriteBarcode && (MDIndex == 0 || (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0)))
  275 + if (MDIndex == 0 || (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0))
272 276 {
273 277 fBeginProcess += fStep;
274 278 MTRACE(g_hEBOOT_DEBUG, "Barcode[%d] = \"%s\"", MDIndex, m_sScanData.strBarcode);
  279 + UpdateUIMsg("WriteNvramLoop REQ_WriteModem_NVRAM_Start WRITE_BARCODE");
275 280 iRet = REQ_WriteModem_NVRAM_Start(WRITE_BARCODE, m_sScanData.strBarcode, 1);
276 281 if (iRet != META_SUCCESS)
277 282 {
... ... @@ -281,7 +286,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
281 286 }
282 287 }
283 288
284   - if (g_sMetaComm.sWriteOption.bWriteIMEI && (MDIndex == 0 || (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0)))
  289 + if (MDIndex == 0 || (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0))
285 290 {
286 291 if (multiIMEIOption == SINGLE_MD_SINGLE_IMEI || multiIMEIOption == SINGLE_MD_MULTI_IMEI)
287 292 {
... ... @@ -291,6 +296,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
291 296 IMEI_index = i;
292 297 MTRACE(g_hEBOOT_DEBUG, "IMEI[%d] = \"%s\"", i, m_sScanData.strIMEI[i]);
293 298
  299 + UpdateUIMsg("WriteNvramLoop REQ_WriteModem_NVRAM_Start WRITE_IMEI");
294 300 iRet = REQ_WriteModem_NVRAM_Start(WRITE_IMEI, m_sScanData.strIMEI[i], i + 1);
295 301 if (iRet != META_SUCCESS)
296 302 {
... ... @@ -402,9 +408,12 @@ int SmartPhoneSN::GetSPModemInfo_Ex()
402 408 SPMETA_DLL::MODEM_QUERY_INFO_CNF pCnf;
403 409 memset(&pReq, 0, sizeof(SPMETA_DLL::MODEM_QUERY_INFO_REQ));
404 410 memset(&pCnf, 0, sizeof(SPMETA_DLL::MODEM_QUERY_INFO_CNF));
  411 + UpdateUIMsg("GetSPModemInfo_Ex");
405 412
  413 + UpdateUIMsg("SP_META_QueryIfFunctionSupportedByTarget_r");
406 414 if (SPMETA_DLL::SP_META_QueryIfFunctionSupportedByTarget_r(m_hSPMetaHandle, 5000, "SP_META_MODEM_Query_Info_r") == SPMETA_DLL::META_SUCCESS)
407 415 {
  416 + UpdateUIMsg("SP_META_MODEM_Query_Info_r");
408 417 iRet = SPMETA_DLL::SP_META_MODEM_Query_Info_r(m_hSPMetaHandle, 10000, &pReq, &pCnf);
409 418 if (iRet != META_SUCCESS)
410 419 {
... ... @@ -427,8 +436,10 @@ int SmartPhoneSN::GetSPModemInfo_Ex()
427 436 memset(&pCapabilitiesReq, 0, sizeof(pCapabilitiesReq));
428 437 memset(&pCapabilitiesCnf, 0, sizeof(pCapabilitiesCnf));
429 438
  439 + UpdateUIMsg("SP_META_QueryIfFunctionSupportedByTarget_r");
430 440 if (SPMETA_DLL::SP_META_QueryIfFunctionSupportedByTarget_r(m_hSPMetaHandle, 5000, "SP_META_MODEM_Capability_r") == SPMETA_DLL::META_SUCCESS)
431 441 {
  442 + UpdateUIMsg("SP_META_MODEM_Capability_r");
432 443 iRet = SPMETA_DLL::SP_META_MODEM_Capability_r(m_hSPMetaHandle, 10000, &pCapabilitiesReq, &pCapabilitiesCnf);
433 444 if (iRet != META_SUCCESS)
434 445 {
... ... @@ -481,8 +492,10 @@ int SmartPhoneSN::GetSPModemInfo_Ex()
481 492 memset(&pCurMDTypeReq, 0, sizeof(pCurMDTypeReq));
482 493 memset(&pCurMDTypeCnf, 0, sizeof(pCurMDTypeCnf));
483 494
  495 + UpdateUIMsg("SP_META_QueryIfFunctionSupportedByTarget_r");
484 496 if (SPMETA_DLL::SP_META_QueryIfFunctionSupportedByTarget_r(m_hSPMetaHandle, 5000, "SP_META_MODEM_Get_CurrentModemType_r") == SPMETA_DLL::META_SUCCESS)
485 497 {
  498 + UpdateUIMsg("SP_META_MODEM_Get_CurrentModemType_r");
486 499 iRet = SPMETA_DLL::SP_META_MODEM_Get_CurrentModemType_r(m_hSPMetaHandle, 10000, &pCurMDTypeReq, &pCurMDTypeCnf);
487 500 if (iRet != META_SUCCESS)
488 501 {
... ... @@ -502,8 +515,10 @@ int SmartPhoneSN::GetSPModemInfo_Ex()
502 515 memset(&pMDImgTypeReq, 0, sizeof(pMDImgTypeReq));
503 516 memset(&pMDImgTypeCnf, 0, sizeof(pMDImgTypeCnf));
504 517
  518 + UpdateUIMsg("SP_META_QueryIfFunctionSupportedByTarget_r");
505 519 if (SPMETA_DLL::SP_META_QueryIfFunctionSupportedByTarget_r(m_hSPMetaHandle, 5000, "SP_META_MODEM_Query_MDIMGType_r") == SPMETA_DLL::META_SUCCESS)
506 520 {
  521 + UpdateUIMsg("SP_META_MODEM_Query_MDIMGType_r");
507 522 iRet = SPMETA_DLL::SP_META_MODEM_Query_MDIMGType_r(m_hSPMetaHandle, 10000, &pMDImgTypeReq, &pMDImgTypeCnf);
508 523 if (iRet != META_SUCCESS)
509 524 {
... ... @@ -562,6 +577,7 @@ int SmartPhoneSN::GetSPModemInfo_Ex()
562 577 memset(&pDLReq, 0, sizeof(SPMETA_DLL::MODEM_QUERY_DOWNLOAD_STATUS_REQ));
563 578 memset(&pDLCnf, 0, sizeof(SPMETA_DLL::MODEM_QUERY_DOWNLOAD_STATUS_CNF));
564 579
  580 + UpdateUIMsg("SP_META_MODEM_Query_Download_Status_r");
565 581 iRet = SPMETA_DLL::SP_META_MODEM_Query_Download_Status_r (m_hSPMetaHandle, 80000, &pDLReq, &pDLCnf);
566 582 if (iRet != META_SUCCESS)
567 583 {
... ... @@ -585,6 +601,7 @@ int SmartPhoneSN::TryToOpenSPKernelComport(int KernelCom_Num)
585 601
586 602 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::TryToOpenSPKernelComport(): Try to open kernel comport until it ready, KernelCom_Num = %d...", KernelCom_Num);
587 603
  604 + UpdateUIMsg("TryToOpenSPKernelComport");
588 605 sz_error = new char[1024];
589 606 memset(sz_error, 0, 1024);
590 607 sprintf(tmp_com, "\\\\.\\COM%d", KernelCom_Num);
... ... @@ -630,6 +647,7 @@ int SmartPhoneSN::ConnectWithKernelPort_Ex()
630 647 SPMETA_DLL::META_ConnectByUSB_Report spUSBConnReport;
631 648
632 649 // kernel comport filter white list
  650 + UpdateUIMsg("ConnectWithKernelPort_Ex");
633 651 cPortHelper.SetFilter(SP_WHITE_LIST, g_sMetaComm.sPortFilter.strKernelFilter);
634 652 psCOMProperty = cPortHelper.GetPorts(true);
635 653 memset(&spUSBConnReq, 0, sizeof(spUSBConnReq));
... ... @@ -643,6 +661,7 @@ int SmartPhoneSN::ConnectWithKernelPort_Ex()
643 661 // timeout unit: s, but m_tMetaReq_Ex.ms_connect_timeout unit is ms
644 662 int iTimeout = m_tMetaReq_Ex.ms_connect_timeout / 1000;
645 663 MTRACE(g_hEBOOT_DEBUG, "SP_BROM::SP_GetUSBCOMPortWithFilter(): enum kernel comport...");
  664 + UpdateUIMsg("SP_GetUSBCOMPortWithFilter");
646 665 iRet = SP_GetUSBCOMPortWithFilter(cPortHelper.GetFilter(), psCOMProperty, _FALSE, m_pMetaStopFlag, iTimeout);
647 666 if (iRet != 0)
648 667 {
... ... @@ -694,6 +713,7 @@ int SmartPhoneSN::ConnectWithKernelPort_Ex()
694 713 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::TryToOpenSPKernelComport(): Try to open kernel com port ok.");
695 714
696 715 MTRACE(g_hEBOOT_DEBUG, "SPMETA_DLL::SP_META_ConnectInMetaModeByUSB_r(): Enter AP meta mode by comport %d...", m_nKernelComport);
  716 + UpdateUIMsg("SP_META_ConnectInMetaModeByUSB_r");
697 717 iRet = SPMETA_DLL::SP_META_ConnectInMetaModeByUSB_r (m_hSPMetaHandle, &spUSBConnReq, m_pMetaStopFlag, &spUSBConnReport);
698 718 if (iRet == SPMETA_DLL::META_SUCCESS)
699 719 {
... ... @@ -803,6 +823,7 @@ int SmartPhoneSN::ConnectWithPreloader()
803 823 int iRet = 0;
804 824 unsigned int eType; //0:BoorROMUSB,1:PreloaderUSB
805 825
  826 + UpdateUIMsg("ConnectWithPreloader");
806 827 cPortHelper.SetFilter(SP_WHITE_LIST, g_sMetaComm.sPortFilter.strBromFilter, BootROMUSB);
807 828 cPortHelper.SetFilter(SP_WHITE_LIST, g_sMetaComm.sPortFilter.strPreloaderFilter, PreloaderUSB, true);
808 829
... ... @@ -814,6 +835,7 @@ int SmartPhoneSN::ConnectWithPreloader()
814 835 else
815 836 {
816 837 int iTimeout = m_stModeArg.m_uTimeout / 1000; //timeout unit: s, but m_stModeArg.m_uTimeout unit is ms
  838 + UpdateUIMsg("SP_GetIncrementCOMPortWithFilter");
817 839 iRet = SP_GetIncrementCOMPortWithFilter(cPortHelper.GetFilter(), &sCOMProperty, NULL, _TRUE, m_pMetaStopFlag, iTimeout);
818 840 if (0 == iRet)
819 841 {
... ... @@ -861,6 +883,7 @@ int SmartPhoneSN::ConnectWithPreloader()
861 883 else if (PreloaderUSB == eType)
862 884 {
863 885 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::ConnectWithPreloader(): Get preloader comport successfully, comport = %d", m_stModeArg.m_uPortNumber);
  886 + UpdateUIMsg("SP_Preloader_BootMode");
864 887 iRet = SP_Preloader_BootMode(&m_stModeArg);
865 888 if (iRet == 0)
866 889 {
... ... @@ -888,6 +911,7 @@ void SmartPhoneSN::APMetaHandle_DeInit()
888 911 SPMETA_DLL::META_RESULT SmartPhoneSN::APMetaHandle_Init()
889 912 {
890 913 SPMETA_DLL::META_RESULT spMetaResult = SPMETA_DLL::META_SUCCESS;
  914 + UpdateUIMsg("APMetaHandle_Init");
891 915 spMetaResult = SPMETA_DLL::SP_META_GetAvailableHandle ( &m_hSPMetaHandle );
892 916 if (spMetaResult != SPMETA_DLL::META_SUCCESS )
893 917 {
... ... @@ -896,6 +920,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::APMetaHandle_Init()
896 920 }
897 921 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::SP_META_GetAvailableHandle(): Get available AP handle success");
898 922
  923 + UpdateUIMsg("SP_META_Init_r");
899 924 spMetaResult = SPMETA_DLL::SP_META_Init_r (m_hSPMetaHandle , NULL);
900 925 if ( spMetaResult != META_SUCCESS)
901 926 {
... ... @@ -953,6 +978,8 @@ void SmartPhoneSN::MetaHandle_DeInit()
953 978 META_RESULT SmartPhoneSN::ModemMetaHandle_Init()
954 979 {
955 980 META_RESULT meta_result = META_SUCCESS;
  981 + UpdateUIMsg("ModemMetaHandle_Init");
  982 + UpdateUIMsg("META_GetAvailableHandle");
956 983 meta_result = META_GetAvailableHandle( &m_hMauiMetaHandle );
957 984 if (meta_result != META_SUCCESS)
958 985 {
... ... @@ -971,6 +998,7 @@ META_RESULT SmartPhoneSN::ModemMetaHandle_Init()
971 998 meta_result = META_Init_Ex_2_r( m_hMauiMetaHandle, NULL, MdQueryHandler, NULL, NULL, NULL, MdTypeSwitchHandler, NULL);
972 999 }
973 1000 */
  1001 + UpdateUIMsg("META_Init_Ex_2_r");
974 1002 meta_result = META_Init_Ex_2_r( m_hMauiMetaHandle, NULL, MdQueryHandler, (void*)&m_sMdInfo, NULL, NULL, MdTypeSwitchHandler, NULL);
975 1003 if (meta_result != META_SUCCESS)
976 1004 {
... ... @@ -986,6 +1014,7 @@ META_RESULT SmartPhoneSN::MetaHandle_Init()
986 1014 {
987 1015 META_RESULT meta_result;
988 1016 SPMETA_DLL::META_RESULT spMetaResult;
  1017 + UpdateUIMsg("MetaHandle_Init");
989 1018
990 1019 if (m_hMauiMetaHandle == INVALID_META_HANDLE)
991 1020 {
... ... @@ -1275,11 +1304,13 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_WriteAP_PRODINFO_Start()
1275 1304 SPMETA_DLL::FT_NVRAM_READ_REQ sNVRAM_ReadReq;
1276 1305 SPMETA_DLL::FT_NVRAM_READ_CNF sNVRAM_ReadCnf;
1277 1306
  1307 + UpdateUIMsg("REQ_WriteAP_PRODINFO_Start");
1278 1308 memset(&sNVRAM_WriteReq, 0, sizeof(SPMETA_DLL::FT_NVRAM_WRITE_REQ));
1279 1309 memset(&sNVRAM_ReadReq, 0, sizeof(SPMETA_DLL::FT_NVRAM_READ_REQ));
1280 1310 memset(&sNVRAM_ReadCnf, 0, sizeof(SPMETA_DLL::FT_NVRAM_READ_CNF));
1281 1311
1282 1312 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::SP_META_NVRAM_GetRecLen(): Start to get nvram struct size via LID = \"%s\"...", pLID);
  1313 + UpdateUIMsg("SP_META_NVRAM_GetRecLen");
1283 1314 meta_result = SPMETA_DLL::SP_META_NVRAM_GetRecLen(pLID, &iWriteBufSize);
1284 1315 if ( SPMETA_DLL::META_SUCCESS != meta_result)
1285 1316 {
... ... @@ -1311,6 +1342,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_WriteAP_PRODINFO_Start()
1311 1342 }
1312 1343
1313 1344 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_ReadFromAPNVRAM(): Start to read nvram data...");
  1345 + UpdateUIMsg("REQ_ReadFromAPNVRAM");
1314 1346 meta_result = REQ_ReadFromAPNVRAM (&sNVRAM_ReadReq, &sNVRAM_ReadCnf);
1315 1347 if (meta_result != SPMETA_DLL::META_SUCCESS )
1316 1348 {
... ... @@ -1319,6 +1351,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_WriteAP_PRODINFO_Start()
1319 1351 }
1320 1352
1321 1353 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::ConductProdInfoData(): Conduct Prod_Info nvram data start...");
  1354 + UpdateUIMsg("ConductProdInfoData");
1322 1355 meta_result = ConductProdInfoData(sNVRAM_ReadCnf.buf, iWriteBufSize);
1323 1356 if (meta_result != SPMETA_DLL::META_SUCCESS)
1324 1357 {
... ... @@ -1339,6 +1372,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_WriteAP_PRODINFO_Start()
1339 1372 m_sNVRAM_OPID = 1;
1340 1373
1341 1374 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_WriteToAPNVRAM(): Start to write nvram data...");
  1375 + UpdateUIMsg("REQ_WriteToAPNVRAM");
1342 1376 meta_result = REQ_WriteToAPNVRAM(sNVRAM_WriteReq);
1343 1377 if (meta_result != SPMETA_DLL::META_SUCCESS )
1344 1378 {
... ... @@ -1349,6 +1383,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_WriteAP_PRODINFO_Start()
1349 1383
1350 1384 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_WriteToAPNVRAM(): Read nvram data for check start...");
1351 1385 memset(sNVRAM_ReadCnf.buf, 0 , sNVRAM_ReadCnf.len);
  1386 + UpdateUIMsg("REQ_ReadFromAPNVRAM");
1352 1387 meta_result = REQ_ReadFromAPNVRAM (&sNVRAM_ReadReq, &sNVRAM_ReadCnf);
1353 1388 if (meta_result != SPMETA_DLL::META_SUCCESS )
1354 1389 {
... ... @@ -3096,6 +3131,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::LoadAPDatabase()
3096 3131 const char * dbpath = NULL;
3097 3132 unsigned long db;
3098 3133
  3134 + UpdateUIMsg("LoadAPDatabase");
3099 3135 if (g_sMetaComm.sDBFileOption.bAPDBFromDUT && g_sMetaComm.sDBFileOption.strAPDbPath_DUT[0] != '\0')
3100 3136 dbpath = g_sMetaComm.sDBFileOption.strAPDbPath_DUT;
3101 3137 else
... ... @@ -3109,6 +3145,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::LoadAPDatabase()
3109 3145 }
3110 3146
3111 3147 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::LoadAPDatabase(): Start to init AP database, DB path = %s", dbpath);
  3148 + UpdateUIMsg("SP_META_NVRAM_Init_r");
3112 3149 MetaResult = SPMETA_DLL::SP_META_NVRAM_Init_r(m_hSPMetaHandle, dbpath, &db);
3113 3150 if ( MetaResult == SPMETA_DLL::META_SUCCESS)
3114 3151 {
... ... @@ -3143,6 +3180,7 @@ META_RESULT SmartPhoneSN::LoadModemDatabase(int MDindex)
3143 3180 const char *pStrMDDbpath = NULL;
3144 3181 unsigned long db = 0;
3145 3182
  3183 + UpdateUIMsg("LoadModemDatabase");
3146 3184 switch (MDindex)
3147 3185 {
3148 3186 case 0:
... ... @@ -3186,6 +3224,7 @@ META_RESULT SmartPhoneSN::LoadModemDatabase(int MDindex)
3186 3224 {
3187 3225 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::META_NVRAM_Init_Ex_r(): start to init MD[%d] database, DB path = \"%s\"...",
3188 3226 MDindex, pStrMDDbpath);
  3227 + UpdateUIMsg("META_NVRAM_Init_Ex_r");
3189 3228 meta_result = META_NVRAM_Init_Ex_r(m_hMauiMetaHandle, MDindex, pStrMDDbpath, &db);
3190 3229 pFuncName = "META_NVRAM_Init_Ex_r";
3191 3230 }
... ... @@ -3204,6 +3243,7 @@ META_RESULT SmartPhoneSN::LoadModemDatabase(int MDindex)
3204 3243
3205 3244 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::META_NVRAM_Init_Ex_Mdtype_r(): start to init MD[%d] database, DB path = \"%s\"...",
3206 3245 MDindex, pStrMDDbpath);
  3246 + UpdateUIMsg("META_NVRAM_Init_Ex_Mdtype_r");
3207 3247 meta_result = META_NVRAM_Init_Ex_Mdtype_r(m_hMauiMetaHandle, MDindex, m_sMdInfo.activeMdTypeIdx, pStrMDDbpath, &db);
3208 3248 pFuncName = "META_NVRAM_Init_Ex_Mdtype_r";
3209 3249 }
... ... @@ -3560,6 +3600,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::EnterAPMetaMode()
3560 3600 int bootResult = 0;
3561 3601
3562 3602 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::EnterAPMetaMode() : Enter ap meta start...");
  3603 + UpdateUIMsg("EnterAPMetaMode");
3563 3604
3564 3605 if (!g_sMetaComm.bAlreadyInMeata)
3565 3606 {
... ... @@ -3929,6 +3970,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3929 3970 }
3930 3971 }
3931 3972
  3973 + UpdateUIMsg("SP_META_QueryIfFunctionSupportedByTarget_r");
3932 3974 SPMetaResult = SPMETA_DLL::SP_META_QueryIfFunctionSupportedByTarget_r(m_hSPMetaHandle, 500, "SP_META_ENCRYPTED_Support_r");
3933 3975 if (SPMetaResult == SPMETA_DLL::META_SUCCESS)
3934 3976 {
... ... @@ -3991,6 +4033,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3991 4033
3992 4034
3993 4035 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::ApSwithToModemMeta_Ex(): Switch to MODEM meta from AP meta start...");
  4036 + UpdateUIMsg("APSwithToModemMeta_Ex");
3994 4037 MetaResult = APSwithToModemMeta_Ex();
3995 4038 if (MetaResult != META_SUCCESS)
3996 4039 {
... ... @@ -4023,6 +4066,9 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4023 4066 }
4024 4067
4025 4068 End:
  4069 +
  4070 + g_pMainDlg->KillTimer(1);
  4071 + g_pMainDlg->mytimecount = 0;
4026 4072 if (m_bStopBeforeUSBInsert == true)
4027 4073 {
4028 4074 UpdateUIMsg("...");
... ... @@ -4913,6 +4959,7 @@ bool SmartPhoneSN::QueryEncryptionSupport(int * MetaHandle )
4913 4959
4914 4960 SPMETA_DLL::CRYPTFS_QUERYSUPPORT_CNF cryptfs_Support_cnf;
4915 4961 SPMETA_DLL::META_RESULT MetaResult;
  4962 + UpdateUIMsg("SP_META_ENCRYPTED_Support_r");
4916 4963 MetaResult = SPMETA_DLL::SP_META_ENCRYPTED_Support_r(*MetaHandle, 60000, &cryptfs_Support_cnf);
4917 4964
4918 4965 if ((MetaResult == META_SUCCESS) && (cryptfs_Support_cnf.support == 1))
... ...
... ... @@ -200,6 +200,7 @@
200 200 #define IDC_STATIC_BARCODE 1174
201 201 #define IDC_BUTTON1 1175
202 202 #define IDC_BUTTON2 1176
  203 +#define IDC_CHECK1 1177
203 204 #define IDR_OPTION_SWITCHTOOL 32772
204 205 #define IDR_OPTION_EXTMODEM 32773
205 206 #define IDR_OPTION_SECURITY_USB 32774
... ... @@ -231,7 +232,7 @@
231 232 #ifndef APSTUDIO_READONLY_SYMBOLS
232 233 #define _APS_NEXT_RESOURCE_VALUE 158
233 234 #define _APS_NEXT_COMMAND_VALUE 32798
234   -#define _APS_NEXT_CONTROL_VALUE 1177
  235 +#define _APS_NEXT_CONTROL_VALUE 1178
235 236 #define _APS_NEXT_SYMED_VALUE 101
236 237 #endif
237 238 #endif
... ...
... ... @@ -53,7 +53,7 @@ BSC32=bscmake.exe
53 53 # ADD BSC32 /nologo
54 54 LINK32=link.exe
55 55 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
56   -# ADD LINK32 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 /machine:I386 /out:"Output/setting_flag.exe"
  56 +# ADD LINK32 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 /machine:I386 /out:"..\intex_tool\flag_setting.exe"
57 57 # SUBTRACT LINK32 /pdb:none
58 58
59 59 !ELSEIF "$(CFG)" == "SN Writer - Win32 Debug"
... ... @@ -80,7 +80,7 @@ BSC32=bscmake.exe
80 80 # ADD BSC32 /nologo
81 81 LINK32=link.exe
82 82 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
83   -# ADD LINK32 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 /debug /machine:I386 /pdbtype:sept
  83 +# ADD LINK32 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 /debug /machine:I386 /out:"..\intex_tool\flag_setting.exe" /pdbtype:sept
84 84 # SUBTRACT LINK32 /pdb:none /incremental:no
85 85
86 86 !ENDIF
... ... @@ -92,30 +92,6 @@ LINK32=link.exe
92 92 # Begin Group "Source Files"
93 93
94 94 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
95   -# Begin Group "Common_SRC"
96   -
97   -# PROP Default_Filter ""
98   -# Begin Source File
99   -
100   -SOURCE=.\Common\Common.cpp
101   -# End Source File
102   -# End Group
103   -# Begin Group "Exec_SRC"
104   -
105   -# PROP Default_Filter ""
106   -# Begin Source File
107   -
108   -SOURCE=.\Execute\FPexc.cpp
109   -# End Source File
110   -# Begin Source File
111   -
112   -SOURCE=.\Execute\SNbase.cpp
113   -# End Source File
114   -# Begin Source File
115   -
116   -SOURCE=.\Execute\SPexc.cpp
117   -# End Source File
118   -# End Group
119 95 # Begin Group "MtkLib_SRC"
120 96
121 97 # PROP Default_Filter ""
... ... @@ -156,69 +132,37 @@ SOURCE=.\MtkLib\Security\src\SLA.cpp
156 132 # End Source File
157 133 # End Group
158 134 # End Group
159   -# Begin Group "Form_SRC"
160   -
161   -# PROP Default_Filter ""
162   -# Begin Group "FileSel_SRC"
163   -
164   -# PROP Default_Filter ""
165 135 # Begin Source File
166 136
167   -SOURCE=.\Form\FileSel\fileseldlg.cpp
  137 +SOURCE=.\Form\About\AboutSNDlg.cpp
168 138 # End Source File
169   -# End Group
170   -# Begin Group "Identify_SRC"
171   -
172   -# PROP Default_Filter ""
173 139 # Begin Source File
174 140
175   -SOURCE=.\Form\Identify\ChgPasswdDlg.cpp
  141 +SOURCE=.\Form\AutoGen\autogendlg.cpp
176 142 # End Source File
177 143 # Begin Source File
178 144
179   -SOURCE=.\Form\Identify\VerifyPasswdDlg.cpp
  145 +SOURCE=.\Form\Identify\ChgPasswdDlg.cpp
180 146 # End Source File
181   -# End Group
182   -# Begin Group "ScanData_SRC"
183   -
184   -# PROP Default_Filter ""
185 147 # Begin Source File
186 148
187   -SOURCE=.\Form\ScanData\ScanData.cpp
  149 +SOURCE=.\Common\Common.cpp
188 150 # End Source File
189   -# End Group
190   -# Begin Group "SystemConfig_SRC"
191   -
192   -# PROP Default_Filter ""
193 151 # Begin Source File
194 152
195   -SOURCE=.\Form\SystemConfig\SystemConfig.cpp
  153 +SOURCE=.\Encryption.cpp
196 154 # End Source File
197   -# End Group
198   -# Begin Group "About_SRC"
199   -
200   -# PROP Default_Filter ""
201 155 # Begin Source File
202 156
203   -SOURCE=.\Form\About\AboutSNDlg.cpp
  157 +SOURCE=.\Form\FileSel\fileseldlg.cpp
204 158 # End Source File
205   -# End Group
206   -# Begin Group "AutoGen_SRC"
207   -
208   -# PROP Default_Filter ""
209 159 # Begin Source File
210 160
211   -SOURCE=.\Form\AutoGen\autogendlg.cpp
  161 +SOURCE=.\Execute\FPexc.cpp
212 162 # End Source File
213   -# End Group
214   -# End Group
215   -# Begin Group "Extra_SRC"
216   -
217   -# PROP Default_Filter ""
218   -# End Group
219 163 # Begin Source File
220 164
221   -SOURCE=.\Encryption.cpp
  165 +SOURCE=.\Form\ScanData\ScanData.cpp
222 166 # End Source File
223 167 # Begin Source File
224 168
... ... @@ -230,37 +174,29 @@ SOURCE=".\SN WriterDlg.cpp"
230 174 # End Source File
231 175 # Begin Source File
232 176
233   -SOURCE=".\StdAfx.cpp"
234   -# ADD CPP /Yc
  177 +SOURCE=.\Execute\SNbase.cpp
235 178 # End Source File
236   -# End Group
237   -# Begin Group "Header Files"
238   -
239   -# PROP Default_Filter "h;hpp;hxx;hm;inl"
240   -# Begin Group "Common_HDR"
241   -
242   -# PROP Default_Filter ""
243 179 # Begin Source File
244 180
245   -SOURCE=.\Common\Common.h
  181 +SOURCE=.\Execute\SPexc.cpp
246 182 # End Source File
247   -# End Group
248   -# Begin Group "Exec_HDR"
249   -
250   -# PROP Default_Filter ""
251 183 # Begin Source File
252 184
253   -SOURCE=.\Execute\FPexc.h
  185 +SOURCE=".\StdAfx.cpp"
  186 +# ADD CPP /Yc
254 187 # End Source File
255 188 # Begin Source File
256 189
257   -SOURCE=.\Execute\SNbase.h
  190 +SOURCE=.\Form\SystemConfig\SystemConfig.cpp
258 191 # End Source File
259 192 # Begin Source File
260 193
261   -SOURCE=.\Execute\SPexc.h
  194 +SOURCE=.\Form\Identify\VerifyPasswdDlg.cpp
262 195 # End Source File
263 196 # End Group
  197 +# Begin Group "Header Files"
  198 +
  199 +# PROP Default_Filter "h;hpp;hxx;hm;inl"
264 200 # Begin Group "MtkLib_HDR"
265 201
266 202 # PROP Default_Filter ""
... ... @@ -413,85 +349,73 @@ SOURCE=.\MtkLib\USBSwitchTool\inc\USBSwitchDLLibrary.h
413 349 # End Source File
414 350 # End Group
415 351 # End Group
416   -# Begin Group "Form_HDR"
417   -
418   -# PROP Default_Filter ""
419   -# Begin Group "FileSel_HDR"
  352 +# Begin Group "Extra_HDR"
420 353
421 354 # PROP Default_Filter ""
  355 +# End Group
422 356 # Begin Source File
423 357
424   -SOURCE=.\Form\FileSel\fileseldlg.h
  358 +SOURCE=.\Form\About\AboutSNDlg.h
425 359 # End Source File
426   -# End Group
427   -# Begin Group "Identify_HDR"
  360 +# Begin Source File
428 361
429   -# PROP Default_Filter ""
  362 +SOURCE=.\Form\AutoGen\autogendlg.h
  363 +# End Source File
430 364 # Begin Source File
431 365
432 366 SOURCE=.\Form\Identify\ChgPasswdDlg.h
433 367 # End Source File
434 368 # Begin Source File
435 369
436   -SOURCE=.\Form\Identify\VerifyPasswdDlg.h
  370 +SOURCE=.\Common\Common.h
437 371 # End Source File
438   -# End Group
439   -# Begin Group "ScanData_HDR"
440   -
441   -# PROP Default_Filter ""
442 372 # Begin Source File
443 373
444   -SOURCE=.\Form\ScanData\ScanData.h
  374 +SOURCE=.\Encryption.h
445 375 # End Source File
446   -# End Group
447   -# Begin Group "SystemConfig_HDR"
448   -
449   -# PROP Default_Filter ""
450 376 # Begin Source File
451 377
452   -SOURCE=.\Form\SystemConfig\SystemConfig.h
  378 +SOURCE=.\Form\FileSel\fileseldlg.h
453 379 # End Source File
454   -# End Group
455   -# Begin Group "About_HDR"
  380 +# Begin Source File
456 381
457   -# PROP Default_Filter ""
  382 +SOURCE=.\Execute\FPexc.h
  383 +# End Source File
458 384 # Begin Source File
459 385
460   -SOURCE=.\Form\About\AboutSNDlg.h
  386 +SOURCE=.\Resource.h
461 387 # End Source File
462   -# End Group
463   -# Begin Group "AutoGen_HDR"
  388 +# Begin Source File
464 389
465   -# PROP Default_Filter ""
  390 +SOURCE=.\Form\ScanData\ScanData.h
  391 +# End Source File
466 392 # Begin Source File
467 393
468   -SOURCE=.\Form\AutoGen\autogendlg.h
  394 +SOURCE=".\SN Writer.h"
469 395 # End Source File
470   -# End Group
471   -# End Group
472   -# Begin Group "Extra_HDR"
  396 +# Begin Source File
473 397
474   -# PROP Default_Filter ""
475   -# End Group
  398 +SOURCE=".\SN WriterDlg.h"
  399 +# End Source File
476 400 # Begin Source File
477 401
478   -SOURCE=.\Encryption.h
  402 +SOURCE=.\Execute\SNbase.h
479 403 # End Source File
480 404 # Begin Source File
481 405
482   -SOURCE=.\Resource.h
  406 +SOURCE=.\Execute\SPexc.h
483 407 # End Source File
484 408 # Begin Source File
485 409
486   -SOURCE=".\SN Writer.h"
  410 +SOURCE=".\StdAfx.h"
487 411 # End Source File
488 412 # Begin Source File
489 413
490   -SOURCE=".\SN WriterDlg.h"
  414 +SOURCE=.\Form\SystemConfig\SystemConfig.h
491 415 # End Source File
492 416 # Begin Source File
493 417
494   -SOURCE=".\StdAfx.h"
  418 +SOURCE=.\Form\Identify\VerifyPasswdDlg.h
495 419 # End Source File
496 420 # End Group
497 421 # Begin Group "Resource Files"
... ...
... ... @@ -268,7 +268,7 @@ BEGIN
268 268 LTEXT "......",IDC_PWD_MSG,7,50,273,23
269 269 END
270 270
271   -IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 290, 156
  271 +IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 294, 223
272 272 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
273 273 WS_SYSMENU
274 274 EXSTYLE WS_EX_APPWINDOW
... ... @@ -276,34 +276,35 @@ CAPTION "SN Writer"
276 276 FONT 10, "System"
277 277 BEGIN
278 278 LTEXT "ComPort:",IDC_STATIC,0,9,43,9,0,WS_EX_RIGHT
279   - PUSHBUTTON "Config",IDC_BTN_SYSCONFIG,195,5,33,13
280   - DEFPUSHBUTTON "Start",IDC_BTN_START,121,5,33,13
281   - PUSHBUTTON "Quit",IDC_BTN_QUIT,159,5,33,13
  279 + PUSHBUTTON "Config",IDC_BTN_SYSCONFIG,5,72,33,13,WS_DISABLED
  280 + DEFPUSHBUTTON "Start",IDC_BTN_START,41,38,33,13
  281 + PUSHBUTTON "Quit",IDC_BTN_QUIT,40,56,33,13
282 282 LTEXT "Target Type:",IDC_STATIC,0,23,43,9,0,WS_EX_RIGHT
283 283 COMBOBOX IDC_COMBO_COMPORT,48,6,68,51,CBS_DROPDOWNLIST | CBS_SORT |
284 284 WS_VSCROLL | WS_TABSTOP
285 285 COMBOBOX IDC_COMBO_TARGET_TYPE,48,20,68,63,CBS_DROPDOWNLIST |
286 286 CBS_SORT | WS_VSCROLL | WS_TABSTOP
287   - PUSHBUTTON "Button1",IDC_BTN_INDITE,232,0,33,18,BS_BITMAP
288   - LTEXT "CFT",IDC_STATIC,0,50,14,8
289   - LTEXT "SMT",IDC_STATIC,0,67,16,8
290   - LTEXT "QC",IDC_STATIC,0,84,11,8
291   - LTEXT "IMEI1",IDC_STATIC,0,101,20,8
292   - COMBOBOX IDC_COMBO_CFT,32,50,52,79,CBS_DROPDOWNLIST | WS_VSCROLL |
  287 + PUSHBUTTON "Button1",IDC_BTN_INDITE,76,37,43,34,BS_BITMAP
  288 + LTEXT "CFT",IDC_STATIC,133,6,14,8
  289 + LTEXT "SMT",IDC_STATIC,133,23,16,8
  290 + LTEXT "QC",IDC_STATIC,133,40,11,8
  291 + LTEXT "IMEI1",IDC_STATIC,133,57,20,8
  292 + COMBOBOX IDC_COMBO_CFT,165,6,52,79,CBS_DROPDOWNLIST | WS_VSCROLL |
293 293 WS_TABSTOP
294   - COMBOBOX IDC_COMBO_SMT,32,67,52,79,CBS_DROPDOWNLIST | WS_VSCROLL |
  294 + COMBOBOX IDC_COMBO_SMT,165,23,52,79,CBS_DROPDOWNLIST | WS_VSCROLL |
295 295 WS_TABSTOP
296   - COMBOBOX IDC_COMBO_QC,32,84,52,79,CBS_DROPDOWNLIST | WS_VSCROLL |
  296 + COMBOBOX IDC_COMBO_QC,165,40,52,79,CBS_DROPDOWNLIST | WS_VSCROLL |
297 297 WS_TABSTOP
298   - LISTBOX IDC_LIST1,121,19,161,111,LBS_NOINTEGRALHEIGHT | NOT
  298 + LISTBOX IDC_LIST1,0,107,285,101,LBS_NOINTEGRALHEIGHT | NOT
299 299 WS_BORDER | WS_VSCROLL | WS_TABSTOP
300   - EDITTEXT IDC_EDIT_IMEI1,32,99,78,14,ES_AUTOHSCROLL
301   - LTEXT "IMEI2",IDC_STATIC,0,117,20,8
302   - EDITTEXT IDC_EDIT_IMEI2,32,115,78,14,ES_AUTOHSCROLL
303   - LTEXT "",IDC_STATIC_BARCODE,1,135,284,16,SS_CENTERIMAGE,
  300 + EDITTEXT IDC_EDIT_IMEI1,165,55,118,14,ES_AUTOHSCROLL
  301 + LTEXT "IMEI2",IDC_STATIC,133,73,20,8
  302 + EDITTEXT IDC_EDIT_IMEI2,165,71,118,14,ES_AUTOHSCROLL
  303 + LTEXT "",IDC_STATIC_BARCODE,0,93,284,12,SS_CENTERIMAGE,
304 304 WS_EX_STATICEDGE
305   - PUSHBUTTON "AP",IDC_BUTTON1,10,33,26,14
306   - PUSHBUTTON "BP",IDC_BUTTON2,51,33,26,14
  305 + PUSHBUTTON "AP",IDC_BUTTON1,5,38,33,14
  306 + PUSHBUTTON "BP",IDC_BUTTON2,5,55,33,14
  307 + GROUPBOX "Setting",IDC_STATIC,0,0,123,90
307 308 END
308 309
309 310 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
... ... @@ -541,7 +542,9 @@ BEGIN
541 542
542 543 IDD_SNWRITER_DIALOG, DIALOG
543 544 BEGIN
  545 + RIGHTMARGIN, 290
544 546 TOPMARGIN, 7
  547 + BOTTOMMARGIN, 171
545 548 END
546 549
547 550 IDD_SCANDATA_DIALOG, DIALOG
... ...
... ... @@ -85,14 +85,15 @@ CSNWriterDlg::CSNWriterDlg(CWnd* pParent /*=NULL*/)
85 85 : CDialog(CSNWriterDlg::IDD, pParent)
86 86 {
87 87 //{{AFX_DATA_INIT(CSNWriterDlg)
88   - myintcft = -1;
89   - myintqc = -1;
90   - myintsmt = -1;
  88 + myintcft = 1;
  89 + myintqc = 1;
  90 + myintsmt = 1;
91 91 mystrimei1 = _T("");
92 92 mystrimei2 = _T("");
93 93 mybarcode = _T("");
94 94 my_str_ap_path = _T("");
95 95 my_str_bp_path = _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);
... ... @@ -112,17 +113,12 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
112 113 DDX_CBIndex(pDX, IDC_COMBO_QC, myintqc);
113 114 DDX_CBIndex(pDX, IDC_COMBO_SMT, myintsmt);
114 115 DDX_Text(pDX, IDC_EDIT_IMEI1, mystrimei1);
  116 + DDV_MaxChars(pDX, mystrimei1, 15);
115 117 DDX_Text(pDX, IDC_EDIT_IMEI2, mystrimei2);
  118 + DDV_MaxChars(pDX, mystrimei2, 15);
116 119 DDX_Text(pDX, IDC_STATIC_BARCODE, mybarcode);
117 120 //}}AFX_DATA_MAP
118 121
119   -#ifdef _BITMAP_BTN_
120   - DDX_Control(pDX, IDC_BTN_INDITE, m_InditeBTN);
121   -
122   -#else
123   - DDX_Control(pDX, IDC_BTN_INDITE, m_InditeBTN);
124   -#endif
125   -
126 122 DDX_Control(pDX, IDC_BTN_START, m_StartBTN);
127 123 DDX_Control(pDX, IDC_BTN_QUIT, m_QuitBTN);
128 124 DDX_Control(pDX, IDC_BTN_SYSCONFIG, m_SystemCfgBTN);
... ... @@ -164,9 +160,10 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
164 160 ON_COMMAND(IDR_OPTION_COMPOSITE_DEVICE, OnOptionCompositeDevice)
165 161 ON_COMMAND(IDR_BACKNV_TOPC, OnBacknvTopc)
166 162 ON_COMMAND(IDR_OEM_LOCK, OnFastbootOemLock)
167   - ON_WM_SYSCOMMAND()
168 163 ON_BN_CLICKED(IDC_BUTTON1, OnButton1)
169 164 ON_BN_CLICKED(IDC_BUTTON2, OnButton2)
  165 + ON_WM_SYSCOMMAND()
  166 + ON_WM_TIMER()
170 167 //}}AFX_MSG_MAP
171 168 END_MESSAGE_MAP()
172 169
... ... @@ -201,9 +198,9 @@ BOOL CSNWriterDlg::OnInitDialog()
201 198 SetIcon(m_hIcon, FALSE); // Set small icon
202 199
203 200 SetWindowText(g_strToolVersion);
204   - myctrlcft.SetCurSel(0);
205   - myctrlsmt.SetCurSel(0);
206   - myctrlqc.SetCurSel(0);
  201 + myctrlcft.SetCurSel(1);
  202 + myctrlsmt.SetCurSel(1);
  203 + myctrlqc.SetCurSel(1);
207 204 GetDlgItem(IDC_EDIT_IMEI1)->SetWindowText("868817019971777");
208 205 GetDlgItem(IDC_EDIT_IMEI2)->SetWindowText("868817019970985");
209 206
... ... @@ -224,7 +221,6 @@ BOOL CSNWriterDlg::OnInitDialog()
224 221
225 222 m_hBitmapFail = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_FAIL));
226 223 m_hBitmapPass = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_PASS));
227   - ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
228 224
229 225
230 226
... ... @@ -442,34 +438,10 @@ void CSNWriterDlg::PopupMsgBox(const char* strTilte, UINT uType, const char* str
442 438
443 439 void CSNWriterDlg::GetIndicatorPos(CRect &rect)
444 440 {
445   - ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->GetWindowRect(&rect);
446 441 }
447 442
448 443 void CSNWriterDlg::UpdateOperateResult(WriteNvram_Status_e eWriteStatus)
449 444 {
450   -#ifdef _BITMAP_BTN_
451   - switch (eWriteStatus)
452   - {
453   - case FAIL:
454   - ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_SHOW);
455   - m_InditeBTN.SetBitmap(m_hBitmapFail);
456   - break;
457   -
458   - case PASS:
459   - ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_SHOW);
460   - m_InditeBTN.SetBitmap(m_hBitmapPass);
461   - break;
462   -
463   - case NORMAL:
464   - ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
465   - break;
466   -
467   - case CANCEL:
468   - default:
469   - //Do nothing
470   - break;
471   - }
472   -#endif
473 445 }
474 446
475 447 void CSNWriterDlg::GetUIItem()
... ... @@ -590,6 +562,7 @@ HCURSOR CSNWriterDlg::OnQueryDragIcon()
590 562 void CSNWriterDlg::OnBtnStart()
591 563 {
592 564 // TODO: Add your control notification handler code here
  565 + myloglist.ResetContent();
593 566 OnSelchangeComboTargetType();
594 567 OnSelchangeComboComport();
595 568 E_TARGET_TYPE eTargetType = GetTargetType();
... ... @@ -605,7 +578,9 @@ void CSNWriterDlg::OnBtnStart()
605 578 }
606 579 else
607 580 {
  581 +
608 582 m_spSN.SNThread_Start();
  583 + SetTimer(1,1000,NULL);
609 584 }
610 585 }
611 586 else if(strText == "Stop")
... ... @@ -616,6 +591,8 @@ void CSNWriterDlg::OnBtnStart()
616 591 }
617 592 else
618 593 {
  594 + KillTimer(1);
  595 + mytimecount = 0;
619 596 m_spSN.SNThread_Stop();
620 597 }
621 598
... ... @@ -1097,3 +1074,16 @@ void CSNWriterDlg::OnButton2()
1097 1074 strcpy(g_sMetaComm.sDBFileOption.strMD1Dbpath,my_str_bp_path.GetBuffer(my_str_bp_path.GetLength()));
1098 1075
1099 1076 }
  1077 +
  1078 +
  1079 +
  1080 +void CSNWriterDlg::OnTimer(UINT nIDEvent)
  1081 +{
  1082 + // TODO: Add your message handler code here and/or call default
  1083 + if (nIDEvent == 1)
  1084 + {
  1085 + mytimecount++;
  1086 + }
  1087 +
  1088 + CDialog::OnTimer(nIDEvent);
  1089 +}
... ...
... ... @@ -89,6 +89,7 @@ protected:
89 89 afx_msg void OnFastbootOemLock();
90 90 afx_msg void OnButton1();
91 91 afx_msg void OnButton2();
  92 + afx_msg void OnTimer(UINT nIDEvent);
92 93 //}}AFX_MSG
93 94 DECLARE_MESSAGE_MAP()
94 95
... ... @@ -130,6 +131,7 @@ public:
130 131 CFont m_font;
131 132 CString my_str_ap_path;
132 133 CString my_str_bp_path;
  134 + int mytimecount;
133 135 };
134 136
135 137 //{{AFX_INSERT_LOCATION}}
... ...
Please register or login to post a comment