Echo / InterlockingTool · Commits

Commit f9737ec2814a533f5796c4fb0654c22927dfe8a1

Authored by xiemeng
1 parent 995accca

把写号工具从master独立出来做一个分支

Inline Side-by-side
Showing 26 changed files with 1196 additions and 960 deletions
... ... @@ -98,7 +98,7 @@ IniData_struct g_IniData[] =
98 98 {"Check FinalTest flag Enable", (bool*)&g_sMetaComm.bCheckFtFlag, INI_BOOLEAN},
99 99 #ifdef __TOPWELL_QCTEST__
100 100 {"Check QCTest flag Enable", (bool*)&g_sMetaComm.bCheckQCFlag, INI_BOOLEAN},
101   - //{"QCTest_flag_index", (bool*)&g_sMetaComm.QCFlag_index, INI_INTEGER},
  101 + {"QCTest_flag_index", (bool*)&g_sMetaComm.QCFlag_index, INI_INTEGER},
102 102 {"Check_SW_VER", (char*)&g_sMetaComm.check_sw_ver, INI_STRING},
103 103 #endif
104 104 // C2K Modem
... ... @@ -921,10 +921,8 @@ int InitSNIni()
921 921 initStatus = 0;
922 922 }
923 923
924   - #ifdef __TOPWELL_QCTEST__
925   - //g_sMetaComm.bCheckQCFlag = true;
926   - #endif
927 924 AuthHandle_Init();
  925 + g_sMetaComm.bCheckQCFlag = true;
928 926
929 927 return initStatus;
930 928
... ... @@ -998,7 +996,7 @@ bool SPScertInit(const char *strSPScertFilePath)
998 996
999 997 E_TARGET_TYPE GetTargetType()
1000 998 {
1001   - return g_sMetaComm.eTargetType;
  999 + return SMART_PHONE;//g_sMetaComm.eTargetType;
1002 1000 }
1003 1001
1004 1002 bool CheckFileSize( const char *strFilePath, const long fileSize )
... ...
... ... @@ -277,7 +277,7 @@ typedef struct {
277 277 bool bCheckFtFlag;
278 278 #ifdef __TOPWELL_QCTEST__
279 279 bool bCheckQCFlag;
280   - // UINT QCFlag_index;
  280 + UINT QCFlag_index;
281 281 char check_sw_ver[255];
282 282 #endif
283 283 bool bCheckBTWifi;
... ... @@ -338,7 +338,11 @@ typedef enum
338 338 SP_CHECK_CAL_FT_FLAG_STAGE,
339 339 SP_BARCODE_MD_STAGE,
340 340 SP_IMEI_MD_STAGE,
  341 + // <<XIEMENG
  342 + #ifdef __TOPWELL_QCTEST__
341 343 SP_IMEI_RD_STAGE,
  344 + #endif
  345 + // >>XIEMENG
342 346 SP_AP2MD_STAGE,
343 347 SP_C2K_STAGE,
344 348 SP_MD2AP_STAGE,
... ...
... ... @@ -932,8 +932,10 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
932 932 EnableStartBTN(false);
933 933
934 934 SNThread_Init();
  935 + UpdateProgress(0.05);
935 936
936 937 SetupMetaModeParameters();
  938 + UpdateProgress(0.10);
937 939
938 940 EnableStartBTN(true);
939 941
... ... @@ -944,6 +946,7 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
944 946 UpdateUIMsg("EnterModemMeta() : MetaResult = %s", ResultToString(MetaResult));
945 947 goto End;
946 948 }
  949 + UpdateProgress(0.15);
947 950
948 951 UpdateUIMsg("Start load and init database...");
949 952 MetaResult = LoadModemDatabase(0);
... ... @@ -954,6 +957,7 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
954 957 PopupMsgBox("Error", MB_OK|MB_ICONERROR, "LoadModemDatabase() : MetaResult = %s", ResultToString(MetaResult));
955 958 goto End;
956 959 }
  960 + UpdateProgress(0.20);
957 961
958 962 /*
959 963 META_MISC_GetRID_r(m_hMauiMetaHandle, 5000, (unsigned char*)strChipID,16);
... ... @@ -965,6 +969,7 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
965 969 */
966 970
967 971 EnableStartBTN(false);
  972 + UpdateProgress(0.22);
968 973 UpdateUIMsg("Start loop write data to nvram...");
969 974 MetaResult = WriteNvramLoop();
970 975 if (MetaResult != META_SUCCESS)
... ... @@ -976,13 +981,14 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
976 981 End:
977 982 if (m_bStopBeforeUSBInsert == true)
978 983 {
  984 + UpdateProgress(0.0);
979 985 UpdateUIMsg("...");
980 986 }
981 987 else
982 988 {
983 989 if (bAnyOperationFail)
984 990 {
985   -// m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
  991 + m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
986 992 UpdateUICountResult(FAIL);
987 993 }
988 994 else
... ... @@ -1000,6 +1006,7 @@ End:
1000 1006
1001 1007 ExitModemMeta();
1002 1008
  1009 + UpdateProgress(1.0);
1003 1010 }
1004 1011
1005 1012 EnableStartBTN(true);
... ...
... ... @@ -151,23 +151,22 @@ 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 154 }
158 155
159 156 int SNBase::UpdateUIMsg(const char * strMsg, ...)
160 157 {
161 158 int iRet = 0;
162 159 char szBuf[256] = "";
163   - CString atime;
164 160 va_list varg;
  161 + CString atime;
165 162
166 163 va_start(varg, strMsg);
167 164 iRet = vsprintf(szBuf, strMsg, varg);
168 165 va_end(varg);
169 166 atime.Format("[%2dS]",g_pMainDlg->mytimecount);
170   - g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(atime+strMsg));
  167 +
  168 +// g_pMainDlg->SetDlgItemText(IDC_OPERATE_INFO, szBuf);
  169 + g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(atime+szBuf));
171 170
172 171 return iRet;
173 172 }
... ... @@ -181,8 +180,7 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
181 180 char strTotal[20] = {0};
182 181 char strPass[20] = {0};
183 182 char strFail[20] = {0};
184   -
185   -
  183 +
186 184 //For the user click 'STOP' button before USB still not insert
187 185 if (m_bStopBeforeUSBInsert == true)
188 186 {
... ... @@ -205,29 +203,6 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
205 203 g_pMainDlg->SetDlgItemText(IDC_COUNT_PASS, strPass);
206 204 g_pMainDlg->SetDlgItemText(IDC_COUNT_FAIL, strFail);
207 205
208   -#if 1
209   - g_pMainDlg->SetDlgItemText(IDC_RSLT_SW, g_pMainDlg->myrslt_sw);
210   - g_pMainDlg->SetDlgItemText(IDC_RSLT_CFT, g_pMainDlg->myrslt_cft);
211   - g_pMainDlg->SetDlgItemText(IDC_RSLT_SMT, g_pMainDlg->myrslt_smt);
212   - g_pMainDlg->SetDlgItemText(IDC_RSLT_QC, g_pMainDlg->myrslt_qc);
213   -#endif
214   - switch (eWriteStatus)
215   - {
216   - case FAIL:
217   - g_pMainDlg->myctrlbit.ShowWindow(SW_SHOW);
218   - g_pMainDlg->myctrlbit.SetBitmap(g_pMainDlg->m_hBitmapFail);
219   - break;
220   - case PASS:
221   - g_pMainDlg->myctrlbit.ShowWindow(SW_SHOW);
222   - g_pMainDlg->myctrlbit.SetBitmap(g_pMainDlg->m_hBitmapPass);
223   - break;
224   - case CANCEL:
225   - case NORMAL:
226   - g_pMainDlg->myctrlbit.ShowWindow(SW_HIDE);
227   - break;
228   - }
229   -
230   -
231 206 UpdateMainDlgUI(true, eWriteStatus);
232 207 }
233 208
... ... @@ -250,6 +225,9 @@ void SNBase::UpdateMainDlgUI(bool bEnable, WriteNvram_Status_e eWriteStatus)
250 225
251 226 }
252 227
  228 +void SNBase::UpdateProgress(double dPercent)
  229 +{
  230 +}
253 231
254 232 void SNBase::PopupMsgBox(const char* strTilte, UINT uType, const char* strMsg, ...)
255 233 {
... ... @@ -348,59 +326,18 @@ bool SNBase::CheckCalFinalTestStatus(const char* strBarcode)
348 326 }
349 327 }
350 328
  329 + if (strBarcode[55] != 49)
  330 + {
  331 + UpdateUIMsg("MMITest Flag : fail!!");
  332 + return false;
  333 + }
  334 +
351 335 MTRACE(g_hEBOOT_DEBUG, "SNBase::CheckCalFinalTestStatus(): Check calibration & nsft flag Pass!!");
352 336
353 337 MTRACE(g_hEBOOT_DEBUG, "SNBase::CheckCalFinalTestStatus(): Check calibration & nsft flag end...");
354 338 return true;
355 339 }
356 340
357   -
358   -
359   -bool SNBase::Check_some_barcode(const char* strBarcode)
360   -{
361   - MTRACE(g_hEBOOT_DEBUG, "SNBase::CheckCalFinalTestStatus(): Check calibration & nsft flag start...");
362   -
363   - if (strBarcode[55] == '1')
364   - {
365   - g_pMainDlg->myrslt_smt= _T("PASS");
366   - UpdateUIMsg("MMI test PASS");
367   - }
368   - else if (strBarcode[55] == '0')
369   - {
370   - g_pMainDlg->myrslt_smt= _T("FAIL");
371   - UpdateUIMsg("MMI test FAIL");
372   - }
373   - else
374   - {
375   - g_pMainDlg->myrslt_smt= _T("UnTested");
376   - UpdateUIMsg("MMI test UnTest");
377   - }
378   -
379   -
380   -
381   - if(strBarcode[60] == '1' && strBarcode[61] == '0' && strBarcode[62] == 'P')
382   - {
383   - g_pMainDlg->myrslt_cft =_T("PASS");
384   - UpdateUIMsg("CFT test PASS");
385   - }
386   - else if(strBarcode[60] == '0' && strBarcode[61] == '1' && strBarcode[62] == 'F')
387   - {
388   - g_pMainDlg->myrslt_cft =_T("FAIL");
389   - UpdateUIMsg("CFT test FAIL");
390   - }
391   - else
392   - {
393   - g_pMainDlg->myrslt_cft =_T("UnTested");
394   - UpdateUIMsg("CFT test UnTest");
395   - }
396   -
397   - return true;
398   -
399   -
400   -}
401   -
402   -
403   -
404 341 CheckFinalTestFlag_Status_e SNBase::CheckFinalTestStatus(const char* strBarcode)
405 342 {
406 343 CheckFinalTestFlag_Status_e eCheckFTFlag = FT_FLAG_PASS;
... ... @@ -1270,8 +1207,8 @@ void SNBase::SNThread_Init()
1270 1207 //Get main dialog handle
1271 1208 //g_pMainDlg = (CSNWriterDlg*)g_MainDlgHandle;
1272 1209
1273   -// m_Process = &(g_pMainDlg->m_ProgressSN);
1274   -// SetProgress();
  1210 + // m_Process = &(g_pMainDlg->m_ProgressSN);
  1211 + //SetProgress();
1275 1212
1276 1213 m_bNeedBackupIMEI = false;
1277 1214 memset(m_strBackupIMEI, 0, IMEI_ARRAY_LEN);
... ... @@ -1311,4 +1248,5 @@ void SNBase::SNThread_Start()
1311 1248 void SNBase::SNThread_Stop()
1312 1249 {
1313 1250 g_iMetaStopFlag = BOOT_STOP;
  1251 + g_pMainDlg->myloglist.ResetContent();
1314 1252 }
... ...
... ... @@ -98,6 +98,7 @@ 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);
101 102 virtual void SetProgress();
102 103
103 104 virtual META_RESULT ConductBarcodeData(char *pOutData, unsigned short RID_para, char *pInDatabuf, int bufSize);
... ... @@ -117,7 +118,6 @@ protected:
117 118 virtual CheckCalFlag_Status_e CheckCalibrationStatus(const char* strBarcode);
118 119 virtual CheckFinalTestFlag_Status_e CheckFinalTestStatus(const char* strBarcode);
119 120 virtual bool CheckCalFinalTestStatus(const char* strBarcode);
120   - virtual bool Check_some_barcode(const char* strBarcode);
121 121 virtual void PopupMsgBox(const char* strTilte, UINT uType, const char* strMsg, ...);
122 122 virtual bool NeedScanData();
123 123
... ... @@ -137,11 +137,11 @@ public:
137 137 void EnableStartBTN(bool bEnable = true);
138 138
139 139 protected:
140   -// CProgressCtrl *m_Process;
  140 + CProgressCtrl *m_Process;
141 141 UINT m_iProcessRange;
142 142 bool m_bBackupNvramSuccess;
143 143 };
144 144
145 145 typedef META_RESULT (SNBase::*pConductDataFunc)(char *pOutData, unsigned short RID_para, char *pInDatabuf, int bufSize);
146 146
147   -#endif
  147 +#endif
\ No newline at end of file
... ...
... ... @@ -19,6 +19,8 @@
19 19
20 20
21 21 extern CSNWriterDlg *g_pMainDlg;
  22 +extern byte g_QC_value_from_phone;// ´ÓÊÖ»úÖжÁµ½µÄQCÖµ
  23 +
22 24
23 25 static const GUID GUID_PORT_CLASS_USB2SER = {0x4D36E978L, 0xE325, 0x11CE, {0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18}};
24 26
... ... @@ -100,66 +102,24 @@ void SmartPhoneSN::SPInit()
100 102 }
101 103 }
102 104
103   -#if 0
104   -int SmartPhoneSN::getLastIMEIdigit(CString strIMEI)
105   -{
106   - int imei1 = (strIMEI[0]-'0');
107   - int imei2 = 2*(strIMEI[1]-'0');
108   - int imei3 = (strIMEI[2]-'0');
109   - int imei4 = 2*(strIMEI[3]-'0');
110   - int imei5 = (strIMEI[4]-'0');
111   - int imei6 = 2*(strIMEI[5]-'0');
112   - int imei7 = (strIMEI[6]-'0');
113   - int imei8 = 2*(strIMEI[7]-'0');
114   - int imei9 = (strIMEI[8]-'0');
115   - int imei10 = 2*(strIMEI[9]-'0');
116   - int imei11 = (strIMEI[10]-'0');
117   - int imei12 = 2*(strIMEI[11]-'0');
118   - int imei13 = (strIMEI[12]-'0');
119   - int imei14 = 2*(strIMEI[13]-'0');
120   -
121   - int ret = imei1 +
122   - (imei2/10)+
123   - (imei2%10)+
124   - imei3+
125   - (imei4/10)+
126   - (imei4%10)+
127   - imei5+
128   - (imei6/10)+
129   - (imei6%10)+
130   - imei7+
131   - (imei8/10)+
132   - (imei8%10)+
133   - imei9+
134   - (imei10/10)+
135   - (imei10%10)+
136   - imei11+
137   - (imei12/10)+
138   - (imei12%10)+
139   - imei13+
140   - (imei14/10)+
141   - (imei14%10);
142   -
143   - return (10 - ret % 10) % 10;
144   -}
145   -#endif
146   -
147 105 META_RESULT SmartPhoneSN::WriteNvramLoop()
148 106 {
149 107 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::WriteNvramLoop() start...");
150   -
  108 +
151 109 SMART_PHONE_STAGE_e spStage = SP_START_STAGE;
152 110 SMART_PHONE_STAGE_e spNextStage = SP_END_STAGE;
153 111 META_RESULT MetaResult = META_SUCCESS;
154 112 MULTIIMEI_OPTION_e multiIMEIOption = SINGLE_MD_SINGLE_IMEI;
155   -
156   - int iRet = 0,iRet1 = 0,iRet2 = 0,iRetcft = 0,option = 0;
157   - double fBeginProcess = 0.25,fStep = 0.04;
  113 +
  114 + int iRet = 0;
  115 + int option = 0;
  116 + double fBeginProcess = 0.25;
  117 + double fStep = 0.04;
158 118 m_bBackupNvramSuccess = false;
159   -
  119 +
160 120 bool bCheckCalFlag = g_sMetaComm.bCheckCalFlag;
161 121 bool bCheckFtFlag = g_sMetaComm.bCheckFtFlag;
162   -
  122 +
163 123 int mdNums = 1;
164 124 int MDIndex = 0;
165 125 int IMEI_index = 0;
... ... @@ -180,7 +140,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
180 140 {
181 141 mdNums = m_sMdInfo.number_of_md;
182 142 }
183   -
  143 +
184 144 while ((spStage != SP_END_STAGE) && (*m_pMetaStopFlag != BOOT_STOP))
185 145 {
186 146 //g_pMainDlg->ShowTemperatureOnUI();
... ... @@ -204,7 +164,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
204 164 spNextStage = SP_WRITE_TEMP_STAGE;
205 165 }
206 166 break;
207   -
  167 +
208 168 case SP_AP2MD_STAGE:
209 169 fBeginProcess += fStep;
210 170 iRet = APSwithToModemMeta_Ex();
... ... @@ -218,132 +178,521 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
218 178 spNextStage = SP_END_STAGE;
219 179 }
220 180 break;
221   -
  181 +
