增加三个工位的定义

写IMEI 检测IMEI  包装复测

@@ -19,6 +19,7 @@
 #define IDB_BITMAP_LOGO                 148
 #define IDI_ICON1                       154
 #define IDD_ENCRYPTION_DIALOG           155
+#define IDD_CHECK_WORKMODE              157
 #define IDC_COUNT_TOTAL                 1000
 #define IDC_BTN_SYSCONFIG               1001
 #define IDC_BTN_START                   1002
@@ -193,6 +194,7 @@
 #define IDC_LOCK_OTP                    1166
 #define IDC_STR_SWVERSION               1167
 #define IDC_STATIC_SWVER                1169
+#define IDC_COMBO2                      1172
 #define IDR_OPTION_SWITCHTOOL           32772
 #define IDR_OPTION_EXTMODEM             32773
 #define IDR_OPTION_SECURITY_USB         32774
@@ -222,9 +224,9 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        157
+#define _APS_NEXT_RESOURCE_VALUE        160
 #define _APS_NEXT_COMMAND_VALUE         32798
-#define _APS_NEXT_CONTROL_VALUE         1170
+#define _APS_NEXT_CONTROL_VALUE         1173
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

@@ -234,6 +234,10 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.cpp
 # End Group
 # Begin Source File
 
+SOURCE=.\chooseworkmode.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\Encryption.cpp
 # End Source File
 # Begin Source File
@@ -507,6 +511,10 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.h
 # End Group
 # Begin Source File
 
+SOURCE=.\chooseworkmode.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\Encryption.h
 # End Source File
 # Begin Source File

@@ -13,6 +13,72 @@
 #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_CHECK_WORKMODE DIALOG DISCARDABLE  0, 0, 145, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 14, "΢ÈíÑźÚ"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,15,43,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,79,43,50,14
+    COMBOBOX        IDC_COMBO2,24,18,97,76,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    LTEXT           "please choose work station",IDC_STATIC,26,5,92,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CHECK_WORKMODE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 138
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 63
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+
+IDD_CHECK_WORKMODE DLGINIT
+BEGIN
+    IDC_COMBO2, 0x403, 11, 0
+0x7277, 0x7469, 0x2065, 0x6d69, 0x6965, "\000" 
+    IDC_COMBO2, 0x403, 11, 0
+0x6863, 0x6365, 0x206b, 0x6d69, 0x6965, "\000" 
+    IDC_COMBO2, 0x403, 10, 0
+0x6863, 0x6365, 0x206b, 0x6c61, 0x006c, 
+    0
+END
+
+#endif    // Chinese (P.R.C.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

@@ -16,7 +16,7 @@
 #include "FileSelDlg.h"
 #include "AutoGenDlg.h"
 #include "HdcpEncryption.h"
-
+#include "chooseworkmode.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -31,6 +31,9 @@ unsigned short g_iTotalComPort = MAX_COMPORT_COUNT;
 unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0};
 byte g_QC_value_from_phone;//  ´ÓÊÖ»úÖжÁµ½µÄQCÖµ
 const char *g_strToolVersion = "SN Writer V1.1728.00";
+TOPWELL_TOOL_WORK_MODE g_topwell_workmode;
+
+
 
 extern CSNWriterDlg *g_pMainDlg;
 
@@ -195,6 +198,16 @@ BOOL CSNWriterDlg::OnInitDialog()
     // TODO: Add extra initialization here
     //g_MainDlgHandle = (DWORD)this;
 
+	Cchooseworkmode dlg_choose;
+	if (dlg_choose.DoModal() == IDOK)
+	{
+		g_topwell_workmode = (TOPWELL_TOOL_WORK_MODE)dlg_choose.mycurindex;
+	} 
+	else
+	{
+		CDialog::OnCancel();
+	}
+
     m_SNMenu.LoadMenu(IDR_SN_MENU);
     m_hSNMenu = m_SNMenu.GetSafeHmenu();
 

@@ -23,6 +23,19 @@
 extern const char* g_strToolVersion;
 #define __TOPWELL_QCTEST__
 
+
+typedef enum
+{
+	//用于写号工位
+    TOPWELL_MODE_WRITE_IMEI = 0,
+	//用于扫码枪的IMEI 工位
+	TOPWELL_MODE_CHECK_IMEI ,
+	//用于包装工位
+	TOPWELL_MODE_CHECK_ALL,
+}TOPWELL_TOOL_WORK_MODE;
+
+
+
 //{{AFX_INSERT_LOCATION}}
 
 #endif // !defined(AFX_STDAFX_H__E5D84E0E_2EFD_421B_A61B_013774C0AA47__INCLUDED_)

+// chooseworkmode.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "sn writer.h"
+#include "chooseworkmode.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// Cchooseworkmode dialog
+
+
+Cchooseworkmode::Cchooseworkmode(CWnd* pParent /*=NULL*/)
+	: CDialog(Cchooseworkmode::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(Cchooseworkmode)
+	mycurindex = -1;
+	//}}AFX_DATA_INIT
+}
+
+
+void Cchooseworkmode::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(Cchooseworkmode)
+	DDX_Control(pDX, IDC_COMBO2, mylist);
+	DDX_CBIndex(pDX, IDC_COMBO2, mycurindex);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(Cchooseworkmode, CDialog)
+	//{{AFX_MSG_MAP(Cchooseworkmode)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// Cchooseworkmode message handlers
+
+BOOL Cchooseworkmode::OnInitDialog() 
+{
+	CDialog::OnInitDialog();
+	
+	mylist.SetCurSel(0);
+	
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}

+#if !defined(AFX_CHOOSEWORKMODE_H__094A8DC6_29C2_46BA_AC7E_E33CFD9B3320__INCLUDED_)
+#define AFX_CHOOSEWORKMODE_H__094A8DC6_29C2_46BA_AC7E_E33CFD9B3320__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// chooseworkmode.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// Cchooseworkmode dialog
+
+class Cchooseworkmode : public CDialog
+{
+// Construction
+public:
+	Cchooseworkmode(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(Cchooseworkmode)
+	enum { IDD = IDD_CHECK_WORKMODE };
+	CComboBox	mylist;
+	int		mycurindex;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(Cchooseworkmode)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(Cchooseworkmode)
+	virtual BOOL OnInitDialog();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_CHOOSEWORKMODE_H__094A8DC6_29C2_46BA_AC7E_E33CFD9B3320__INCLUDED_)