回复出厂设置功能

xiemeng
1 parent 02d27829
Showing 6 changed files with 57 additions and 6 deletions
.gitignore
Execute/SPexc.cpp
SN Writer.rc
SN WriterDlg.cpp
SN WriterDlg.h
resource.h
--- a/.gitignore 0 → 100644
View file @4928008
+++ b/.gitignore 0 → 100644
View file @4928008
+/INTEX_TOOL.IAB
+/INTEX_TOOL.IAD
+/INTEX_TOOL.IMB
+/INTEX_TOOL.IMD
+/INTEX_TOOL.PFI
+/INTEX_TOOL.PO
+/INTEX_TOOL.PR
+/INTEX_TOOL.PRI
+/INTEX_TOOL.PS
+/INTEX_TOOL.SearchResults
+/INTEX_TOOL.WK3
+/SN Writer.aps
+/SN Writer.plg
--- a/Execute/SPexc.cpp
View file @4928008
+++ b/Execute/SPexc.cpp
View file @4928008
@@ -3704,6 +3704,10 @@ void SmartPhoneSN::ThreadMainEntryPoint()
     byte resultQC;
 	SPMETA_DLL::VerInfo_V2_Cnf a_v2cnf;
+	SPMETA_DLL::EMMC_CLEAR_CNF_S aclear_cnf;
+	SPMETA_DLL::EMMC_FORMAT_TCARD_CNF_S aformat_tcard;
+
+
 	short a_token;
     /*For dual talk(external modem) project
@@ -3924,21 +3928,34 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 			{
 			case 0:
 				g_pMainDlg->myrslt_qc=_T("UnTested");
-				UpdateUIMsg("QC untest");
+				UpdateUIMsg("QC1 untest");
 				bAnyOperationFail = true;
 				break;
 			case 1:
 				g_pMainDlg->myrslt_qc=_T("PASS");
-				UpdateUIMsg("QC test pass");
+				UpdateUIMsg("QC1 test pass");
 				break;
 			default:
 				g_pMainDlg->myrslt_qc=_T("Fail");
-				UpdateUIMsg("QC test fail");
+				UpdateUIMsg("QC1 test fail");
 				bAnyOperationFail = true;
 				break;
 			}
 		}
+		if (g_pMainDlg->myflag_reset)
+		{
+			SPMETA_DLL::META_RESULT SPMetaclear = SPMETA_DLL::META_SUCCESS;
+			SPMETA_DLL::META_RESULT SPMetaformat = SPMETA_DLL::META_SUCCESS;
+			SPMetaclear = SPMETA_DLL::SP_META_ClearValue_r(m_hSPMetaHandle, 5000, &aclear_cnf);
+			SPMetaformat = SPMETA_DLL::SP_META_EMMC_FormatTCard_r(m_hSPMetaHandle, 5000, &aformat_tcard);
+			if (SPMetaclear || SPMetaformat)
+			{
+				UpdateUIMsg("reset to factory fail");
+				bAnyOperationFail = true;
+			}
+		}
+
 #endif
 	}
--- a/SN Writer.rc
View file @4928008
+++ b/SN Writer.rc
View file @4928008
@@ -213,7 +213,7 @@ FONT 9, "Î¢ÈíÑÅºÚ"
 BEGIN
     EDITTEXT        IDC_IMEI1_FROM_SCAN,44,15,109,12,ES_AUTOHSCROLL
     EDITTEXT        IDC_IMEI2_FROM_SCAN,44,33,109,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "Start",IDC_BTN_START,173,16,99,25,BS_CENTER | 
+    DEFPUSHBUTTON   "Start",IDC_BTN_START,173,20,99,25,BS_CENTER | 
                     BS_VCENTER | NOT WS_TABSTOP
     LISTBOX         IDC_LOG_LIST,0,118,293,133,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_HSCROLL
@@ -242,6 +242,8 @@ BEGIN
     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
 END
 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
--- a/SN WriterDlg.cpp
View file @4928008
+++ b/SN WriterDlg.cpp
View file @4928008
@@ -97,6 +97,7 @@ CSNWriterDlg::CSNWriterDlg(CWnd* pParent /*=NULL*/)
 	myscanimei1 = _T("");
 	myscanimei2 = _T("");
 	mytime_count = 0;
+	myflag_reset = TRUE;
 	//}}AFX_DATA_INIT
     // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
     m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
@@ -118,6 +119,7 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
 	DDV_MaxChars(pDX, myscanimei1, 15);
 	DDX_Text(pDX, IDC_IMEI2_FROM_SCAN, myscanimei2);
 	DDV_MaxChars(pDX, myscanimei2, 15);
+	DDX_Check(pDX, IDC_CHECK_RST, myflag_reset);
 	//}}AFX_DATA_MAP
@@ -419,7 +421,7 @@ void CSNWriterDlg::EnableUIItem()
 //    GetDlgItem(IDC_MAINUI_TEMP2)->ShowWindow(FALSE);
     SetDlgItemText(IDC_BTN_START, "Start");
-	GetDlgItem(IDC_BTN_START)->EnableWindow(FALSE);
+//	GetDlgItem(IDC_BTN_START)->EnableWindow(FALSE);
 	//UpdateData(FALSE);
@@ -605,6 +607,21 @@ void CSNWriterDlg::OnBtnStart()
     CString strText;
     ((CWnd*)GetDlgItem(IDC_BTN_START))->GetWindowText(strText);
+	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")
     {
--- a/SN WriterDlg.h
View file @4928008
+++ b/SN WriterDlg.h
View file @4928008
@@ -43,6 +43,7 @@ public:
 	CString	myrslt_imei;
 	CString	myscanimei1;
 	CString	myscanimei2;
+	BOOL	myflag_reset;
 	//}}AFX_DATA
 	// ClassWizard generated virtual function overrides
--- a/resource.h
View file @4928008
+++ b/resource.h
View file @4928008
@@ -221,6 +221,7 @@
 #define IDC_STATIC_IMEI1                1177
 #define IDC_STATIC_IMEI2                1178
 #define IDC_STATIC_TIMECOUNT            1179
+#define IDC_CHECK_RST                   1180
 #define IDR_OPTION_SWITCHTOOL           32772
 #define IDR_OPTION_EXTMODEM             32773
 #define IDR_OPTION_SECURITY_USB         32774
@@ -252,7 +253,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        160
 #define _APS_NEXT_COMMAND_VALUE         32798
-#define _APS_NEXT_CONTROL_VALUE         1180
+#define _APS_NEXT_CONTROL_VALUE         1181
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif