IMEI检测工具

+// Choosedbdlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "sn writer.h"
+#include "Choosedbdlg.h"
+#include "Common.h"
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+extern META_Common_struct g_sMetaComm;
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CChoosedbdlg dialog
+
+
+CChoosedbdlg::CChoosedbdlg(CWnd* pParent /*=NULL*/)
+	: CDialog(CChoosedbdlg::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(CChoosedbdlg)
+	my_str_ap_path = _T("");
+	my_str_bp_path = _T("");
+	myversion = _T("");
+	//}}AFX_DATA_INIT
+}
+
+
+void CChoosedbdlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CChoosedbdlg)
+	DDX_Text(pDX, IDC_EDIT1, my_str_ap_path);
+	DDX_Text(pDX, IDC_EDIT2, my_str_bp_path);
+	DDX_Text(pDX, IDC_EDT_VERSION, myversion);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CChoosedbdlg, CDialog)
+	//{{AFX_MSG_MAP(CChoosedbdlg)
+	ON_BN_CLICKED(IDC_BUTTON1, OnButton1)
+	ON_BN_CLICKED(IDC_BUTTON4, OnButton4)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CChoosedbdlg message handlers
+
+void CChoosedbdlg::OnButton1() 
+{
+    char szFilter[]="Database files(*.*)|*.*";
+    CFileDialog dlg(TRUE, NULL, NULL,
+        OFN_FILEMUSTEXIST|OFN_EXPLORER|OFN_ENABLESIZING|0x10000000/*OFN_FORCESHOWHIDDEN*/,
+        szFilter, this);
+    dlg.m_ofn.lpstrTitle = _T("Select Modem_1 database file...");
+    if(dlg.DoModal() == IDOK)
+    {
+        g_sMetaComm.sDBFileOption.bDBInitModem_1 = false;
+        my_str_ap_path = dlg.GetPathName();
+    }
+	UpdateData(FALSE);
+    strcpy(g_sMetaComm.sDBFileOption.strAPDbpath,my_str_ap_path.GetBuffer(my_str_ap_path.GetLength()));
+	
+}
+
+void CChoosedbdlg::OnButton4() 
+{
+    char szFilter[]="Database files(*.*)|*.*";
+    CFileDialog dlg(TRUE, NULL, NULL,
+        OFN_FILEMUSTEXIST|OFN_EXPLORER|OFN_ENABLESIZING|0x10000000/*OFN_FORCESHOWHIDDEN*/,
+        szFilter, this);
+    dlg.m_ofn.lpstrTitle = _T("Select Modem_1 database file...");
+    if(dlg.DoModal() == IDOK)
+    {
+        g_sMetaComm.sDBFileOption.bDBInitModem_1 = false;
+        my_str_bp_path = dlg.GetPathName();
+    }
+	UpdateData(FALSE);
+	
+	strcpy(g_sMetaComm.sDBFileOption.strMD1Dbpath,my_str_bp_path.GetBuffer(my_str_bp_path.GetLength()));
+	
+	
+}
+
+BOOL CChoosedbdlg::OnInitDialog() 
+{
+	CDialog::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);
+	//
+	
+	myversion = CString(g_sMetaComm.check_sw_ver);
+	GetDlgItem(IDC_EDT_VERSION)->SetWindowText(myversion);
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void CChoosedbdlg::OnOK() 
+{
+	UpdateData(TRUE);
+    // TODO: Add your control notification handler code here
+	//    OnSelchangeComboTargetType();
+	if (my_str_ap_path== "" ||my_str_bp_path== "")
+	{
+		MessageBox("请指定DB文件");
+		return;
+	}
+	if (myversion == "")
+	{
+		MessageBox("请输入版本号");
+	}
+	
+	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());
+	SaveParaToSetupFile();
+	CDialog::OnOK();
+}
+

+#if !defined(AFX_CHOOSEDBDLG_H__22EAEAD5_3188_4DC6_B2BB_21E4FF12A640__INCLUDED_)
+#define AFX_CHOOSEDBDLG_H__22EAEAD5_3188_4DC6_B2BB_21E4FF12A640__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// Choosedbdlg.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CChoosedbdlg dialog
+
+class CChoosedbdlg : public CDialog
+{
+// Construction
+public:
+	CChoosedbdlg(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CChoosedbdlg)
+	enum { IDD = IDD_FIRST_CHOOSE_DB };
+	CString	my_str_ap_path;
+	CString	my_str_bp_path;
+	CString	myversion;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CChoosedbdlg)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CChoosedbdlg)
+	afx_msg void OnButton1();
+	afx_msg void OnButton4();
+	virtual BOOL OnInitDialog();
+	virtual void OnOK();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_CHOOSEDBDLG_H__22EAEAD5_3188_4DC6_B2BB_21E4FF12A640__INCLUDED_)

