增加 only factory reset

@@ -2142,6 +2142,7 @@ byte SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
 	}
 	else if(sNVRAM_ReadCnf.buf[1006] == 1)
 	{
+
 		//			::AfxMessageBox("QC test pass");
 		return 1;
 	}
@@ -3748,8 +3749,8 @@ void SmartPhoneSN::ThreadMainEntryPoint()
     byte resultQC;
 	
 	SPMETA_DLL::VerInfo_V2_Cnf a_v2cnf;
-
-
+	
+	
 	short a_token;
 	
     /*For dual talk(external modem) project
@@ -3845,8 +3846,15 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 		UpdateUIMsg("Wait for usb insert...");
 	}
 	
-        EnableStartBTN(true);
-		g_pMainDlg->SetTimer(1,1000,NULL);
+	EnableStartBTN(true);
+	
+// 	{
+// 		bAnyOperationFail = true;
+// 		m_bStopBeforeUSBInsert = false;
+// 		goto End;// xiemeng test
+// 	}
+	
+	g_pMainDlg->SetTimer(1,1000,NULL);
 	
 	MetaResult = (META_RESULT)EnterAPMetaMode();
 	if (MetaResult != META_SUCCESS)
@@ -3929,6 +3937,27 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 		MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end.");
 #ifdef __TOPWELL_QCTEST__
 		
+		if (g_pMainDlg->myflag_reset == FALSE)
+		{
+			SPMETA_DLL::EMMC_CLEAR_CNF_S aclear_cnf;
+			SPMETA_DLL::EMMC_FORMAT_TCARD_CNF_S aformat_tcard;
+			SPMETA_DLL::META_RESULT SPMetaclear = SPMETA_DLL::META_FAILED;
+			SPMETA_DLL::META_RESULT SPMetaformat = SPMETA_DLL::META_FAILED;
+			SPMetaclear = SPMETA_DLL::SP_META_ClearValue_r(m_hSPMetaHandle, 5000, &aclear_cnf);
+			SPMetaformat = SPMETA_DLL::SP_META_EMMC_FormatTCard_r(m_hSPMetaHandle, 20000, &aformat_tcard);
+			if (SPMetaclear)
+			{
+				UpdateUIMsg("reset to factory fail");
+				bAnyOperationFail = true;
+				goto End;
+			}
+			else
+			{
+				UpdateUIMsg("reset to factory Sucess");
+				goto End;
+			}
+		}
+		
 		
 		SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL);
 		{
@@ -4070,23 +4099,23 @@ End:
 		{
 			//                m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
 			UpdateUICountResult(FAIL);
-				g_pMainDlg->mytime_count= 0;
-				g_pMainDlg->KillTimer(1);
+			g_pMainDlg->mytime_count= 0;
+			g_pMainDlg->KillTimer(1);
 		}
 		else
 		{
 			UpdateUIMsg("All Operate successfully!!");
 			MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::All Operate successfully!!");
 			
-			#ifdef _AUTO_GEN_FEATURE_
-                if (g_AutoGenData.bEnableAutoGen)
-                {
-                    UpdateAutoGenParaToSetupFile();
-                }
-			#endif
+#ifdef _AUTO_GEN_FEATURE_
+			if (g_AutoGenData.bEnableAutoGen)
+			{
+				UpdateAutoGenParaToSetupFile();
+			}
+#endif
 			UpdateUICountResult(PASS);
-				g_pMainDlg->mytime_count = 0;
-				g_pMainDlg->KillTimer(1);
+			g_pMainDlg->mytime_count = 0;
+			g_pMainDlg->KillTimer(1);
 		}
 		
 	}
@@ -4112,7 +4141,7 @@ End:
         DisableUSBSwitch();
 	
     MetaHandle_DeInit();
-
+	
 }
 
 bool SmartPhoneSN::Adb_Manager_Init()

@@ -234,16 +234,16 @@ BEGIN
     LTEXT           "",IDC_COUNT_TOTAL,32,105,29,8,SS_SUNKEN
     LTEXT           "",IDC_COUNT_PASS,90,105,32,8,SS_SUNKEN
     LTEXT           "",IDC_COUNT_FAIL,145,105,37,8,SS_SUNKEN
-    LTEXT           "IMEI1",IDC_STATIC,8,15,20,12,SS_CENTERIMAGE
-    LTEXT           "IMEI2",IDC_STATIC,8,33,20,12,SS_CENTERIMAGE
+    LTEXT           "IMEI1",IDC_STATIC_1,8,15,20,12,SS_CENTERIMAGE
+    LTEXT           "IMEI2",IDC_STATIC_2,8,33,20,12,SS_CENTERIMAGE
     GROUPBOX        "IMEI from phone",IDC_STATIC,2,53,158,49
     LTEXT           "IMEI1",IDC_STATIC,10,65,20,12,SS_CENTERIMAGE
     LTEXT           "IMEI2",IDC_STATIC,10,84,20,12,SS_CENTERIMAGE
     DEFPUSHBUTTON   "",IDOK,270,69,9,8,NOT WS_VISIBLE | NOT WS_TABSTOP
     CTEXT           "Static",IDC_STATIC_TIMECOUNT,191,104,106,12,
                     SS_CENTERIMAGE
-    CONTROL         "reset factory",IDC_CHECK_RST,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,170,8,98,10
+    CONTROL         "Factory reset ",IDC_CHECK_RST,"Button",BS_AUTOCHECKBOX,
+                    170,8,98,10
 END
 
 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316

@@ -30,7 +30,7 @@ static char THIS_FILE[] = __FILE__;
 unsigned short g_iTotalComPort = MAX_COMPORT_COUNT;
 unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0};
 
-const char *g_strToolVersion = "SN Writer V1.1728.00";
+const char *g_strToolVersion = "IMEI checker By TOPWELL";
 
 extern CSNWriterDlg *g_pMainDlg;
 
@@ -167,6 +167,7 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
 	ON_WM_KEYDOWN()
 	ON_WM_SYSCOMMAND()
 	ON_WM_TIMER()
+	ON_BN_CLICKED(IDC_CHECK_RST, OnCheckRst)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -607,23 +608,29 @@ void CSNWriterDlg::OnBtnStart()
 
     CString strText;
     ((CWnd*)GetDlgItem(IDC_BTN_START))->GetWindowText(strText);
-	if (myscanimei1 == "" || myscanimei2 == "")
+	myloglist.ResetContent();
+	GetDlgItem(IDC_STATIC_IMEI1)->SetWindowText("");
+	GetDlgItem(IDC_STATIC_IMEI2)->SetWindowText("");
+	if (myflag_reset)
 	{
-		myloglist.SetCurSel(myloglist.AddString("please input IMEI!"));
-		return;
-	}
-	if (myscanimei1 == myscanimei2)
-	{
-		myloglist.SetCurSel(myloglist.AddString("please input different IMEI!"));
-		myscanimei2 = "";
-		myctrlscan2.SetWindowText("");
-		myscanimei1 = "";
-		myctrlscan1.SetWindowText("");
-		myctrlscan1.SetFocus();
-		return;
+		if (myscanimei1 == "" || myscanimei2 == "")
+		{
+			myloglist.SetCurSel(myloglist.AddString("please input IMEI!"));
+			return;
+		}
+		if (myscanimei1 == myscanimei2)
+		{
+			myloglist.SetCurSel(myloglist.AddString("please input different IMEI!"));
+			myscanimei2 = "";
+			myctrlscan2.SetWindowText("");
+			myscanimei1 = "";
+			myctrlscan1.SetWindowText("");
+			myctrlscan1.SetFocus();
+			return;
+		}
 	}
 
-    if (strText == "Start")
+    if (strText == "Start" ||strText == "Only factory reset")
     {
 		m_spSN.SNThread_Start();
     }
@@ -1146,3 +1153,25 @@ void CSNWriterDlg::OnTimer(UINT nIDEvent)
 	}
 	CDialog::OnTimer(nIDEvent);
 }
+
+void CSNWriterDlg::OnCheckRst() 
+{
+	UpdateData(TRUE);
+	if (myflag_reset)
+	{
+		myctrlscan1.ShowWindow(SW_SHOW);
+		myctrlscan2.ShowWindow(SW_SHOW);
+		GetDlgItem(IDC_STATIC_1)->ShowWindow(SW_SHOW);
+		GetDlgItem(IDC_STATIC_2)->ShowWindow(SW_SHOW);
+		GetDlgItem(IDC_BTN_START)->SetWindowText("Start");
+	}
+	else
+	{
+		myctrlscan1.ShowWindow(SW_HIDE);
+		myctrlscan2.ShowWindow(SW_HIDE);
+		GetDlgItem(IDC_STATIC_1)->ShowWindow(SW_HIDE);
+		GetDlgItem(IDC_STATIC_2)->ShowWindow(SW_HIDE);
+		GetDlgItem(IDC_BTN_START)->SetWindowText("Only factory reset");
+	}
+	
+}

@@ -95,6 +95,7 @@ protected:
 	afx_msg void OnSelchangeComboComport();
 	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnTimer(UINT nIDEvent);
+	afx_msg void OnCheckRst();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 

@@ -27,6 +27,7 @@
 #define IDC_COUNT_PASS                  1004
 #define IDC_COUNT_FAIL                  1005
 #define IDC_PROGRESS_SN                 1006
+#define IDC_BTN_RESET_FT                1006
 #define IDC_COMBO_COMPORT               1007
 #define IDC_COMBO_TARGET_TYPE           1008
 #define IDC_MD_1_DBFILE_PATH            1009
@@ -222,6 +223,8 @@
 #define IDC_STATIC_IMEI2                1178
 #define IDC_STATIC_TIMECOUNT            1179
 #define IDC_CHECK_RST                   1180
+#define IDC_STATIC_1                    1181
+#define IDC_STATIC_2                    1182
 #define IDR_OPTION_SWITCHTOOL           32772
 #define IDR_OPTION_EXTMODEM             32773
 #define IDR_OPTION_SECURITY_USB         32774
@@ -253,7 +256,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        160
 #define _APS_NEXT_COMMAND_VALUE         32798
-#define _APS_NEXT_CONTROL_VALUE         1181
+#define _APS_NEXT_CONTROL_VALUE         1183
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif