1.检查、比对版本号；2.显示检查到的标志位

@@ -98,8 +98,8 @@ IniData_struct g_IniData[] =
     {"Check FinalTest flag Enable", (bool*)&g_sMetaComm.bCheckFtFlag, INI_BOOLEAN},
 	#ifdef __TOPWELL_QCTEST__
 	    {"Check QCTest flag Enable", (bool*)&g_sMetaComm.bCheckQCFlag, INI_BOOLEAN},
+    	    //{"QCTest_flag_index", (bool*)&g_sMetaComm.QCFlag_index, INI_INTEGER},
 	    {"Check_SW_VER", (char*)&g_sMetaComm.check_sw_ver, INI_STRING},
-
 	#endif
     // C2K Modem
     {"Write Meid", (bool*)&g_sMetaComm.sWriteOption.bWriteMeid, INI_BOOLEAN},

@@ -277,6 +277,7 @@ typedef struct {
     bool bCheckFtFlag;
 	#ifdef __TOPWELL_QCTEST__
     bool bCheckQCFlag;
+   // UINT QCFlag_index;
     char check_sw_ver[255];
 	#endif
     bool bCheckBTWifi;

@@ -181,7 +181,8 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
     char strTotal[20] = {0};
     char strPass[20] = {0};
     char strFail[20] = {0};
-
+	
+	
     //For the user click 'STOP' button before USB still not insert
     if (m_bStopBeforeUSBInsert == true)
     {
@@ -204,6 +205,15 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
     g_pMainDlg->SetDlgItemText(IDC_COUNT_PASS, strPass);
     g_pMainDlg->SetDlgItemText(IDC_COUNT_FAIL, strFail);
 
+#if 1 
+  
+    g_pMainDlg->SetDlgItemText(IDC_RSLT_SW, g_pMainDlg->myrslt_sw);
+    g_pMainDlg->SetDlgItemText(IDC_RSLT_CFT, g_pMainDlg->myrslt_cft);
+    g_pMainDlg->SetDlgItemText(IDC_RSLT_SMT, g_pMainDlg->myrslt_smt);
+    g_pMainDlg->SetDlgItemText(IDC_RSLT_QC, g_pMainDlg->myrslt_qc);
+    g_pMainDlg->SetDlgItemText(IDC_RSLT_WRITE_IMEI, g_pMainDlg->myrslt_imei);
+#endif
+
     UpdateMainDlgUI(true, eWriteStatus);
 }
 
@@ -348,29 +358,35 @@ bool SNBase::Check_some_barcode(const char* strBarcode)
 
     if (strBarcode[55] == '1')
     {
-		UpdateUIMsg("ATA测试已经通过");
+    		g_pMainDlg->myrslt_smt= _T("1");
+		UpdateUIMsg("ATA test has passed");
     }
-	else
+    else
     {
-		UpdateUIMsg("ATA测试未通过");
+    		g_pMainDlg->myrslt_smt= _T("0");
+		UpdateUIMsg("ATA test failed");
     }
 
 
     if (strBarcode[60] == '1' && strBarcode[61] == '0')  //Calibration Pass
-    {
-		UpdateUIMsg("校准已经成功");
+    {		
+               g_pMainDlg->myrslt_cft= _T("10");
+		UpdateUIMsg("Calibration has been successful");
     }
     else if (strBarcode[60] == '0' && strBarcode[61] == '1')//Calibration Fail
     {
-		UpdateUIMsg("尚未校准");
+    		g_pMainDlg->myrslt_cft= _T("01");
+		UpdateUIMsg("Not yet calibrated");
     }
+	
     if (strBarcode[62] == 'P' )  //Final Test Pass
     {
-		UpdateUIMsg("综测通过");
+		g_pMainDlg->myrslt_cft = g_pMainDlg->myrslt_cft+ _T("P");
+		UpdateUIMsg("Comprehensive test pass");
     }
 	else
     {
-		UpdateUIMsg("综测失败");
+		UpdateUIMsg("Comprehensive test failed");
     }
 
 

@@ -265,13 +265,13 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 						a_imei_ary2[10],a_imei_ary2[11],a_imei_ary2[12],a_imei_ary2[13],a_imei_ary2[14]
 						);
 
-
-                    UpdateUIMsg("IMEI读取成功"+str_imei);
+		     g_pMainDlg->myrslt_imei.Format(_T("%s"), str_imei);
+                    UpdateUIMsg("IMEI read successfully "+str_imei);
                     spNextStage = SP_END_STAGE;
                 }
                 else
                 {
-                    UpdateUIMsg("IMEI读取失败");
+                    UpdateUIMsg("IMEI failed to read");
                     spNextStage = SP_END_STAGE;
                 }
             }
@@ -2542,7 +2542,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_ReadAP_NVRAM_Start(WriteData_Type_e da
 
 
 #ifdef __TOPWELL_QCTEST__
-int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
+byte SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
 {
     MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_ReadAP_NVRAM_QC()...");
 	
@@ -2612,7 +2612,7 @@ int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
 		}
 	}
 	
-	if(sNVRAM_ReadCnf.buf[202] == 0)
+	if(sNVRAM_ReadCnf.buf[1006] == 0)
 	{
 		//			::AfxMessageBox("QC test fail");
 		return	0;
@@ -2624,8 +2624,6 @@ int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
 	}
 	
 	
-	
-	
 }
 
 #endif
@@ -4223,7 +4221,9 @@ void SmartPhoneSN::ThreadMainEntryPoint()
     bool bNeedScanData = false;
     bool bNeedLoadAPDB = false;
     int times = 0;
-    int Ret = 0;
+    int  Ret = 0;
+    byte resultQC;
+	
 	SPMETA_DLL::VerInfo_V2_Cnf a_v2cnf;
 	short a_token;
 
@@ -4259,7 +4259,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
             UpdateUIMsg("Set Fastboot Environment Variable Fail!!");
             return;
         }
-        UpdateUIMsg("设置 Fastboot 环境变量成功OK!!");
+        UpdateUIMsg("Set Fastboot Environment Variable OK!!");
         if (!Adb_Manager_Init())
         {
             MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::Adb_Manager_Init() FAIL...");
@@ -4314,13 +4314,13 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 
         SetupMetaModeParameters();
 
-        UpdateUIMsg("开始加载AP database...");
+        UpdateUIMsg("Start load and init AP database...");
 
         UpdateProgress(0.06);
 
         if (g_sMetaComm.bUsbEnable)
         {
-            UpdateUIMsg("请使用USB连接手机");
+            UpdateUIMsg("Wait for usb insert...");
         }
 
         EnableStartBTN(true);
@@ -4337,7 +4337,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
             SPMetaResult = QueryDBFromDUT();
             if (SPMetaResult != 0)
             {
-                UpdateUIMsg("加载DB失败");
+                UpdateUIMsg("Don't support load db from device.");
                 bAnyOperationFail = true;
                 goto End;
             }
@@ -4360,7 +4360,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
             if (MetaResult != META_SUCCESS)
             {
                 bAnyOperationFail = true;
-                UpdateUIMsg("加载 AP 失败, %s", ResultToString_SP(MetaResult));
+                UpdateUIMsg("Load AP Database fail, %s", ResultToString_SP(MetaResult));
                 goto End;
             }
         }
@@ -4400,7 +4400,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
             {
                 bAnyOperationFail = true;
                 MTRACE_ERR(g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information fail, MetaResult = %s", ResultToString_SP(Ret));
-                UpdateUIMsg("查询modem信息失败, %s", ResultToString_SP(Ret));
+					UpdateUIMsg("Query modem information fail, %s", ResultToString_SP(Ret));
                 goto End;
             }
             MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end.");
@@ -4409,17 +4409,32 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 
 		SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL);
 		{
-			int a_verlen = g_pMainDlg->myversion.GetLength();
-			if (strcmp(a_v2cnf.BUILD_DISP_ID,g_pMainDlg->myversion.GetBuffer(a_verlen)) != 0 )
+			//int a_verlen = g_pMainDlg->myversion.GetLength();
+			//int a_verlen =strlen(g_sMetaComm.check_sw_ver());
+			char tmp_checkSwVer[255];
+			int len=strlen(g_sMetaComm.check_sw_ver);
+
+				/* strcpy(tmp_checkSwVer,g_sMetaComm.check_sw_ver);
+				 
+				tmp_checkSwVer[len]=10;
+				tmp_checkSwVer[len+1]='\0';*/
+				
+				if (strncmp(a_v2cnf.BUILD_DISP_ID,g_sMetaComm.check_sw_ver,len) != 0 )
 			{
-				UpdateUIMsg("版本号不匹配");
+					UpdateUIMsg("Version number is wrong");
 				bAnyOperationFail = true;
 			}
 			else
 			{
-				UpdateUIMsg("版本号匹配!");
+					UpdateUIMsg("Version number OK!");
 			}
 			
+			int testLen=strlen(a_v2cnf.BUILD_DISP_ID)-1;
+			memset(tmp_checkSwVer,0x0,sizeof(tmp_checkSwVer));
+			strncpy(tmp_checkSwVer,a_v2cnf.BUILD_DISP_ID,testLen);
+			g_pMainDlg->myrslt_sw.Format(_T("%s"), tmp_checkSwVer);
+
+			
 		}
 		//if (strcmp(g_pMainDlg->myversion.GetBuffer(),a_v2cnf.))
 		//{g_pMainDlg->myversion