@@ -932,10 +932,8 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
         EnableStartBTN(false);
 
         SNThread_Init();
-        UpdateProgress(0.05);
 
         SetupMetaModeParameters();
-        UpdateProgress(0.10);
 
         EnableStartBTN(true);
 
@@ -946,7 +944,6 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
             UpdateUIMsg("EnterModemMeta() : MetaResult = %s", ResultToString(MetaResult));
             goto End;
         }
-        UpdateProgress(0.15);
 
         UpdateUIMsg("Start load and init database...");
         MetaResult = LoadModemDatabase(0);
@@ -957,7 +954,6 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
             PopupMsgBox("Error", MB_OK|MB_ICONERROR, "LoadModemDatabase() : MetaResult = %s", ResultToString(MetaResult));
             goto End;
         }
-        UpdateProgress(0.20);
 
         /*
         META_MISC_GetRID_r(m_hMauiMetaHandle, 5000, (unsigned char*)strChipID,16);
@@ -969,7 +965,6 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
         */
 
         EnableStartBTN(false);
-        UpdateProgress(0.22);
         UpdateUIMsg("Start loop write data to nvram...");
         MetaResult = WriteNvramLoop();
         if (MetaResult != META_SUCCESS)
@@ -981,14 +976,13 @@ void FeaturePhoneSN::ThreadMainEntryPoint()
 End:
         if (m_bStopBeforeUSBInsert == true)
         {
-            UpdateProgress(0.0);
             UpdateUIMsg("...");
         }
         else
         {
             if (bAnyOperationFail)
             {
-                m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
+//                m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
                 UpdateUICountResult(FAIL);
             }
             else
@@ -1006,7 +1000,6 @@ End:
 
             ExitModemMeta();
 
-            UpdateProgress(1.0);
         }
 
         EnableStartBTN(true);

@@ -151,10 +151,9 @@ UINT SNBase::ThreadStaticEntryPoint(LPVOID pThis)
 
 void SNBase::SetProgress()
 {
-    m_iProcessRange = 1000;
-    m_Process->SetRange(0, m_iProcessRange);
-    m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(0, 0, 255));
-    UpdateProgress(0.01);
+//m_iProcessRange = 1000;
+//m_Process->SetRange(0, m_iProcessRange);
+//m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(0, 0, 255));
 }
 
 int SNBase::UpdateUIMsg(const char * strMsg, ...)
@@ -167,7 +166,7 @@ int SNBase::UpdateUIMsg(const char * strMsg, ...)
     iRet = vsprintf(szBuf, strMsg, varg);
     va_end(varg);
 
-    g_pMainDlg->myloglist.AddString(strMsg);
+	g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(strMsg));
 
     return iRet;
 }
@@ -205,14 +204,6 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
     g_pMainDlg->SetDlgItemText(IDC_COUNT_PASS, strPass);
     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);
-    g_pMainDlg->SetDlgItemText(IDC_RSLT_QC, g_pMainDlg->myrslt_qc);
-    g_pMainDlg->SetDlgItemText(IDC_RSLT_WRITE_IMEI, g_pMainDlg->myrslt_imei);
-#endif
 
     UpdateMainDlgUI(true, eWriteStatus);
 }
@@ -236,16 +227,6 @@ void SNBase::UpdateMainDlgUI(bool bEnable, WriteNvram_Status_e eWriteStatus)
 
 }
 
-void SNBase::UpdateProgress(double dPercent)
-{
-    if (dPercent >= 1)
-    {
-        dPercent = 1;
-    }
-
-    int curPos = (int)(dPercent * m_iProcessRange);
-    m_Process->SetPos(curPos);
-}
 
 void SNBase::PopupMsgBox(const char* strTilte, UINT uType, const char* strMsg, ...)
 {
@@ -1279,8 +1260,8 @@ void SNBase::SNThread_Init()
     //Get main dialog handle
     //g_pMainDlg = (CSNWriterDlg*)g_MainDlgHandle;
 
-    m_Process = &(g_pMainDlg->m_ProgressSN);
-    SetProgress();
+//    m_Process = &(g_pMainDlg->m_ProgressSN);
+//    SetProgress();
 
     m_bNeedBackupIMEI = false;
     memset(m_strBackupIMEI, 0, IMEI_ARRAY_LEN);

@@ -98,7 +98,6 @@ protected:
     virtual META_RESULT WriteNvramLoop() = 0;
 
     virtual META_RESULT LoadModemDatabase(int MDindex) = 0;
-    virtual void UpdateProgress(double dPercent);
     virtual void SetProgress();
 
     virtual META_RESULT ConductBarcodeData(char *pOutData, unsigned short RID_para, char *pInDatabuf, int bufSize);
@@ -138,7 +137,7 @@ public:
     void EnableStartBTN(bool bEnable = true);
 
 protected:
-    CProgressCtrl *m_Process;
+//    CProgressCtrl *m_Process;
     UINT  m_iProcessRange;
     bool  m_bBackupNvramSuccess;
 };

@@ -802,7 +802,6 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
         }
         }
 
-        UpdateProgress(fBeginProcess);
         spStage = spNextStage;
     }
 
@@ -4121,7 +4120,6 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::EnterAPMetaMode()
     if (!g_sMetaComm.bAlreadyInMeata)
     {
         UpdateUIMsg("Start searching preloader com port and handshake...");
-        UpdateProgress(0.08);
 
         bootResult = ConnectWithPreloader();
         if (bootResult != 0)
@@ -4139,14 +4137,11 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::EnterAPMetaMode()
     else
     {
         UpdateUIMsg("Already in Meta Mode, bypass preloader com port handshake.");
-        UpdateProgress(0.08);
     }
 
     UpdateUIMsg("Start searching kernel com port and handshake...");
-    UpdateProgress(0.10);
 
     bootResult = ConnectWithKernelPort_Ex();
-    UpdateProgress(0.12);
     if (bootResult == 0)
     {
         UpdateUIMsg("Searching kernel com port and handshake OK.");
@@ -4371,7 +4366,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 
         UpdateUIMsg("Start load and init AP database...");
 
-        UpdateProgress(0.06);
 
         if (g_sMetaComm.bUsbEnable)
         {
@@ -4527,7 +4521,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
         {
             UpdateUIMsg("Start switch to MD meta and init Modem database...");
 
-            UpdateProgress(0.14);
 
             if (!g_sMetaComm.sDBFileOption.bDBInitModem_1 && g_sMetaComm.sDBFileOption.bMDDBFromDUT)
             {
@@ -4539,7 +4532,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
                     MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::GetMDDBFromDUT() : end.");
             }
 
-            UpdateProgress(0.18);
 
             MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::ApSwithToModemMeta_Ex(): Switch to MODEM meta from AP meta start...");
             MetaResult = APSwithToModemMeta_Ex();
@@ -4563,7 +4555,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
             }
             MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::LoadModemDatabase(): end.");
         }
-        UpdateProgress(0.22);
 
         EnableStartBTN(false);
         UpdateUIMsg("Start loop write data to nvram...");
@@ -4577,7 +4568,6 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 End:
         if (m_bStopBeforeUSBInsert == true)
         {
-            UpdateProgress(0.0);
             UpdateUIMsg("...");
         }
         else
@@ -4604,7 +4594,7 @@ End:
 
             if (bAnyOperationFail)
             {
-                m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
+//                m_Process->SendMessage(PBM_SETBARCOLOR, 0, RGB(255, 0, 0));
                 UpdateUICountResult(FAIL);
             }
             else
@@ -4621,7 +4611,6 @@ End:
                 UpdateUICountResult(PASS);
             }
 
-            UpdateProgress(1.0);
         }
 
         EnableStartBTN(true);
@@ -5068,7 +5057,6 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
         MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] can not find C2K modem.");
         return META_FAILED;
     }
-    UpdateProgress(0.14);
 
 
     // init c2k
@@ -5103,7 +5091,6 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
     }
     bInited = true; // inited
     MTRACE (g_hEBOOT_DEBUG, "[C2K] META_C2K_Init() end...");
-    UpdateProgress(0.18);
 
 
     // connect to c2k
@@ -5144,16 +5131,13 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
         {
             UpdateUIMsg("META_C2K_LoadMessage_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
             MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_LoadMessage_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
-            UpdateProgress(1.00);
             goto end;
         }
         UpdateUIMsg("META_C2K_LoadMessage_r() : successful!");
         MTRACE (g_hEBOOT_DEBUG, "[C2K] META_C2K_LoadMessage_r() : successful!");
-        UpdateProgress(0.28);
     }
 
     UpdateUIMsg("Start connect with C2K Meta...");
-    UpdateProgress(0.34);
 
     MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_ConnectWithTarget_r() start...");
     for (i = 0; i < 20; i++)
@@ -5166,13 +5150,11 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
     {
         UpdateUIMsg("META_C2K_ConnectWithTarget_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
         MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_ConnectWithTarget_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
-        UpdateProgress(1.00);
         goto end;
     }
     bConnected = true; // connected
     UpdateUIMsg("META_C2K_ConnectWithTarget_r() : successful!");
     MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_ConnectWithTarget_r() : successful!");
-    UpdateProgress(0.48);
 
 
     // handshake with c2k
@@ -5186,10 +5168,8 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
     {
         UpdateUIMsg("META_C2K_LoopbackTest_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
         MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_LoopbackTest_r() : fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
-        UpdateProgress(1.00);
         goto end;
     }
-    UpdateProgress(0.60);
 
 
     // task
@@ -5210,13 +5190,11 @@ META_RESULT SmartPhoneSN::EnterC2KGen90()
         DisconnectC2KMeta();
         DeinitC2KMeta();
 
-        UpdateProgress(1.00);
 
         goto end;
     }
     MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_FlushNvram_r() : Flaush NVRAM to Flash FFS successful!");
 #endif
-    UpdateProgress(0.85);
 
 end:
     // disconnect
@@ -5289,7 +5267,6 @@ end:
             UpdateUIMsg("[C2K] Write MEID fail.");
         else if (g_sMetaComm.sWriteOption.bWriteEsn)
             UpdateUIMsg("[C2K] Write ESN fail.");
-        UpdateProgress(1.00);
     }
 
     return ret_last;
@@ -5395,7 +5372,6 @@ int SmartPhoneSN::WriteMEID()
         return ret_meta;
     }
     MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_WriteNvram_r() : Write MEID end.");
-    UpdateProgress(0.70);
 
 
     UpdateUIMsg("Read MEID for check start...");
@@ -5409,7 +5385,6 @@ int SmartPhoneSN::WriteMEID()
         MTRACE_ERR(g_hEBOOT_DEBUG, "[C2K] META_C2K_ReadNvram_r(): Read MEID fail, %s", META_C2K_GetErrorString(m_hMauiMetaHandle));
         return ret_meta;
     }
-    UpdateProgress(0.75);
 
     MTRACE(g_hEBOOT_DEBUG, "[C2K] Write MEID :%s", g_sMetaComm.sScanData.strMeid);
     MTRACE(g_hEBOOT_DEBUG, "[C2K] Read MEID :%s", data_meid.meid);
@@ -5421,7 +5396,6 @@ int SmartPhoneSN::WriteMEID()
     }
     UpdateUIMsg("Checking MEID succesfully!");
     MTRACE(g_hEBOOT_DEBUG, "[C2K] Checking MEID succesfully!");
-    UpdateProgress(0.80);
 
     return META_SUCCESS;
 }
@@ -5451,7 +5425,6 @@ int SmartPhoneSN::WriteESN()
     }
     UpdateUIMsg("META_C2K_WriteNvram_r() : Write ESN succesful!");
     MTRACE(g_hEBOOT_DEBUG, "[C2K] META_C2K_WriteNvram_r() : Write ESN succesful!");
-    UpdateProgress(0.70);
 
     UpdateUIMsg("Read ESN for check start...");
     MTRACE(g_hEBOOT_DEBUG, "[C2K] Read ESN for check start...");
@@ -5475,7 +5448,6 @@ int SmartPhoneSN::WriteESN()
     }
     UpdateUIMsg("Checking Esn Successfully!");
     MTRACE(g_hEBOOT_DEBUG, "[C2K] Checking ESN successfully!");
-    UpdateProgress(0.80);
 
     return META_SUCCESS;
 }

@@ -214,6 +214,10 @@ SOURCE=.\Form\AutoGen\autogendlg.cpp
 # End Group
 # Begin Source File
 
+SOURCE=.\Choosedbdlg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\Encryption.cpp
 # End Source File
 # Begin Source File
@@ -467,6 +471,10 @@ SOURCE=.\Form\AutoGen\autogendlg.h
 # End Group
 # Begin Source File
 
+SOURCE=.\Choosedbdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\Encryption.h
 # End Source File
 # Begin Source File

