Echo / InterlockingTool · Commits

Commit c409511c954029e80c1f0cd8c3d188cb5db1c5d8

Authored by xiemeng
1 parent 4f6274e0

update for default imei

Inline Side-by-side
Showing 2 changed files with 53 additions and 45 deletions
... ... @@ -217,15 +217,19 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
217 217 a_imei_ary[15] = 0;
218 218 a_imei_ary2[15] = 0;
219 219
220   - if (strcmp(a_imei_ary,"352246078300483") == 0 || strcmp(a_imei_ary,"352246078300491"))
221   - {
222   - memset(a_imei_ary,0,16);
223   - memset(a_imei_ary2,0,16);
224   - }
225 220 calc_imei1 = META_NVRAM_Calculate_IMEI_CD(a_imei_ary, &checksum_v);
226 221 calc_imei2 = META_NVRAM_Calculate_IMEI_CD(a_imei_ary2, &checksum_v);
227   - g_pMainDlg->GetDlgItem(IDC_STATIC_IMEI1)->SetWindowText(a_imei_ary);
228   - g_pMainDlg->GetDlgItem(IDC_STATIC_IMEI2)->SetWindowText(a_imei_ary2);
  222 + if (strcmp(a_imei_ary,"352246078300483") == 0 || strcmp(a_imei_ary,"352246078300491"))
  223 + {
  224 + g_pMainDlg->GetDlgItem(IDC_STATIC_IMEI1)->SetWindowText("default IMEI 352246078300483");
  225 + g_pMainDlg->GetDlgItem(IDC_STATIC_IMEI2)->SetWindowText("default IMEI 352246078300491");
  226 + }
  227 + else
  228 + {
  229 + g_pMainDlg->GetDlgItem(IDC_STATIC_IMEI1)->SetWindowText(a_imei_ary);
  230 + g_pMainDlg->GetDlgItem(IDC_STATIC_IMEI2)->SetWindowText(a_imei_ary2);
  231 + }
  232 +