222 182 case SP_CHECK_CAL_FT_FLAG_STAGE:
223   -#ifdef __TOPWELL_QCTEST__
224   - if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag || g_sMetaComm.bCheckQCFlag)
225   -#else
226   - if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag)
227   -#endif
228   - {
229   - char tmpBuf[2048] = {0};
230   - iRetcft = REQ_ReadModem_NVRAM_Start(WRITE_BARCODE, tmpBuf, 1);
231   - if (iRetcft == META_SUCCESS)
232   - {
233   - bool bCheckPass = true;
234   - bCheckPass = Check_some_barcode(tmpBuf);
235   - if (bCheckPass == true)
236   - {
237   - spNextStage = SP_IMEI_RD_STAGE;
238   - }
239   - else
240   - {
241   - iRetcft = META_FAILED;
242   - spNextStage = SP_END_STAGE;
243   - }
244   - }
245   - else
246   - {
247   - UpdateUIMsg("ERROR!! Read Barcode: MetaResult = %s", ResultToString(iRetcft));
248   - spNextStage = SP_END_STAGE;
249   - }
250   - }
251   - else
252   - {
253   - spNextStage = SP_BARCODE_MD_STAGE;
254   - }
255   - break;
256   - case SP_IMEI_RD_STAGE:
257   - {
258   - CString str_imei;
259   - char a_imei_ary[16];
260   - char a_imei_ary2[16];
261   - char tmpBuf1[20] = {0};
262   - char tmpBuf2[20] = {0};
263   - META_RESULT calc_imei1 = META_SUCCESS;
264   - META_RESULT calc_imei2 = META_SUCCESS;
265   - unsigned short checksum_v;
266   - // CString IMEI1_validity;
267   - // CString IMEI2_validity;
268   -
269   - iRet1 = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf1, 1);
270   - iRet2 = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf2, 2);
271   -
272   - if(tmpBuf1[0]== -1) iRet = META_FAILED;
273   - if(tmpBuf2[0]== -1) iRet2 =META_FAILED;
274   -
275   -
276   - if (iRet1 == META_SUCCESS || iRet2 == META_SUCCESS)
  183 + // <<XIEMENG
  184 + #ifdef __TOPWELL_QCTEST__
  185 + if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag || g_sMetaComm.bCheckQCFlag)
  186 + #else
  187 + if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag)
  188 + #endif
  189 + // >>XIEMENG
  190 + {
  191 + char tmpBuf[2048] = {0};
  192 + iRet = REQ_ReadModem_NVRAM_Start(WRITE_BARCODE, tmpBuf, 1);
  193 + if (iRet == META_SUCCESS)
  194 + {
  195 + bool bCheckPass = true;
  196 + bCheckPass = CheckCalFinalTestStatus(tmpBuf);
  197 + if (bCheckPass == true && g_QC_value_from_phone == 1)
  198 + {
  199 + spNextStage = SP_BARCODE_MD_STAGE;
  200 + }
  201 + else
  202 + {
  203 + iRet = META_FAILED;
  204 + spNextStage = SP_END_STAGE;
  205 + }
  206 + }
  207 + else
  208 + {
  209 + UpdateUIMsg("ERROR!! Read Barcode: MetaResult = %s", ResultToString(iRet));
  210 + spNextStage = SP_END_STAGE;
  211 + }
  212 + }
  213 + else
  214 + {
  215 + spNextStage = SP_BARCODE_MD_STAGE;
  216 + }
  217 + break;
  218 +
  219 + case SP_BARCODE_MD_STAGE:
  220 + if (g_sMetaComm.sWriteOption.bWriteIMEI)
  221 + {
  222 + if (mdNums == 1 && g_sMetaComm.sIMEIOption.iImeiNums == 1)
  223 + {
  224 + multiIMEIOption = SINGLE_MD_SINGLE_IMEI;
  225 + }
  226 + else if (mdNums == 1 && g_sMetaComm.sIMEIOption.iImeiNums >= 2)
  227 + {
  228 + multiIMEIOption = SINGLE_MD_MULTI_IMEI;
  229 + }
  230 + else if (mdNums == 2)
  231 + {
  232 + if (m_iC2kProject != 0 && g_sMetaComm.sIMEIOption.iImeiNums == 1)
  233 + {
  234 + multiIMEIOption = SINGLE_MD_SINGLE_IMEI;
  235 + }
  236 + if (m_iC2kProject != 0 && g_sMetaComm.sIMEIOption.iImeiNums >= 2 )
  237 + {
  238 + multiIMEIOption = SINGLE_MD_MULTI_IMEI;
  239 + }
  240 + if (g_sMetaComm.eTargetType == SMART_PHONE_DUALMODEM && g_sMetaComm.sIMEIOption.iImeiNums == 2)
  241 + {
  242 + multiIMEIOption = DUAL_MD_DUAL_IMEI;
  243 + }
  244 + }
  245 + else
  246 + {
  247 + multiIMEIOption = MULTIIMEI_RESERVE;
  248 + }
  249 + }
  250 + spNextStage = SP_IMEI_MD_STAGE;
  251 +
  252 + break;
  253 +
  254 + case SP_IMEI_MD_STAGE:
  255 + bWriteModemFail = false;
  256 + for (MDIndex = 0; MDIndex < mdNums && bWriteModemFail == false; MDIndex++)
  257 + {
  258 + //When MDIndex = 0, database already init by EnterModemMetaToInitModemDB() function
  259 + //So just need to load MDIndex >= 1 MD database
  260 + if (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0)
  261 + {
  262 + fBeginProcess += fStep;
  263 + iRet = SwitchMDByIndex(MDIndex);
  264 + if (iRet != META_SUCCESS)
  265 + {
  266 + UpdateUIMsg("ERROR!!SwitchMDByIndex[%d] : MetaResult = %s", MDIndex, ResultToString(iRet));
  267 + bWriteModemFail = true;
  268 + break;
  269 + }
  270 + else
  271 + {
  272 + fBeginProcess += fStep;
  273 + iRet = LoadModemDatabase(MDIndex);
  274 + if (iRet != META_SUCCESS)
  275 + {
  276 + UpdateUIMsg("ERROR!!LoadModemDatabase[%d] : MetaResult = %s", MDIndex, ResultToString(iRet));
  277 + bWriteModemFail = true;
  278 + break;
  279 + }
  280 + }
  281 + }
  282 +
  283 + if (g_sMetaComm.sWriteOption.bWriteBarcode && (MDIndex == 0 || (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0)))
  284 + {
  285 + fBeginProcess += fStep;
  286 + MTRACE(g_hEBOOT_DEBUG, "Barcode[%d] = \"%s\"", MDIndex, m_sScanData.strBarcode);
  287 + iRet = REQ_WriteModem_NVRAM_Start(WRITE_BARCODE, m_sScanData.strBarcode, 1);
  288 + if (iRet != META_SUCCESS)
  289 + {
  290 + UpdateUIMsg("ERROR!! Barcode[%d] : MetaResult = %s", MDIndex, ResultToString(iRet));
  291 + bWriteModemFail = true;
  292 + break;
  293 + }
  294 + }
  295 +
  296 + if (g_sMetaComm.sWriteOption.bWriteIMEI && (MDIndex == 0 || (mdNums >= 2 && MDIndex >= 1 && m_iC2kProject == 0)))
  297 + {
  298 + if (multiIMEIOption == SINGLE_MD_SINGLE_IMEI || multiIMEIOption == SINGLE_MD_MULTI_IMEI)
  299 + {
  300 + for (int i = 0; i < g_sMetaComm.sIMEIOption.iImeiNums; i++)
  301 + {
  302 + fBeginProcess += fStep;
  303 + IMEI_index = i;
  304 + MTRACE(g_hEBOOT_DEBUG, "IMEI[%d] = \"%s\"", i, m_sScanData.strIMEI[i]);
  305 +
  306 + iRet = REQ_WriteModem_NVRAM_Start(WRITE_IMEI, m_sScanData.strIMEI[i], i + 1);
  307 + if (iRet != META_SUCCESS)
  308 + {
  309 + if (m_bNeedBackupIMEI)
  310 + {
  311 + strncpy(g_AutoGenData.sIMEI.Next, m_strBackupIMEI, strlen(m_strBackupIMEI));
  312 + }
  313 +
  314 + UpdateUIMsg("ERROR!! IMEI[%d] : MetaResult = %s", i, ResultToString(iRet));
  315 + bWriteModemFail = true;
  316 + break;
  317 + }
  318 + }
  319 + }
  320 + else if (multiIMEIOption == DUAL_MD_DUAL_IMEI)
  321 + {
  322 + fBeginProcess += fStep;
  323 + int i = 0;
  324 + i = MDIndex;
  325 + IMEI_index = MDIndex;
  326 + if (m_bDSDAProject)
  327 + {
  328 + IMEI_index = 0;
  329 + }
  330 +
  331 + MTRACE(g_hEBOOT_DEBUG, "IMEI[%d] = \"%s\"", i, m_sScanData.strIMEI[i]);
  332 + iRet = REQ_WriteModem_NVRAM_Start(WRITE_IMEI, m_sScanData.strIMEI[i], IMEI_index + 1);
  333 + if (iRet != META_SUCCESS)
  334 + {
  335 + if (m_bNeedBackupIMEI)
  336 + {
  337 + strncpy(g_AutoGenData.sIMEI.Next, m_strBackupIMEI, strlen(m_strBackupIMEI));
  338 + }
  339 +
  340 + UpdateUIMsg("ERROR!! IMEI[%d] : MetaResult = %s", i, ResultToString(iRet));
  341 + bWriteModemFail = true;
  342 + break;
  343 + }
  344 + }
  345 +
  346 + if (iRet == META_SUCCESS)
  347 + {
  348 + if ((IMEI_index + 1) == g_sMetaComm.sIMEIOption.iImeiNums)
  349 + {
  350 + if (g_sMetaComm.sIMEIOption.bLockIMEI)
  351 + {
  352 + iRet = META_NVRAM_LockDown_r(m_hMauiMetaHandle, 5000);
  353 + if (iRet != META_SUCCESS)
  354 + {
  355 + bWriteModemFail = true;
  356 + break;
  357 + }
  358 + }
  359 + }
  360 + }
  361 + else
  362 + {
  363 + bWriteModemFail = true;
  364 + break;
  365 + }
  366 + }//end if(g_sMetaComm.sWriteOption.bWriteIMEI)
  367 + }//end for(MDIndex = 0; MDIndex < mdNums; MDIndex++)
  368 +
  369 + // Backup imei to SDS
  370 + if (!bWriteModemFail && m_bDSDAProject)
  371 + {
  372 + _BOOL BackupResult = DSDA_ExternalModemBackup();
  373 + if (_TRUE != BackupResult)
  374 + {
  375 + UpdateUIMsg("ERROR!! Backup external modem fail!");
  376 + spNextStage = SP_C2K_STAGE;
  377 + break;
  378 + }
  379 + }
  380 +
  381 + if (bWriteModemFail == true)
  382 + {
  383 + spNextStage = SP_END_STAGE;
  384 + }
  385 + else
  386 + {
  387 + spNextStage = SP_C2K_STAGE;
  388 + }
  389 +
  390 + break;
  391 +
  392 + case SP_C2K_STAGE:
  393 + fBeginProcess += fStep;
  394 + if (g_sMetaComm.sWriteOption.bWriteMeid || g_sMetaComm.sWriteOption.bWriteEsn)
  395 + {
  396 + if (m_iC2kProject != 0)
  397 + iRet = EnterC2KGen90();
  398 + else
  399 + iRet = EnterC2KGen93();
  400 +
  401 + if (iRet != META_SUCCESS)
  402 + {
  403 + spNextStage = SP_END_STAGE;
  404 + break;
  405 + }
  406 + }
  407 + spNextStage = SP_MD2AP_STAGE;
  408 + break;
  409 +
  410 + case SP_MD2AP_STAGE:
  411 +
  412 + if (g_sMetaComm.sIMEIOption.bLockOtp)
  413 + {
  414 + iRet = LockOTP();
  415 + if (iRet != 0)
277 416 {
278   - memset(a_imei_ary,0,16);
279   - memset(a_imei_ary2,0,16);
280   - for (int loop = 0;loop<15;loop++)
281   - {
282   - if (loop%2 == 0)
283   - {
284   - a_imei_ary[loop] = 0x30 + (byte)(tmpBuf1[loop/2])%16;
285   - a_imei_ary2[loop] = 0x30 + (byte)(tmpBuf2[loop/2])%16;
286   - }
287   - else
288   - {
289   - a_imei_ary[loop] = 0x30 + (byte)(tmpBuf1[loop/2])/16;
290   - a_imei_ary2[loop] = 0x30 + (byte)(tmpBuf2[loop/2])/16;
291   - }
292   - }
293   - a_imei_ary[15] = 0;
294   - a_imei_ary2[15] = 0;
295   - calc_imei1 = META_NVRAM_Calculate_IMEI_CD(a_imei_ary, &checksum_v);
296   - calc_imei2 = META_NVRAM_Calculate_IMEI_CD(a_imei_ary2, &checksum_v);
297   - if (calc_imei1 == META_INVALID_ARGUMENTS)
298   - {
299   - UpdateUIMsg("IMEI1 checksum FAIL!!!");
300   - }
301   - if (calc_imei2 == META_INVALID_ARGUMENTS)
302   - {
303   - UpdateUIMsg("IMEI2 checksum FAIL!!!");
304   - }
305   -
306   - if (strcmp(a_imei_ary,"352246078300483") == 0 || strcmp(a_imei_ary2,"352246078300491"))
307   - {
308   - g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("FAIL");
309   - iRet1 = META_FAILED;
310   - iRet2 = META_FAILED;
311   - }
312   -
313   - if(iRet1 == META_SUCCESS && iRet2 == META_SUCCESS)
314   - {
315   - g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("PASS");
316   - UpdateUIMsg("IMEI read success!!!");
317   - }
318   - else
319   - {
320   - g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("FAIL");
321   - UpdateUIMsg("IMEI read fail");
322   - }
323   -
324   -
325   - // UpdateUIMsg("IMEI read success!!!");
326 417 spNextStage = SP_END_STAGE;
  418 + break;
  419 + }
  420 + }
  421 +
  422 + fBeginProcess += fStep;
  423 + iRet = ModemSwithToAPMeta();
  424 + if (iRet == META_SUCCESS)
  425 + {
  426 + spNextStage = SP_WRITE_TEMP_STAGE;
  427 + }
  428 + else
  429 + {
  430 + spNextStage = SP_END_STAGE;
  431 + }
  432 + break;
  433 +
  434 + case SP_WRITE_TEMP_STAGE:
  435 + if (QuerySpeakerCalibrationSupport() == SPMETA_DLL::META_SUCCESS && g_sMetaComm.sIMEIOption.Temp_Option.bWriteTemperature) //Query support yes or no from target
  436 + {
  437 + fBeginProcess += fStep;
  438 + float minTemp = 20.0;
  439 + float maxTemp = 30.0;
  440 + float curTemp = 0.0;
  441 + curTemp = atof(g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData);
  442 +
  443 + MTRACE(g_hEBOOT_DEBUG, "CurTemperature = \"%s\"", g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData);
  444 + if ((minTemp <= curTemp) && (curTemp <= maxTemp))
  445 + {
  446 + iRet = REQ_WriteAP_NVRAM_Start(WRITE_TEMPERATURE, g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData, 1);
  447 + if (iRet == META_SUCCESS)
  448 + {
  449 + spNextStage = SP_BT_ADDRESS_STAGE;
  450 + }
  451 + else
  452 + {
  453 + UpdateUIMsg("ERROR!! Audio_Temperature : MetaResult = %s", ResultToString_SP(iRet));
  454 + spNextStage = SP_END_STAGE;
  455 + }
327 456 }
328 457 else
329 458 {
330   - g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("FAIL");
331   - UpdateUIMsg("IMEI read fail");
  459 + UpdateUIMsg("Warning: Temperature must be between 20.0~30.0, please reset current temperature!!");
  460 + MTRACE(g_hEBOOT_DEBUG, "Warning: Temperature must be between 20.0~30.0, please reset current temperature!!");
  461 + iRet = META_FAILED;
332 462 spNextStage = SP_END_STAGE;
333 463 }
334   - }
  464 + }
  465 + else
  466 + {
  467 + spNextStage = SP_BT_ADDRESS_STAGE;
  468 + }
  469 + break;
  470 +
  471 + case SP_BT_ADDRESS_STAGE:
  472 + if (g_sMetaComm.sWriteOption.bWriteBT)
  473 + {
  474 + fBeginProcess += fStep;
  475 + MTRACE(g_hEBOOT_DEBUG, "BT = \"%s\"", m_sScanData.strBTAddr);
  476 + iRet = REQ_WriteAP_NVRAM_Start(WRITE_BT, m_sScanData.strBTAddr, 1);
  477 + if (iRet == META_SUCCESS)
  478 + {
  479 + spNextStage = SP_WIFI_ADDRESS_STAGE;
  480 + }
  481 + else
  482 + {
  483 + UpdateUIMsg("ERROR!! BT : MetaResult = %s", ResultToString_SP(iRet));
  484 + spNextStage = SP_END_STAGE;
  485 + }
  486 + }
  487 + else
  488 + {
  489 + spNextStage = SP_WIFI_ADDRESS_STAGE;
  490 + }
  491 + break;
  492 +
  493 + case SP_WIFI_ADDRESS_STAGE:
  494 + if (g_sMetaComm.sWriteOption.bWriteWifi)
  495 + {
  496 + fBeginProcess += fStep;
  497 + MTRACE(g_hEBOOT_DEBUG, "Wifi = \"%s\"", m_sScanData.strWifiAddr);
  498 + iRet = REQ_WriteAP_NVRAM_Start(WRITE_WIFI, m_sScanData.strWifiAddr, 1);
  499 + if (iRet == META_SUCCESS)
  500 + {
  501 + spNextStage = SP_ETHERNET_MAC_STAGE;
  502 + }
  503 + else
  504 + {
  505 + UpdateUIMsg("ERROR!! Wifi : MetaResult = %s", ResultToString_SP(iRet));
  506 + spNextStage = SP_END_STAGE;
  507 + }
  508 + }
  509 + else
  510 + {
  511 + spNextStage = SP_ETHERNET_MAC_STAGE;
  512 + }
  513 + break;
  514 +
  515 + case SP_ETHERNET_MAC_STAGE:
  516 + if (g_sMetaComm.sWriteOption.bWriteEthernetMac)
  517 + {
  518 + fBeginProcess += fStep;
  519 + MTRACE(g_hEBOOT_DEBUG, "Ethernet Mac = \"%s\"", m_sScanData.strEthernetMac);
  520 + iRet = REQ_WriteAP_NVRAM_Start(WRITE_ETHERNET_MAC, m_sScanData.strEthernetMac, 1);
  521 + if (iRet == META_SUCCESS)
  522 + {
  523 + spNextStage = SP_HDCP_STAGE;
  524 + }
  525 + else
  526 + {
  527 + UpdateUIMsg("ERROR!! Ethernet Mac : MetaResult = %s", ResultToString_SP(iRet));
  528 + spNextStage = SP_END_STAGE;
  529 + }
  530 + }
  531 + else
  532 + {
  533 + spNextStage = SP_HDCP_STAGE;
  534 + }
  535 + break;
  536 +
  537 + case SP_HDCP_STAGE:
  538 + fBeginProcess += fStep;
  539 + if (g_sMetaComm.sWriteOption.bWriteHdcp)
  540 + {
  541 + iRet = REQ_WriteHdcpBinToAPNvram_Start(g_sMetaComm.sLoadFile.strHdcpBinPath);
  542 + if (iRet == META_SUCCESS)
  543 + {
  544 + spNextStage = SP_DRMKEY_STAGE;
  545 + }
  546 + else
  547 + {
  548 + UpdateUIMsg("ERROR!! Hdcp : MetaResult = %s", ResultToString_SP(iRet));
  549 + spNextStage = SP_END_STAGE;
  550 + }
  551 + }
  552 + else
  553 + {
  554 + spNextStage = SP_DRMKEY_STAGE;
  555 + }
  556 + break;
  557 +
  558 + case SP_DRMKEY_STAGE:
  559 + fBeginProcess += fStep;
  560 + if (g_sMetaComm.sWriteOption.bWriteDrm)
  561 + {
  562 + iRet = REQ_InstallDRMKey_Start();
  563 + if (iRet == META_SUCCESS)
  564 + {
  565 + spNextStage = SP_HDCPDATA_INSTALL_STAGE;
  566 + }
  567 + else
  568 + {
  569 + UpdateUIMsg("ERROR!! DRMKey : MetaResult = %s", ResultToString_SP(iRet));
  570 + spNextStage = SP_END_STAGE;
  571 + }
  572 + }
  573 + else
  574 + {
  575 + spNextStage = SP_HDCPDATA_INSTALL_STAGE;
  576 + }
  577 + break;
  578 +
  579 + case SP_HDCPDATA_INSTALL_STAGE:
  580 + fBeginProcess += fStep;
  581 + if (g_sMetaComm.sWriteOption.bInstallHdcpData)
  582 + {
  583 + iRet = REQ_InstallHdcpData_Start(g_sMetaComm.sLoadFile.strHdcpDataPath, g_sMetaComm.sLoadFile.strHdcpCekPath);
  584 + if (iRet == META_SUCCESS)
  585 + {
  586 + spNextStage = SP_DRMKEY_MCID_STAGE;
  587 + }
  588 + else
  589 + {
  590 + UpdateUIMsg("ERROR!! HdcpData : MetaResult = %s", ResultToString_SP(iRet));
  591 + spNextStage = SP_END_STAGE;
  592 + }
  593 + }
  594 + else
  595 + {
  596 + spNextStage = SP_DRMKEY_MCID_STAGE;
  597 + }
  598 + break;
  599 +
  600 + case SP_DRMKEY_MCID_STAGE:
  601 + fBeginProcess += fStep;
  602 + if (g_sMetaComm.sWriteOption.bWriteDrmkeyMCID)
  603 + {
  604 + iRet = REQ_WriteDRMKeyMCID_Start(m_sScanData.strDrmkeyMCID);
  605 + if (iRet == META_SUCCESS)
  606 + {
  607 + spNextStage = SP_BACKUPNV_TO_PC_STAGE;
  608 + }
  609 + else
  610 + {
  611 + UpdateUIMsg("ERROR!! DRMKeyMCID : MetaResult = %s", ResultToString_SP(iRet));
  612 + spNextStage = SP_END_STAGE;
  613 + }
  614 + }
  615 + else
  616 + {
  617 + spNextStage = SP_BACKUPNV_TO_PC_STAGE;
  618 + }
  619 + break;
  620 +
  621 + case SP_BACKUPNV_TO_PC_STAGE:
  622 + if (g_sMetaComm.bCheckBackNVtoPC)
  623 + {
  624 + fBeginProcess += fStep;
  625 + char NumFile[100] = {0};
  626 + iRet = GetNvramFileName(NumFile);
  627 +
  628 + if (iRet == META_SUCCESS)
  629 + {
  630 + iRet = REQ_BackupNvram2PC_Start(NumFile);
  631 + if (iRet != META_SUCCESS)
  632 + {
  633 + UpdateUIMsg("ERROR!! REQ_BackupNvram2PC_Start : MetaResult = %s", ResultToString_SP(iRet));
  634 + spNextStage = SP_END_STAGE;
  635 + }
  636 + else
  637 + {
  638 + spNextStage = SP_BACKUP_NVRAM_STAGE;
  639 + }
  640 + }
  641 + else
  642 + {
  643 + spNextStage = SP_END_STAGE;
  644 + }
  645 + }
  646 + else
  647 + {
  648 + spNextStage = SP_BACKUP_NVRAM_STAGE;
  649 + }
  650 + break;
  651 +
  652 + case SP_BACKUP_NVRAM_STAGE:
  653 + {
  654 + fBeginProcess += fStep;
  655 +
  656 + iRet = REQ_BackupNvram2BinRegion_Start();
  657 + if (iRet != META_SUCCESS)
  658 + {
  659 + m_bBackupNvramSuccess = false;
  660 + UpdateUIMsg("ERROR!! BackUP : MetaResult = %s", ResultToString_SP(iRet));
  661 + spNextStage = SP_END_STAGE;
  662 + }
  663 + else
  664 + {
  665 + m_bBackupNvramSuccess = true;
  666 + spNextStage = SP_PRODINFO_STAGE;
  667 + }
  668 +
335 669 break;
336   -
337   -
338   -
339   -
340 670 }
341   -
  671 +
  672 + case SP_PRODINFO_STAGE:
  673 + {
  674 + if (m_bWriteProdInfo && g_sMetaComm.bSkipWriteProdInfo == false)
  675 + {
  676 + MTRACE(g_hEBOOT_DEBUG, "Prod_Info = \"...\"");
  677 + fBeginProcess += fStep;
  678 + iRet = REQ_WriteAP_PRODINFO_Start();
  679 + if (iRet != META_SUCCESS)
  680 + {
  681 + UpdateUIMsg("ERROR!! Prod_Info : MetaResult = %s", ResultToString_SP(iRet));
  682 + }
  683 + }
  684 + spNextStage = SP_END_STAGE;
  685 +
  686 + break;
  687 + }
  688 + }
  689 +
  690 + UpdateProgress(fBeginProcess);
342 691 spStage = spNextStage;
343 692 }
344   -
  693 +
345 694 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::WriteNvramLoop() end...");
346   - return (META_RESULT)(iRet1||iRet2||iRetcft);
  695 + return (META_RESULT)iRet;
347 696 }
348 697
349 698 int SmartPhoneSN::GetSPModemInfo_Ex()
... ... @@ -2128,7 +2477,8 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_ReadAP_NVRAM_Start(WriteData_Type_e da
2128 2477
2129 2478
2130 2479
2131   -#ifdef __TOPWELL_QCTEST__
  2480 + // <<XIEMENG
  2481 +#ifdef __TOPWELL_QCTEST__
2132 2482 byte SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
2133 2483 {
2134 2484 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_ReadAP_NVRAM_QC()...");
... ... @@ -2199,25 +2549,13 @@ byte SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
2199 2549 }
2200 2550 }
2201 2551
2202   - if(sNVRAM_ReadCnf.buf[1006] == 0)
2203   - {
2204   - // ::AfxMessageBox("QC test fail");
2205   - return 0;
2206   - }
2207   - else if(sNVRAM_ReadCnf.buf[1006] == 1)
2208   - {
2209   - // ::AfxMessageBox("QC test pass");
2210   - return 1;
2211   - }
2212   - else
2213   - {
2214   - return 3;
2215   - }
  2552 + return sNVRAM_ReadCnf.buf[1006];
2216 2553
2217 2554
2218 2555 }
2219 2556
2220 2557 #endif
  2558 + // >>XIEMENG
2221 2559
2222 2560 SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_WriteAP_NVRAM_Start(WriteData_Type_e dataType, char *pInData, unsigned short iRID)
2223 2561 {
... ... @@ -3656,12 +3994,13 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::EnterAPMetaMode()
3656 3994
3657 3995 if (!g_sMetaComm.bAlreadyInMeata)
3658 3996 {
3659   - UpdateUIMsg("Start searching com port and handshake...");
  3997 + UpdateUIMsg("Start searching preloader com port and handshake...");
  3998 + UpdateProgress(0.08);
3660 3999
3661 4000 bootResult = ConnectWithPreloader();
3662 4001 if (bootResult != 0)
3663 4002 {
3664   - UpdateUIMsg("Searching com port and handshake Fail.");
  4003 + UpdateUIMsg("Searching preloader com port and handshake Fail.");
3665 4004
3666 4005 spMetaResult = (SPMETA_DLL::META_RESULT)bootResult;
3667 4006 return spMetaResult;
... ... @@ -3674,18 +4013,21 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::EnterAPMetaMode()
3674 4013 else
3675 4014 {
3676 4015 UpdateUIMsg("Already in Meta Mode, bypass preloader com port handshake.");
  4016 + UpdateProgress(0.08);
3677 4017 }
3678 4018
3679   - //UpdateUIMsg("Start searching kernel com port and handshake...");
  4019 + UpdateUIMsg("Start searching kernel com port and handshake...");
  4020 + UpdateProgress(0.10);
3680 4021
3681 4022 bootResult = ConnectWithKernelPort_Ex();
  4023 + UpdateProgress(0.12);
3682 4024 if (bootResult == 0)
3683 4025 {
3684   - UpdateUIMsg("Searching com port and handshake OK.");
  4026 + UpdateUIMsg("Searching kernel com port and handshake OK.");
3685 4027 }
3686 4028 else
3687 4029 {
3688   - UpdateUIMsg("Searching com port and handshake Fail.");
  4030 + UpdateUIMsg("Searching kernel com port and handshake Fail.");
3689 4031 }
3690 4032
3691 4033 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::EnterAPMetaMode() : Enter ap meta end.");
... ... @@ -3806,13 +4148,14 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3806 4148 {
3807 4149 int iTestCount = 0;
3808 4150 bool bNeedScanData = false;
  4151 + bool bSkipScanData = false;
3809 4152 bool bNeedLoadAPDB = false;
3810 4153 int times = 0;
3811   - int Ret = 0;
3812   - byte resultQC;
3813   -
3814   - SPMETA_DLL::VerInfo_V2_Cnf a_v2cnf;
  4154 + int Ret = 0;
  4155 + // <<XIEMENG
  4156 + SPMETA_DLL::VerInfo_V2_Cnf a_v2cnf;
3815 4157 short a_token;
  4158 + // >>XIEMENG
3816 4159
3817 4160 /*For dual talk(external modem) project
3818 4161 * Due to dual talk project can`t switch back and forth between ap and external modem
... ... @@ -3828,12 +4171,47 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3828 4171 g_sMetaComm.sWriteOption.bWriteIMEI = false;
3829 4172 }
3830 4173
3831   - bNeedLoadAPDB = true;
  4174 + bNeedScanData = NeedScanData();
  4175 + if (bNeedScanData == false)
  4176 + {
  4177 + if (g_sMetaComm.sWriteOption.bWriteDrm == false
  4178 + && g_sMetaComm.sWriteOption.bWriteHdcp == false
  4179 + && g_sMetaComm.sWriteOption.bInstallHdcpData == false)
  4180 + {
  4181 + PopupMsgBox("Warning", MB_OK | MB_ICONWARNING, "At least select one write option!!\nplease click config button");
  4182 + return;
  4183 + }
  4184 + else
  4185 + {
  4186 + // Don't need to Popup scan data dialog
  4187 + bSkipScanData = true;
  4188 + if (g_sMetaComm.sWriteOption.bWriteHdcp)
  4189 + {
  4190 + // Write DRM Key & Install Hdcp data don't need to load ap database
  4191 + bNeedLoadAPDB = true;
  4192 + }
  4193 + }
  4194 + }
  4195 + else
  4196 + {
  4197 + if (g_sMetaComm.sWriteOption.bWriteBarcode ||
  4198 + g_sMetaComm.sWriteOption.bWriteIMEI ||
  4199 + g_sMetaComm.sWriteOption.bWriteBT ||
  4200 + g_sMetaComm.sWriteOption.bWriteWifi ||
  4201 + g_sMetaComm.sWriteOption.bWriteEthernetMac ||
  4202 + g_sMetaComm.sWriteOption.bWriteDrmkeyMCID ||
  4203 + g_sMetaComm.sWriteOption.bWriteSerialNo ||
  4204 + g_sMetaComm.sWriteOption.bWriteMeid ||
  4205 + g_sMetaComm.bClearMetaBootFlag)
  4206 + {
  4207 + bNeedLoadAPDB = true;
  4208 + }
  4209 + }
3832 4210
3833 4211 bool bAnyOperationFail = false;
3834 4212 META_RESULT MetaResult = META_SUCCESS;
3835 4213 SPMETA_DLL::META_RESULT SPMetaResult = SPMETA_DLL::META_SUCCESS;
3836   -
  4214 +
3837 4215 if (g_sMetaComm.bSwithTool)
3838 4216 EnableUSBSwitch();
3839 4217
... ... @@ -3870,7 +4248,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3870 4248 }
3871 4249 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::MetaHandle_Init() end...");
3872 4250
3873   - //CScanData scanDlg;
  4251 + CScanData scanDlg;
3874 4252
3875 4253
3876 4254 while(true)
... ... @@ -3882,12 +4260,10 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3882 4260 if (iTestCount >= g_sMetaComm.iStressTest)
3883 4261 break;
3884 4262 }
  4263 + else if (!bSkipScanData && scanDlg.DoModal() != IDOK)
  4264 + break;
3885 4265 iTestCount++;
3886   - g_pMainDlg->GetDlgItem(IDC_RSLT_SW)->SetWindowText("");
3887   - g_pMainDlg->GetDlgItem(IDC_RSLT_CFT)->SetWindowText("");
3888   - g_pMainDlg->GetDlgItem(IDC_RSLT_SMT)->SetWindowText("");
3889   - g_pMainDlg->GetDlgItem(IDC_RSLT_QC)->SetWindowText("");
3890   - g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("");
  4266 + g_pMainDlg->SetTimer(1,1000,NULL);
3891 4267 g_pMainDlg->myloglist.ResetContent();
3892 4268
3893 4269 DebugOnOff(true);
... ... @@ -3909,14 +4285,14 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3909 4285
3910 4286 UpdateUIMsg("Start load and init AP database...");
3911 4287
  4288 + UpdateProgress(0.06);
3912 4289
3913 4290 if (g_sMetaComm.bUsbEnable)
3914 4291 {
3915   - UpdateUIMsg("please connect phone...");
  4292 + UpdateUIMsg("Wait for usb insert...");
3916 4293 }
3917 4294
3918 4295 EnableStartBTN(true);
3919   - g_pMainDlg->SetTimer(1,1000,NULL);
3920 4296
3921 4297 MetaResult = (META_RESULT)EnterAPMetaMode();
3922 4298 if (MetaResult != META_SUCCESS)
... ... @@ -3993,70 +4369,55 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3993 4369 {
3994 4370 bAnyOperationFail = true;
3995 4371 MTRACE_ERR(g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information fail, MetaResult = %s", ResultToString_SP(Ret));
3996   - UpdateUIMsg("Query modem information fail, %s", ResultToString_SP(Ret));
  4372 + UpdateUIMsg("Query modem information fail, %s", ResultToString_SP(Ret));
3997 4373 goto End;
3998 4374 }
3999 4375 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end.");
4000   - #ifdef __TOPWELL_QCTEST__
4001   -
4002   -
4003   - SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL);
4004   - {
4005   - //int a_verlen = g_pMainDlg->myversion.GetLength();
4006   - //int a_verlen =strlen(g_sMetaComm.check_sw_ver());
4007   - char tmp_checkSwVer[255];
4008   - int len=strlen(g_sMetaComm.check_sw_ver);
4009   -
  4376 + }
  4377 + #ifdef __TOPWELL_QCTEST__
  4378 + SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL);
  4379 + {
  4380 + UpdateUIMsg("SW version from mobile");
  4381 + UpdateUIMsg(a_v2cnf.BUILD_DISP_ID);
  4382 + int len=strlen(g_sMetaComm.check_sw_ver);
  4383 +
4010 4384 /* strcpy(tmp_checkSwVer,g_sMetaComm.check_sw_ver);
4011 4385
4012 4386 tmp_checkSwVer[len]=10;
4013 4387 tmp_checkSwVer[len+1]='\0';*/
4014 4388
4015 4389 if (strncmp(a_v2cnf.BUILD_DISP_ID,g_sMetaComm.check_sw_ver,len) != 0 )
4016   - {
  4390 + {
  4391 + bAnyOperationFail = true;
4017 4392 UpdateUIMsg("Version number is wrong");
4018   - bAnyOperationFail = true;
4019   - }
4020   - else
4021   - {
  4393 + goto End;
  4394 + }
  4395 + else
  4396 + {
4022 4397 UpdateUIMsg("Version number OK!");
  4398 + }
4023 4399 }
4024   -
4025   - int testLen=strlen(a_v2cnf.BUILD_DISP_ID)-1;
4026   - memset(tmp_checkSwVer,0x0,sizeof(tmp_checkSwVer));
4027   - strncpy(tmp_checkSwVer,a_v2cnf.BUILD_DISP_ID,testLen);
4028   - g_pMainDlg->myrslt_sw.Format(_T("%s"), tmp_checkSwVer);
4029   -
4030   -
4031   - }
4032   - //if (strcmp(g_pMainDlg->myversion.GetBuffer(),a_v2cnf.))
4033   - //{g_pMainDlg->myversion
4034   - //}
4035   -
4036   - if (g_sMetaComm.bCheckQCFlag)
4037   - {
4038   - resultQC = REQ_ReadAP_NVRAM_QC();
4039   - switch(resultQC)
  4400 + if (g_sMetaComm.bCheckQCFlag)
4040 4401 {
4041   - case 0:
4042   - g_pMainDlg->myrslt_qc=_T("UnTested");
  4402 + g_QC_value_from_phone = REQ_ReadAP_NVRAM_QC();
  4403 + switch(g_QC_value_from_phone)
  4404 + {
  4405 + case 0:
  4406 + bAnyOperationFail = true;
4043 4407 UpdateUIMsg("QC1 untest");
4044   - bAnyOperationFail = true;
4045   - break;
4046   - case 1:
4047   - g_pMainDlg->myrslt_qc=_T("PASS");
  4408 + goto End;
  4409 + break;
  4410 + case 1:
4048 4411 UpdateUIMsg("QC1 test pass");
4049   - break;
4050   - default:
4051   - g_pMainDlg->myrslt_qc=_T("FAIL");
  4412 + break;
  4413 + default:
  4414 + bAnyOperationFail = true;
4052 4415 UpdateUIMsg("QC1 test fail");
4053   - bAnyOperationFail = true;
4054   - break;
  4416 + goto End;
  4417 + break;
  4418 + }
4055 4419 }
4056   -
4057   - }
4058   - #endif
4059   - }
  4420 + #endif
4060 4421
4061 4422 //Special case: m_bWriteModemNvram = true && m_sMdInfo.number_of_md = 0
4062 4423 //So skip to load modem database
... ... @@ -4065,6 +4426,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4065 4426 {
4066 4427 UpdateUIMsg("Start switch to MD meta and init Modem database...");
4067 4428
  4429 + UpdateProgress(0.14);
4068 4430
4069 4431 if (!g_sMetaComm.sDBFileOption.bDBInitModem_1 && g_sMetaComm.sDBFileOption.bMDDBFromDUT)
4070 4432 {
... ... @@ -4076,6 +4438,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4076 4438 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::GetMDDBFromDUT() : end.");
4077 4439 }
4078 4440
  4441 + UpdateProgress(0.18);
4079 4442
4080 4443 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::ApSwithToModemMeta_Ex(): Switch to MODEM meta from AP meta start...");
4081 4444 MetaResult = APSwithToModemMeta_Ex();
... ... @@ -4099,6 +4462,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4099 4462 }
4100 4463 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::LoadModemDatabase(): end.");
4101 4464 }
  4465 + UpdateProgress(0.22);
4102 4466
4103 4467 EnableStartBTN(false);
4104 4468 UpdateUIMsg("Start loop write data to nvram...");
... ... @@ -4112,6 +4476,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4112 4476 End:
4113 4477 if (m_bStopBeforeUSBInsert == true)
4114 4478 {
  4479 + UpdateProgress(0.0);
4115 4480 UpdateUIMsg("...");
4116 4481 }
4117 4482 else
... ... @@ -4138,13 +4503,8 @@ End:
4138 4503
4139 4504 if (bAnyOperationFail)
4140 4505 {
  4506 + //m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
4141 4507 UpdateUICountResult(FAIL);
4142   - g_pMainDlg->mytimecount = 0;
4143   - g_pMainDlg->KillTimer(1);
4144   - if (g_pMainDlg->mytipsdlg.DoModal() != IDOK)
4145   - {
4146   - break;
4147   - }
4148 4508 }
4149 4509 else
4150 4510 {
... ... @@ -4158,14 +4518,9 @@ End:
4158 4518 }
4159 4519 #endif
4160 4520 UpdateUICountResult(PASS);
4161   - g_pMainDlg->mytimecount = 0;
4162   - g_pMainDlg->KillTimer(1);
4163   - if (g_pMainDlg->mytipsdlg.DoModal() != IDOK)
4164   - {
4165   - break;
4166   - }
4167 4521 }
4168 4522
  4523 + UpdateProgress(1.0);
4169 4524 }
4170 4525
4171 4526 EnableStartBTN(true);
... ... @@ -4175,7 +4530,7 @@ End:
4175 4530 }
4176 4531 MTRACE(g_hEBOOT_DEBUG, "------------------------------------ END --------------------------------------");
4177 4532 DebugOnOff(false);
4178   - Sleep(1000);
  4533 + Sleep(bSkipScanData ? 3000 : 1000);
4179 4534 }
4180 4535
4181 4536 if (g_sMetaComm.bCheckFastbootLock)
... ... @@ -4184,6 +4539,8 @@ End:
4184 4539 }
4185 4540 g_sMetaComm.sWriteOption.bWriteBarcode = bWriteBarcode;
4186 4541 g_sMetaComm.sWriteOption.bWriteIMEI = bWriteIMEI;
  4542 + g_pMainDlg->KillTimer(1);
  4543 + g_pMainDlg->GetDlgItem(IDC_MAINUI_TIME_COUNT)->SetWindowText("0 Sec");
4187 4544
4188 4545 if (g_sMetaComm.bSwithTool)
4189 4546 DisableUSBSwitch();
... ... @@ -4612,6 +4969,7 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
4612 4969 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] can not find C2K modem.");
4613 4970 return META_FAILED;
4614 4971 }
  4972 + UpdateProgress(0.14);
4615 4973
4616 4974
4617 4975 // init c2k
... ... @@ -4646,6 +5004,7 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
4646 5004 }
4647 5005 bInited = true; // inited
4648 5006 MTRACE (g_hEBOOT_DEBUG, "[C2K] META_C2K_Init() end...");
  5007 + UpdateProgress(0.18);
4649 5008
4650 5009
4651 5010 // connect to c2k
... ... @@ -4686,13 +5045,16 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
4686 5045 {
4687 5046 UpdateUIMsg("META_C2K_LoadMessage_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
4688 5047 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_LoadMessage_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
  5048 + UpdateProgress(1.00);
4689 5049 goto end;
4690 5050 }
4691 5051 UpdateUIMsg("META_C2K_LoadMessage_r() : successful!");
4692 5052 MTRACE (g_hEBOOT_DEBUG, "[C2K] META_C2K_LoadMessage_r() : successful!");
  5053 + UpdateProgress(0.28);
4693 5054 }
4694 5055
4695 5056 UpdateUIMsg("Start connect with C2K Meta...");
  5057 + UpdateProgress(0.34);
4696 5058
4697 5059 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_ConnectWithTarget_r() start...");
4698 5060 for (i = 0; i < 20; i++)
... ... @@ -4705,11 +5067,13 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
4705 5067 {
4706 5068 UpdateUIMsg("META_C2K_ConnectWithTarget_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
4707 5069 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_ConnectWithTarget_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
  5070 + UpdateProgress(1.00);
4708 5071 goto end;
4709 5072 }
4710 5073 bConnected = true; // connected
4711 5074 UpdateUIMsg("META_C2K_ConnectWithTarget_r() : successful!");
4712 5075 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_ConnectWithTarget_r() : successful!");
  5076 + UpdateProgress(0.48);
4713 5077
4714 5078
4715 5079 // handshake with c2k
... ... @@ -4723,8 +5087,10 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
4723 5087 {
4724 5088 UpdateUIMsg("META_C2K_LoopbackTest_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
4725 5089 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_LoopbackTest_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
  5090 + UpdateProgress(1.00);
4726 5091 goto end;
4727 5092 }
  5093 + UpdateProgress(0.60);
4728 5094
4729 5095
4730 5096 // task
... ... @@ -4745,11 +5111,13 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
4745 5111 DisconnectC2KMeta();
4746 5112 DeinitC2KMeta();
4747 5113
  5114 + UpdateProgress(1.00);
4748 5115
4749 5116 goto end;
4750 5117 }
4751 5118 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_FlushNvram_r() : Flaush NVRAM to Flash FFS successful!");
4752 5119 #endif
  5120 + UpdateProgress(0.85);
4753 5121
4754 5122 end:
4755 5123 // disconnect
... ... @@ -4822,6 +5190,7 @@ end:
4822 5190 UpdateUIMsg("[C2K] Write MEID fail.");
4823 5191 else if (g_sMetaComm.sWriteOption.bWriteEsn)
4824 5192 UpdateUIMsg("[C2K] Write ESN fail.");
  5193 + UpdateProgress(1.00);
4825 5194 }
4826 5195
4827 5196 return ret_last;
... ... @@ -4927,6 +5296,7 @@ int SmartPhoneSN::WriteMEID()
4927 5296 return ret_meta;
4928 5297 }
4929 5298 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_WriteNvram_r() : Write MEID end.");
  5299 + UpdateProgress(0.70);
4930 5300
4931 5301
4932 5302 UpdateUIMsg("Read MEID for check start...");
... ... @@ -4940,6 +5310,7 @@ int SmartPhoneSN::WriteMEID()
4940 5310 MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_ReadNvram_r(): Read MEID fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
4941 5311 return ret_meta;
4942 5312 }
  5313 + UpdateProgress(0.75);
4943 5314
4944 5315 MTRACE(g_hEBOOT_DEBUG, "[C2K] Write MEID :%s", g_sMetaComm.sScanData.strMeid);
4945 5316 MTRACE(g_hEBOOT_DEBUG, "[C2K] Read MEID :%s", data_meid.meid);
... ... @@ -4951,6 +5322,7 @@ int SmartPhoneSN::WriteMEID()
4951 5322 }
4952 5323 UpdateUIMsg("Checking MEID succesfully!");
4953 5324 MTRACE(g_hEBOOT_DEBUG, "[C2K] Checking MEID succesfully!");
  5325 + UpdateProgress(0.80);
4954 5326
4955 5327 return META_SUCCESS;
4956 5328 }
... ... @@ -4980,6 +5352,7 @@ int SmartPhoneSN::WriteESN()
4980 5352 }
4981 5353 UpdateUIMsg("META_C2K_WriteNvram_r() : Write ESN succesful!");
4982 5354 MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_WriteNvram_r() : Write ESN succesful!");
  5355 + UpdateProgress(0.70);
4983 5356
4984 5357 UpdateUIMsg("Read ESN for check start...");
4985 5358 MTRACE(g_hEBOOT_DEBUG, "[C2K] Read ESN for check start...");
... ... @@ -5003,6 +5376,7 @@ int SmartPhoneSN::WriteESN()
5003 5376 }
5004 5377 UpdateUIMsg("Checking Esn Successfully!");
5005 5378 MTRACE(g_hEBOOT_DEBUG, "[C2K] Checking ESN successfully!");
  5379 + UpdateProgress(0.80);
5006 5380
5007 5381 return META_SUCCESS;
5008 5382 }
... ...
... ... @@ -148,6 +148,8 @@ BOOL CAutoGenDlg::OnInitDialog()
148 148 CDialog::OnInitDialog();
149 149
150 150 // TODO: Add extra initialization here
  151 + m_AutoGenCancelBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  152 + m_AutoGenOKBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
151 153
152 154 int i = 0;
153 155 char strTmp[5] = {0};
... ...
... ... @@ -10,7 +10,7 @@
10 10 /////////////////////////////////////////////////////////////////////////////
11 11 // CAutoGenDlg dialog
12 12
13   -//#include "ShadeButtonST.h"
  13 +#include "ShadeButtonST.h"
14 14
15 15 class CAutoGenDlg : public CDialog
16 16 {
... ... @@ -102,8 +102,8 @@ protected:
102 102
103 103 private:
104 104 bool m_bEnableAutoGen;
105   - CButton m_AutoGenCancelBTN;
106   - CButton m_AutoGenOKBTN;
  105 + CShadeButtonST m_AutoGenCancelBTN;
  106 + CShadeButtonST m_AutoGenOKBTN;
107 107 };
108 108
109 109 //{{AFX_INSERT_LOCATION}}
... ...
... ... @@ -87,6 +87,15 @@ BOOL CFileSelDlg::OnInitDialog()
87 87 CDialog::OnInitDialog();
88 88
89 89 // TODO: Add extra initialization here
  90 + m_LoadFPAuthBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  91 + m_LoadSPAuthBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  92 + m_LoadHdcpBinBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  93 + m_LoadDRMKeyBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  94 + m_LoadHdcpDataBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  95 + m_LoadHdcpCekBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  96 + m_LoadOKBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  97 + m_LoadCancelBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  98 +
90 99 EnableUIItemByFileType(m_eFileType);
91 100
92 101 return TRUE; // return TRUE unless you set the focus to a control
... ...
... ... @@ -10,7 +10,7 @@
10 10 /////////////////////////////////////////////////////////////////////////////
11 11 // CFileSelDlg dialog
12 12
13   -//#include "ShadeButtonST.h"
  13 +#include "ShadeButtonST.h"
14 14
15 15 typedef enum
16 16 {
... ... @@ -69,14 +69,14 @@ protected:
69 69 DECLARE_MESSAGE_MAP()
70 70
71 71 private:
72   - CButton m_LoadFPAuthBTN;
73   - CButton m_LoadSPAuthBTN;
74   - CButton m_LoadHdcpBinBTN;
75   - CButton m_LoadDRMKeyBTN;
76   - CButton m_LoadHdcpDataBTN;
77   - CButton m_LoadHdcpCekBTN;
78   - CButton m_LoadOKBTN;
79   - CButton m_LoadCancelBTN;
  72 + CShadeButtonST m_LoadFPAuthBTN;
  73 + CShadeButtonST m_LoadSPAuthBTN;
  74 + CShadeButtonST m_LoadHdcpBinBTN;
  75 + CShadeButtonST m_LoadDRMKeyBTN;
  76 + CShadeButtonST m_LoadHdcpDataBTN;
  77 + CShadeButtonST m_LoadHdcpCekBTN;
  78 + CShadeButtonST m_LoadOKBTN;
  79 + CShadeButtonST m_LoadCancelBTN;
80 80
81 81 LoadFile_Type_e m_eFileType;
82 82
... ...
... ... @@ -117,6 +117,8 @@ BOOL CScanData::OnInitDialog()
117 117
118 118 // TODO: Add extra initialization here
119 119
  120 + m_ScanCancelBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  121 + m_ScanOKBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
120 122
121 123 InitScanUI();
122 124
... ...
... ... @@ -10,7 +10,7 @@
10 10 /////////////////////////////////////////////////////////////////////////////
11 11 // CScanData dialog
12 12
13   -//#include "ShadeButtonST.h"
  13 +#include "ShadeButtonST.h"
14 14
15 15
16 16 typedef enum
... ... @@ -116,8 +116,8 @@ private:
116 116 bool m_bNeedBackupIMEI;
117 117 char m_strBackupIMEI[16];
118 118 char* m_pstrScanItem;
119   - CButton m_ScanCancelBTN;
120   - CButton m_ScanOKBTN;
  119 + CShadeButtonST m_ScanCancelBTN;
  120 + CShadeButtonST m_ScanOKBTN;
121 121
122 122 protected:
123 123 void GenSerialNoFirstStep(const char* pFirstIMEI);
... ...
... ... @@ -122,6 +122,8 @@ void CSystemConfig::DoDataExchange(CDataExchange* pDX)
122 122 DDX_Text(pDX, IDC_SERIAL_NO_HEADER_STR, m_strSerialNoHD);
123 123 // DDX_Check(pDX, IDC_EXTERN_MD_DOWNLOAD, m_bExternMDDownload);
124 124 DDV_MaxChars(pDX, m_strSerialNoHD, 8);
  125 + DDX_Text(pDX, IDC_STR_SWVERSION, myswversion);
  126 +
125 127 //}}AFX_DATA_MAP
126 128
127 129 DDX_Check(pDX, IDC_APDB_FROM_DUT_CHECK, m_bAPDBFromDUT);
... ... @@ -185,6 +187,11 @@ BOOL CSystemConfig::OnInitDialog()
185 187 CDialog::OnInitDialog();
186 188
187 189 // TODO: Add extra initialization here
  190 + m_Load_MD1DB_BTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  191 + m_Load_MD2DB_BTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  192 + m_Load_APDB_BTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  193 + m_LogDir_BTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  194 + m_SaveBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
188 195
189 196 if (g_sMetaComm.eTargetType == SMART_PHONE_DUALMODEM)
190 197 {
... ... @@ -208,6 +215,7 @@ BOOL CSystemConfig::OnInitDialog()
208 215 GetDlgItem(IDC_LOCK_OTP)->ShowWindow(SW_HIDE);
209 216 else
210 217 ((CButton *)GetDlgItem(IDC_LOCK_OTP))->SetCheck(g_sMetaComm.sIMEIOption.bLockOtp ? BST_CHECKED : BST_UNCHECKED);
  218 + myswversion = CString(g_sMetaComm.check_sw_ver);
211 219
212 220 UpdateConfigUIOption();
213 221
... ... @@ -867,6 +875,17 @@ BOOL CSystemConfig::DestroyWindow()
867 875 g_sMetaComm.sIMEIOption.bDualIMEI = true;
868 876 g_sMetaComm.sIMEIOption.iImeiNums = DUAL_IMEI;
869 877 }
  878 + if (myswversion == "" ||myswversion == "null" )
  879 + {
  880 + strcpy(g_sMetaComm.check_sw_ver,"null");
  881 + }
  882 + else
  883 + {
  884 + memset(g_sMetaComm.check_sw_ver,0x0,sizeof(g_sMetaComm.check_sw_ver));
  885 + memcpy(g_sMetaComm.check_sw_ver,myswversion.GetBuffer(myswversion.GetLength()),myswversion.GetLength());
  886 + }
  887 +
  888 +
870 889 SaveParaToSetupFile();
871 890
872 891 // release ToolTip Control
... ... @@ -883,6 +902,21 @@ BOOL CSystemConfig::DestroyWindow()
883 902 void CSystemConfig::OnBtnSave()
884 903 {
885 904 g_sMetaComm.sIMEIOption.bLockOtp = ((CButton *)GetDlgItem(IDC_LOCK_OTP))->GetCheck() == BST_CHECKED;
  905 +
  906 +
  907 +#if 0
  908 + if (myswversion.IsEmpty() || (myswversion.Compare("null")==0))
  909 + {
  910 + MessageBox("please input SW version!!");
  911 + }
  912 +#endif
  913 +
  914 +#if 0
  915 + if (myswversion == "null" ||myswversion == "")
  916 + {
  917 + MessageBox("please input SW version!!");
  918 + }
  919 +#endif
886 920
887 921 CDialog::OnOK();
888 922 }
... ...
... ... @@ -10,7 +10,7 @@
10 10 /////////////////////////////////////////////////////////////////////////////
11 11 // CSystemConfig dialog
12 12
13   -//#include "ShadeButtonST.h"
  13 +#include "ShadeButtonST.h"
14 14 #include "Common.h"
15 15
16 16 class CSystemConfig : public CDialog
... ... @@ -25,6 +25,7 @@ public:
25 25 //************C2K PARA START************//
26 26 CString m_strMeidHD;
27 27 CString m_strEsnHD;
  28 + CString myswversion;
28 29 BOOL m_bCheckMeidHD;
29 30 BOOL m_bCheckEsnHD;
30 31 BOOL m_bWriteMeid;
... ... @@ -142,11 +143,11 @@ protected:
142 143 void CheckTempDataValid();
143 144
144 145 private:
145   - CButton m_Load_MD1DB_BTN;
146   - CButton m_Load_MD2DB_BTN;
147   - CButton m_Load_APDB_BTN;
148   - CButton m_LogDir_BTN;
149   - CButton m_SaveBTN;
  146 + CShadeButtonST m_Load_MD1DB_BTN;
  147 + CShadeButtonST m_Load_MD2DB_BTN;
  148 + CShadeButtonST m_Load_APDB_BTN;
  149 + CShadeButtonST m_LogDir_BTN;
  150 + CShadeButtonST m_SaveBTN;
150 151
151 152 CToolTipCtrl * m_pToolTip;
152 153
... ...
... ... @@ -3,13 +3,16 @@ Stress Test = 0
3 3 Already in Meta = False
4 4 Keep in Meta = False
5 5 Clear Meta Boot Flag = False
6   -Operator Mode = 10000
  6 +Operator Mode = 0
7 7 Preloader Connect Timeout = 20000
8 8 Kernel Connect Timeout = 120000
9   -Target type = 64182496
  9 +Target type = 1
  10 +
  11 +; com port scan filter, white list, use space/tab/comma/semicolon to split multi-filters
10 12 Brom Port Filter = VID_0E8D&PID_0003
11 13 Preloader Port Filter = VID_0E8D&PID_2000 VID_0525&PID_A4A7 VID_1004&PID_6000
12 14 Kernel Port Filter = VID_0E8D&PID_2007 VID_0E8D&PID_2006&MI_02 VID_0E8D&PID_2040&MI_02 VID_0BB4&PID_0005&MI_02 VID_1004&PID_6000
  15 +
13 16 Composite Device Enable = False
14 17 Usb Enable = True
15 18 USBSwitchTool Enable = False
... ... @@ -19,17 +22,15 @@ USB Without Battery Enable = False
19 22 Skip Write Prod_Info Enable = False
20 23 Check BackupNv to PC Enable = False
21 24 Check Fastboot OEM Lock Enable = False
22   -Check Calibration flag Enable = True
  25 +Check Calibration flag Enable = False
23 26 Check FinalTest flag Enable = False
24   -Check QCTest flag Enable = True
25   -Check_SW_VER = INTEX_AQUA_LIONS_N1_V02_INDIAN
26   -Write Meid = False
  27 +Write Meid = True
27 28 Write Esn = False
28   -Write Barcode = False
29   -Write IMEI = False
  29 +Write Barcode = True
  30 +Write IMEI = True
30 31 Write Serial No. = False
31   -Write BT = False
32   -Write Wifi = False
  32 +Write BT = True
  33 +Write Wifi = True
33 34 Write Hdcp = False
34 35 Write DRMKey = False
35 36 Install Hdcp Data = False
... ... @@ -38,7 +39,6 @@ Write DRMkey MCID = False
38 39 IMEI Nums = 1
39 40 IMEI CheckSum = True
40 41 IMEI Lock = False
41   -Lock OTP = False
42 42 DualIMEI same = False
43 43 IMEI_1 Check header = False
44 44 IMEI_2 Check header = False
... ... @@ -67,9 +67,9 @@ Ethernet header string =
67 67 DRMKey MCID header string =
68 68 AP DB from DUT = False
69 69 MD DB from DUT = False
70   -Modem_1 database path = C:\Users\echo\Desktop\L71\db\BPLGUInfoCustomAppSrcP_MT6735_S00_MOLY_LR9_W1444_MD_LWTG_MP_V110_5_P5_1_lwg_n
  70 +Modem_1 database path =
71 71 Modem_2 database path =
72   -AP database path = C:\Users\echo\Desktop\L71\db\APDB_MT6735_S01_alps-mp-n0.mp1_W17.31
  72 +AP database path =
73 73 FP Auth path =
74 74 SP Auth path =
75 75 Hdcp Bin path =
... ... @@ -78,10 +78,11 @@ Hdcp data path =
78 78 Hdcp cek path =
79 79 Enable Write Temperature = True
80 80 The Current Temperature = 20.3
  81 +Lock OTP = False
81 82 Log Dir = C:\SNWriter_LOG\
82 83 ModemLog = False
83 84 Enable Serial No = False
  85 +Enable Lock OTP = False
84 86 Ignore Database Inconsistent = False
85 87 Serial Num From IMEI = False
86 88 IMEI Lock Hidden = True
87   -Enable Lock OTP = False
... ...
... ... @@ -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:"..\intex_tool\check_all.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\SN Writer.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 /out:"..\intex_tool\check_all.exe" /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\SN Writer.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,53 @@ 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"
  135 +# Begin Group "Extra_SRC"
163 136
164 137 # PROP Default_Filter ""
165 138 # Begin Source File
166 139
167   -SOURCE=.\Form\FileSel\fileseldlg.cpp
  140 +SOURCE=.\Form\AutoGen\autogendlg.cpp
168 141 # End Source File
169   -# End Group
170   -# Begin Group "Identify_SRC"
171   -
172   -# PROP Default_Filter ""
173 142 # Begin Source File
174 143
175   -SOURCE=.\Form\Identify\ChgPasswdDlg.cpp
  144 +SOURCE=.\Extra\CBtnST\BtnST.cpp
176 145 # End Source File
177 146 # Begin Source File
178 147
179   -SOURCE=.\Form\Identify\VerifyPasswdDlg.cpp
  148 +SOURCE=.\Extra\CBtnST\CeXDib.cpp
180 149 # End Source File
181   -# End Group
182   -# Begin Group "ScanData_SRC"
183   -
184   -# PROP Default_Filter ""
185 150 # Begin Source File
186 151
187   -SOURCE=.\Form\ScanData\ScanData.cpp
  152 +SOURCE=.\Extra\CBtnST\ShadeButtonST.cpp
188 153 # End Source File
189 154 # End Group
190   -# Begin Group "SystemConfig_SRC"
191   -
192   -# PROP Default_Filter ""
193 155 # Begin Source File
194 156
195   -SOURCE=.\Form\SystemConfig\SystemConfig.cpp
  157 +SOURCE=.\Form\About\AboutSNDlg.cpp
196 158 # End Source File
197   -# End Group
198   -# Begin Group "About_SRC"
  159 +# Begin Source File
199 160
200   -# PROP Default_Filter ""
  161 +SOURCE=.\Form\Identify\ChgPasswdDlg.cpp
  162 +# End Source File
201 163 # Begin Source File
202 164
203   -SOURCE=.\Form\About\AboutSNDlg.cpp
  165 +SOURCE=.\Common\Common.cpp
204 166 # End Source File
205   -# End Group
206   -# Begin Group "AutoGen_SRC"
  167 +# Begin Source File
207 168
208   -# PROP Default_Filter ""
  169 +SOURCE=.\Encryption.cpp
  170 +# End Source File
209 171 # Begin Source File
210 172
211   -SOURCE=.\Form\AutoGen\autogendlg.cpp
  173 +SOURCE=.\Form\FileSel\fileseldlg.cpp
212 174 # End Source File
213   -# End Group
214   -# End Group
215 175 # Begin Source File
216 176
217   -SOURCE=.\dlg_tips.cpp
  177 +SOURCE=.\Execute\FPexc.cpp
218 178 # End Source File
219 179 # Begin Source File
220 180
221   -SOURCE=.\Encryption.cpp
  181 +SOURCE=.\Form\ScanData\ScanData.cpp
222 182 # End Source File
223 183 # Begin Source File
224 184
... ... @@ -230,9 +190,25 @@ SOURCE=".\SN WriterDlg.cpp"
230 190 # End Source File
231 191 # Begin Source File
232 192
  193 +SOURCE=.\Execute\SNbase.cpp
  194 +# End Source File
  195 +# Begin Source File
  196 +
  197 +SOURCE=.\Execute\SPexc.cpp
  198 +# End Source File
  199 +# Begin Source File
  200 +
233 201 SOURCE=".\StdAfx.cpp"
234 202 # ADD CPP /Yc
235 203 # End Source File
  204 +# Begin Source File
  205 +
  206 +SOURCE=.\Form\SystemConfig\SystemConfig.cpp
  207 +# End Source File
  208 +# Begin Source File
  209 +
  210 +SOURCE=.\Form\Identify\VerifyPasswdDlg.cpp
  211 +# End Source File
236 212 # End Group
237 213 # Begin Group "Header Files"
238 214
... ... @@ -240,33 +216,22 @@ SOURCE=".\StdAfx.cpp"
240 216 # Begin Group "Common_HDR"
241 217
242 218 # PROP Default_Filter ""
243   -# Begin Source File
244   -
245   -SOURCE=.\Common\Common.h
246   -# End Source File
247 219 # End Group
248   -# Begin Group "Exec_HDR"
  220 +# Begin Group "MtkLib_HDR"
249 221
250 222 # PROP Default_Filter ""
251 223 # Begin Source File
252 224
253   -SOURCE=.\Execute\FPexc.h
  225 +SOURCE=.\MtkLib\AT_cmd\inc\AtProcess.h
254 226 # End Source File
255 227 # Begin Source File
256 228
257   -SOURCE=.\Execute\SNbase.h
  229 +SOURCE=.\MtkLib\Security\inc\AUTH.h
258 230 # End Source File
259 231 # Begin Source File
260 232
261   -SOURCE=.\Execute\SPexc.h
  233 +SOURCE=.\MtkLib\SNFstream\inc\AutoGen.h
262 234 # End Source File
263   -# End Group
264   -# Begin Group "MtkLib_HDR"
265   -
266   -# PROP Default_Filter ""
267   -# Begin Group "Meta_HDR"
268   -
269   -# PROP Default_Filter ""
270 235 # Begin Source File
271 236
272 237 SOURCE=.\MtkLib\Meta\inc\brom.h
... ... @@ -277,6 +242,10 @@ SOURCE=.\MtkLib\Meta\inc\com_enum.h
277 242 # End Source File
278 243 # Begin Source File
279 244
  245 +SOURCE=.\MtkLib\Security\inc\des.h
  246 +# End Source File
  247 +# Begin Source File
  248 +
280 249 SOURCE=.\MtkLib\Meta\inc\DOWNLOAD.H
281 250 # End Source File
282 251 # Begin Source File
... ... @@ -301,6 +270,10 @@ SOURCE=.\MtkLib\Meta\inc\HdcpEncryption.h
301 270 # End Source File
302 271 # Begin Source File
303 272
  273 +SOURCE=.\MtkLib\DebugTrace\inc\Mdebug.h
  274 +# End Source File
  275 +# Begin Source File
  276 +
304 277 SOURCE=.\MtkLib\Meta\inc\meta.h
305 278 # End Source File
306 279 # Begin Source File
... ... @@ -321,177 +294,136 @@ SOURCE=.\MtkLib\Meta\inc\rom_setting.h
321 294 # End Source File
322 295 # Begin Source File
323 296
324   -SOURCE=.\MtkLib\Meta\inc\sp_brom.h
325   -# End Source File
326   -# Begin Source File
327   -
328   -SOURCE=.\MtkLib\Meta\inc\SP_META_Wrapper.h
329   -# End Source File
330   -# Begin Source File
331   -
332   -SOURCE=.\MtkLib\Meta\inc\spmeta.h
  297 +SOURCE=.\MtkLib\AT_cmd\inc\rs232Module.h
333 298 # End Source File
334 299 # Begin Source File
335 300
336   -SOURCE=.\MtkLib\Meta\inc\wm_meta_cct.h
  301 +SOURCE=.\MtkLib\Security\inc\SCERT.h
337 302 # End Source File
338 303 # Begin Source File
339 304
340   -SOURCE=.\MtkLib\Meta\inc\wm_meta_cct_6238.h
  305 +SOURCE=.\MtkLib\Security\inc\SLA.h
341 306 # End Source File
342 307 # Begin Source File
343 308
344   -SOURCE=.\MtkLib\Meta\inc\xboot.h
  309 +SOURCE=.\MtkLib\Security\inc\SLA_Challenge.h
345 310 # End Source File
346   -# End Group
347   -# Begin Group "ATCmd_HDR"
348   -
349   -# PROP Default_Filter ""
350 311 # Begin Source File
351 312
352   -SOURCE=.\MtkLib\AT_cmd\inc\AtProcess.h
  313 +SOURCE=.\MtkLib\SNFstream\inc\SNFstream.h
353 314 # End Source File
354 315 # Begin Source File
355 316
356   -SOURCE=.\MtkLib\AT_cmd\inc\rs232Module.h
  317 +SOURCE=.\MtkLib\Meta\inc\sp_brom.h
357 318 # End Source File
358   -# End Group
359   -# Begin Group "DebugTrace_HDR"
360   -
361   -# PROP Default_Filter ""
362 319 # Begin Source File
363 320
364   -SOURCE=.\MtkLib\DebugTrace\inc\Mdebug.h
  321 +SOURCE=.\MtkLib\Meta\inc\SP_META_Wrapper.h
365 322 # End Source File
366 323 # Begin Source File
367 324
368   -SOURCE=.\MtkLib\DebugTrace\inc\xboot_debug.h
  325 +SOURCE=.\MtkLib\Meta\inc\spmeta.h
369 326 # End Source File
370   -# End Group
371   -# Begin Group "Security_HDR"
372   -
373   -# PROP Default_Filter ""
374 327 # Begin Source File
375 328
376   -SOURCE=.\MtkLib\Security\inc\AUTH.h
  329 +SOURCE=.\MtkLib\USBSwitchTool\inc\USBSwitchDLLibrary.h
377 330 # End Source File
378 331 # Begin Source File
379 332
380   -SOURCE=.\MtkLib\Security\inc\des.h
  333 +SOURCE=.\MtkLib\Meta\inc\wm_meta_cct.h
381 334 # End Source File
382 335 # Begin Source File
383 336
384   -SOURCE=.\MtkLib\Security\inc\SCERT.h
  337 +SOURCE=.\MtkLib\Meta\inc\wm_meta_cct_6238.h
385 338 # End Source File
386 339 # Begin Source File
387 340
388   -SOURCE=.\MtkLib\Security\inc\SLA.h
  341 +SOURCE=.\MtkLib\Meta\inc\xboot.h
389 342 # End Source File
390 343 # Begin Source File
391 344
392   -SOURCE=.\MtkLib\Security\inc\SLA_Challenge.h
  345 +SOURCE=.\MtkLib\DebugTrace\inc\xboot_debug.h
393 346 # End Source File
394 347 # End Group
395   -# Begin Group "SNFstream_HDR"
  348 +# Begin Group "Extra_HDR"
396 349
397 350 # PROP Default_Filter ""
398 351 # Begin Source File
399 352
400   -SOURCE=.\MtkLib\SNFstream\inc\AutoGen.h
  353 +SOURCE=.\Extra\CBtnST\BtnST.h
401 354 # End Source File
402 355 # Begin Source File
403 356
404   -SOURCE=.\MtkLib\SNFstream\inc\SNFstream.h
  357 +SOURCE=.\Extra\CBtnST\CeXDib.h
405 358 # End Source File
406   -# End Group
407   -# Begin Group "USBSwitchTool_HDR"
408   -
409   -# PROP Default_Filter ""
410 359 # Begin Source File
411 360
412   -SOURCE=.\MtkLib\USBSwitchTool\inc\USBSwitchDLLibrary.h
  361 +SOURCE=.\Extra\CBtnST\ShadeButtonST.h
413 362 # End Source File
414 363 # End Group
415   -# End Group
416   -# Begin Group "Form_HDR"
417   -
418   -# PROP Default_Filter ""
419   -# Begin Group "FileSel_HDR"
420   -
421   -# PROP Default_Filter ""
422 364 # Begin Source File
423 365
424   -SOURCE=.\Form\FileSel\fileseldlg.h
  366 +SOURCE=.\Form\About\AboutSNDlg.h
425 367 # End Source File
426   -# End Group
427   -# Begin Group "Identify_HDR"
  368 +# Begin Source File
428 369
429   -# PROP Default_Filter ""
  370 +SOURCE=.\Form\AutoGen\autogendlg.h
  371 +# End Source File
430 372 # Begin Source File
431 373
432 374 SOURCE=.\Form\Identify\ChgPasswdDlg.h
433 375 # End Source File
434 376 # Begin Source File
435 377
436   -SOURCE=.\Form\Identify\VerifyPasswdDlg.h
  378 +SOURCE=.\Common\Common.h
437 379 # End Source File
438   -# End Group
439   -# Begin Group "ScanData_HDR"
440   -
441   -# PROP Default_Filter ""
442 380 # Begin Source File
443 381
444   -SOURCE=.\Form\ScanData\ScanData.h
  382 +SOURCE=.\Encryption.h
445 383 # End Source File
446   -# End Group
447   -# Begin Group "SystemConfig_HDR"
448   -
449   -# PROP Default_Filter ""
450 384 # Begin Source File
451 385
452   -SOURCE=.\Form\SystemConfig\SystemConfig.h
  386 +SOURCE=.\Form\FileSel\fileseldlg.h
453 387 # End Source File
454   -# End Group
455   -# Begin Group "About_HDR"
  388 +# Begin Source File
456 389
457   -# PROP Default_Filter ""
  390 +SOURCE=.\Execute\FPexc.h
  391 +# End Source File
458 392 # Begin Source File
459 393
460   -SOURCE=.\Form\About\AboutSNDlg.h
  394 +SOURCE=.\Resource.h
461 395 # End Source File
462   -# End Group
463   -# Begin Group "AutoGen_HDR"
  396 +# Begin Source File
464 397
465   -# PROP Default_Filter ""
  398 +SOURCE=.\Form\ScanData\ScanData.h
  399 +# End Source File
466 400 # Begin Source File
467 401
468   -SOURCE=.\Form\AutoGen\autogendlg.h
  402 +SOURCE=".\SN Writer.h"
469 403 # End Source File
470   -# End Group
471   -# End Group
472 404 # Begin Source File
473 405
474   -SOURCE=.\dlg_tips.h
  406 +SOURCE=".\SN WriterDlg.h"
475 407 # End Source File
476 408 # Begin Source File
477 409
478   -SOURCE=.\Encryption.h
  410 +SOURCE=.\Execute\SNbase.h
479 411 # End Source File
480 412 # Begin Source File
481 413
482   -SOURCE=.\Resource.h
  414 +SOURCE=.\Execute\SPexc.h
483 415 # End Source File
484 416 # Begin Source File
485 417
486   -SOURCE=".\SN Writer.h"
  418 +SOURCE=".\StdAfx.h"
487 419 # End Source File
488 420 # Begin Source File
489 421
490   -SOURCE=".\SN WriterDlg.h"
  422 +SOURCE=.\Form\SystemConfig\SystemConfig.h
491 423 # End Source File
492 424 # Begin Source File
493 425
494   -SOURCE=".\StdAfx.h"
  426 +SOURCE=.\Form\Identify\VerifyPasswdDlg.h
495 427 # End Source File
496 428 # End Group
497 429 # Begin Group "Resource Files"
... ... @@ -503,11 +435,11 @@ SOURCE=.\res\FAIL.bmp
503 435 # End Source File
504 436 # Begin Source File
505 437
506   -SOURCE=.\res\icon2.ico
  438 +SOURCE=.\res\manifest.xml
507 439 # End Source File
508 440 # Begin Source File
509 441
510   -SOURCE=.\res\manifest.xml
  442 +SOURCE=.\res\NORMAL.bmp
511 443 # End Source File
512 444 # Begin Source File
513 445
... ...
No preview for this file type
... ... @@ -6,60 +6,130 @@
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\RSP713A.tmp" with contents
  9 +Creating temporary file "D:\temp\RSPAC26.tmp" with contents
10 10 [
11   -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   -.\Debug\Common.obj
13   -.\Debug\FPexc.obj
14   -.\Debug\SNbase.obj
15   -.\Debug\SPexc.obj
  11 +/nologo /MTd /W3 /Gi /GX /ZI /Od /I ".\\" /I ".\SNbase\inc" /I ".\Execute" /I ".\Extra\CBtnST" /I ".\Form\About" /I ".\Form\AutoGen" /I ".\Form\ScanData" /I ".\Form\Identify" /I ".\Form\FileSel" /I ".\Form\SystemConfig" /I ".\MtkLib\AT_cmd\inc" /I ".\CBtnST" /I ".\MtkLib\Brom\inc" /I ".\MtkLib\DebugTrace\inc" /I ".\MtkLib\SNFstream\inc" /I ".\Common" /I ".\MtkLib\Eboot\inc" /I ".\MtkLib\Meta\inc" /I ".\MtkLib\Security\inc" /I ".\MtkLib\USBSwitchTool\inc" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"Debug/" /Fp"Debug/SN_Station.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
  12 +"D:\workspace\intex_tool\src_intex_check\MtkLib\AT_cmd\src\AtProcess.cpp"
  13 +"D:\workspace\intex_tool\src_intex_check\MtkLib\AT_cmd\src\rs232Module.cpp"
  14 +"D:\workspace\intex_tool\src_intex_check\MtkLib\DebugTrace\src\xboot_debug.cpp"
  15 +"D:\workspace\intex_tool\src_intex_check\MtkLib\Security\src\AUTH.cpp"
  16 +"D:\workspace\intex_tool\src_intex_check\MtkLib\Security\src\SCERT.cpp"
  17 +"D:\workspace\intex_tool\src_intex_check\MtkLib\Security\src\SLA.cpp"
  18 +"D:\workspace\intex_tool\src_intex_check\Form\AutoGen\autogendlg.cpp"
  19 +"D:\workspace\intex_tool\src_intex_check\Extra\CBtnST\BtnST.cpp"
  20 +"D:\workspace\intex_tool\src_intex_check\Extra\CBtnST\CeXDib.cpp"
  21 +"D:\workspace\intex_tool\src_intex_check\Extra\CBtnST\ShadeButtonST.cpp"
  22 +"D:\workspace\intex_tool\src_intex_check\Form\About\AboutSNDlg.cpp"
  23 +"D:\workspace\intex_tool\src_intex_check\Form\Identify\ChgPasswdDlg.cpp"
  24 +"D:\workspace\intex_tool\src_intex_check\Common\Common.cpp"
  25 +"D:\workspace\intex_tool\src_intex_check\Encryption.cpp"
  26 +"D:\workspace\intex_tool\src_intex_check\Form\FileSel\fileseldlg.cpp"
  27 +"D:\workspace\intex_tool\src_intex_check\Execute\FPexc.cpp"
  28 +"D:\workspace\intex_tool\src_intex_check\Form\ScanData\ScanData.cpp"
  29 +"D:\workspace\intex_tool\src_intex_check\SN Writer.cpp"
  30 +"D:\workspace\intex_tool\src_intex_check\SN WriterDlg.cpp"
  31 +"D:\workspace\intex_tool\src_intex_check\Execute\SNbase.cpp"
  32 +"D:\workspace\intex_tool\src_intex_check\Execute\SPexc.cpp"
  33 +"D:\workspace\intex_tool\src_intex_check\Form\SystemConfig\SystemConfig.cpp"
  34 +"D:\workspace\intex_tool\src_intex_check\Form\Identify\VerifyPasswdDlg.cpp"
  35 +]
  36 +Creating command line "cl.exe @D:\temp\RSPAC26.tmp"
  37 +Creating temporary file "D:\temp\RSPAC27.tmp" with contents
  38 +[
  39 +/nologo /MTd /W3 /Gi /GX /ZI /Od /I ".\\" /I ".\SNbase\inc" /I ".\Execute" /I ".\Extra\CBtnST" /I ".\Form\About" /I ".\Form\AutoGen" /I ".\Form\ScanData" /I ".\Form\Identify" /I ".\Form\FileSel" /I ".\Form\SystemConfig" /I ".\MtkLib\AT_cmd\inc" /I ".\CBtnST" /I ".\MtkLib\Brom\inc" /I ".\MtkLib\DebugTrace\inc" /I ".\MtkLib\SNFstream\inc" /I ".\Common" /I ".\MtkLib\Eboot\inc" /I ".\MtkLib\Meta\inc" /I ".\MtkLib\Security\inc" /I ".\MtkLib\USBSwitchTool\inc" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"Debug/" /Fp"Debug/SN_Station.pch" /Yc /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
  40 +"D:\workspace\intex_tool\src_intex_check\StdAfx.cpp"
  41 +]
  42 +Creating command line "cl.exe @D:\temp\RSPAC27.tmp"
  43 +Creating temporary file "D:\temp\RSPAC28.tmp" with contents
  44 +[
  45 +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:"..\intex_tool\SN Writer.exe" /pdbtype:sept
16 46 .\Debug\AtProcess.obj
17 47 .\Debug\rs232Module.obj
18 48 .\Debug\xboot_debug.obj
19 49 .\Debug\AUTH.obj
20 50 .\Debug\SCERT.obj
21 51 .\Debug\SLA.obj
22   -.\Debug\fileseldlg.obj
23   -.\Debug\ChgPasswdDlg.obj
24   -.\Debug\VerifyPasswdDlg.obj
25   -.\Debug\ScanData.obj
26   -.\Debug\SystemConfig.obj
27   -.\Debug\AboutSNDlg.obj
28 52 .\Debug\autogendlg.obj
  53 +.\Debug\BtnST.obj
  54 +.\Debug\CeXDib.obj
  55 +.\Debug\ShadeButtonST.obj
  56 +.\Debug\AboutSNDlg.obj
  57 +.\Debug\ChgPasswdDlg.obj
  58 +.\Debug\Common.obj
29 59 .\Debug\Encryption.obj
  60 +.\Debug\fileseldlg.obj
  61 +.\Debug\FPexc.obj
  62 +.\Debug\ScanData.obj
30 63 ".\Debug\SN Writer.obj"
31 64 ".\Debug\SN WriterDlg.obj"
  65 +.\Debug\SNbase.obj
  66 +.\Debug\SPexc.obj
32 67 .\Debug\StdAfx.obj
  68 +.\Debug\SystemConfig.obj
  69 +.\Debug\VerifyPasswdDlg.obj
33 70 ".\Debug\SN Writer.res"
34 71 ]
35   -Creating command line "link.exe @C:\Users\echo\AppData\Local\Temp\RSP713A.tmp"
  72 +Creating command line "link.exe @D:\temp\RSPAC28.tmp"
36 73 <h3>Output Window</h3>
  74 +Compiling...
  75 +StdAfx.cpp
  76 +Compiling...
  77 +AtProcess.cpp
  78 +rs232Module.cpp
  79 +xboot_debug.cpp
  80 +AUTH.cpp
  81 +SCERT.cpp
  82 +SLA.cpp
  83 +autogendlg.cpp
  84 +BtnST.cpp
  85 +CeXDib.cpp
  86 +ShadeButtonST.cpp
  87 +AboutSNDlg.cpp
  88 +ChgPasswdDlg.cpp
  89 +Common.cpp
  90 +Encryption.cpp
  91 +fileseldlg.cpp
  92 +FPexc.cpp
  93 +ScanData.cpp
  94 +SN Writer.cpp
  95 +SN WriterDlg.cpp
  96 +SNbase.cpp
  97 +Generating Code...
  98 +Compiling...
  99 +SPexc.cpp
  100 +SystemConfig.cpp
  101 +VerifyPasswdDlg.cpp
  102 +Generating Code...
37 103 Linking...
38   -Creating temporary file "C:\Users\echo\AppData\Local\Temp\RSP717A.tmp" with contents
  104 + Creating library ..\intex_tool\SN Writer.lib and object ..\intex_tool\SN Writer.exp
  105 +Creating temporary file "D:\temp\RSPC332.tmp" with contents
39 106 [
40 107 /nologo /o"Output/SN Writer.bsc"
41 108 .\Debug\StdAfx.sbr
42   -.\Debug\Common.sbr
43   -.\Debug\FPexc.sbr
44   -.\Debug\SNbase.sbr
45   -.\Debug\SPexc.sbr
46 109 .\Debug\AtProcess.sbr
47 110 .\Debug\rs232Module.sbr
48 111 .\Debug\xboot_debug.sbr
49 112 .\Debug\AUTH.sbr
50 113 .\Debug\SCERT.sbr
51 114 .\Debug\SLA.sbr
52   -.\Debug\fileseldlg.sbr
53   -.\Debug\ChgPasswdDlg.sbr
54   -.\Debug\VerifyPasswdDlg.sbr
55   -.\Debug\ScanData.sbr
56   -.\Debug\SystemConfig.sbr
57   -.\Debug\AboutSNDlg.sbr
58 115 .\Debug\autogendlg.sbr
  116 +.\Debug\BtnST.sbr
  117 +.\Debug\CeXDib.sbr
  118 +.\Debug\ShadeButtonST.sbr
  119 +.\Debug\AboutSNDlg.sbr
  120 +.\Debug\ChgPasswdDlg.sbr
  121 +.\Debug\Common.sbr
59 122 .\Debug\Encryption.sbr
  123 +.\Debug\fileseldlg.sbr
  124 +.\Debug\FPexc.sbr
  125 +.\Debug\ScanData.sbr
60 126 ".\Debug\SN Writer.sbr"
61   -".\Debug\SN WriterDlg.sbr"]
62   -Creating command line "bscmake.exe @C:\Users\echo\AppData\Local\Temp\RSP717A.tmp"
  127 +".\Debug\SN WriterDlg.sbr"
  128 +.\Debug\SNbase.sbr
  129 +.\Debug\SPexc.sbr
  130 +.\Debug\SystemConfig.sbr
  131 +.\Debug\VerifyPasswdDlg.sbr]
  132 +Creating command line "bscmake.exe @D:\temp\RSPC332.tmp"
63 133 Creating browse info file...
64 134 <h3>Output Window</h3>
65 135
... ...
... ... @@ -13,62 +13,6 @@
13 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, "΢ÈíÑźÚ", 0, 0, 0x1
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   -
59   -/////////////////////////////////////////////////////////////////////////////
60   -//
61   -// Icon
62   -//
63   -
64   -// Icon with lowest ID value placed first to ensure application icon
65   -// remains consistent on all systems.
66   -IDR_MAINFRAME ICON DISCARDABLE "res\\icon2.ico"
67   -#endif // Chinese (P.R.C.) resources
68   -/////////////////////////////////////////////////////////////////////////////
69   -
70   -
71   -/////////////////////////////////////////////////////////////////////////////
72 16 // English (U.S.) resources
73 17
74 18 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
... ... @@ -82,7 +26,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
82 26 // Dialog
83 27 //
84 28
85   -IDD_SYSTEM_CONFIG_DIALOG DIALOGEX 0, 0, 285, 352
  29 +IDD_SYSTEM_CONFIG_DIALOG DIALOGEX 0, 0, 404, 258
86 30 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
87 31 CAPTION "System Config"
88 32 FONT 4, "System", 0, 0, 0x1
... ... @@ -106,92 +50,93 @@ BEGIN
106 50 WS_TABSTOP,13,96,88,8
107 51 CONTROL "Serial No.",IDC_WRITE_SERIAL_NO_CHECK,"Button",
108 52 BS_AUTOCHECKBOX | WS_TABSTOP,13,108,88,8
109   - GROUPBOX "IMEI Option",IDC_STATIC,7,123,100,113
  53 + GROUPBOX "IMEI Option",IDC_STATIC,114,5,100,113
110 54 CONTROL "IMEI CheckSum",IDC_IMEI_CHECKSUM,"Button",
111   - BS_AUTOCHECKBOX | WS_TABSTOP,12,131,88,11
  55 + BS_AUTOCHECKBOX | WS_TABSTOP,119,13,88,11
