1.cft的状态：10Ｐ：pass;01F：fail;other：untested；2.判断IMEI校验合法：pass不合法为：Fail，为空时：Untested,

Echo
1 parent 457582ed
Showing 3 changed files with 97 additions and 8 deletions
Execute/SNbase.cpp
Execute/SPexc.cpp
Execute/SPexc.h
--- a/Execute/SNbase.cpp
View file @855fdc2
+++ b/Execute/SNbase.cpp
View file @855fdc2
@@ -204,7 +204,6 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
     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);
@@ -401,10 +400,14 @@ bool SNBase::Check_some_barcode(const char* strBarcode)
     {
     		g_pMainDlg->myrslt_cft =_T("PASS");
     }
-    else
+    else if(strBarcode[60] == '0' && strBarcode[61] == '1' && strBarcode[62] == 'F')
     {
     		g_pMainDlg->myrslt_cft =_T("Fail");
     }
+    else
+    {
+    	       g_pMainDlg->myrslt_cft =_T("UnTested");
+    }
     return true;
--- a/Execute/SPexc.cpp
View file @855fdc2
+++ b/Execute/SPexc.cpp
View file @855fdc2
@@ -100,6 +100,49 @@ void SmartPhoneSN::SPInit()
     }
 }
+int SmartPhoneSN::getLastIMEIdigit(CString strIMEI)
+{
+ int imei1 = (strIMEI[0]-'0');
+ int imei2 = 2*(strIMEI[1]-'0');
+ int imei3 = (strIMEI[2]-'0');
+ int imei4 = 2*(strIMEI[3]-'0');
+ int imei5 = (strIMEI[4]-'0');
+ int imei6 = 2*(strIMEI[5]-'0');
+ int imei7 = (strIMEI[6]-'0');
+ int imei8 = 2*(strIMEI[7]-'0');
+ int imei9 = (strIMEI[8]-'0');
+ int imei10 = 2*(strIMEI[9]-'0');
+ int imei11 = (strIMEI[10]-'0');
+ int imei12 = 2*(strIMEI[11]-'0');
+ int imei13 = (strIMEI[12]-'0');
+ int imei14 = 2*(strIMEI[13]-'0');
+
+ int ret = imei1 + 
+        (imei2/10)+
+     (imei2%10)+
+     imei3+
+     (imei4/10)+
+     (imei4%10)+
+     imei5+
+     (imei6/10)+
+     (imei6%10)+
+     imei7+
+     (imei8/10)+
+     (imei8%10)+
+     imei9+
+     (imei10/10)+
+     (imei10%10)+
+     imei11+
+     (imei12/10)+
+     (imei12%10)+
+     imei13+
+     (imei14/10)+
+     (imei14%10);
+
+ return (10 - ret % 10) % 10;
+}
+
+
 META_RESULT SmartPhoneSN::WriteNvramLoop()
 {
     MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::WriteNvramLoop() start...");
@@ -219,12 +262,14 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 				char a_imei_ary2[16];
                 char tmpBuf1[20] = {0};
                 char tmpBuf2[20] = {0};
-				
+		 CString IMEI1_validity;
+		 CString IMEI2_validity;
+		 
                 iRet = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf1, 1);
                 iRet2 = REQ_ReadModem_NVRAM_Start(WRITE_IMEI, tmpBuf2, 2);
-				if(tmpBuf1[0]== -1) iRet = META_FAILED;
-				if(tmpBuf2[0]== -1) iRet2 =META_FAILED;
+		if(tmpBuf1[0]== -1) iRet = META_FAILED;
+		if(tmpBuf2[0]== -1) iRet2 =META_FAILED;
                 if (iRet == META_SUCCESS || iRet2 == META_SUCCESS)
@@ -246,13 +291,53 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 					}
 					a_imei_ary[15] = 0;
 					a_imei_ary2[15] = 0;
-					g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText(CString(a_imei_ary)+","+CString(a_imei_ary2));
-                    UpdateUIMsg("IMEI read success!!!");
+
+			     	if(iRet == META_SUCCESS)
+			      	{
+					if((a_imei_ary[14]-'0') == getLastIMEIdigit(CString(a_imei_ary)))
+					{
+						IMEI1_validity = _T("PASS");
+					}
+					else
+					{
+						IMEI1_validity = _T("Fail");
+					}
+			     	}
+				else 
+				{
+					IMEI1_validity = _T("UnTested");;
+				}
+
+				if(iRet2 == META_SUCCESS )
+				{
+					if((a_imei_ary2[14]-'0') ==getLastIMEIdigit(CString(a_imei_ary2)))
+					{
+						IMEI2_validity = _T("PASS");
+					}
+					else
+					{
+						IMEI2_validity = _T("Fail");
+					}	
+				}
+				else
+				{
+					IMEI2_validity = _T("UnTested");;
+				}
+			    	
+			g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText(IMEI1_validity+","+IMEI2_validity);
+				
+				
+                   // UpdateUIMsg("IMEI read success!!!");
                     spNextStage = SP_END_STAGE;
                 }
+		 else  if (iRet == META_FAILED && iRet2 == META_FAILED)
+		 {
+		 	g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("UnTested,UnTested");
+			 spNextStage = SP_END_STAGE;
+		 }
                 else
                 {
-					g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("fail!!!");
+		     g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("Fail");
                     UpdateUIMsg("IMEI read fail");
                     spNextStage = SP_END_STAGE;
                 }
--- a/Execute/SPexc.h
View file @855fdc2
+++ b/Execute/SPexc.h
View file @855fdc2
@@ -66,6 +66,7 @@ protected:
     virtual META_RESULT SwitchMDByIndex(UINT MDIndex);
     virtual int GetSPModemInfo_Ex();
+    virtual int getLastIMEIdigit(CString strIMEI);	
     virtual SPMETA_DLL::META_RESULT QueryDBFromDUT();
     virtual SPMETA_DLL::META_RESULT GetAPDBFromDUT();
     virtual SPMETA_DLL::META_RESULT GetMDDBFromDUT();