229 233 if (g_pMainDlg->myscanimei1 == CString(a_imei_ary) &&
230 234 g_pMainDlg->myscanimei2 == CString(a_imei_ary2))
231 235 {
... ... @@ -256,7 +260,11 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
256 260 if (iRet == META_SUCCESS)
257 261 {
258 262 UpdateUIMsg("Start to restore factory settings!!!");
259   - spNextStage = SP_RESET_STAGE;
  263 + if (g_pMainDlg->myflag_reset)
  264 + spNextStage = SP_RESET_STAGE;
  265 + else
  266 + spNextStage = SP_END_STAGE;
  267 +
260 268 }
261 269 else
262 270 {
... ... @@ -3945,26 +3953,26 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3945 3953 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end.");
3946 3954 #ifdef __TOPWELL_QCTEST__
3947 3955
3948   - if (g_pMainDlg->myflag_reset == FALSE)
3949   - {
3950   - SPMETA_DLL::EMMC_CLEAR_CNF_S aclear_cnf;
3951   - SPMETA_DLL::EMMC_FORMAT_TCARD_CNF_S aformat_tcard;
3952   - SPMETA_DLL::META_RESULT SPMetaclear = SPMETA_DLL::META_FAILED;
3953   - SPMETA_DLL::META_RESULT SPMetaformat = SPMETA_DLL::META_FAILED;
3954   - SPMetaclear = SPMETA_DLL::SP_META_ClearValue_r(m_hSPMetaHandle, 5000, &aclear_cnf);
3955   - SPMetaformat = SPMETA_DLL::SP_META_EMMC_FormatTCard_r(m_hSPMetaHandle, 20000, &aformat_tcard);
3956   - if (SPMetaclear)
3957   - {
3958   - UpdateUIMsg("reset to factory fail");
3959   - bAnyOperationFail = true;
3960   - goto End;
3961   - }
3962   - else
3963   - {
3964   - UpdateUIMsg("reset to factory Sucess");
3965   - goto End;
3966   - }
3967   - }
  3956 +// if (g_pMainDlg->myflag_reset == FALSE)
  3957 +// {
  3958 +// SPMETA_DLL::EMMC_CLEAR_CNF_S aclear_cnf;
  3959 +// SPMETA_DLL::EMMC_FORMAT_TCARD_CNF_S aformat_tcard;
  3960 +// SPMETA_DLL::META_RESULT SPMetaclear = SPMETA_DLL::META_FAILED;
  3961 +// SPMETA_DLL::META_RESULT SPMetaformat = SPMETA_DLL::META_FAILED;
  3962 +// SPMetaclear = SPMETA_DLL::SP_META_ClearValue_r(m_hSPMetaHandle, 5000, &aclear_cnf);
  3963 +// SPMetaformat = SPMETA_DLL::SP_META_EMMC_FormatTCard_r(m_hSPMetaHandle, 20000, &aformat_tcard);
  3964 +// if (SPMetaclear)
  3965 +// {
  3966 +// UpdateUIMsg("reset to factory fail");
  3967 +// bAnyOperationFail = true;
  3968 +// goto End;
  3969 +// }
  3970 +// else
  3971 +// {
  3972 +// UpdateUIMsg("reset to factory Sucess");
  3973 +// goto End;
  3974 +// }
  3975 +// }
3968 3976
3969 3977
3970 3978 // SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL);
... ...
... ... @@ -1161,22 +1161,22 @@ void CSNWriterDlg::OnTimer(UINT nIDEvent)
1161 1161
1162 1162 void CSNWriterDlg::OnCheckRst()
1163 1163 {
1164   - UpdateData(TRUE);
1165   - if (myflag_reset)
1166   - {
1167   - myctrlscan1.ShowWindow(SW_SHOW);
1168   - myctrlscan2.ShowWindow(SW_SHOW);
1169   - GetDlgItem(IDC_STATIC_1)->ShowWindow(SW_SHOW);
1170   - GetDlgItem(IDC_STATIC_2)->ShowWindow(SW_SHOW);
1171   - GetDlgItem(IDC_BTN_START)->SetWindowText("Start");
1172   - }
1173   - else
1174   - {
1175   - myctrlscan1.ShowWindow(SW_HIDE);
1176   - myctrlscan2.ShowWindow(SW_HIDE);
1177   - GetDlgItem(IDC_STATIC_1)->ShowWindow(SW_HIDE);
1178   - GetDlgItem(IDC_STATIC_2)->ShowWindow(SW_HIDE);
1179   - GetDlgItem(IDC_BTN_START)->SetWindowText("Only factory reset");
1180   - }
  1164 +// UpdateData(TRUE);
  1165 +// if (myflag_reset)
  1166 +// {
  1167 +// myctrlscan1.ShowWindow(SW_SHOW);
  1168 +// myctrlscan2.ShowWindow(SW_SHOW);
  1169 +// GetDlgItem(IDC_STATIC_1)->ShowWindow(SW_SHOW);
  1170 +// GetDlgItem(IDC_STATIC_2)->ShowWindow(SW_SHOW);
  1171 +// GetDlgItem(IDC_BTN_START)->SetWindowText("Start");
  1172 +// }
  1173 +// else
  1174 +// {
  1175 +// myctrlscan1.ShowWindow(SW_HIDE);
  1176 +// myctrlscan2.ShowWindow(SW_HIDE);
  1177 +// GetDlgItem(IDC_STATIC_1)->ShowWindow(SW_HIDE);
  1178 +// GetDlgItem(IDC_STATIC_2)->ShowWindow(SW_HIDE);
  1179 +// GetDlgItem(IDC_BTN_START)->SetWindowText("Only factory reset");
  1180 +// }
1181 1181
1182 1182 }
... ...
Please register or login to post a comment