112 56 CONTROL "IMEI Lock",IDC_IMEI_LOCK,"Button",BS_AUTOCHECKBOX |
113   - WS_TABSTOP,12,142,88,11
  57 + WS_TABSTOP,119,24,88,11
114 58 CONTROL "Dual IMEI",IDC_DUAL_IMEI,"Button",BS_AUTOCHECKBOX |
115   - WS_TABSTOP,12,153,88,11
  59 + WS_TABSTOP,119,35,88,11
116 60 CONTROL "DualIMEI Same",IDC_DUAL_IMEI_SAME,"Button",
117   - BS_AUTOCHECKBOX | WS_TABSTOP,29,164,65,11
  61 + BS_AUTOCHECKBOX | WS_TABSTOP,136,46,65,11
118 62 CONTROL "Three IMEI",IDC_THREE_IMEI,"Button",BS_AUTOCHECKBOX |
119   - WS_TABSTOP,12,175,88,11
  63 + WS_TABSTOP,119,57,88,11
120 64 CONTROL "Four IMEI",IDC_FOUR_IMEI,"Button",BS_AUTOCHECKBOX |
121   - WS_TABSTOP,12,186,88,11
  65 + WS_TABSTOP,119,68,88,11
122 66 CONTROL "CurTemperature",IDC_CURRENT_TEMPERATURE,"Button",
123   - BS_AUTOCHECKBOX | WS_TABSTOP,12,197,63,11
124   - EDITTEXT IDC_TEMPERATURE,33,209,19,12,ES_AUTOHSCROLL
125   - LTEXT "°C",IDC_STATIC,56,210,19,8
  67 + BS_AUTOCHECKBOX | WS_TABSTOP,119,79,63,11
  68 + EDITTEXT IDC_TEMPERATURE,140,91,19,12,ES_AUTOHSCROLL
  69 + LTEXT "°C",IDC_STATIC,163,92,19,8
126 70 CONTROL "Lock OTP",IDC_LOCK_OTP,"Button",BS_AUTOCHECKBOX |
127   - WS_TABSTOP,12,223,88,11
128   - GROUPBOX "Header Option",IDC_STATIC,110,3,166,233
129   - LTEXT "Barc Header:",IDC_STATIC,115,20,55,8,0,WS_EX_RIGHT
130   - EDITTEXT IDC_BARC_HEADER_STR,178,18,50,12,ES_AUTOHSCROLL
  71 + WS_TABSTOP,119,105,88,11
  72 + GROUPBOX "Header Option",IDC_STATIC,238,0,166,233
  73 + LTEXT "Barc Header:",IDC_STATIC,243,17,55,8,0,WS_EX_RIGHT
  74 + EDITTEXT IDC_BARC_HEADER_STR,306,15,50,12,ES_AUTOHSCROLL
131 75 CONTROL "On/Off",IDC_BARC_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
132   - WS_TABSTOP,237,20,32,8
133   - LTEXT "BT Header:",IDC_STATIC,115,38,55,8,0,WS_EX_RIGHT
134   - EDITTEXT IDC_BT_HEADER_STR,178,36,50,12,ES_AUTOHSCROLL
  76 + WS_TABSTOP,365,17,32,8
  77 + LTEXT "BT Header:",IDC_STATIC,243,35,55,8,0,WS_EX_RIGHT
  78 + EDITTEXT IDC_BT_HEADER_STR,306,33,50,12,ES_AUTOHSCROLL
135 79 CONTROL "On/Off",IDC_BT_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
136   - WS_TABSTOP,237,38,32,8
137   - LTEXT "Wifi Header:",IDC_STATIC,115,56,55,8,0,WS_EX_RIGHT
138   - EDITTEXT IDC_WIFI_HEADER_STR,178,54,50,12,ES_AUTOHSCROLL
  80 + WS_TABSTOP,365,35,32,8
  81 + LTEXT "Wifi Header:",IDC_STATIC,243,53,55,8,0,WS_EX_RIGHT
  82 + EDITTEXT IDC_WIFI_HEADER_STR,306,51,50,12,ES_AUTOHSCROLL
139 83 CONTROL "On/Off",IDC_WIFI_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
140   - WS_TABSTOP,237,56,32,8
141   - LTEXT "IMEI_1 Header:",IDC_STATIC,115,74,55,8,0,WS_EX_RIGHT
142   - EDITTEXT IDC_IMEI_1_HEADER_STR,178,72,50,12,ES_AUTOHSCROLL
  84 + WS_TABSTOP,365,53,32,8
  85 + LTEXT "IMEI_1 Header:",IDC_STATIC,243,71,55,8,0,WS_EX_RIGHT
  86 + EDITTEXT IDC_IMEI_1_HEADER_STR,306,69,50,12,ES_AUTOHSCROLL
143 87 CONTROL "On/Off",IDC_IMEI_1_HEADER_CHECK,"Button",
144   - BS_AUTOCHECKBOX | WS_TABSTOP,237,74,32,8
145   - LTEXT "IMEI_2 Header:",IDC_STATIC,115,92,55,8,0,WS_EX_RIGHT
146   - EDITTEXT IDC_IMEI_2_HEADER_STR,178,90,50,12,ES_AUTOHSCROLL
  88 + BS_AUTOCHECKBOX | WS_TABSTOP,365,71,32,8
  89 + LTEXT "IMEI_2 Header:",IDC_STATIC,243,89,55,8,0,WS_EX_RIGHT
  90 + EDITTEXT IDC_IMEI_2_HEADER_STR,306,87,50,12,ES_AUTOHSCROLL
147 91 CONTROL "On/Off",IDC_IMEI_2_HEADER_CHECK,"Button",
148   - BS_AUTOCHECKBOX | WS_TABSTOP,237,92,32,8
149   - LTEXT "IMEI_3 Header:",IDC_STATIC,115,110,55,8,0,WS_EX_RIGHT
150   - EDITTEXT IDC_IMEI_3_HEADER_STR,178,108,50,12,ES_AUTOHSCROLL
  92 + BS_AUTOCHECKBOX | WS_TABSTOP,365,89,32,8
  93 + LTEXT "IMEI_3 Header:",IDC_STATIC,243,107,55,8,0,WS_EX_RIGHT
  94 + EDITTEXT IDC_IMEI_3_HEADER_STR,306,105,50,12,ES_AUTOHSCROLL
151 95 CONTROL "On/Off",IDC_IMEI_3_HEADER_CHECK,"Button",
152   - BS_AUTOCHECKBOX | WS_TABSTOP,237,110,32,8
153   - LTEXT "IMEI_4 Header:",IDC_STATIC,115,128,55,8,0,WS_EX_RIGHT
154   - EDITTEXT IDC_IMEI_4_HEADER_STR,178,126,50,12,ES_AUTOHSCROLL
  96 + BS_AUTOCHECKBOX | WS_TABSTOP,365,107,32,8
  97 + LTEXT "IMEI_4 Header:",IDC_STATIC,243,125,55,8,0,WS_EX_RIGHT
  98 + EDITTEXT IDC_IMEI_4_HEADER_STR,306,123,50,12,ES_AUTOHSCROLL
155 99 CONTROL "On/Off",IDC_IMEI_4_HEADER_CHECK,"Button",
156   - BS_AUTOCHECKBOX | WS_TABSTOP,237,128,32,8
157   - LTEXT "Serial Header:",IDC_STATIC,115,146,55,8,0,WS_EX_RIGHT
158   - EDITTEXT IDC_SERIAL_NO_HEADER_STR,178,144,50,12,ES_AUTOHSCROLL
  100 + BS_AUTOCHECKBOX | WS_TABSTOP,365,125,32,8
  101 + LTEXT "Serial Header:",IDC_STATIC,243,143,55,8,0,WS_EX_RIGHT
  102 + EDITTEXT IDC_SERIAL_NO_HEADER_STR,306,141,50,12,ES_AUTOHSCROLL
159 103 CONTROL "On/Off",IDC_SERIAL_NO_HEADER_CHECK,"Button",
160   - BS_AUTOCHECKBOX | WS_TABSTOP,237,146,32,8
161   - LTEXT "Ethernet Header:",IDC_STATIC,115,164,55,8,0,WS_EX_RIGHT
162   - EDITTEXT IDC_ETHERNET_HEADER_STR,178,162,50,12,ES_AUTOHSCROLL
  104 + BS_AUTOCHECKBOX | WS_TABSTOP,365,143,32,8
  105 + LTEXT "Ethernet Header:",IDC_STATIC,243,161,55,8,0,WS_EX_RIGHT
  106 + EDITTEXT IDC_ETHERNET_HEADER_STR,306,159,50,12,ES_AUTOHSCROLL
163 107 CONTROL "On/Off",IDC_ETHERNET_HEADER_CHECK,"Button",
164   - BS_AUTOCHECKBOX | WS_TABSTOP,237,164,32,8
165   - LTEXT "MCID Header:",IDC_STATIC,115,182,55,8,0,WS_EX_RIGHT
166   - EDITTEXT IDC_DRMKEY_MCID_HEADER_STR,178,180,50,12,ES_AUTOHSCROLL
  108 + BS_AUTOCHECKBOX | WS_TABSTOP,365,161,32,8
  109 + LTEXT "MCID Header:",IDC_STATIC,243,179,55,8,0,WS_EX_RIGHT
  110 + EDITTEXT IDC_DRMKEY_MCID_HEADER_STR,306,177,50,12,ES_AUTOHSCROLL
167 111 CONTROL "On/Off",IDC_DRMKEY_MCID_HEADER_CHECK,"Button",
168   - BS_AUTOCHECKBOX | WS_TABSTOP,237,182,32,8
169   - LTEXT "MEID:",IDC_STATIC,115,200,55,8,0,WS_EX_RIGHT
170   - EDITTEXT IDC_MEID_HEADER_STR,178,198,50,12,ES_AUTOHSCROLL
  112 + BS_AUTOCHECKBOX | WS_TABSTOP,365,179,32,8
  113 + LTEXT "MEID:",IDC_STATIC,243,197,55,8,0,WS_EX_RIGHT
  114 + EDITTEXT IDC_MEID_HEADER_STR,306,195,50,12,ES_AUTOHSCROLL
171 115 CONTROL "On/Off",IDC_MEID_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
172   - WS_TABSTOP,237,200,32,8
173   - LTEXT "MSN:",IDC_STATIC,115,218,55,8,0,WS_EX_RIGHT
174   - EDITTEXT IDC_ESN_HEADER_STR,178,216,50,12,ES_AUTOHSCROLL
  116 + WS_TABSTOP,365,197,32,8
  117 + LTEXT "MSN:",IDC_STATIC,243,215,55,8,0,WS_EX_RIGHT
  118 + EDITTEXT IDC_ESN_HEADER_STR,306,213,50,12,ES_AUTOHSCROLL
175 119 CONTROL "On/Off",IDC_ESN_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
176   - WS_TABSTOP,237,218,32,8
177   - GROUPBOX "DataBase File",IDC_STATIC,7,239,269,70
  120 + WS_TABSTOP,365,215,32,8
  121 + GROUPBOX "DataBase File",IDC_STATIC,0,144,233,70
178 122 CONTROL "Load AP DB from DUT",IDC_APDB_FROM_DUT_CHECK,"Button",
179   - BS_AUTOCHECKBOX | WS_TABSTOP,15,248,103,10
  123 + BS_AUTOCHECKBOX | WS_TABSTOP,6,152,103,10
180 124 CONTROL "Load Modem DB from DUT",IDC_MDDB_FROM_DUT_CHECK,"Button",
181   - BS_AUTOCHECKBOX | WS_TABSTOP,128,248,103,10
182   - EDITTEXT IDC_MD_1_DBFILE_PATH,12,261,225,12,ES_AUTOHSCROLL |
  125 + BS_AUTOCHECKBOX | WS_TABSTOP,119,152,103,10
  126 + EDITTEXT IDC_MD_1_DBFILE_PATH,3,165,187,12,ES_AUTOHSCROLL |
183 127 ES_READONLY
184   - PUSHBUTTON "MD1_DB",IDC_BTN_MD1,240,261,32,12
185   - EDITTEXT IDC_MD_2_DBFILE_PATH,12,277,225,12,ES_AUTOHSCROLL |
  128 + PUSHBUTTON "MD1_DB",IDC_BTN_MD1,192,165,32,12
  129 + EDITTEXT IDC_MD_2_DBFILE_PATH,3,181,187,12,ES_AUTOHSCROLL |
186 130 ES_READONLY
187   - PUSHBUTTON "MD2_DB",IDC_BTN_MD2,240,277,32,12
188   - EDITTEXT IDC_AP_DBFILE_PATH,12,292,225,12,ES_AUTOHSCROLL |
  131 + PUSHBUTTON "MD2_DB",IDC_BTN_MD2,192,181,32,12
  132 + EDITTEXT IDC_AP_DBFILE_PATH,3,196,187,12,ES_AUTOHSCROLL |
189 133 ES_READONLY
190   - PUSHBUTTON "AP_DB",IDC_BTN_AP,240,292,32,12
191   - LTEXT "Log Dir",IDC_STATIC,7,314,29,8
192   - EDITTEXT IDC_LOG_DIR,36,313,226,12,ES_AUTOHSCROLL | ES_READONLY
193   - PUSHBUTTON "...",IDC_BTN_LOG,262,313,14,12
194   - PUSHBUTTON "Save",IDC_BTN_SAVE,72,329,140,17
  134 + PUSHBUTTON "AP_DB",IDC_BTN_AP,192,196,32,12
  135 + EDITTEXT IDC_LOG_DIR,0,217,164,12,ES_AUTOHSCROLL | ES_READONLY
  136 + PUSHBUTTON "LOG Dir",IDC_BTN_LOG,170,218,54,12
  137 + PUSHBUTTON "Save",IDC_BTN_SAVE,132,233,140,17
  138 + LTEXT "SW version",IDC_STATIC,0,126,39,8
  139 + EDITTEXT IDC_STR_SWVERSION,45,124,183,14,ES_AUTOHSCROLL
195 140 END
196 141
197 142 IDD_ENCRYPTION_DIALOG DIALOG DISCARDABLE 0, 0, 287, 111
... ... @@ -206,60 +151,37 @@ BEGIN
206 151 LTEXT "......",IDC_PWD_MSG,7,50,273,23
207 152 END
208 153
209   -IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 458, 195
  154 +IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 299, 145
210 155 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
211 156 WS_SYSMENU
212 157 EXSTYLE WS_EX_APPWINDOW
213   -CAPTION "c"
214   -FONT 9, "΢ÈíÑźÚ", 0, 0, 0x1
  158 +CAPTION "SN Writer(TOPWELL)"
  159 +FONT 10, "System", 0, 0, 0x1
215 160 BEGIN
216   - EDITTEXT IDC_EDT_VERSION,56,0,160,13,ES_AUTOHSCROLL
217   - PUSHBUTTON "Save",IDC_BT_SAVE_SWVER,223,0,44,15
218   - PUSHBUTTON "Select",IDC_BTN_AP_PATH,222,26,44,12,NOT WS_TABSTOP
219   - PUSHBUTTON "Select",IDC_BTN_BP_PATH,222,41,44,12,NOT WS_TABSTOP
220   - DEFPUSHBUTTON "Start",IDC_BTN_START,8,147,101,22
221   - DEFPUSHBUTTON "Config",IDC_BTN_SYSCONFIG,9,186,6,6,NOT WS_VISIBLE
222   - DEFPUSHBUTTON "Quit",IDC_BTN_QUIT,161,147,101,22
223   - LTEXT "Total:",IDC_STATIC,6,126,27,10
224   - LTEXT "Pass:",IDC_STATIC_PASS,88,126,27,10
225   - LTEXT "Fail:",IDC_STATIC,166,126,27,10
226   - COMBOBOX IDC_COMBO_COMPORT,37,183,34,51,CBS_DROPDOWNLIST |
227   - CBS_SORT | WS_VSCROLL
228   - LTEXT "SW Version",IDC_STATIC,6,2,48,9
229   - LTEXT "BP DB",IDC_STATIC,14,41,20,9
230   - LTEXT "AP DB",IDC_STATIC,14,27,20,9
231   - EDITTEXT IDC_STR_AP_PATH,38,24,179,13,ES_AUTOHSCROLL |
232   - ES_READONLY | NOT WS_TABSTOP
233   - EDITTEXT IDC_STR_BP_PATH,38,40,179,13,ES_AUTOHSCROLL |
234   - ES_READONLY | NOT WS_TABSTOP
235   - GROUPBOX "DB file path",IDC_STATIC,6,14,264,44
236   - CONTROL 133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,157,86,91,38
237   - LTEXT "SW",IDC_STATIC,6,73,11,9
238   - LTEXT "CFT",IDC_STATIC,5,90,12,9
239   - LTEXT "MMI",IDC_STATIC,73,90,17,9
240   - LTEXT "IMEI",IDC_STATIC,73,111,22,9
241   - LTEXT "QC1",IDC_STATIC,5,110,13,9
242   - EDITTEXT IDC_RSLT_CFT,29,90,37,12,ES_AUTOHSCROLL | ES_READONLY |
243   - NOT WS_TABSTOP
244   - EDITTEXT IDC_RSLT_SMT,102,90,37,12,ES_AUTOHSCROLL | ES_READONLY |
245   - NOT WS_TABSTOP
246   - EDITTEXT IDC_RSLT_QC,29,109,37,12,ES_AUTOHSCROLL | ES_READONLY |
247   - NOT WS_TABSTOP
248   - EDITTEXT IDC_RSLT_WRITE_IMEI,102,109,37,12,ES_AUTOHSCROLL |
249   - ES_READONLY | NOT WS_TABSTOP
250   - GROUPBOX "Test Result",IDC_STATIC,2,60,266,83
251   - LISTBOX IDC_LOG_LIST,275,0,182,174,LBS_NOINTEGRALHEIGHT |
252   - WS_VSCROLL
253   - CONTROL "",IDC_COUNT_TOTAL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
254   - 44,126,30,8,WS_EX_STATICEDGE
255   - CONTROL "",IDC_COUNT_PASS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
256   - 115,126,29,8,WS_EX_STATICEDGE
257   - CONTROL "",IDC_COUNT_FAIL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
258   - 193,126,36,8,WS_EX_STATICEDGE
259   - CTEXT "",IDC_RSLT_SW,35,73,228,11,SS_CENTERIMAGE,
260   - WS_EX_STATICEDGE
261   - CTEXT "",IDC_STATIC_TIMECOUNT,114,152,41,12,SS_CENTERIMAGE,
262   - WS_EX_STATICEDGE
  161 + LTEXT "ComPort:",IDC_STATIC,5,15,34,9,0,WS_EX_RIGHT
  162 + EDITTEXT IDC_COUNT_TOTAL,185,13,22,13,ES_AUTOHSCROLL |
  163 + ES_READONLY
  164 + PUSHBUTTON "Config",IDC_BTN_SYSCONFIG,48,29,34,14
  165 + DEFPUSHBUTTON "Start",IDC_BTN_START,8,29,34,14
  166 + PUSHBUTTON "Quit",IDC_BTN_QUIT,88,29,34,14
  167 + EDITTEXT IDC_COUNT_PASS,185,29,22,13,ES_AUTOHSCROLL | ES_READONLY
  168 + EDITTEXT IDC_COUNT_FAIL,185,45,22,13,ES_AUTOHSCROLL | ES_READONLY
  169 + LTEXT "Total:",IDC_STATIC,157,16,20,10
  170 + LTEXT "Pass:",IDC_STATIC_PASS,158,32,21,10
  171 + LTEXT "Fail:",IDC_STATIC,158,48,18,10
  172 + GROUPBOX "config",IDC_STATIC,0,0,149,67
  173 + COMBOBOX IDC_COMBO_COMPORT,49,12,51,51,CBS_DROPDOWNLIST |
  174 + CBS_SORT | WS_VSCROLL | WS_TABSTOP
  175 + COMBOBOX IDC_COMBO_TARGET_TYPE,4,133,16,63,CBS_DROPDOWNLIST |
  176 + CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
  177 + PUSHBUTTON "Button1",IDC_BTN_INDITE,209,12,76,50,BS_BITMAP |
  178 + BS_FLAT
  179 + CTEXT "",IDC_MAINUI_TIME_COUNT,109,14,37,9,SS_CENTERIMAGE,
  180 + WS_EX_RIGHT
  181 + LTEXT "Static",IDC_STATIC_SWVER,6,49,138,11,0,WS_EX_STATICEDGE
  182 + LISTBOX IDC_LIST_LOG,1,69,297,62,LBS_NOINTEGRALHEIGHT |
  183 + WS_VSCROLL | WS_TABSTOP
  184 + GROUPBOX "Result",IDC_STATIC,151,0,148,67
