1.QC位：0：untest ;1:pass;other:fail；2.版本号保存之前要初始化下，否则会导致之前长的版本号有残留”

@@ -358,30 +358,30 @@ bool SNBase::Check_some_barcode(const char* strBarcode)
 
 
     if (strBarcode[55] == '1')
     if (strBarcode[55] == '1')
     {
     {
-    		g_pMainDlg->myrslt_smt= _T("1");
+    		g_pMainDlg->myrslt_smt= _T("PASS");
 		UpdateUIMsg("ATA test has passed");
 		UpdateUIMsg("ATA test has passed");
     }
     }
     else
     else
     {
     {
-    		g_pMainDlg->myrslt_smt= _T("0");
+    		g_pMainDlg->myrslt_smt= _T("FAIL");
 		UpdateUIMsg("ATA test failed");
 		UpdateUIMsg("ATA test failed");
     }
     }
 
 
 
 
     if (strBarcode[60] == '1' && strBarcode[61] == '0')  //Calibration Pass
     if (strBarcode[60] == '1' && strBarcode[61] == '0')  //Calibration Pass
     {		
     {		
-               g_pMainDlg->myrslt_cft= _T("10");
+             //  g_pMainDlg->myrslt_cft= _T("10");
 		UpdateUIMsg("Calibration has been successful");
 		UpdateUIMsg("Calibration has been successful");
     }
     }
     else if (strBarcode[60] == '0' && strBarcode[61] == '1')//Calibration Fail
     else if (strBarcode[60] == '0' && strBarcode[61] == '1')//Calibration Fail
     {
     {
-    		g_pMainDlg->myrslt_cft= _T("01");
+    	     //  g_pMainDlg->myrslt_cft= _T("UnTested");
 		UpdateUIMsg("Not yet calibrated");
 		UpdateUIMsg("Not yet calibrated");
     }
     }
 	
 	
     if (strBarcode[62] == 'P' )  //Final Test Pass
     if (strBarcode[62] == 'P' )  //Final Test Pass
     {
     {
-		g_pMainDlg->myrslt_cft = g_pMainDlg->myrslt_cft+ _T("P");
+	       //g_pMainDlg->myrslt_cft = g_pMainDlg->myrslt_cft+ _T("P");
 		UpdateUIMsg("Comprehensive test pass");
 		UpdateUIMsg("Comprehensive test pass");
     }
     }
 	else
 	else
@@ -389,9 +389,18 @@ bool SNBase::Check_some_barcode(const char* strBarcode)
 		UpdateUIMsg("Comprehensive test failed");
 		UpdateUIMsg("Comprehensive test failed");
     }
     }
 
 
-
+    if(strBarcode[60] == '1' && strBarcode[61] == '0' && strBarcode[62] == 'P')
+    {
+    		g_pMainDlg->myrslt_cft =_T("PASS");
+    }
+    else
+    {
+    		g_pMainDlg->myrslt_cft =_T("Fail");
+    }
 
 
     return true;
     return true;
+	
+	
 }
 }
 
 
 
 

@@ -110,6 +110,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
     MULTIIMEI_OPTION_e multiIMEIOption = SINGLE_MD_SINGLE_IMEI;
     MULTIIMEI_OPTION_e multiIMEIOption = SINGLE_MD_SINGLE_IMEI;
 
 
     int iRet = 0;
     int iRet = 0;
+    int iRet2 = 0;	
     int option = 0;
     int option = 0;
     double fBeginProcess = 0.25;
     double fBeginProcess = 0.25;
     double fStep = 0.04;
     double fStep = 0.04;
@@ -219,8 +220,8 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
                 char tmpBuf1[20] = {0};
                 char tmpBuf1[20] = {0};
                 char tmpBuf2[20] = {0};
                 char tmpBuf2[20] = {0};
                 iRet = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf1, 1);
                 iRet = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf1, 1);
-                iRet = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf2, 2);
-                if (iRet == META_SUCCESS)
+                iRet2 = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf2, 2);
+                if (iRet == META_SUCCESS || iRet2 == META_SUCCESS)
                 {
                 {
 					memset(a_imei_ary,0,sizeof(int)*16);
 					memset(a_imei_ary,0,sizeof(int)*16);
 
 
@@ -265,15 +266,36 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 						a_imei_ary2[10],a_imei_ary2[11],a_imei_ary2[12],a_imei_ary2[13],a_imei_ary2[14]
 						a_imei_ary2[10],a_imei_ary2[11],a_imei_ary2[12],a_imei_ary2[13],a_imei_ary2[14]
 						);
 						);
 
 
-		     g_pMainDlg->myrslt_imei.Format(_T("%s"), str_imei);
+		       //g_pMainDlg->myrslt_imei= _T("PASS");	 
                     UpdateUIMsg("IMEI read successfully "+str_imei);
                     UpdateUIMsg("IMEI read successfully "+str_imei);
                     spNextStage = SP_END_STAGE;
                     spNextStage = SP_END_STAGE;
                 }
                 }
                 else
                 else
                 {
                 {
+                    //g_pMainDlg->myrslt_imei= _T("Fail");	
                     UpdateUIMsg("IMEI failed to read");
                     UpdateUIMsg("IMEI failed to read");
                     spNextStage = SP_END_STAGE;
                     spNextStage = SP_END_STAGE;
                 }
                 }
+				
+		 if(iRet == META_SUCCESS)
+		 {
+		 	g_pMainDlg->myrslt_imei= _T("PASS");
+		 }
+		 else
+		 {
+		 	g_pMainDlg->myrslt_imei= _T("Fail");
+		 }
+		 
+		 if(iRet2 == META_SUCCESS)
+		 {
+		 	g_pMainDlg->myrslt_imei = g_pMainDlg->myrslt_imei+ _T(",PASS");
+		 }
+		 else
+		 {
+		 	g_pMainDlg->myrslt_imei = g_pMainDlg->myrslt_imei+ _T(",Fail");
+		 }
+		
+				
             }
             }
             break;
             break;
  
  
@@ -2617,11 +2639,15 @@ byte SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
 		//			::AfxMessageBox("QC test fail");
 		//			::AfxMessageBox("QC test fail");
 		return	0;
 		return	0;
 	}
 	}
-	else
+	else if(sNVRAM_ReadCnf.buf[1006] == 1)
 	{
 	{
 		//			::AfxMessageBox("QC test pass");
 		//			::AfxMessageBox("QC test pass");
 		return 1;
 		return 1;
 	}
 	}
+	else
+	{
+		return 3;
+	}
 	
 	
 	
 	
 }
 }