@@ -4427,18 +4442,21 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 	
 		if (g_sMetaComm.bCheckQCFlag)
 		{
-			Ret = REQ_ReadAP_NVRAM_QC();
-			switch(Ret)
+			resultQC = REQ_ReadAP_NVRAM_QC();
+			switch(resultQC)
 			{
 			case 0:
-				UpdateUIMsg("未进行QC测试");
+				g_pMainDlg->myrslt_qc=_T("0");
+					UpdateUIMsg("QC untest");
 				bAnyOperationFail = true;
 				break;
 			case 1:
-				UpdateUIMsg("QC测试通过");
+				g_pMainDlg->myrslt_qc=_T("1");
+					UpdateUIMsg("QC test pass");
 				break;
 			default:
-				UpdateUIMsg("QC测试失败");
+				g_pMainDlg->myrslt_qc=_T("Fail");
+					UpdateUIMsg("QC test fail");
 				bAnyOperationFail = true;
 				break;
 			}
@@ -4452,7 +4470,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
         MTRACE (g_hEBOOT_DEBUG, "m_bWriteModemNvram = %d,m_sMdInfo.number_of_md = %d", m_bWriteModemNvram, m_sMdInfo.number_of_md);
         if ((m_bWriteModemNvram == true || g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag) && m_sMdInfo.number_of_md >= 1)
         {
-            UpdateUIMsg("切换到BP database");
+            UpdateUIMsg("Start switch to MD meta and init Modem database...");
 
             UpdateProgress(0.14);
 
@@ -4493,7 +4511,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
         UpdateProgress(0.22);
 
         EnableStartBTN(false);
-        UpdateUIMsg("开始读取BARCODE IMEI");
+        UpdateUIMsg("Start loop write data to nvram...");
         MetaResult = WriteNvramLoop();
         if (MetaResult != META_SUCCESS)
         {
@@ -4536,7 +4554,7 @@ End:
             }
             else
             {
-                UpdateUIMsg("所有操作完成!!");
+                UpdateUIMsg("All Operate successfully!!");
                 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::All Operate successfully!!");
 
 #ifdef _AUTO_GEN_FEATURE_

@@ -74,7 +74,7 @@ protected:
 
     virtual SPMETA_DLL::META_RESULT REQ_ReadAP_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID);
 	#ifdef __TOPWELL_QCTEST__
-    virtual int REQ_ReadAP_NVRAM_QC();
+    virtual byte REQ_ReadAP_NVRAM_QC();
 	#endif
     virtual SPMETA_DLL::META_RESULT REQ_WriteAP_NVRAM_Start(WriteData_Type_e dataType, char *pInData, unsigned short iRID);
     virtual META_RESULT REQ_ReadModem_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID);

----- start searching Matches (6 in 1 files) ----
-SPexc.cpp (execute):        UpdateUIMsg("Start searching preloader com port and handshake...");
-SPexc.cpp (execute):    UpdateUIMsg("Start searching kernel com port and handshake...");
-SPexc.cpp (execute):    UpdateUIMsg("Start searching preloader com port and handshake...");
-SPexc.cpp (execute):        UpdateUIMsg("Start searching fastboot devices...");
-SPexc.cpp (execute):    UpdateUIMsg("Start searching preloader com port and handshake...");
-SPexc.cpp (execute):        UpdateUIMsg("Start searching ADB devices...");
+---- IMEI¶ÁÈ¡ Matches (2 in 1 files) ----
+SPexc.cpp (execute):                    UpdateUIMsg("IMEI¶ÁÈ¡³É¹¦"+str_imei);
+SPexc.cpp (execute):                    UpdateUIMsg("IMEI¶Áȡʧ°Ü");

@@ -3,10 +3,10 @@ Stress Test = 0
 Already in Meta = False
 Keep in Meta = False
 Clear Meta Boot Flag = False
-Operator Mode = 0
+Operator Mode = 10000
 Preloader Connect Timeout = 20000
 Kernel Connect Timeout = 120000
-Target type = 1
+Target type = 64182496
 Brom Port Filter = VID_0E8D&PID_0003
 Preloader Port Filter = VID_0E8D&PID_2000 VID_0525&PID_A4A7 VID_1004&PID_6000
 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
@@ -22,7 +22,7 @@ Check Fastboot OEM Lock Enable = False
 Check Calibration flag Enable = True
 Check FinalTest flag Enable = False
 Check QCTest flag Enable = True
-Check_SW_VER = fdsfsfd
+Check_SW_VER = L61_V5019A_AR_KMG_V1.02_201708220170826
 Write Meid = True
 Write Esn = False
 Write Barcode = True
@@ -67,9 +67,9 @@ Ethernet header string =
 DRMKey MCID header string = 
 AP DB from DUT = False
 MD DB from DUT = False
-Modem_1 database path = E:\zc\INTEX_AQUA_LIONS_N1_V01_INDIAN\db\BPLGUInfoCustomAppSrcP_MT6735_S00_MOLY_LR9_W1444_MD_LWTG_MP_V110_5_P5_1_lwg_n
+Modem_1 database path = C:\Users\echo\Desktop\L61\L61_V5019A_AR_KMG_V1.02_20170822\db\BPLGUInfoCustomAppSrcP_MT6735_S00_MOLY_LR9_W1444_MD_LWTG_MP_V110_5_P9_1_lwg_n
 Modem_2 database path = 
-AP database path = E:\zc\INTEX_AQUA_LIONS_N1_V01_INDIAN\db\APDB_MT6735_S01_alps-mp-n0.mp1_W17.31
+AP database path = C:\Users\echo\Desktop\L61\L61_V5019A_AR_KMG_V1.02_20170822\db\APDB_MT6735_S01_alps-mp-n0.mp1_W17.31
 FP Auth path = 
 SP Auth path = 
 Hdcp Bin path = 

@@ -6,13 +6,7 @@
 --------------------Configuration: SN Writer - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "D:\temp\RSP357D.tmp" with contents
-[
-/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 
-"D:\workspace\SN_Write_tool_v1728\Execute\SPexc.cpp"
-]
-Creating command line "cl.exe @D:\temp\RSP357D.tmp" 
-Creating temporary file "D:\temp\RSP357E.tmp" with contents
+Creating temporary file "C:\Users\echo\AppData\Local\Temp\RSPD80C.tmp" with contents
 [
 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 
 .\Debug\Common.obj
@@ -38,12 +32,9 @@ shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Secur
 .\Debug\StdAfx.obj
 ".\Debug\SN Writer.res"
 ]
-Creating command line "link.exe @D:\temp\RSP357E.tmp"
+Creating command line "link.exe @C:\Users\echo\AppData\Local\Temp\RSPD80C.tmp"
 <h3>Output Window</h3>
-Compiling...
-SPexc.cpp
 Linking...
-   Creating library Output/SN Writer.lib and object Output/SN Writer.exp
 
 
 

@@ -277,9 +277,9 @@ FONT 9, "΢ÈíÑźÚ"
 BEGIN
     EDITTEXT        IDC_COUNT_TOTAL,198,139,38,13,ES_AUTOHSCROLL | 
                     ES_READONLY
-    PUSHBUTTON      "Config",IDC_BTN_SYSCONFIG,48,213,30,12
+    DEFPUSHBUTTON   "Config",IDC_BTN_SYSCONFIG,48,214,30,12
     DEFPUSHBUTTON   "Start",IDC_BTN_START,11,214,30,12
-    PUSHBUTTON      "Quit",IDC_BTN_QUIT,119,214,30,12
+    DEFPUSHBUTTON   "Quit",IDC_BTN_QUIT,119,214,30,12
     EDITTEXT        IDC_COUNT_PASS,198,163,38,13,ES_AUTOHSCROLL | 
                     ES_READONLY
     EDITTEXT        IDC_COUNT_FAIL,198,187,38,13,ES_AUTOHSCROLL | 
@@ -291,7 +291,7 @@ BEGIN
     LTEXT           "Fail:",IDC_STATIC,166,187,27,10
     COMBOBOX        IDC_COMBO_COMPORT,180,209,34,51,CBS_DROPDOWNLIST | 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Button1",IDC_BTN_INDITE,83,214,30,12,BS_BITMAP
+    DEFPUSHBUTTON   "Reset",IDC_BTN_RESET,83,214,30,12
     LTEXT           "SW Version",IDC_STATIC,6,12,48,9
     EDITTEXT        IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL
     PUSHBUTTON      "Save",IDC_BT_SAVE_SWVER,246,10,44,15

@@ -15,7 +15,7 @@
 #include "FileSelDlg.h"
 #include "AutoGenDlg.h"
 #include "HdcpEncryption.h"
-
+#include "spmeta.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -127,6 +127,9 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
     DDX_Control(pDX, IDC_BTN_QUIT, m_QuitBTN);
     DDX_Control(pDX, IDC_BTN_SYSCONFIG, m_SystemCfgBTN);
 
+    DDX_Control(pDX, IDC_BTN_RESET, m_ResetBTN);
+	
+
 
 }
 