263 185 END
264 186
265 187 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
... ... @@ -321,8 +243,7 @@ BEGIN
321 243 10,162,8
322 244 LTEXT "Meta DLL 1340.01",IDC_METADLL_VERSION,42,27,104,8
323 245 LTEXT "SPMeta DLL 1345.01",IDC_SPMETADLL_VERSION,42,40,104,8
324   - LTEXT "Copyright(C) 2004-2010 MediaTek Inc. All rights reserved.",
325   - IDC_STATIC,42,58,170,8
  246 + ICON IDR_MAINFRAME,IDC_STATIC,13,12,20,20
326 247 END
327 248
328 249 IDD_IDENTIFY_VERIFY_DIALOG DIALOG DISCARDABLE 0, 0, 187, 61
... ... @@ -481,9 +402,9 @@ BEGIN
481 402 IDD_SYSTEM_CONFIG_DIALOG, DIALOG
482 403 BEGIN
483 404 LEFTMARGIN, 7
484   - RIGHTMARGIN, 276
  405 + RIGHTMARGIN, 395
485 406 TOPMARGIN, 3
486   - BOTTOMMARGIN, 346
  407 + BOTTOMMARGIN, 252
487 408 END
488 409
489 410 IDD_ENCRYPTION_DIALOG, DIALOG
... ... @@ -496,9 +417,7 @@ BEGIN
496 417
497 418 IDD_SNWRITER_DIALOG, DIALOG
498 419 BEGIN
499   - RIGHTMARGIN, 150
500 420 TOPMARGIN, 7
501   - BOTTOMMARGIN, 183
502 421 END
503 422
504 423 IDD_SCANDATA_DIALOG, DIALOG
... ... @@ -589,11 +508,21 @@ END
589 508
590 509 /////////////////////////////////////////////////////////////////////////////
591 510 //
  511 +// Icon
  512 +//
  513 +
  514 +// Icon with lowest ID value placed first to ensure application icon
  515 +// remains consistent on all systems.
  516 +IDR_MAINFRAME ICON DISCARDABLE "res\\SN Writer.ico"
  517 +
  518 +/////////////////////////////////////////////////////////////////////////////
  519 +//
592 520 // Bitmap
593 521 //
594 522
595 523 IDB_BITMAP_FAIL BITMAP MOVEABLE PURE "res\\FAIL.bmp"
596 524 IDB_BITMAP_PASS BITMAP MOVEABLE PURE "res\\PASS.bmp"
  525 +IDB_BITMAP_NORMAL BITMAP DISCARDABLE "res\\NORMAL.bmp"
597 526
598 527 /////////////////////////////////////////////////////////////////////////////
599 528 //
... ...
... ... @@ -9,13 +9,15 @@
9 9 #include "Common.h"
10 10 #include "Com_Enum.h"
11 11 #include "SNBase.h"
  12 +#include "BtnST.h"
12 13 #include "AboutSNDlg.h"
13 14 #include "ChgPasswdDlg.h"
14 15 #include "VerifyPasswdDlg.h"
15 16 #include "FileSelDlg.h"
16 17 #include "AutoGenDlg.h"
17 18 #include "HdcpEncryption.h"
18   -#include "spmeta.h"
  19 +
  20 +
19 21
20 22 #ifdef _DEBUG
21 23 #define new DEBUG_NEW
... ... @@ -28,8 +30,11 @@ static char THIS_FILE[] = __FILE__;
28 30 #define MAX_COMPORT_COUNT 255
29 31 unsigned short g_iTotalComPort = MAX_COMPORT_COUNT;
30 32 unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0};
  33 +byte g_QC_value_from_phone;// ´ÓÊÖ»úÖжÁµ½µÄQCÖµ
  34 +const char *g_strToolVersion = "SN Writer (TOPWELL)";
  35 +TOPWELL_TOOL_WORK_MODE g_topwell_workmode;
  36 +
31 37
32   -const char *g_strToolVersion = "check flag tool By TOPWELL";
33 38
34 39 extern CSNWriterDlg *g_pMainDlg;
35 40
... ... @@ -88,47 +93,36 @@ CSNWriterDlg::CSNWriterDlg(CWnd* pParent /*=NULL*/)
88 93 m_strTotal = _T("");
89 94 m_strPass = _T("");
90 95 m_strFail = _T("");
91   - myversion = _T("");
92   - my_str_ap_path = _T("");
93   - my_str_bp_path = _T("");
94   - myrslt_qc = _T("");
95   - myrslt_smt = _T("");
96   - myrslt_cft = _T("");
97   - myrslt_sw = _T("");
98   - myrslt_imei = _T("");
99 96 mytimecount = 0;
100   - //}}AFX_DATA_INIT
  97 + //}}AFX_DATA_INIT
101 98 // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
102   - m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
  99 + m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
103 100 }
104 101
105 102 void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
106 103 {
107 104 CDialog::DoDataExchange(pDX);
108 105 //{{AFX_DATA_MAP(CSNWriterDlg)
109   - DDX_Control(pDX, IDC_LOG_LIST, myloglist);
110   - DDX_Control(pDX, IDC_BITMAP_RESAULT, myctrlbit);
  106 + DDX_Control(pDX, IDC_LIST_LOG, myloglist);
  107 + DDX_Control(pDX, IDC_COMBO_TARGET_TYPE, m_cTargetTypeBox);
111 108 DDX_Control(pDX, IDC_COMBO_COMPORT, m_cComPortBox);
112 109 DDX_Text(pDX, IDC_COUNT_TOTAL, m_strTotal);
113 110 DDX_Text(pDX, IDC_COUNT_PASS, m_strPass);
114 111 DDX_Text(pDX, IDC_COUNT_FAIL, m_strFail);
115   - DDX_Text(pDX, IDC_EDT_VERSION, myversion);
116   - DDX_Text(pDX, IDC_STR_AP_PATH, my_str_ap_path);
117   - DDX_Text(pDX, IDC_STR_BP_PATH, my_str_bp_path);
118   - DDX_Text(pDX, IDC_RSLT_QC, myrslt_qc);
119   - DDX_Text(pDX, IDC_RSLT_SMT, myrslt_smt);
120   - DDX_Text(pDX, IDC_RSLT_CFT, myrslt_cft);
121   - DDX_Text(pDX, IDC_RSLT_SW, myrslt_sw);
122   - DDX_Text(pDX, IDC_RSLT_WRITE_IMEI, myrslt_imei);
  112 + DDX_Text(pDX,IDC_MAINUI_TEMP1,m_MainUIT1);
123 113 //}}AFX_DATA_MAP
124 114
  115 +#ifdef _BITMAP_BTN_
  116 + DDX_Control(pDX, IDC_BTN_INDITE, m_InditeBTN);
  117 +
  118 +#else
  119 + DDX_Control(pDX, IDC_BTN_INDITE, m_InditeBTN);
  120 +#endif
125 121
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);
129 125
130   -
131   -
132 126
133 127 }
134 128
... ... @@ -140,6 +134,7 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
140 134 ON_BN_CLICKED(IDC_BTN_QUIT, OnBtnQuit)
141 135 ON_BN_CLICKED(IDC_BTN_SYSCONFIG, OnBtnSysconfig)
142 136 ON_CBN_SELCHANGE(IDC_COMBO_COMPORT, OnSelchangeComboComport)
  137 + ON_CBN_SELCHANGE(IDC_COMBO_TARGET_TYPE, OnSelchangeComboTargetType)
143 138 ON_WM_CTLCOLOR()
144 139 ON_COMMAND(IDR_ABOUT_SN, OnAboutSn)
145 140 ON_COMMAND(IDR_ATCMD_MODE, OnAtcmdMode)
... ... @@ -165,9 +160,6 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
165 160 ON_COMMAND(IDR_OPTION_COMPOSITE_DEVICE, OnOptionCompositeDevice)
166 161 ON_COMMAND(IDR_BACKNV_TOPC, OnBacknvTopc)
167 162 ON_COMMAND(IDR_OEM_LOCK, OnFastbootOemLock)
168   - ON_BN_CLICKED(IDC_BT_SAVE_SWVER, OnBtSaveSwver)
169   - ON_BN_CLICKED(IDC_BTN_AP_PATH, OnBtnApPath)
170   - ON_BN_CLICKED(IDC_BTN_BP_PATH, OnBtnBpPath)
171 163 ON_WM_SYSCOMMAND()
172 164 ON_WM_TIMER()
173 165 //}}AFX_MSG_MAP
... ... @@ -200,41 +192,45 @@ BOOL CSNWriterDlg::OnInitDialog()
200 192
201 193 // Set the icon for this dialog. The framework does this automatically
202 194 // when the application's main window is not a dialog
203   - // SetIcon(m_hIcon, TRUE); // Set big icon
204   - //SetIcon(m_hIcon, FALSE); // Set small icon
  195 + SetIcon(m_hIcon, TRUE); // Set big icon
  196 + SetIcon(m_hIcon, FALSE); // Set small icon
205 197
206 198 SetWindowText(g_strToolVersion);
207 199
208 200 // TODO: Add extra initialization here
209 201 //g_MainDlgHandle = (DWORD)this;
210   -
211 202 m_SNMenu.LoadMenu(IDR_SN_MENU);
212 203 m_hSNMenu = m_SNMenu.GetSafeHmenu();
213 204
214 205 #ifdef _LOAD_SKIN_
215 206 skinppSetDrawMenu(m_hSNMenu, TRUE);
216 207 #endif
217   -#ifdef __TOPWELL_QCTEST__
218   - g_sMetaComm.bCheckQCFlag = true;
219   -#endif
220   - m_font.CreatePointFont(250, "Arial");
  208 +
  209 + m_font.CreatePointFont(380, "Arial");
221 210
222 211 //m_hSNMenu = LoadMenu(AfxGetInstanceHandle(),MAKEINTRESOURCE(IDR_SN_MENU));
223 212 ::SetMenu(this->GetSafeHwnd(),m_hSNMenu);
224 213
225 214 m_hBitmapFail = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_FAIL));
226 215 m_hBitmapPass = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_PASS));
227   - GetDlgItem(IDC_BTN_START)->SetFont(&m_font);
228   - GetDlgItem(IDC_BTN_QUIT)->SetFont(&m_font);
229   -// ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
  216 + m_hBitmapnormal = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_NORMAL));
  217 + //((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
230 218
  219 +#ifdef _BITMAP_BTN_
  220 + m_InditeBTN.SetBitmap(m_hBitmapnormal);
  221 +#else
  222 + m_InditeBTN.SetShade(CShadeButtonST::SHS_METAL);
  223 +#endif
231 224
  225 + m_StartBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  226 + m_QuitBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
  227 + m_SystemCfgBTN.SetShade(CShadeButtonST::SHS_SOFTBUMP);
232 228
233 229 // Get main dialog handle
234 230 g_pMainDlg = (CSNWriterDlg*)this;
235 231 ParameterInit();
236   - myctrlbit.ShowWindow(SW_HIDE);
237   - m_cComPortBox.ShowWindow(SW_HIDE);
  232 + SetDlgItemText(IDC_STATIC_SWVER,"please setting SW version");
  233 + SetDlgItemText(IDC_MAINUI_TIME_COUNT,"0 Sec");
