重复扫码问题以及其他代码优化

xiemeng
1 parent 20d2c36f
Showing 8 changed files with 82 additions and 18 deletions
Choosedbdlg.cpp
Execute/SPexc.cpp
SN Writer.aps
SN Writer.opt
SN Writer.plg
SN Writer.rc
SN WriterDlg.cpp
SN WriterDlg.h
--- a/Choosedbdlg.cpp
View file @a416a9a
+++ b/Choosedbdlg.cpp
View file @a416a9a
@@ -153,9 +153,9 @@ BOOL CChoosedbdlg::OnInitDialog()
 	my_str_ap_path = CString(g_sMetaComm.sDBFileOption.strAPDbpath);
 	my_str_bp_path = CString(g_sMetaComm.sDBFileOption.strMD1Dbpath);
-	SetDlgItemText(IDC_STR_AP_PATH,my_str_ap_path);
-	SetDlgItemText(IDC_STR_BP_PATH,my_str_bp_path);
-	//
+
+	GetDlgItem(IDC_EDIT1)->SetWindowText(my_str_ap_path);
+	GetDlgItem(IDC_EDIT2)->SetWindowText(my_str_bp_path);
 	myversion = CString(g_sMetaComm.check_sw_ver);
 	GetDlgItem(IDC_EDT_VERSION)->SetWindowText(myversion);
--- a/Execute/SPexc.cpp
View file @a416a9a
+++ b/Execute/SPexc.cpp
View file @a416a9a
@@ -206,8 +206,6 @@ 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_STATIC_IMEI1)->SetWindowText(a_imei_ary);
 						g_pMainDlg->GetDlgItem(IDC_STATIC_IMEI2)->SetWindowText(a_imei_ary2);
 						if (g_pMainDlg->myscanimei1 == CString(a_imei_ary) && 
@@ -219,12 +217,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 						{
 							UpdateUIMsg("IMEI wrong!!!");
 						}
-					}
-					else
-					{
-						UpdateUIMsg("IMEI failed to read");
-					}
-                    spNextStage = SP_END_STAGE;
+					
                 }
                 else
                 {
@@ -3801,7 +3794,8 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 		UpdateUIMsg("Wait for usb insert...");
 	}
-	EnableStartBTN(true);
+        EnableStartBTN(true);
+		g_pMainDlg->SetTimer(1,1000,NULL);
 	MetaResult = (META_RESULT)EnterAPMetaMode();
 	if (MetaResult != META_SUCCESS)
@@ -4025,6 +4019,8 @@ End:
 		{
 			//                m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
 			UpdateUICountResult(FAIL);
+				g_pMainDlg->mytime_count= 0;
+				g_pMainDlg->KillTimer(1);
 		}
 		else
 		{
@@ -4032,10 +4028,14 @@ End:
 			MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::All Operate successfully!!");
 			#ifdef _AUTO_GEN_FEATURE_
-			if (g_AutoGenData.bEnableAutoGen)
-				UpdateAutoGenParaToSetupFile();
+                if (g_AutoGenData.bEnableAutoGen)
+                {
+                    UpdateAutoGenParaToSetupFile();
+                }
 			#endif
 			UpdateUICountResult(PASS);
+				g_pMainDlg->mytime_count = 0;
+				g_pMainDlg->KillTimer(1);
 		}
 	}
--- a/SN Writer.aps
View file @a416a9a
+++ b/SN Writer.aps
View file @a416a9a
--- a/SN Writer.opt
View file @a416a9a
+++ b/SN Writer.opt
View file @a416a9a
--- a/SN Writer.plg
View file @a416a9a
+++ b/SN Writer.plg
View file @a416a9a
@@ -6,7 +6,13 @@
 --------------------Configuration: SN Writer - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\Users\echo\AppData\Local\Temp\RSP8602.tmp" with contents
+Creating temporary file "D:\temp\RSP345.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\intex_tool\intex_check_src_git\InterlockingTool\Choosedbdlg.cpp"
+]
+Creating command line "cl.exe @D:\temp\RSP345.tmp" 
+Creating temporary file "D:\temp\RSP346.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
@@ -26,15 +32,46 @@ shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Secur
 .\Debug\SystemConfig.obj
 .\Debug\AboutSNDlg.obj
 .\Debug\autogendlg.obj
+.\Debug\Choosedbdlg.obj
 .\Debug\Encryption.obj
 ".\Debug\SN Writer.obj"
 ".\Debug\SN WriterDlg.obj"
 .\Debug\StdAfx.obj
 ".\Debug\SN Writer.res"
 ]
-Creating command line "link.exe @C:\Users\echo\AppData\Local\Temp\RSP8602.tmp"
+Creating command line "link.exe @D:\temp\RSP346.tmp"
 <h3>Output Window</h3>
+Compiling...
+Choosedbdlg.cpp
 Linking...
+Creating temporary file "D:\temp\RSP402.tmp" with contents
+[
+/nologo /o"Output/SN Writer.bsc" 
+.\Debug\StdAfx.sbr
+.\Debug\Common.sbr
+.\Debug\FPexc.sbr
+.\Debug\SNbase.sbr
+.\Debug\SPexc.sbr
+.\Debug\AtProcess.sbr
+.\Debug\rs232Module.sbr
+.\Debug\xboot_debug.sbr
+.\Debug\AUTH.sbr
+.\Debug\SCERT.sbr
+.\Debug\SLA.sbr
+.\Debug\fileseldlg.sbr
+.\Debug\ChgPasswdDlg.sbr
+.\Debug\VerifyPasswdDlg.sbr
+.\Debug\ScanData.sbr
+.\Debug\SystemConfig.sbr
+.\Debug\AboutSNDlg.sbr
+.\Debug\autogendlg.sbr
+.\Debug\Choosedbdlg.sbr
+.\Debug\Encryption.sbr
+".\Debug\SN Writer.sbr"
+".\Debug\SN WriterDlg.sbr"]
+Creating command line "bscmake.exe @D:\temp\RSP402.tmp"
+Creating browse info file...
+<h3>Output Window</h3>
--- a/SN Writer.rc
View file @a416a9a
+++ b/SN Writer.rc
View file @a416a9a
@@ -213,7 +213,7 @@ FONT 9, "Î¢ÈíÑÅºÚ"
 BEGIN
     EDITTEXT        IDC_IMEI1_FROM_SCAN,44,15,109,12,ES_AUTOHSCROLL
     EDITTEXT        IDC_IMEI2_FROM_SCAN,44,33,109,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "Start",IDC_BTN_START,169,16,103,25,BS_CENTER | 
+    DEFPUSHBUTTON   "Start",IDC_BTN_START,173,16,99,25,BS_CENTER | 
                     BS_VCENTER | NOT WS_TABSTOP
     LISTBOX         IDC_LOG_LIST,0,118,293,133,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_HSCROLL
--- a/SN WriterDlg.cpp
View file @a416a9a
+++ b/SN WriterDlg.cpp
View file @a416a9a
@@ -96,6 +96,7 @@ CSNWriterDlg::CSNWriterDlg(CWnd* pParent /*=NULL*/)
 	myrslt_imei = _T("");
 	myscanimei1 = _T("");
 	myscanimei2 = _T("");
+	mytime_count = 0;
 	//}}AFX_DATA_INIT
     // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
     m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
@@ -161,8 +162,9 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
     ON_COMMAND(IDR_OPTION_COMPOSITE_DEVICE, OnOptionCompositeDevice)
     ON_COMMAND(IDR_BACKNV_TOPC, OnBacknvTopc)
     ON_COMMAND(IDR_OEM_LOCK, OnFastbootOemLock)
-	ON_WM_SYSCOMMAND()
 	ON_WM_KEYDOWN()
+	ON_WM_SYSCOMMAND()
+	ON_WM_TIMER()
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
@@ -417,6 +419,7 @@ void CSNWriterDlg::EnableUIItem()
 //    GetDlgItem(IDC_MAINUI_TEMP2)->ShowWindow(FALSE);
     SetDlgItemText(IDC_BTN_START, "Start");
+	GetDlgItem(IDC_BTN_START)->EnableWindow(FALSE);
 	//UpdateData(FALSE);
@@ -1083,6 +1086,16 @@ void CSNWriterDlg::OnOK()
 	if (GetFocus() == GetDlgItem(IDC_IMEI2_FROM_SCAN))
 	{
+		if (myscanimei2 == myscanimei1)
+		{
+			myloglist.SetCurSel(myloglist.AddString("IMEI same, please re scan!!!"));
+			myscanimei2 = "";
+			myctrlscan2.SetWindowText("");
+			myscanimei1 = "";
+			myctrlscan1.SetWindowText("");
+			myctrlscan1.SetFocus();
+			return;
+		}
 		if (myscanimei2.GetLength() == 15)
 		{
 			OnBtnStart();
@@ -1104,3 +1117,15 @@ void CSNWriterDlg::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 	CDialog::OnKeyDown(nChar, nRepCnt, nFlags);
 }
+
+void CSNWriterDlg::OnTimer(UINT nIDEvent) 
+{
+	CString astr_time;
+	if (nIDEvent == 1)
+	{
+		mytime_count++;
+		astr_time.Format("%d S",mytime_count);
+		GetDlgItem(IDC_STATIC_TIMECOUNT)->SetWindowText(astr_time);
+	}
+	CDialog::OnTimer(nIDEvent);
+}
--- a/SN WriterDlg.h
View file @a416a9a
+++ b/SN WriterDlg.h
View file @a416a9a
@@ -93,6 +93,7 @@ protected:
 	virtual void OnOK();
 	afx_msg void OnSelchangeComboComport();
 	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+	afx_msg void OnTimer(UINT nIDEvent);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
@@ -127,6 +128,7 @@ public:
     HBITMAP m_hBitmapPass;
     HBITMAP m_hBitmapFail;
 	CFont m_font;
+	int mytime_count;
 };
 //{{AFX_INSERT_LOCATION}}