@@ -135,6 +138,7 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
     ON_WM_PAINT()
     ON_WM_QUERYDRAGICON()
     ON_BN_CLICKED(IDC_BTN_START, OnBtnStart)
+    ON_BN_CLICKED(IDC_BTN_RESET, OnBtnReset)
     ON_BN_CLICKED(IDC_BTN_QUIT, OnBtnQuit)
     ON_BN_CLICKED(IDC_BTN_SYSCONFIG, OnBtnSysconfig)
     ON_CBN_SELCHANGE(IDC_COMBO_COMPORT, OnSelchangeComboComport)
@@ -624,6 +628,13 @@ void CSNWriterDlg::OnBtnStart()
     }
 }
 
+void CSNWriterDlg::OnBtnReset()
+{
+	 MessageBox("This feature has not yet been completed");
+	//  SPMETA_DLL::SP_META_NVRAM_ResetToFactoryDefault(5000); 
+}
+
+
 void CSNWriterDlg::OnBtnQuit()
 {
     // TODO: Add your control notification handler code here

@@ -64,6 +64,7 @@ protected:
 	afx_msg HCURSOR OnQueryDragIcon();
 	afx_msg void OnBtnStart();
 	afx_msg void OnBtnQuit();
+	afx_msg void OnBtnReset();
 	afx_msg void OnBtnSysconfig();
 	afx_msg void OnSelchangeComboComport();
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
@@ -123,6 +124,7 @@ private:
     CButton	m_StartBTN;
     CButton	m_QuitBTN;
     CButton  m_SystemCfgBTN;
+    CButton	m_ResetBTN;	
 
 
 public:

@@ -101,6 +101,7 @@
 #define IDC_DRMKEY_MCID_DATA            1077
 #define IDC_BTN_INDITE                  1078
 #define IDC_MEID_DATA                   1078
+#define IDC_BTN_RESET                   1078
 #define IDC_SERIAL_NO_DATA              1079
 #define IDC_SERIAL_NO_HEADER_SCAN       1080
 #define IDC_BTN_SAVE                    1081