细节优化

xiemeng
1 parent fb327873
Showing 2 changed files with 76 additions and 85 deletions
Execute/SPexc.cpp
SN Writer.rc
--- a/Execute/SPexc.cpp
View file @4599bd1
+++ b/Execute/SPexc.cpp
View file @4599bd1
@@ -147,22 +147,22 @@ int SmartPhoneSN::getLastIMEIdigit(CString strIMEI)
 META_RESULT SmartPhoneSN::WriteNvramLoop()
 {
     MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::WriteNvramLoop() start...");
-
+	
     SMART_PHONE_STAGE_e spStage = SP_START_STAGE;
     SMART_PHONE_STAGE_e spNextStage = SP_END_STAGE;
     META_RESULT MetaResult = META_SUCCESS;
     MULTIIMEI_OPTION_e multiIMEIOption = SINGLE_MD_SINGLE_IMEI;
-
+	
     int iRet = 0;
     int iRet2 = 0;	
     int option = 0;
     double fBeginProcess = 0.25;
     double fStep = 0.04;
     m_bBackupNvramSuccess = false;
-
+	
     bool bCheckCalFlag = g_sMetaComm.bCheckCalFlag;
     bool bCheckFtFlag = g_sMetaComm.bCheckFtFlag;
-
+	
     int mdNums = 1;
     int MDIndex = 0;
     int IMEI_index = 0;
@@ -183,7 +183,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
     {
         mdNums = m_sMdInfo.number_of_md;
     }
-
+	
     while ((spStage != SP_END_STAGE) && (*m_pMetaStopFlag != BOOT_STOP))
     {
         //g_pMainDlg->ShowTemperatureOnUI();
@@ -207,7 +207,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
                 spNextStage = SP_WRITE_TEMP_STAGE;
             }
             break;
-
+			
         case SP_AP2MD_STAGE:
             fBeginProcess += fStep;
             iRet = APSwithToModemMeta_Ex();
@@ -221,41 +221,41 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
                 spNextStage = SP_END_STAGE;
             }
             break;
-
+			
         case SP_CHECK_CAL_FT_FLAG_STAGE:
-	#ifdef __TOPWELL_QCTEST__
-    if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag || g_sMetaComm.bCheckQCFlag)
-	#else
-    if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag)
-	#endif
-            {
-                char tmpBuf[2048] = {0};
-                iRet = REQ_ReadModem_NVRAM_Start(WRITE_BARCODE, tmpBuf, 1);
-                if (iRet == META_SUCCESS)
-                {
-                    bool bCheckPass = true;
-                    bCheckPass = Check_some_barcode(tmpBuf);
-                    if (bCheckPass == true)
-                    {
-                        spNextStage = SP_IMEI_RD_STAGE;
-                    }
-                    else
-                    {
-                        iRet = META_FAILED;
-                        spNextStage = SP_END_STAGE;
-                    }
-                }
-                else
-                {
-                    UpdateUIMsg("ERROR!! Read Barcode: MetaResult = %s", ResultToString(iRet));
-                    spNextStage = SP_END_STAGE;
-                }
-            }
-            else
-            {
-                spNextStage = SP_BARCODE_MD_STAGE;
-            }
-            break;
+#ifdef __TOPWELL_QCTEST__
+			if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag || g_sMetaComm.bCheckQCFlag)
+#else
+				if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag)
+#endif
+				{
+					char tmpBuf[2048] = {0};
+					iRet = REQ_ReadModem_NVRAM_Start(WRITE_BARCODE, tmpBuf, 1);
+					if (iRet == META_SUCCESS)
+					{
+						bool bCheckPass = true;
+						bCheckPass = Check_some_barcode(tmpBuf);
+						if (bCheckPass == true)
+						{
+							spNextStage = SP_IMEI_RD_STAGE;
+						}
+						else
+						{
+							iRet = META_FAILED;
+							spNextStage = SP_END_STAGE;
+						}
+					}
+					else
+					{
+						UpdateUIMsg("ERROR!! Read Barcode: MetaResult = %s", ResultToString(iRet));
+						spNextStage = SP_END_STAGE;
+					}
+				}
+				else
+				{
+					spNextStage = SP_BARCODE_MD_STAGE;
+				}
+				break;
         case SP_IMEI_RD_STAGE:
 			{
 				CString str_imei;
@@ -263,14 +263,14 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 				char a_imei_ary2[16];
                 char tmpBuf1[20] = {0};
                 char tmpBuf2[20] = {0};
-		// CString IMEI1_validity;
-		// CString IMEI2_validity;
-		 
+				// 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)
@@ -292,39 +292,39 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 					}
 					a_imei_ary[15] = 0;
 					a_imei_ary2[15] = 0;
-
-			     	if(iRet == META_SUCCESS && iRet2 == META_SUCCESS)
-			      	{
-					g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("PASS");
-					UpdateUIMsg("IMEI read success!!!");
-			     	}
-				else 
-				{
-					g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("Fail");
-					UpdateUIMsg("IMEI read fail");
-				}
-				
-				
-                   // UpdateUIMsg("IMEI read success!!!");
+					
+					if(iRet == META_SUCCESS && iRet2 == META_SUCCESS)
+					{ 
+						g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("PASS");
+						UpdateUIMsg("IMEI read success!!!");
+					}
+					else 
+					{
+						g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("Fail");
+						UpdateUIMsg("IMEI read fail");
+					}
+					
+					
+					// UpdateUIMsg("IMEI read success!!!");
                     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;
                 }
 			}
             break;
- 
-
-
+			
+			
+			
         }
-
+		
         spStage = spNextStage;
     }
-
+	
     MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::WriteNvramLoop() end...");
     return (META_RESULT)iRet;
 }
@@ -3866,6 +3866,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
                 break;
         }
         iTestCount++;
+		g_pMainDlg->myloglist.ResetContent();
         DebugOnOff(true);
         MTRACE(g_hEBOOT_DEBUG, "------------------------------------ START -------------------------------------");
@@ -4017,16 +4018,16 @@ 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;
 			}
--- a/SN Writer.rc
View file @4599bd1
+++ b/SN Writer.rc
View file @4599bd1
@@ -60,15 +60,6 @@ END
 /////////////////////////////////////////////////////////////////////////////
 //
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-//IDR_MAINFRAME           ICON    DISCARDABLE     "res\\idr_main.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Bitmap
 //
@@ -273,7 +264,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
     WS_SYSMENU
 EXSTYLE WS_EX_CLIENTEDGE | WS_EX_APPWINDOW
 CAPTION "c"
-FONT 9, "Î¢ÈíÑÅºÚ", 0, 0, 0x1
+FONT 9, "Î¢ÈíÑÅºÚ"
 BEGIN
     EDITTEXT        IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL
     PUSHBUTTON      "Save",IDC_BT_SAVE_SWVER,246,10,44,15
@@ -298,14 +289,14 @@ BEGIN
     CONTROL         133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,190,83,93,45
     LTEXT           "SW",IDC_STATIC,6,91,11,9
     LTEXT           "CFT",IDC_STATIC,5,115,12,9
-    LTEXT           "SMT MMI",IDC_STATIC,64,115,23,9
+    LTEXT           "MMI",IDC_STATIC,64,115,17,9
     LTEXT           "IMEI",IDC_STATIC,7,138,32,9
-    LTEXT           "QC1",IDC_STATIC,120,115,13,9
-    EDITTEXT        IDC_RSLT_CFT,35,115,24,15,ES_AUTOHSCROLL | ES_READONLY | 
+    LTEXT           "QC1",IDC_STATIC,128,115,13,9
+    EDITTEXT        IDC_RSLT_CFT,19,115,40,15,ES_AUTOHSCROLL | ES_READONLY | 
                     NOT WS_TABSTOP
-    EDITTEXT        IDC_RSLT_SMT,90,115,24,13,ES_AUTOHSCROLL | ES_READONLY | 
+    EDITTEXT        IDC_RSLT_SMT,84,115,42,13,ES_AUTOHSCROLL | ES_READONLY | 
                     NOT WS_TABSTOP
-    EDITTEXT        IDC_RSLT_QC,150,115,24,15,ES_AUTOHSCROLL | ES_READONLY | 
+    EDITTEXT        IDC_RSLT_QC,150,115,39,15,ES_AUTOHSCROLL | ES_READONLY | 
                     NOT WS_TABSTOP
     EDITTEXT        IDC_RSLT_WRITE_IMEI,49,138,214,15,ES_AUTOHSCROLL | 
                     ES_READONLY | NOT WS_TABSTOP
@@ -321,7 +312,7 @@ BEGIN
     CTEXT           "",IDC_RSLT_SW,35,91,148,11,SS_CENTERIMAGE,
                     WS_EX_STATICEDGE
     LTEXT           "",IDC_STATIC_TIMECOUNT,119,181,61,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
+                    WS_EX_STATICEDGE
 END
 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
@@ -385,7 +376,6 @@ BEGIN
     LTEXT           "SPMeta DLL 1345.01",IDC_SPMETADLL_VERSION,42,40,104,8
     LTEXT           "Copyright(C) 2004-2010 MediaTek Inc. All rights reserved.",
                     IDC_STATIC,42,58,170,8
-   // ICON            IDR_MAINFRAME,IDC_STATIC,13,12,20,20
 END
 IDD_IDENTIFY_VERIFY_DIALOG DIALOG DISCARDABLE  0, 0, 187, 61