238 234
239 235 return TRUE; // return TRUE unless you set the focus to a control
240 236 }
... ... @@ -389,11 +385,12 @@ void CSNWriterDlg::EnableStartBTN(bool bEnable)
389 385
390 386 void CSNWriterDlg::EnableUIItem()
391 387 {
392   - //GetDlgItem(IDC_COMBO_COMPORT)->EnableWindow(TRUE);
  388 + GetDlgItem(IDC_COMBO_COMPORT)->EnableWindow(TRUE);
393 389
394 390 if (g_LoginIdentify == ENGINEER)
395 391 {
396 392 GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(TRUE);
  393 + GetDlgItem(IDC_COMBO_TARGET_TYPE)->ShowWindow(SW_HIDE);
397 394
398 395 m_SNMenu.EnableMenuItem(0, MF_ENABLED | MF_BYPOSITION);
399 396 m_SNMenu.EnableMenuItem(1, MF_ENABLED | MF_BYPOSITION);
... ... @@ -405,6 +402,7 @@ void CSNWriterDlg::EnableUIItem()
405 402 else
406 403 {
407 404 GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(FALSE);
  405 + GetDlgItem(IDC_COMBO_TARGET_TYPE)->ShowWindow(SW_HIDE);
408 406 m_SNMenu.EnableMenuItem(0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
409 407 m_SNMenu.EnableMenuItem(1, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
410 408 m_SNMenu.EnableMenuItem(2, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
... ... @@ -412,23 +410,14 @@ void CSNWriterDlg::EnableUIItem()
412 410 m_SNMenu.GetSubMenu(3)->EnableMenuItem(0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
413 411 m_SNMenu.GetSubMenu(3)->EnableMenuItem(1, MF_ENABLED | MF_BYPOSITION);
414 412 }
415   -// GetDlgItem(IDC_MAINUI_TEMP1)->ShowWindow(FALSE);
416   -// GetDlgItem(IDC_MAINUI_TEMP2)->ShowWindow(FALSE);
417 413
418 414 SetDlgItemText(IDC_BTN_START, "Start");
419   - myversion = CString(g_sMetaComm.check_sw_ver);
420   - my_str_ap_path = CString(g_sMetaComm.sDBFileOption.strAPDbpath);
421   - my_str_bp_path = CString(g_sMetaComm.sDBFileOption.strMD1Dbpath);
422   - GetDlgItem(IDC_EDT_VERSION)->SetWindowText(myversion);
423   - GetDlgItem(IDC_STR_AP_PATH)->SetWindowText(my_str_ap_path);
424   - GetDlgItem(IDC_STR_BP_PATH)->SetWindowText(my_str_bp_path);
425   - //
426   - //UpdateData(FALSE);
427 415 }
428 416
429 417 void CSNWriterDlg::DisableUIItem()
430 418 {
431 419 GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(FALSE);
  420 + GetDlgItem(IDC_COMBO_TARGET_TYPE)->ShowWindow(SW_HIDE);
432 421 GetDlgItem(IDC_COMBO_COMPORT)->EnableWindow(FALSE);
433 422 m_SNMenu.EnableMenuItem( 0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION );
434 423 m_SNMenu.EnableMenuItem( 1, MF_GRAYED | MF_DISABLED | MF_BYPOSITION );
... ... @@ -453,7 +442,7 @@ void CSNWriterDlg::PopupMsgBox(const char* strTilte, UINT uType, const char* str
453 442
454 443 void CSNWriterDlg::GetIndicatorPos(CRect &rect)
455 444 {
456   -// ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->GetWindowRect(&rect);
  445 + ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->GetWindowRect(&rect);
457 446 }
458 447
459 448 void CSNWriterDlg::UpdateOperateResult(WriteNvram_Status_e eWriteStatus)
... ... @@ -462,15 +451,18 @@ void CSNWriterDlg::UpdateOperateResult(WriteNvram_Status_e eWriteStatus)
462 451 switch (eWriteStatus)
463 452 {
464 453 case FAIL:
465   - myctrlbit.SetBitmap(m_hBitmapFail);
  454 + ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_SHOW);
  455 + m_InditeBTN.SetBitmap(m_hBitmapFail);
466 456 break;
467 457
468 458 case PASS:
469   - myctrlbit.SetBitmap(m_hBitmapPass);
  459 + ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_SHOW);
  460 + m_InditeBTN.SetBitmap(m_hBitmapPass);
470 461 break;
471 462
472 463 case NORMAL:
473   - myctrlbit.ShowWindow(SW_HIDE);
  464 + ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_SHOW);
  465 + m_InditeBTN.SetBitmap(m_hBitmapnormal);
474 466 break;
475 467
476 468 case CANCEL:
... ... @@ -484,7 +476,7 @@ void CSNWriterDlg::UpdateOperateResult(WriteNvram_Status_e eWriteStatus)
484 476 void CSNWriterDlg::GetUIItem()
485 477 {
486 478 OnSelchangeComboComport();
487   -// OnSelchangeComboTargetType();
  479 + OnSelchangeComboTargetType();
488 480 }
489 481
490 482 void CSNWriterDlg::SwitchToEngineer()
... ... @@ -547,6 +539,12 @@ void CSNWriterDlg::SetUIItem()
547 539 {
548 540 GetComPortDynamiclly();
549 541
  542 +// m_cTargetTypeBox.InsertString(FEATURE_PHONE, "Feature Phone");
  543 +// m_cTargetTypeBox.InsertString(SMART_PHONE, "Smart Phone");
  544 +// m_cTargetTypeBox.InsertString(SMART_PHONE_DUALMODEM, "SP DualModem");
  545 +// m_cTargetTypeBox.InsertString(TABLET_WIFI_ONLY, "Tablet Wifi Only");
  546 +// m_cTargetTypeBox.InsertString(RNDIG_DONGLE, "Rndis Dongle");
  547 + m_cTargetTypeBox.SetCurSel(SMART_PHONE);
550 548 }
551 549
552 550 // If you add a minimize button to your dialog, you will need the code below
... ... @@ -570,7 +568,7 @@ void CSNWriterDlg::OnPaint()
570 568 int y = (rect.Height() - cyIcon + 1) / 2;
571 569
572 570 // Draw the icon
573   - // dc.DrawIcon(x, y, m_hIcon);
  571 + dc.DrawIcon(x, y, m_hIcon);
574 572 }
575 573 else
576 574 {
... ... @@ -580,41 +578,24 @@ void CSNWriterDlg::OnPaint()
580 578
581 579 void CSNWriterDlg::ShowTemperatureOnUI()
582 580 {
583   -// GetDlgItem(IDC_MAINUI_TEMP1)->ShowWindow(true);
584   -// GetDlgItem(IDC_MAINUI_TEMP2)->ShowWindow(true);
585 581
586   -// m_MainUIT1.Format("%s", g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData);
587   -// GetDlgItem(IDC_MAINUI_TEMP1)->SetWindowText(m_MainUIT1);
  582 + m_MainUIT1.Format("%s", g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData);
588 583
589   -// GetDlgItem(IDC_MAINUI_TEMP1)->SetFont(&m_font);
590   -// GetDlgItem(IDC_MAINUI_TEMP2)->SetFont(&m_font);
591 584 //m_font.DeleteObject();
592 585 }
593 586
594 587
595 588 // The system calls this to obtain the cursor to display while the user drags
596 589 // the minimized window.
597   -
598   -#if 0
599 590 HCURSOR CSNWriterDlg::OnQueryDragIcon()
600 591 {
601 592 return (HCURSOR) m_hIcon;
602 593 }
603   -#endif
604 594
605 595 void CSNWriterDlg::OnBtnStart()
606 596 {
607 597 // TODO: Add your control notification handler code here
608   -// OnSelchangeComboTargetType();
609   - if (my_str_ap_path== "" ||my_str_bp_path== "")
610   - {
611   - MessageBox("请指定DB文件");
612   - return;
613   - }
614   - if (myversion == "")
615   - {
616   - MessageBox("请输入版本号");
617   - }
  598 + OnSelchangeComboTargetType();
618 599 OnSelchangeComboComport();
619 600 E_TARGET_TYPE eTargetType = GetTargetType();
620 601
... ... @@ -623,14 +604,26 @@ void CSNWriterDlg::OnBtnStart()
623 604
624 605 if (strText == "Start")
625 606 {
626   - m_spSN.SNThread_Start();
627   -// SetTimer(1,1000,NULL);
  607 + if (eTargetType == FEATURE_PHONE)
  608 + {
  609 + m_fpSN.SNThread_Start();
  610 + }
  611 + else
  612 + {
  613 + m_spSN.SNThread_Start();
  614 + }
628 615 }
629 616 else if(strText == "Stop")
630 617 {
631   - m_spSN.SNThread_Stop();
632   - mytimecount = 0;
633   - KillTimer(1);
  618 + if (eTargetType == FEATURE_PHONE)
  619 + {
  620 + m_fpSN.SNThread_Stop();
  621 + }
  622 + else
  623 + {
  624 + m_spSN.SNThread_Stop();
  625 + }
  626 +
634 627 EnableUIItem();
635 628 }
636 629 }
... ... @@ -666,6 +659,14 @@ void CSNWriterDlg::OnBtnSysconfig()
666 659 // TODO: Add your control notification handler code here
667 660 CSystemConfig dlg;
668 661 dlg.DoModal();
  662 + if (dlg.myswversion == "" ||dlg.myswversion == "null")
  663 + {
  664 + SetDlgItemText(IDC_STATIC_SWVER,"The version number is empty!!!");
  665 + }
  666 + else
  667 + {
  668 + SetDlgItemText(IDC_STATIC_SWVER,dlg.myswversion);
  669 + }
669 670 }
670 671
671 672 void CSNWriterDlg::OnSelchangeComboComport()
... ... @@ -689,49 +690,48 @@ void CSNWriterDlg::OnSelchangeComboComport()
689 690 }
690 691 }
691 692
692   -// void CSNWriterDlg::OnSelchangeComboTargetType()
693   -// {
694   -// // TODO: Add your control notification handler code here
695   -// UpdateData(TRUE);
696   -// // g_sMetaComm.eTargetType =(E_TARGET_TYPE)m_cTargetTypeBox.GetCurSel();
697   -//
698   -// if (g_sMetaComm.eTargetType == RNDIG_DONGLE)
699   -// {
700   -// g_sMetaComm.bSwithTool = true;
701   -// g_sMetaComm.bDualTalk = false;
702   -// m_SNMenu.GetSubMenu(1)->CheckMenuItem(IDR_OPTION_SWITCHTOOL, MF_CHECKED | MF_BYCOMMAND); //USB SwithTool option
703   -// m_SNMenu.GetSubMenu(1)->CheckMenuItem(IDR_OPTION_EXTMODEM, MF_UNCHECKED | MF_BYCOMMAND); //Extern modem option
704   -// }
705   -//
706   -// if (g_sMetaComm.eTargetType != FEATURE_PHONE && g_sMetaComm.eTargetType != RNDIG_DONGLE)
707   -// {
708   -// g_sMetaComm.bSwithTool = false;
709   -// g_sMetaComm.bWithoutBattery = false;
710   -// m_SNMenu.GetSubMenu(1)->CheckMenuItem(IDR_OPTION_USB_WITHOUT_BATTERY, MF_UNCHECKED | MF_BYCOMMAND); //USB without battery
711   -// m_SNMenu.GetSubMenu(1)->CheckMenuItem(IDR_OPTION_SWITCHTOOL, MF_UNCHECKED | MF_BYCOMMAND); //USB SwithTool
712   -// }
713   -//
714   -// if(g_sMetaComm.eTargetType == TABLET_WIFI_ONLY)
715   -// {
716   -// g_sMetaComm.sWriteOption.bWriteHdcp = false;
717   -// g_sMetaComm.sWriteOption.bInstallHdcpData = false;
718   -// m_SNMenu.GetSubMenu(2)->EnableMenuItem(IDR_OPTION_HDCP, MF_GRAYED | MF_DISABLED | MF_BYCOMMAND);
719   -// m_SNMenu.GetSubMenu(2)->EnableMenuItem(IDR_OPTION_HDCPDATA, MF_GRAYED | MF_DISABLED | MF_BYCOMMAND);
720   -// m_SNMenu.GetSubMenu(2)->CheckMenuItem(IDR_OPTION_HDCP, MF_UNCHECKED);
721   -// m_SNMenu.GetSubMenu(2)->CheckMenuItem(IDR_OPTION_HDCPDATA, MF_UNCHECKED);
722   -// }
723   -// else
724   -// {
725   -// m_SNMenu.GetSubMenu(2)->EnableMenuItem(IDR_OPTION_HDCP, MF_ENABLED | MF_BYCOMMAND);
726   -// m_SNMenu.GetSubMenu(2)->EnableMenuItem(IDR_OPTION_HDCPDATA, MF_ENABLED | MF_BYCOMMAND);
727   -// }
728   -// }
  693 +void CSNWriterDlg::OnSelchangeComboTargetType()
  694 +{
  695 + // TODO: Add your control notification handler code here
  696 + UpdateData(TRUE);
  697 + g_sMetaComm.eTargetType =(E_TARGET_TYPE)m_cTargetTypeBox.GetCurSel();
  698 +
  699 + if (g_sMetaComm.eTargetType == RNDIG_DONGLE)
  700 + {
  701 + g_sMetaComm.bSwithTool = true;
  702 + g_sMetaComm.bDualTalk = false;
  703 + m_SNMenu.GetSubMenu(1)->CheckMenuItem(IDR_OPTION_SWITCHTOOL, MF_CHECKED | MF_BYCOMMAND); //USB SwithTool option
  704 + m_SNMenu.GetSubMenu(1)->CheckMenuItem(IDR_OPTION_EXTMODEM, MF_UNCHECKED | MF_BYCOMMAND); //Extern modem option
  705 + }
  706 +
  707 + if (g_sMetaComm.eTargetType != FEATURE_PHONE && g_sMetaComm.eTargetType != RNDIG_DONGLE)
  708 + {
  709 + g_sMetaComm.bSwithTool = false;
  710 + g_sMetaComm.bWithoutBattery = false;
  711 + m_SNMenu.GetSubMenu(1)->CheckMenuItem(IDR_OPTION_USB_WITHOUT_BATTERY, MF_UNCHECKED | MF_BYCOMMAND); //USB without battery
  712 + m_SNMenu.GetSubMenu(1)->CheckMenuItem(IDR_OPTION_SWITCHTOOL, MF_UNCHECKED | MF_BYCOMMAND); //USB SwithTool
  713 + }
  714 +
  715 + if(g_sMetaComm.eTargetType == TABLET_WIFI_ONLY)
  716 + {
  717 + g_sMetaComm.sWriteOption.bWriteHdcp = false;
  718 + g_sMetaComm.sWriteOption.bInstallHdcpData = false;
  719 + m_SNMenu.GetSubMenu(2)->EnableMenuItem(IDR_OPTION_HDCP, MF_GRAYED | MF_DISABLED | MF_BYCOMMAND);
  720 + m_SNMenu.GetSubMenu(2)->EnableMenuItem(IDR_OPTION_HDCPDATA, MF_GRAYED | MF_DISABLED | MF_BYCOMMAND);
  721 + m_SNMenu.GetSubMenu(2)->CheckMenuItem(IDR_OPTION_HDCP, MF_UNCHECKED);
  722 + m_SNMenu.GetSubMenu(2)->CheckMenuItem(IDR_OPTION_HDCPDATA, MF_UNCHECKED);
  723 + }
  724 + else
  725 + {
  726 + m_SNMenu.GetSubMenu(2)->EnableMenuItem(IDR_OPTION_HDCP, MF_ENABLED | MF_BYCOMMAND);
  727 + m_SNMenu.GetSubMenu(2)->EnableMenuItem(IDR_OPTION_HDCPDATA, MF_ENABLED | MF_BYCOMMAND);
  728 + }
  729 +}
729 730
730 731 HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
731 732 {
732 733 HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
733   -
734   - if((IDC_STATIC_TIMECOUNT == pWnd->GetDlgCtrlID()))
  734 + if((IDC_MAINUI_TIME_COUNT == pWnd->GetDlgCtrlID()))
735 735 {
736 736 pDC->SetTextColor(RGB(255,0,0));
737 737 }
... ... @@ -1083,61 +1083,15 @@ void CSNWriterDlg::OnFastbootOemLock()
1083 1083
1084 1084 }
1085 1085
1086   -void CSNWriterDlg::OnBtSaveSwver()
1087   -{
1088   - UpdateData(TRUE);
1089   - memset(g_sMetaComm.check_sw_ver,0x0,sizeof(g_sMetaComm.check_sw_ver));
1090   - memcpy(g_sMetaComm.check_sw_ver,myversion.GetBuffer(myversion.GetLength()),myversion.GetLength());
1091   - SaveParaToSetupFile();
1092   -}
1093   -
1094   -void CSNWriterDlg::OnBtnApPath()
1095   -{
1096   - char szFilter[]="Database files(*.*)|*.*";
1097   - CFileDialog dlg(TRUE, NULL, NULL,
1098   - OFN_FILEMUSTEXIST|OFN_EXPLORER|OFN_ENABLESIZING|0x10000000/*OFN_FORCESHOWHIDDEN*/,
1099   - szFilter, this);
1100   - dlg.m_ofn.lpstrTitle = _T("Select Modem_1 database file...");
1101   - if(dlg.DoModal() == IDOK)
1102   - {
1103   - g_sMetaComm.sDBFileOption.bDBInitModem_1 = false;
1104   - my_str_ap_path = dlg.GetPathName();
1105   - }
1106   - UpdateData(FALSE);
1107   - strcpy(g_sMetaComm.sDBFileOption.strAPDbpath,my_str_ap_path.GetBuffer(my_str_ap_path.GetLength()));
1108   -
1109   -
1110   -
1111   -}
1112   -
1113   -void CSNWriterDlg::OnBtnBpPath()
1114   -{
1115   - char szFilter[]="Database files(*.*)|*.*";
1116   - CFileDialog dlg(TRUE, NULL, NULL,
1117   - OFN_FILEMUSTEXIST|OFN_EXPLORER|OFN_ENABLESIZING|0x10000000/*OFN_FORCESHOWHIDDEN*/,
1118   - szFilter, this);
1119   - dlg.m_ofn.lpstrTitle = _T("Select Modem_1 database file...");
1120   - if(dlg.DoModal() == IDOK)
1121   - {
1122   - g_sMetaComm.sDBFileOption.bDBInitModem_1 = false;
1123   - my_str_bp_path = dlg.GetPathName();
1124   - }
1125   - UpdateData(FALSE);
1126   -
1127   - strcpy(g_sMetaComm.sDBFileOption.strMD1Dbpath,my_str_bp_path.GetBuffer(my_str_bp_path.GetLength()));
1128   -
1129   -}
1130   -
1131   -
1132   -
1133 1086 void CSNWriterDlg::OnTimer(UINT nIDEvent)
1134 1087 {
1135 1088 CString astr_time;
1136 1089 if (nIDEvent == 1)
1137 1090 {
1138   - mytimecount++;
1139   - astr_time.Format("%d S",mytimecount);
1140   - GetDlgItem(IDC_STATIC_TIMECOUNT)->SetWindowText(astr_time);
  1091 + mytimecount ++;
  1092 + astr_time.Format("%d Sec",mytimecount);
  1093 + SetDlgItemText(IDC_MAINUI_TIME_COUNT,astr_time);
  1094 +
1141 1095 }
1142 1096 CDialog::OnTimer(nIDEvent);
1143 1097 }
... ...
... ... @@ -16,8 +16,7 @@
16 16
17 17 #include "FPexc.h"
18 18 #include "SPexc.h"
19   -//#include "ShadeButtonST.h"
20   -#include "dlg_tips.h"
  19 +#include "ShadeButtonST.h"
21 20
22 21 class CSNWriterDlg : public CDialog
23 22 {
... ... @@ -29,21 +28,13 @@ public:
29 28 //{{AFX_DATA(CSNWriterDlg)
30 29 enum { IDD = IDD_SNWRITER_DIALOG };
31 30 CListBox myloglist;
32   - CStatic myctrlbit;
33 31 CComboBox m_cTargetTypeBox;
34 32 CComboBox m_cComPortBox;
35 33 CProgressCtrl m_ProgressSN;
36 34 CString m_strTotal;
37 35 CString m_strPass;
38 36 CString m_strFail;
39   - CString myversion;
40   - CString my_str_ap_path;
41   - CString my_str_bp_path;
42   - CString myrslt_qc;
43   - CString myrslt_smt;
44   - CString myrslt_cft;
45   - CString myrslt_sw;
46   - CString myrslt_imei;
  37 + CString m_MainUIT1;
47 38 //}}AFX_DATA
48 39
49 40 // ClassWizard generated virtual function overrides
... ... @@ -62,11 +53,12 @@ protected:
62 53 //{{AFX_MSG(CSNWriterDlg)
63 54 virtual BOOL OnInitDialog();
64 55 afx_msg void OnPaint();
65   - //afx_msg HCURSOR OnQueryDragIcon();
  56 + afx_msg HCURSOR OnQueryDragIcon();
66 57 afx_msg void OnBtnStart();
67 58 afx_msg void OnBtnQuit();
68 59 afx_msg void OnBtnSysconfig();
69 60 afx_msg void OnSelchangeComboComport();
  61 + afx_msg void OnSelchangeComboTargetType();
70 62 afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
71 63 afx_msg void OnAboutSn();
72 64 afx_msg void OnAtcmdMode();
... ... @@ -92,9 +84,6 @@ protected:
92 84 afx_msg void OnOptionCompositeDevice();
93 85 afx_msg void OnBacknvTopc();
94 86 afx_msg void OnFastbootOemLock();
95   - afx_msg void OnBtSaveSwver();
96   - afx_msg void OnBtnApPath();
97   - afx_msg void OnBtnBpPath();
98 87 afx_msg void OnTimer(UINT nIDEvent);
99 88 //}}AFX_MSG
100 89 DECLARE_MESSAGE_MAP()
... ... @@ -121,16 +110,22 @@ private:
121 110 CMenu m_SNMenu;
122 111 SmartPhoneSN m_spSN;
123 112 FeaturePhoneSN m_fpSN;
124   - CButton m_StartBTN;
125   - CButton m_QuitBTN;
126   - CButton m_SystemCfgBTN;
  113 + CShadeButtonST m_StartBTN;
  114 + CShadeButtonST m_QuitBTN;
  115 + CShadeButtonST m_SystemCfgBTN;
  116 +
  117 +#ifdef _BITMAP_BTN_
  118 + CButton m_InditeBTN;
  119 +#else
  120 + CShadeButtonST m_InditeBTN;
  121 +#endif
127 122
128 123 public:
129 124 HBITMAP m_hBitmapPass;
130 125 HBITMAP m_hBitmapFail;
  126 + HBITMAP m_hBitmapnormal;
131 127 CFont m_font;
132 128 int mytimecount;
133   - Cdlg_tips mytipsdlg;
134 129 };
135 130
136 131 //{{AFX_INSERT_LOCATION}}
... ...
... ... @@ -23,6 +23,19 @@
23 23 extern const char* g_strToolVersion;
24 24 #define __TOPWELL_QCTEST__
25 25
  26 +
  27 +typedef enum
  28 +{
  29 + //用于写号工位
  30 + TOPWELL_MODE_WRITE_IMEI = 0,
  31 + //用于扫码枪的IMEI 工位
  32 + TOPWELL_MODE_CHECK_IMEI ,
  33 + //用于包装工位
  34 + TOPWELL_MODE_CHECK_ALL,
  35 +}TOPWELL_TOOL_WORK_MODE;
  36 +
  37 +
  38 +
26 39 //{{AFX_INSERT_LOCATION}}
27 40
28 41 #endif // !defined(AFX_STDAFX_H__E5D84E0E_2EFD_421B_A61B_013774C0AA47__INCLUDED_)
... ...
No preview for this file type
No preview for this file type
No preview for this file type
... ... @@ -4,6 +4,7 @@
4 4 //
5 5 #define IDS_ABOUTBOX 101
6 6 #define IDD_SNWRITER_DIALOG 102
  7 +#define IDR_MAINFRAME 128
7 8 #define IDD_SCANDATA_DIALOG 129
8 9 #define IDD_SYSTEM_CONFIG_DIALOG 130
9 10 #define IDB_BITMAP_FAIL 131
... ... @@ -13,13 +14,9 @@
13 14 #define IDD_IDENTIFY_VERIFY_DIALOG 142
14 15 #define IDD_CHANGE_PASSWD_DIALOG 143
15 16 #define IDD_FILE_LOAD_DIALOG 144
16   -#define IDD_DIALOG1 145
17 17 #define IDD_AUTOGEN_DIALOG 146
18   -#define IDB_BITMAP_LOGO 148
19   -#define IDI_ICON1 154
20 18 #define IDD_ENCRYPTION_DIALOG 155
21   -#define IDD_DIALOG_TIPS 159
22   -#define IDR_MAINFRAME 160
  19 +#define IDB_BITMAP_NORMAL 162
23 20 #define IDC_COUNT_TOTAL 1000
24 21 #define IDC_BTN_SYSCONFIG 1001
25 22 #define IDC_BTN_START 1002
... ... @@ -35,9 +32,6 @@
35 32 #define IDC_BTN_MD1 1012
36 33 #define IDC_BTN_MD2 1013
37 34 #define IDC_BTN_AP 1014
38   -#define IDC_SECURITY_USB 1017
39   -#define IDC_SWITCHTOOL_CHECK 1018
40   -#define IDC_DUALTALK_CHECK 1019
41 35 #define IDC_WRITE_BARC_CHECK 1021
42 36 #define IDC_WRITE_IMEI_CHECK 1022
43 37 #define IDC_WRITE_WIFI_CHECK 1023
... ... @@ -97,7 +91,6 @@
97 91 #define IDC_SCAN_MSG 1072
98 92 #define IDC_STATIC_PASS 1073
99 93 #define IDC_ETHERNET_MAC_DATA 1074
100   -#define IDC_OPERATE_INFO 1075
101 94 #define IDC_DRMKEY_MCID_HEADER_SCAN 1076
102 95 #define IDC_DRMKEY_MCID_DATA 1077
103 96 #define IDC_BTN_INDITE 1078
... ... @@ -160,9 +153,9 @@
160 153 #define IDC_ETHERNET_NEXT_STR 1131
161 154 #define IDC_WIFI_AUTOGEN_STEP 1132
162 155 #define IDC_ETHERNET_AUTOGEN_STEP 1134
163   -#define IDC_MAINUI_TEMP2 1135
164 156 #define IDC_AUTOGEN_ETHERNET_CHECK 1136
165 157 #define IDC_MAINUI_TEMP1 1137
  158 +#define IDC_MAINUI_TIME_COUNT 1137
166 159 #define IDC_DRMKEY_MCID_START_STR 1138
167 160 #define IDC_DRMKEY_MCID_END_STR 1139
168 161 #define IDC_BARC_STATIC 1140
... ... @@ -170,50 +163,30 @@
170 163 #define IDC_BT_STATIC 1142
171 164 #define IDC_DRMKEY_MCID_AUTOGEN_STEP 1143
172 165 #define IDC_WIFI_STATIC 1144
173   -#define IDC_EXTERN_MD_DOWNLOAD 1145
174 166 #define IDC_AUTOGEN_DRMKEY_MCID_CHECK 1146
175 167 #define IDC_PWD_DATA 1147
176 168 #define IDC_IMEI_1_STATIC 1148
177 169 #define IDC_PWD_STATIC 1149
178   -#define IDC_EDT_VERSION 1149
179 170 #define IDC_IMEI_2_STATIC 1150
180   -#define IDC_BT_SAVE_SWVER 1150
181 171 #define IDC_PWD_MSG 1151
182 172 #define IDC_IMEI_3_STATIC 1152
183 173 #define IDC_IMEI_4_STATIC 1153
184   -#define IDC_STR_AP_PATH 1153
185 174 #define IDC_ETHERNET_STATIC 1154
186   -#define IDC_STR_BP_PATH 1154
187 175 #define IDC_MCID_STATIC 1155
188   -#define IDC_BUTTON2 1155
189   -#define IDC_BTN_AP_PATH 1155
190 176 #define IDC_SERIAL_NO_STATIC 1156
191   -#define IDC_BUTTON3 1156
192   -#define IDC_BTN_BP_PATH 1156
193 177 #define IDC_DENARY_INCREASE 1157
194   -#define IDC_STR_R 1157
195   -#define IDC_RSLT_SW 1157
196 178 #define IDC_MEID_STATIC 1158
197   -#define IDC_EDIT5 1158
198   -#define IDC_RSLT_CFT 1158
199 179 #define IDC_HEX_INCREASE 1159
200   -#define IDC_EDIT6 1159
201   -#define IDC_RSLT_SMT 1159
202 180 #define IDC_ESN_STATIC 1160
203   -#define IDC_EDIT7 1160
204   -#define IDC_RSLT_QC 1160
205 181 #define IDC_WRITE_SERIAL_NO_CHECK 1161
206   -#define IDC_EDIT8 1161
207   -#define IDC_RSLT_WRITE_IMEI 1161
208 182 #define IDC_MDDB_FROM_DUT_CHECK 1162
209   -#define IDC_BITMAP_RESAULT 1162
210 183 #define IDC_APDB_FROM_DUT_CHECK 1163
211 184 #define IDC_LOG_DIR 1164
212 185 #define IDC_BTN_LOG 1165
213 186 #define IDC_LOCK_OTP 1166
214   -#define IDC_LOG_LIST 1170
215   -#define IDC_STATIC_TIMECOUNT 1173
216   -#define IDC_DATETIMEPICKER2 1176
  187 +#define IDC_STR_SWVERSION 1167
  188 +#define IDC_STATIC_SWVER 1169
  189 +#define IDC_LIST_LOG 1175
217 190 #define IDR_OPTION_SWITCHTOOL 32772
218 191 #define IDR_OPTION_EXTMODEM 32773
219 192 #define IDR_OPTION_SECURITY_USB 32774
... ... @@ -243,9 +216,9 @@
243 216 //
244 217 #ifdef APSTUDIO_INVOKED
245 218 #ifndef APSTUDIO_READONLY_SYMBOLS
246   -#define _APS_NEXT_RESOURCE_VALUE 161
  219 +#define _APS_NEXT_RESOURCE_VALUE 163
247 220 #define _APS_NEXT_COMMAND_VALUE 32798
248   -#define _APS_NEXT_CONTROL_VALUE 1177
  221 +#define _APS_NEXT_CONTROL_VALUE 1176
249 222 #define _APS_NEXT_SYMED_VALUE 101
250 223 #endif
251 224 #endif
... ...
Please register or login to post a comment