@@ -13,6 +13,60 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
+// Chinese (P.R.C.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
+#ifdef _WIN32
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+#pragma code_page(936)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_FIRST_CHOOSE_DB DIALOG DISCARDABLE  0, 0, 271, 153
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Please choose DB file"
+FONT 10, "System"
+BEGIN
+    PUSHBUTTON      "Button1",IDC_BUTTON1,230,21,32,14
+    PUSHBUTTON      "Button1",IDC_BUTTON4,230,59,32,14
+    EDITTEXT        IDC_EDT_VERSION,4,102,254,14,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,73,125,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,148,126,50,14
+    EDITTEXT        IDC_EDIT1,7,21,205,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT2,7,59,205,14,ES_AUTOHSCROLL
+    GROUPBOX        "AP file path",IDC_STATIC,1,0,270,40
+    GROUPBOX        "BP file path",IDC_STATIC,0,46,270,40
+    GROUPBOX        "Static",IDC_STATIC,0,90,271,33
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_FIRST_CHOOSE_DB, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 264
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 146
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Chinese (P.R.C.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
@@ -268,56 +322,39 @@ BEGIN
     LTEXT           "......",IDC_PWD_MSG,7,50,273,23
 END
 
-IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 486, 251
+IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 299, 250
 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
-EXSTYLE WS_EX_CLIENTEDGE | WS_EX_APPWINDOW
+EXSTYLE WS_EX_APPWINDOW
 CAPTION "SN Writer"
 FONT 9, "΢ÈíÑźÚ"
 BEGIN
-    EDITTEXT        IDC_COUNT_TOTAL,198,139,38,13,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    DEFPUSHBUTTON   "Config",IDC_BTN_SYSCONFIG,63,214,30,12
-    DEFPUSHBUTTON   "Start",IDC_BTN_START,11,214,30,12
-    DEFPUSHBUTTON   "Quit",IDC_BTN_QUIT,119,214,30,12
-    EDITTEXT        IDC_COUNT_PASS,198,163,38,13,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    EDITTEXT        IDC_COUNT_FAIL,198,187,38,13,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    LTEXT           "Total:",IDC_STATIC,166,139,27,10
-    LTEXT           "Pass:",IDC_STATIC_PASS,166,163,27,10
-    CONTROL         "Progress1",IDC_PROGRESS_SN,"msctls_progress32",
-                    WS_BORDER,2,229,268,10
-    LTEXT           "Fail:",IDC_STATIC,166,187,27,10
-    COMBOBOX        IDC_COMBO_COMPORT,180,209,34,51,CBS_DROPDOWNLIST | 
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "SW Version",IDC_STATIC,6,12,48,9
-    EDITTEXT        IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Save",IDC_BT_SAVE_SWVER,246,10,44,15
-    LTEXT           "BP DB",IDC_STATIC,14,55,20,9
-    LTEXT           "AP DB",IDC_STATIC,14,41,20,9
-    EDITTEXT        IDC_STR_AP_PATH,38,38,197,13,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    EDITTEXT        IDC_STR_BP_PATH,38,54,197,13,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    PUSHBUTTON      "Select",IDC_BTN_AP_PATH,240,40,44,12
-    PUSHBUTTON      "Select",IDC_BTN_BP_PATH,240,55,44,12
-    GROUPBOX        "",IDC_STATIC,6,28,285,44
-    CONTROL         133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,154,84,93,45
-    LTEXT           "SW",IDC_STATIC,6,91,11,9
-    LTEXT           "CFT",IDC_STATIC,5,115,12,9
-    LTEXT           "SMT MMI",IDC_STATIC,5,139,30,9
-    LTEXT           "IMEI",IDC_STATIC,5,187,32,9
-    LTEXT           "QC1",IDC_STATIC,5,163,13,9
-    EDITTEXT        IDC_RSLT_SW,47,91,104,15,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_RSLT_CFT,47,115,104,15,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_RSLT_SMT,47,139,104,13,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_RSLT_QC,47,163,82,15,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_RSLT_WRITE_IMEI,47,187,82,15,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    GROUPBOX        "Test Result",IDC_STATIC,2,78,285,131
-    LISTBOX         IDC_LOG_LIST,293,1,193,249,LBS_NOINTEGRALHEIGHT | NOT 
+    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 | 
+                    BS_VCENTER
+    DEFPUSHBUTTON   "",IDC_BTN_SYSCONFIG,262,62,9,8,NOT WS_VISIBLE
+    DEFPUSHBUTTON   "",IDC_BTN_QUIT,262,71,9,8,NOT WS_VISIBLE
+    LTEXT           "Total:",IDC_STATIC,7,105,27,8
+    LTEXT           "Pass:",IDC_STATIC_PASS,103,105,27,10
+    LTEXT           "Fail:",IDC_STATIC,200,105,27,10
+    COMBOBOX        IDC_COMBO_COMPORT,262,83,16,51,CBS_DROPDOWNLIST | 
+                    CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    CONTROL         133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,167,56,93,45
+    GROUPBOX        "IMEI form Scan",IDC_STATIC,0,2,282,45
+    LISTBOX         IDC_LOG_LIST,0,118,293,133,LBS_NOINTEGRALHEIGHT | NOT 
                     WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "",IDC_COUNT_TOTAL,35,105,29,8,SS_SUNKEN
+    LTEXT           "",IDC_COUNT_PASS,143,105,32,8,SS_SUNKEN
+    LTEXT           "",IDC_COUNT_FAIL,241,105,37,8,SS_SUNKEN
+    LTEXT           "IMEI1",IDC_STATIC,8,15,20,12,SS_CENTERIMAGE
+    LTEXT           "IMEI2",IDC_STATIC,8,33,20,12,SS_CENTERIMAGE
+    GROUPBOX        "IMEI from phone",IDC_STATIC,2,53,158,49
+    LTEXT           "IMEI1",IDC_STATIC,10,65,20,12,SS_CENTERIMAGE
+    LTEXT           "IMEI2",IDC_STATIC,10,84,20,12,SS_CENTERIMAGE
+    LTEXT           "",IDC_STATIC,46,65,109,12,SS_SUNKEN
+    LTEXT           "",IDC_STATIC,46,84,109,12,SS_CENTERIMAGE | SS_SUNKEN
+    DEFPUSHBUTTON   "",IDOK,270,69,9,8,NOT WS_VISIBLE
 END
 
 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
@@ -555,9 +592,8 @@ BEGIN
 
     IDD_SNWRITER_DIALOG, DIALOG
     BEGIN
-        RIGHTMARGIN, 178
         TOPMARGIN, 7
-        BOTTOMMARGIN, 239
+        BOTTOMMARGIN, 238
     END
 
     IDD_SCANDATA_DIALOG, DIALOG

@@ -16,6 +16,7 @@
 #include "AutoGenDlg.h"
 #include "HdcpEncryption.h"
 #include "spmeta.h"
+#include "Choosedbdlg.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -88,14 +89,13 @@ CSNWriterDlg::CSNWriterDlg(CWnd* pParent /*=NULL*/)
     m_strTotal = _T("");
     m_strPass = _T("");
     m_strFail = _T("");
-	myversion = _T("");
-	my_str_ap_path = _T("");
-	my_str_bp_path = _T("");
 	myrslt_qc = _T("");
 	myrslt_smt = _T("");
 	myrslt_cft = _T("");
 	myrslt_sw = _T("");
 	myrslt_imei = _T("");
+	myscanimei1 = _T("");
+	myscanimei2 = _T("");
 	//}}AFX_DATA_INIT
     // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
     m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
@@ -105,21 +105,16 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
 {
     CDialog::DoDataExchange(pDX);
     //{{AFX_DATA_MAP(CSNWriterDlg)
+	DDX_Control(pDX, IDC_IMEI2_FROM_SCAN, myctrlscan2);
+	DDX_Control(pDX, IDC_IMEI1_FROM_SCAN, myctrlscan1);
 	DDX_Control(pDX, IDC_LOG_LIST, myloglist);
 	DDX_Control(pDX, IDC_BITMAP_RESAULT, myctrlbit);
     DDX_Control(pDX, IDC_COMBO_COMPORT, m_cComPortBox);
-    DDX_Control(pDX, IDC_PROGRESS_SN, m_ProgressSN);
     DDX_Text(pDX, IDC_COUNT_TOTAL, m_strTotal);
     DDX_Text(pDX, IDC_COUNT_PASS, m_strPass);
     DDX_Text(pDX, IDC_COUNT_FAIL, m_strFail);
-	DDX_Text(pDX, IDC_EDT_VERSION, myversion);
-	DDX_Text(pDX, IDC_STR_AP_PATH, my_str_ap_path);
-	DDX_Text(pDX, IDC_STR_BP_PATH, my_str_bp_path);
-	DDX_Text(pDX, IDC_RSLT_QC, myrslt_qc);
-	DDX_Text(pDX, IDC_RSLT_SMT, myrslt_smt);
-	DDX_Text(pDX, IDC_RSLT_CFT, myrslt_cft);
-	DDX_Text(pDX, IDC_RSLT_SW, myrslt_sw);
-	DDX_Text(pDX, IDC_RSLT_WRITE_IMEI, myrslt_imei);
+	DDX_Text(pDX, IDC_IMEI1_FROM_SCAN, myscanimei1);
+	DDX_Text(pDX, IDC_IMEI2_FROM_SCAN, myscanimei2);
 	//}}AFX_DATA_MAP
 
 
@@ -139,7 +134,6 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
     ON_BN_CLICKED(IDC_BTN_START, OnBtnStart)
     ON_BN_CLICKED(IDC_BTN_QUIT, OnBtnQuit)
     ON_BN_CLICKED(IDC_BTN_SYSCONFIG, OnBtnSysconfig)
-    ON_CBN_SELCHANGE(IDC_COMBO_COMPORT, OnSelchangeComboComport)
     ON_WM_CTLCOLOR()
     ON_COMMAND(IDR_ABOUT_SN, OnAboutSn)
     ON_COMMAND(IDR_ATCMD_MODE, OnAtcmdMode)
@@ -166,9 +160,9 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
     ON_COMMAND(IDR_BACKNV_TOPC, OnBacknvTopc)
     ON_COMMAND(IDR_OEM_LOCK, OnFastbootOemLock)
 	ON_BN_CLICKED(IDC_BT_SAVE_SWVER, OnBtSaveSwver)
-	ON_BN_CLICKED(IDC_BTN_AP_PATH, OnBtnApPath)
-	ON_BN_CLICKED(IDC_BTN_BP_PATH, OnBtnBpPath)
-    ON_WM_SYSCOMMAND()
+	ON_EN_SETFOCUS(IDC_IMEI2_FROM_SCAN, OnSetfocusImei2FromScan)
+	ON_WM_SYSCOMMAND()
+	ON_EN_SETFOCUS(IDC_IMEI1_FROM_SCAN, OnSetfocusImei1FromScan)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -208,7 +202,7 @@ BOOL CSNWriterDlg::OnInitDialog()
     //g_MainDlgHandle = (DWORD)this;
 
     m_SNMenu.LoadMenu(IDR_SN_MENU);
-    m_hSNMenu = m_SNMenu.GetSafeHmenu();
+    //m_hSNMenu = m_SNMenu.GetSafeHmenu();
 
 #ifdef _LOAD_SKIN_
     skinppSetDrawMenu(m_hSNMenu, TRUE);
@@ -230,6 +224,16 @@ BOOL CSNWriterDlg::OnInitDialog()
     // Get main dialog handle
     g_pMainDlg = (CSNWriterDlg*)this;
     ParameterInit();
+	CChoosedbdlg choosedlg;
+	if (choosedlg.DoModal() == IDOK)
+	{
+//		myctrlscan1.SetFocus();
+		GetDlgItem(IDC_IMEI2_FROM_SCAN)->SetFocus();
+	} 
+	else
+	{
+		CDialog::OnCancel();
+	}
 	myctrlbit.ShowWindow(SW_HIDE);
 	m_cComPortBox.ShowWindow(SW_HIDE);
 
@@ -413,20 +417,15 @@ void CSNWriterDlg::EnableUIItem()
 //    GetDlgItem(IDC_MAINUI_TEMP2)->ShowWindow(FALSE);
 
     SetDlgItemText(IDC_BTN_START, "Start");
-	myversion = CString(g_sMetaComm.check_sw_ver);
-	my_str_ap_path = CString(g_sMetaComm.sDBFileOption.strAPDbpath);
-	my_str_bp_path = CString(g_sMetaComm.sDBFileOption.strMD1Dbpath);
-	GetDlgItem(IDC_EDT_VERSION)->SetWindowText(myversion);
-	GetDlgItem(IDC_STR_AP_PATH)->SetWindowText(my_str_ap_path);
-	GetDlgItem(IDC_STR_BP_PATH)->SetWindowText(my_str_bp_path);
-	//
+
+	
 	//UpdateData(FALSE);
 }
 
 void CSNWriterDlg::DisableUIItem()
 {
     GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(FALSE);
-    GetDlgItem(IDC_COMBO_COMPORT)->EnableWindow(FALSE);
+//    GetDlgItem(IDC_COMBO_COMPORT)->EnableWindow(FALSE);
     m_SNMenu.EnableMenuItem( 0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION );
     m_SNMenu.EnableMenuItem( 1, MF_GRAYED | MF_DISABLED | MF_BYPOSITION );
     m_SNMenu.EnableMenuItem( 2, MF_GRAYED | MF_DISABLED | MF_BYPOSITION );
@@ -598,17 +597,6 @@ HCURSOR CSNWriterDlg::OnQueryDragIcon()
 
 void CSNWriterDlg::OnBtnStart()
 {
-    // TODO: Add your control notification handler code here
-//    OnSelchangeComboTargetType();
-	if (my_str_ap_path== "" ||my_str_bp_path== "")
-	{
-		MessageBox("请指定DB文件");
-		return;
-	}
-	if (myversion == "")
-	{
-		MessageBox("请输入版本号");
-	}
     OnSelchangeComboComport();
     E_TARGET_TYPE eTargetType = GetTargetType();
 
@@ -1083,47 +1071,29 @@ void CSNWriterDlg::OnOptionCheckQcFlag()
 
 void CSNWriterDlg::OnBtSaveSwver() 
 {
-	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());
-	SaveParaToSetupFile();
 }
 
-void CSNWriterDlg::OnBtnApPath() 
-{
-    char szFilter[]="Database files(*.*)|*.*";
-    CFileDialog dlg(TRUE, NULL, NULL,
-        OFN_FILEMUSTEXIST|OFN_EXPLORER|OFN_ENABLESIZING|0x10000000/*OFN_FORCESHOWHIDDEN*/,
-        szFilter, this);
-    dlg.m_ofn.lpstrTitle = _T("Select Modem_1 database file...");
-    if(dlg.DoModal() == IDOK)
-    {
-        g_sMetaComm.sDBFileOption.bDBInitModem_1 = false;
-        my_str_ap_path = dlg.GetPathName();
-    }
-	UpdateData(FALSE);
-    strcpy(g_sMetaComm.sDBFileOption.strAPDbpath,my_str_ap_path.GetBuffer(my_str_ap_path.GetLength()));
 
 
 
+void CSNWriterDlg::OnOK() 
+{
+	if (GetFocus() == GetDlgItem(IDC_IMEI1_FROM_SCAN))
+	{
+		myctrlscan2.SetFocus();
+	} 
+	else
+	{
+		GetDlgItem(IDC_BTN_START)->SetFocus();
+	}
+	
 }
 
-void CSNWriterDlg::OnBtnBpPath() 
+void CSNWriterDlg::OnSetfocusImei2FromScan() 
 {
-    char szFilter[]="Database files(*.*)|*.*";
-    CFileDialog dlg(TRUE, NULL, NULL,
-        OFN_FILEMUSTEXIST|OFN_EXPLORER|OFN_ENABLESIZING|0x10000000/*OFN_FORCESHOWHIDDEN*/,
-        szFilter, this);
-    dlg.m_ofn.lpstrTitle = _T("Select Modem_1 database file...");
-    if(dlg.DoModal() == IDOK)
-    {
-        g_sMetaComm.sDBFileOption.bDBInitModem_1 = false;
-        my_str_bp_path = dlg.GetPathName();
-    }
-	UpdateData(FALSE);
-
-	strcpy(g_sMetaComm.sDBFileOption.strMD1Dbpath,my_str_bp_path.GetBuffer(my_str_bp_path.GetLength()));
-
 }
 
-
+void CSNWriterDlg::OnSetfocusImei1FromScan() 
+{
+	
+}

@@ -27,22 +27,22 @@ public:
 // Dialog Data
 	//{{AFX_DATA(CSNWriterDlg)
 	enum { IDD = IDD_SNWRITER_DIALOG };
+	CEdit	myctrlscan2;
+	CEdit	myctrlscan1;
 	CListBox	myloglist;
 	CStatic	myctrlbit;
 	CComboBox	m_cTargetTypeBox;
 	CComboBox	m_cComPortBox;
-	CProgressCtrl	m_ProgressSN;
 	CString	m_strTotal;
 	CString	m_strPass;
 	CString	m_strFail;
-	CString	myversion;
-	CString	my_str_ap_path;
-	CString	my_str_bp_path;
 	CString	myrslt_qc;
 	CString	myrslt_smt;
 	CString	myrslt_cft;
 	CString	myrslt_sw;
 	CString	myrslt_imei;
+	CString	myscanimei1;
+	CString	myscanimei2;
 	//}}AFX_DATA
 
 	// ClassWizard generated virtual function overrides
@@ -93,8 +93,9 @@ protected:
 	afx_msg void OnBacknvTopc();
 	afx_msg void OnFastbootOemLock();
 	afx_msg void OnBtSaveSwver();
-	afx_msg void OnBtnApPath();
-	afx_msg void OnBtnBpPath();
+	virtual void OnOK();
+	afx_msg void OnSetfocusImei2FromScan();
+	afx_msg void OnSetfocusImei1FromScan();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 

@@ -19,6 +19,7 @@
 #define IDB_BITMAP_LOGO                 148
 #define IDI_ICON1                       154
 #define IDD_ENCRYPTION_DIALOG           155
+#define IDD_FIRST_CHOOSE_DB             158
 #define IDC_COUNT_TOTAL                 1000
 #define IDC_BTN_SYSCONFIG               1001
 #define IDC_BTN_START                   1002
@@ -211,6 +212,12 @@
 #define IDC_BTN_LOG                     1165
 #define IDC_LOCK_OTP                    1166
 #define IDC_LOG_LIST                    1170
+#define IDC_IMEI1_FROM_SCAN             1171
+#define IDC_IMEI2_FROM_SCAN             1172
+#define IDC_EDIT1                       1172
+#define IDC_BUTTON1                     1173
+#define IDC_EDIT2                       1174
+#define IDC_BUTTON4                     1175
 #define IDR_OPTION_SWITCHTOOL           32772
 #define IDR_OPTION_EXTMODEM             32773
 #define IDR_OPTION_SECURITY_USB         32774
@@ -240,9 +247,9 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        158
+#define _APS_NEXT_RESOURCE_VALUE        159
 #define _APS_NEXT_COMMAND_VALUE         32798
-#define _APS_NEXT_CONTROL_VALUE         1171
+#define _APS_NEXT_CONTROL_VALUE         1177
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif