没写IMEI号时读取IMEI状态有误

Echo
1 parent 732d2bb8
Showing 1 changed file with 24 additions and 22 deletions
Execute/SPexc.cpp
--- a/Execute/SPexc.cpp
View file @fe8649a
+++ b/Execute/SPexc.cpp
View file @fe8649a
@@ -219,24 +219,35 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 				int a_imei_ary2[16];
                 char tmpBuf1[20] = {0};
                 char tmpBuf2[20] = {0};
+
                 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 (iRet == META_SUCCESS || iRet2 == META_SUCCESS)
+                    {
+                    	   UpdateUIMsg("IMEI read successfully "+str_imei);
+		     }
+		     else
+		     {
+   		     	    UpdateUIMsg("IMEI failed to read");
+		     }
+
+			 
+			 
                 if (iRet == META_SUCCESS || iRet2 == META_SUCCESS)
                 {
-
-				 if(strspn(tmpBuf1, "0123456789") != strlen(tmpBuf1))
-				 {
-				 	iRet = META_FAILED;
-				 }
-
-				 
-		                if(strspn(tmpBuf2, "0123456789") != strlen(tmpBuf2))
-				 {
-				 	iRet2 = META_FAILED;
-				 }	
-						
+	
 					memset(a_imei_ary,0,sizeof(int)*16);
 					memset(a_imei_ary2,0,sizeof(int)*16);
@@ -287,15 +298,6 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 		  }*/
 		       //g_pMainDlg->myrslt_imei= _T("PASS");	
-
-		     if (iRet == META_SUCCESS || iRet2 == META_SUCCESS)
-                    {
-                    	   UpdateUIMsg("IMEI read successfully "+str_imei);
-		     }
-		     else
-		     {
-   		     	    UpdateUIMsg("IMEI failed to read");
-		     }
                     spNextStage = SP_END_STAGE;
                 }