@@ -4446,12 +4472,12 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 			switch(resultQC)
 			switch(resultQC)
 			{
 			{
 			case 0:
 			case 0:
-				g_pMainDlg->myrslt_qc=_T("0");
+				g_pMainDlg->myrslt_qc=_T("UnTested");
 					UpdateUIMsg("QC untest");
 					UpdateUIMsg("QC untest");
 				bAnyOperationFail = true;
 				bAnyOperationFail = true;
 				break;
 				break;
 			case 1:
 			case 1:
-				g_pMainDlg->myrslt_qc=_T("1");
+				g_pMainDlg->myrslt_qc=_T("PASS");
 					UpdateUIMsg("QC test pass");
 					UpdateUIMsg("QC test pass");
 				break;
 				break;
 			default:
 			default:

----- IMEI¶ÁÈ¡ Matches (2 in 1 files) ----
-SPexc.cpp (execute):                    UpdateUIMsg("IMEI¶ÁÈ¡³É¹¦"+str_imei);
-SPexc.cpp (execute):                    UpdateUIMsg("IMEI¶Áȡʧ°Ü");
+---- myrslt_qc Matches (7 in 4 files) ----
+SN WriterDlg.cpp:	myrslt_qc = _T("");
+SN WriterDlg.cpp:	DDX_Text(pDX, IDC_RSLT_QC, myrslt_qc);
+SN WriterDlg.h:	CString	myrslt_qc;
+SNbase.cpp (execute):    g_pMainDlg->SetDlgItemText(IDC_RSLT_QC, g_pMainDlg->myrslt_qc);
+SPexc.cpp (execute):				g_pMainDlg->myrslt_qc=_T("UnTested");
+SPexc.cpp (execute):				g_pMainDlg->myrslt_qc=_T("PASS");
+SPexc.cpp (execute):				g_pMainDlg->myrslt_qc=_T("Fail");

@@ -22,7 +22,7 @@ Check Fastboot OEM Lock Enable = False
 Check Calibration flag Enable = True
 Check Calibration flag Enable = True
 Check FinalTest flag Enable = False
 Check FinalTest flag Enable = False
 Check QCTest flag Enable = True
 Check QCTest flag Enable = True
-Check_SW_VER = L61_V5019A_AR_KMG_V1.02_201708220170826
+Check_SW_VER = INTEX_AQUA_LIONS_N1_V02_INDIAN
 Write Meid = True
 Write Meid = True
 Write Esn = False
 Write Esn = False
 Write Barcode = True
 Write Barcode = True
@@ -67,9 +67,9 @@ Ethernet header string =
 DRMKey MCID header string = 
 DRMKey MCID header string = 
 AP DB from DUT = False
 AP DB from DUT = False
 MD DB from DUT = False
 MD DB from DUT = False
-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_1 database path = C:\Users\echo\Desktop\L71\db\BPLGUInfoCustomAppSrcP_MT6735_S00_MOLY_LR9_W1444_MD_LWTG_MP_V110_5_P5_1_lwg_n
 Modem_2 database path = 
 Modem_2 database path = 
-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
+AP database path = C:\Users\echo\Desktop\L71\db\APDB_MT6735_S01_alps-mp-n0.mp1_W17.31
 FP Auth path = 
 FP Auth path = 
 SP Auth path = 
 SP Auth path = 
 Hdcp Bin path = 
 Hdcp Bin path = 

@@ -6,40 +6,20 @@
 --------------------Configuration: SN Writer - Win32 Debug--------------------
 --------------------Configuration: SN Writer - Win32 Debug--------------------
 </h3>
 </h3>
 <h3>Command Lines</h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\Users\echo\AppData\Local\Temp\RSPD80C.tmp" with contents
+Creating temporary file "C:\Users\echo\AppData\Local\Temp\RSPAA22.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
-.\Debug\FPexc.obj
-.\Debug\SNbase.obj
-.\Debug\SPexc.obj
-.\Debug\AtProcess.obj
-.\Debug\rs232Module.obj
-.\Debug\xboot_debug.obj
-.\Debug\AUTH.obj
-.\Debug\SCERT.obj
-.\Debug\SLA.obj
-.\Debug\fileseldlg.obj
-.\Debug\ChgPasswdDlg.obj
-.\Debug\VerifyPasswdDlg.obj
-.\Debug\ScanData.obj
-.\Debug\SystemConfig.obj
-.\Debug\AboutSNDlg.obj
-.\Debug\autogendlg.obj
-.\Debug\Encryption.obj
-".\Debug\SN Writer.obj"
-".\Debug\SN WriterDlg.obj"
-.\Debug\StdAfx.obj
-".\Debug\SN Writer.res"
+/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:\InterlockingTool\Execute\SNbase.cpp"
 ]
 ]
-Creating command line "link.exe @C:\Users\echo\AppData\Local\Temp\RSPD80C.tmp"
+Creating command line "cl.exe @C:\Users\echo\AppData\Local\Temp\RSPAA22.tmp" 
 <h3>Output Window</h3>
 <h3>Output Window</h3>
-Linking...
+Compiling...
+SNbase.cpp
 
 
 
 
 
 
 <h3>Results</h3>
 <h3>Results</h3>
-SN Writer.exe - 0 error(s), 0 warning(s)
+SNbase.obj - 0 error(s), 0 warning(s)
 </pre>
 </pre>
 </body>
 </body>
 </html>
 </html>

@@ -1093,6 +1093,7 @@ void CSNWriterDlg::OnOptionCheckQcFlag()
 void CSNWriterDlg::OnBtSaveSwver() 
 void CSNWriterDlg::OnBtSaveSwver() 
 {
 {
 	UpdateData(TRUE);
 	UpdateData(TRUE);
+	memset(g_sMetaComm.check_sw_ver,0x0,sizeof(g_sMetaComm.check_sw_ver));
 	memcpy(g_sMetaComm.check_sw_ver,myversion.GetBuffer(myversion.GetLength()),myversion.GetLength());
 	memcpy(g_sMetaComm.check_sw_ver,myversion.GetBuffer(myversion.GetLength()),myversion.GetLength());
 	SaveParaToSetupFile();
 	SaveParaToSetupFile();
 }
 }