Echo / InterlockingTool · Commits

Commit 6e9ceea5c0ef43c512d838d4d8c4dd8707757c12

Authored by xiemeng
1 parent 41b70451

增加 only factory reset

Inline Side-by-side
Showing 5 changed files with 97 additions and 35 deletions
@@ -2142,6 +2142,7 @@ byte SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void) @@ -2142,6 +2142,7 @@ byte SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
2142 } 2142 }
2143 else if(sNVRAM_ReadCnf.buf[1006] == 1) 2143 else if(sNVRAM_ReadCnf.buf[1006] == 1)
2144 { 2144 {
  2145 +
2145 // ::AfxMessageBox("QC test pass"); 2146 // ::AfxMessageBox("QC test pass");
2146 return 1; 2147 return 1;
2147 } 2148 }
@@ -3748,8 +3749,8 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -3748,8 +3749,8 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3748 byte resultQC; 3749 byte resultQC;
3749 3750
3750 SPMETA_DLL::VerInfo_V2_Cnf a_v2cnf; 3751 SPMETA_DLL::VerInfo_V2_Cnf a_v2cnf;
3751 -  
3752 - 3752 +
  3753 +
3753 short a_token; 3754 short a_token;
3754 3755
3755 /*For dual talk(external modem) project 3756 /*For dual talk(external modem) project
@@ -3845,8 +3846,15 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -3845,8 +3846,15 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3845 UpdateUIMsg("Wait for usb insert..."); 3846 UpdateUIMsg("Wait for usb insert...");
3846 } 3847 }
3847 3848
3848 - EnableStartBTN(true);  
3849 - g_pMainDlg->SetTimer(1,1000,NULL); 3849 + EnableStartBTN(true);
  3850 +
  3851 +// {
  3852 +// bAnyOperationFail = true;
  3853 +// m_bStopBeforeUSBInsert = false;
  3854 +// goto End;// xiemeng test
  3855 +// }
  3856 +
  3857 + g_pMainDlg->SetTimer(1,1000,NULL);
3850 3858
3851 MetaResult = (META_RESULT)EnterAPMetaMode(); 3859 MetaResult = (META_RESULT)EnterAPMetaMode();
3852 if (MetaResult != META_SUCCESS) 3860 if (MetaResult != META_SUCCESS)
@@ -3929,6 +3937,27 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -3929,6 +3937,27 @@ void SmartPhoneSN::ThreadMainEntryPoint()
3929 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end."); 3937 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end.");
3930 #ifdef __TOPWELL_QCTEST__ 3938 #ifdef __TOPWELL_QCTEST__
3931 3939
  3940 + if (g_pMainDlg->myflag_reset == FALSE)
  3941 + {
  3942 + SPMETA_DLL::EMMC_CLEAR_CNF_S aclear_cnf;
  3943 + SPMETA_DLL::EMMC_FORMAT_TCARD_CNF_S aformat_tcard;
  3944 + SPMETA_DLL::META_RESULT SPMetaclear = SPMETA_DLL::META_FAILED;
  3945 + SPMETA_DLL::META_RESULT SPMetaformat = SPMETA_DLL::META_FAILED;
  3946 + SPMetaclear = SPMETA_DLL::SP_META_ClearValue_r(m_hSPMetaHandle, 5000, &aclear_cnf);
  3947 + SPMetaformat = SPMETA_DLL::SP_META_EMMC_FormatTCard_r(m_hSPMetaHandle, 20000, &aformat_tcard);
  3948 + if (SPMetaclear)
  3949 + {
  3950 + UpdateUIMsg("reset to factory fail");
  3951 + bAnyOperationFail = true;
  3952 + goto End;
  3953 + }
  3954 + else
  3955 + {
  3956 + UpdateUIMsg("reset to factory Sucess");
  3957 + goto End;
  3958 + }
  3959 + }
  3960 +
3932 3961
3933 SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL); 3962 SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL);
3934 { 3963 {
@@ -4070,23 +4099,23 @@ End: @@ -4070,23 +4099,23 @@ End:
4070 { 4099 {
4071 // m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0)); 4100 // m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
4072 UpdateUICountResult(FAIL); 4101 UpdateUICountResult(FAIL);
4073 - g_pMainDlg->mytime_count= 0;  
4074 - g_pMainDlg->KillTimer(1); 4102 + g_pMainDlg->mytime_count= 0;
  4103 + g_pMainDlg->KillTimer(1);
4075 } 4104 }
4076 else 4105 else
4077 { 4106 {
4078 UpdateUIMsg("All Operate successfully!!"); 4107 UpdateUIMsg("All Operate successfully!!");
4079 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::All Operate successfully!!"); 4108 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::All Operate successfully!!");
4080 4109
4081 - #ifdef _AUTO_GEN_FEATURE_  
4082 - if (g_AutoGenData.bEnableAutoGen)  
4083 - {  
4084 - UpdateAutoGenParaToSetupFile();  
4085 - }  
4086 - #endif 4110 +#ifdef _AUTO_GEN_FEATURE_
  4111 + if (g_AutoGenData.bEnableAutoGen)
  4112 + {
  4113 + UpdateAutoGenParaToSetupFile();
  4114 + }
  4115 +#endif
4087 UpdateUICountResult(PASS); 4116 UpdateUICountResult(PASS);
4088 - g_pMainDlg->mytime_count = 0;  
4089 - g_pMainDlg->KillTimer(1); 4117 + g_pMainDlg->mytime_count = 0;
  4118 + g_pMainDlg->KillTimer(1);
4090 } 4119 }
4091 4120
4092 } 4121 }
@@ -4112,7 +4141,7 @@ End: @@ -4112,7 +4141,7 @@ End:
4112 DisableUSBSwitch(); 4141 DisableUSBSwitch();
4113 4142
4114 MetaHandle_DeInit(); 4143 MetaHandle_DeInit();
4115 - 4144 +
4116 } 4145 }
4117 4146
4118 bool SmartPhoneSN::Adb_Manager_Init() 4147 bool SmartPhoneSN::Adb_Manager_Init()
@@ -234,16 +234,16 @@ BEGIN @@ -234,16 +234,16 @@ BEGIN
234 LTEXT "",IDC_COUNT_TOTAL,32,105,29,8,SS_SUNKEN 234 LTEXT "",IDC_COUNT_TOTAL,32,105,29,8,SS_SUNKEN
235 LTEXT "",IDC_COUNT_PASS,90,105,32,8,SS_SUNKEN 235 LTEXT "",IDC_COUNT_PASS,90,105,32,8,SS_SUNKEN
236 LTEXT "",IDC_COUNT_FAIL,145,105,37,8,SS_SUNKEN 236 LTEXT "",IDC_COUNT_FAIL,145,105,37,8,SS_SUNKEN
237 - LTEXT "IMEI1",IDC_STATIC,8,15,20,12,SS_CENTERIMAGE  
238 - LTEXT "IMEI2",IDC_STATIC,8,33,20,12,SS_CENTERIMAGE 237 + LTEXT "IMEI1",IDC_STATIC_1,8,15,20,12,SS_CENTERIMAGE
  238 + LTEXT "IMEI2",IDC_STATIC_2,8,33,20,12,SS_CENTERIMAGE
239 GROUPBOX "IMEI from phone",IDC_STATIC,2,53,158,49 239 GROUPBOX "IMEI from phone",IDC_STATIC,2,53,158,49
240 LTEXT "IMEI1",IDC_STATIC,10,65,20,12,SS_CENTERIMAGE 240 LTEXT "IMEI1",IDC_STATIC,10,65,20,12,SS_CENTERIMAGE
241 LTEXT "IMEI2",IDC_STATIC,10,84,20,12,SS_CENTERIMAGE 241 LTEXT "IMEI2",IDC_STATIC,10,84,20,12,SS_CENTERIMAGE
242 DEFPUSHBUTTON "",IDOK,270,69,9,8,NOT WS_VISIBLE | NOT WS_TABSTOP 242 DEFPUSHBUTTON "",IDOK,270,69,9,8,NOT WS_VISIBLE | NOT WS_TABSTOP
243 CTEXT "Static",IDC_STATIC_TIMECOUNT,191,104,106,12, 243 CTEXT "Static",IDC_STATIC_TIMECOUNT,191,104,106,12,
244 SS_CENTERIMAGE 244 SS_CENTERIMAGE
245 - CONTROL "reset factory",IDC_CHECK_RST,"Button",BS_AUTOCHECKBOX |  
246 - WS_TABSTOP,170,8,98,10 245 + CONTROL "Factory reset ",IDC_CHECK_RST,"Button",BS_AUTOCHECKBOX,
  246 + 170,8,98,10
247 END 247 END
248 248
249 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316 249 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
@@ -30,7 +30,7 @@ static char THIS_FILE[] = __FILE__; @@ -30,7 +30,7 @@ static char THIS_FILE[] = __FILE__;
30 unsigned short g_iTotalComPort = MAX_COMPORT_COUNT; 30 unsigned short g_iTotalComPort = MAX_COMPORT_COUNT;
31 unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0}; 31 unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0};
32 32
33 -const char *g_strToolVersion = "SN Writer V1.1728.00"; 33 +const char *g_strToolVersion = "IMEI checker By TOPWELL";
34 34
35 extern CSNWriterDlg *g_pMainDlg; 35 extern CSNWriterDlg *g_pMainDlg;
36 36
@@ -167,6 +167,7 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog) @@ -167,6 +167,7 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
167 ON_WM_KEYDOWN() 167 ON_WM_KEYDOWN()
168 ON_WM_SYSCOMMAND() 168 ON_WM_SYSCOMMAND()
169 ON_WM_TIMER() 169 ON_WM_TIMER()
  170 + ON_BN_CLICKED(IDC_CHECK_RST, OnCheckRst)
170 //}}AFX_MSG_MAP 171 //}}AFX_MSG_MAP
171 END_MESSAGE_MAP() 172 END_MESSAGE_MAP()
172 173
@@ -607,23 +608,29 @@ void CSNWriterDlg::OnBtnStart() @@ -607,23 +608,29 @@ void CSNWriterDlg::OnBtnStart()
607 608
608 CString strText; 609 CString strText;
609 ((CWnd*)GetDlgItem(IDC_BTN_START))->GetWindowText(strText); 610 ((CWnd*)GetDlgItem(IDC_BTN_START))->GetWindowText(strText);
610 - if (myscanimei1 == "" || myscanimei2 == "") 611 + myloglist.ResetContent();
  612 + GetDlgItem(IDC_STATIC_IMEI1)->SetWindowText("");
  613 + GetDlgItem(IDC_STATIC_IMEI2)->SetWindowText("");
  614 + if (myflag_reset)
611 { 615 {
612 - myloglist.SetCurSel(myloglist.AddString("please input IMEI!"));  
613 - return;  
614 - }  
615 - if (myscanimei1 == myscanimei2)  
616 - {  
617 - myloglist.SetCurSel(myloglist.AddString("please input different IMEI!"));  
618 - myscanimei2 = "";  
619 - myctrlscan2.SetWindowText("");  
620 - myscanimei1 = "";  
621 - myctrlscan1.SetWindowText("");  
622 - myctrlscan1.SetFocus();  
623 - return; 616 + if (myscanimei1 == "" || myscanimei2 == "")
  617 + {
  618 + myloglist.SetCurSel(myloglist.AddString("please input IMEI!"));
  619 + return;
  620 + }
  621 + if (myscanimei1 == myscanimei2)
  622 + {
  623 + myloglist.SetCurSel(myloglist.AddString("please input different IMEI!"));
  624 + myscanimei2 = "";
  625 + myctrlscan2.SetWindowText("");
  626 + myscanimei1 = "";
  627 + myctrlscan1.SetWindowText("");
  628 + myctrlscan1.SetFocus();
  629 + return;
  630 + }
624 } 631 }
625 632
626 - if (strText == "Start") 633 + if (strText == "Start" ||strText == "Only factory reset")
627 { 634 {
628 m_spSN.SNThread_Start(); 635 m_spSN.SNThread_Start();
629 } 636 }
@@ -1146,3 +1153,25 @@ void CSNWriterDlg::OnTimer(UINT nIDEvent) @@ -1146,3 +1153,25 @@ void CSNWriterDlg::OnTimer(UINT nIDEvent)
1146 } 1153 }
1147 CDialog::OnTimer(nIDEvent); 1154 CDialog::OnTimer(nIDEvent);
1148 } 1155 }
  1156 +
  1157 +void CSNWriterDlg::OnCheckRst()
  1158 +{
  1159 + UpdateData(TRUE);
  1160 + if (myflag_reset)
  1161 + {
  1162 + myctrlscan1.ShowWindow(SW_SHOW);
  1163 + myctrlscan2.ShowWindow(SW_SHOW);
  1164 + GetDlgItem(IDC_STATIC_1)->ShowWindow(SW_SHOW);
  1165 + GetDlgItem(IDC_STATIC_2)->ShowWindow(SW_SHOW);
  1166 + GetDlgItem(IDC_BTN_START)->SetWindowText("Start");
  1167 + }
  1168 + else
  1169 + {
  1170 + myctrlscan1.ShowWindow(SW_HIDE);
  1171 + myctrlscan2.ShowWindow(SW_HIDE);
  1172 + GetDlgItem(IDC_STATIC_1)->ShowWindow(SW_HIDE);
  1173 + GetDlgItem(IDC_STATIC_2)->ShowWindow(SW_HIDE);
  1174 + GetDlgItem(IDC_BTN_START)->SetWindowText("Only factory reset");
  1175 + }
  1176 +
  1177 +}
@@ -95,6 +95,7 @@ protected: @@ -95,6 +95,7 @@ protected:
95 afx_msg void OnSelchangeComboComport(); 95 afx_msg void OnSelchangeComboComport();
96 afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); 96 afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
97 afx_msg void OnTimer(UINT nIDEvent); 97 afx_msg void OnTimer(UINT nIDEvent);
  98 + afx_msg void OnCheckRst();
98 //}}AFX_MSG 99 //}}AFX_MSG
99 DECLARE_MESSAGE_MAP() 100 DECLARE_MESSAGE_MAP()
100 101
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 #define IDC_COUNT_PASS 1004 27 #define IDC_COUNT_PASS 1004
28 #define IDC_COUNT_FAIL 1005 28 #define IDC_COUNT_FAIL 1005
29 #define IDC_PROGRESS_SN 1006 29 #define IDC_PROGRESS_SN 1006
  30 +#define IDC_BTN_RESET_FT 1006
30 #define IDC_COMBO_COMPORT 1007 31 #define IDC_COMBO_COMPORT 1007
31 #define IDC_COMBO_TARGET_TYPE 1008 32 #define IDC_COMBO_TARGET_TYPE 1008
32 #define IDC_MD_1_DBFILE_PATH 1009 33 #define IDC_MD_1_DBFILE_PATH 1009
@@ -222,6 +223,8 @@ @@ -222,6 +223,8 @@
222 #define IDC_STATIC_IMEI2 1178 223 #define IDC_STATIC_IMEI2 1178
223 #define IDC_STATIC_TIMECOUNT 1179 224 #define IDC_STATIC_TIMECOUNT 1179
224 #define IDC_CHECK_RST 1180 225 #define IDC_CHECK_RST 1180
  226 +#define IDC_STATIC_1 1181
  227 +#define IDC_STATIC_2 1182
225 #define IDR_OPTION_SWITCHTOOL 32772 228 #define IDR_OPTION_SWITCHTOOL 32772
226 #define IDR_OPTION_EXTMODEM 32773 229 #define IDR_OPTION_EXTMODEM 32773
227 #define IDR_OPTION_SECURITY_USB 32774 230 #define IDR_OPTION_SECURITY_USB 32774
@@ -253,7 +256,7 @@ @@ -253,7 +256,7 @@
253 #ifndef APSTUDIO_READONLY_SYMBOLS 256 #ifndef APSTUDIO_READONLY_SYMBOLS
254 #define _APS_NEXT_RESOURCE_VALUE 160 257 #define _APS_NEXT_RESOURCE_VALUE 160
255 #define _APS_NEXT_COMMAND_VALUE 32798 258 #define _APS_NEXT_COMMAND_VALUE 32798
256 -#define _APS_NEXT_CONTROL_VALUE 1181 259 +#define _APS_NEXT_CONTROL_VALUE 1183
257 #define _APS_NEXT_SYMED_VALUE 101 260 #define _APS_NEXT_SYMED_VALUE 101
258 #endif 261 #endif
259 #endif 262 #endif
Please register or login to post a comment