xiemeng / xiemeng_intex_write_tool · Commits

Commit d42d404491c8207333a6b578ca1288df86621aaa

Authored by xiemeng
1 parent adcfaa70

增加三个工位的定义 

写IMEI 检测IMEI  包装复测
Inline Side-by-side
Showing 7 changed files with 205 additions and 3 deletions
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 #define IDB_BITMAP_LOGO 148 19 #define IDB_BITMAP_LOGO 148
20 #define IDI_ICON1 154 20 #define IDI_ICON1 154
21 #define IDD_ENCRYPTION_DIALOG 155 21 #define IDD_ENCRYPTION_DIALOG 155
  22 +#define IDD_CHECK_WORKMODE 157
22 #define IDC_COUNT_TOTAL 1000 23 #define IDC_COUNT_TOTAL 1000
23 #define IDC_BTN_SYSCONFIG 1001 24 #define IDC_BTN_SYSCONFIG 1001
24 #define IDC_BTN_START 1002 25 #define IDC_BTN_START 1002
@@ -193,6 +194,7 @@ @@ -193,6 +194,7 @@
193 #define IDC_LOCK_OTP 1166 194 #define IDC_LOCK_OTP 1166
194 #define IDC_STR_SWVERSION 1167 195 #define IDC_STR_SWVERSION 1167
195 #define IDC_STATIC_SWVER 1169 196 #define IDC_STATIC_SWVER 1169
  197 +#define IDC_COMBO2 1172
196 #define IDR_OPTION_SWITCHTOOL 32772 198 #define IDR_OPTION_SWITCHTOOL 32772
197 #define IDR_OPTION_EXTMODEM 32773 199 #define IDR_OPTION_EXTMODEM 32773
198 #define IDR_OPTION_SECURITY_USB 32774 200 #define IDR_OPTION_SECURITY_USB 32774
@@ -222,9 +224,9 @@ @@ -222,9 +224,9 @@
222 // 224 //
223 #ifdef APSTUDIO_INVOKED 225 #ifdef APSTUDIO_INVOKED
224 #ifndef APSTUDIO_READONLY_SYMBOLS 226 #ifndef APSTUDIO_READONLY_SYMBOLS
225 -#define _APS_NEXT_RESOURCE_VALUE 157 227 +#define _APS_NEXT_RESOURCE_VALUE 160
226 #define _APS_NEXT_COMMAND_VALUE 32798 228 #define _APS_NEXT_COMMAND_VALUE 32798
227 -#define _APS_NEXT_CONTROL_VALUE 1170 229 +#define _APS_NEXT_CONTROL_VALUE 1173
228 #define _APS_NEXT_SYMED_VALUE 101 230 #define _APS_NEXT_SYMED_VALUE 101
229 #endif 231 #endif
230 #endif 232 #endif
@@ -234,6 +234,10 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.cpp @@ -234,6 +234,10 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.cpp
234 # End Group 234 # End Group
235 # Begin Source File 235 # Begin Source File
236 236
  237 +SOURCE=.\chooseworkmode.cpp
  238 +# End Source File
  239 +# Begin Source File
  240 +
237 SOURCE=.\Encryption.cpp 241 SOURCE=.\Encryption.cpp
238 # End Source File 242 # End Source File
239 # Begin Source File 243 # Begin Source File
@@ -507,6 +511,10 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.h @@ -507,6 +511,10 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.h
507 # End Group 511 # End Group
508 # Begin Source File 512 # Begin Source File
509 513
  514 +SOURCE=.\chooseworkmode.h
  515 +# End Source File
  516 +# Begin Source File
  517 +
510 SOURCE=.\Encryption.h 518 SOURCE=.\Encryption.h
511 # End Source File 519 # End Source File
512 # Begin Source File 520 # Begin Source File
@@ -13,6 +13,72 @@ @@ -13,6 +13,72 @@
13 #undef APSTUDIO_READONLY_SYMBOLS 13 #undef APSTUDIO_READONLY_SYMBOLS
14 14
15 ///////////////////////////////////////////////////////////////////////////// 15 /////////////////////////////////////////////////////////////////////////////
  16 +// Chinese (P.R.C.) resources
  17 +
  18 +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
  19 +#ifdef _WIN32
  20 +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
  21 +#pragma code_page(936)
  22 +#endif //_WIN32
  23 +
  24 +/////////////////////////////////////////////////////////////////////////////
  25 +//
  26 +// Dialog
  27 +//
  28 +
  29 +IDD_CHECK_WORKMODE DIALOG DISCARDABLE 0, 0, 145, 70
  30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  31 +CAPTION "Dialog"
  32 +FONT 14, "΢ÈíÑźÚ"
  33 +BEGIN
  34 + DEFPUSHBUTTON "OK",IDOK,15,43,50,14
  35 + PUSHBUTTON "Cancel",IDCANCEL,79,43,50,14
  36 + COMBOBOX IDC_COMBO2,24,18,97,76,CBS_DROPDOWNLIST | WS_VSCROLL |
  37 + WS_TABSTOP
  38 + LTEXT "please choose work station",IDC_STATIC,26,5,92,8
  39 +END
  40 +
  41 +
  42 +/////////////////////////////////////////////////////////////////////////////
  43 +//
  44 +// DESIGNINFO
  45 +//
  46 +
  47 +#ifdef APSTUDIO_INVOKED
  48 +GUIDELINES DESIGNINFO DISCARDABLE
  49 +BEGIN
  50 + IDD_CHECK_WORKMODE, DIALOG
  51 + BEGIN
  52 + LEFTMARGIN, 7
  53 + RIGHTMARGIN, 138
  54 + TOPMARGIN, 7
  55 + BOTTOMMARGIN, 63
  56 + END
  57 +END
  58 +#endif // APSTUDIO_INVOKED
  59 +
  60 +
  61 +/////////////////////////////////////////////////////////////////////////////
  62 +//
  63 +// Dialog Info
  64 +//
  65 +
  66 +IDD_CHECK_WORKMODE DLGINIT
  67 +BEGIN
  68 + IDC_COMBO2, 0x403, 11, 0
  69 +0x7277, 0x7469, 0x2065, 0x6d69, 0x6965, "\000"
  70 + IDC_COMBO2, 0x403, 11, 0
  71 +0x6863, 0x6365, 0x206b, 0x6d69, 0x6965, "\000"
  72 + IDC_COMBO2, 0x403, 10, 0
  73 +0x6863, 0x6365, 0x206b, 0x6c61, 0x006c,
  74 + 0
  75 +END
  76 +
  77 +#endif // Chinese (P.R.C.) resources
  78 +/////////////////////////////////////////////////////////////////////////////
  79 +
  80 +
  81 +/////////////////////////////////////////////////////////////////////////////
16 // English (U.S.) resources 82 // English (U.S.) resources
17 83
18 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) 84 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 #include "FileSelDlg.h" 16 #include "FileSelDlg.h"
17 #include "AutoGenDlg.h" 17 #include "AutoGenDlg.h"
18 #include "HdcpEncryption.h" 18 #include "HdcpEncryption.h"
19 - 19 +#include "chooseworkmode.h"
20 20
21 #ifdef _DEBUG 21 #ifdef _DEBUG
22 #define new DEBUG_NEW 22 #define new DEBUG_NEW
@@ -31,6 +31,9 @@ unsigned short g_iTotalComPort = MAX_COMPORT_COUNT; @@ -31,6 +31,9 @@ unsigned short g_iTotalComPort = MAX_COMPORT_COUNT;
31 unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0}; 31 unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0};
32 byte g_QC_value_from_phone;// ´ÓÊÖ»úÖжÁµ½µÄQCÖµ 32 byte g_QC_value_from_phone;// ´ÓÊÖ»úÖжÁµ½µÄQCÖµ
33 const char *g_strToolVersion = "SN Writer V1.1728.00"; 33 const char *g_strToolVersion = "SN Writer V1.1728.00";
  34 +TOPWELL_TOOL_WORK_MODE g_topwell_workmode;
  35 +
  36 +
34 37
35 extern CSNWriterDlg *g_pMainDlg; 38 extern CSNWriterDlg *g_pMainDlg;
36 39
@@ -195,6 +198,16 @@ BOOL CSNWriterDlg::OnInitDialog() @@ -195,6 +198,16 @@ BOOL CSNWriterDlg::OnInitDialog()
195 // TODO: Add extra initialization here 198 // TODO: Add extra initialization here
196 //g_MainDlgHandle = (DWORD)this; 199 //g_MainDlgHandle = (DWORD)this;
197 200
  201 + Cchooseworkmode dlg_choose;
  202 + if (dlg_choose.DoModal() == IDOK)
  203 + {
  204 + g_topwell_workmode = (TOPWELL_TOOL_WORK_MODE)dlg_choose.mycurindex;
  205 + }
  206 + else
  207 + {
  208 + CDialog::OnCancel();
  209 + }
  210 +
198 m_SNMenu.LoadMenu(IDR_SN_MENU); 211 m_SNMenu.LoadMenu(IDR_SN_MENU);
199 m_hSNMenu = m_SNMenu.GetSafeHmenu(); 212 m_hSNMenu = m_SNMenu.GetSafeHmenu();
200 213
@@ -23,6 +23,19 @@ @@ -23,6 +23,19 @@
23 extern const char* g_strToolVersion; 23 extern const char* g_strToolVersion;
24 #define __TOPWELL_QCTEST__ 24 #define __TOPWELL_QCTEST__
25 25
  26 +
  27 +typedef enum
  28 +{
  29 + //用于写号工位
  30 + TOPWELL_MODE_WRITE_IMEI = 0,
  31 + //用于扫码枪的IMEI 工位
  32 + TOPWELL_MODE_CHECK_IMEI ,
  33 + //用于包装工位
  34 + TOPWELL_MODE_CHECK_ALL,
  35 +}TOPWELL_TOOL_WORK_MODE;
  36 +
  37 +
  38 +
26 //{{AFX_INSERT_LOCATION}} 39 //{{AFX_INSERT_LOCATION}}
27 40
28 #endif // !defined(AFX_STDAFX_H__E5D84E0E_2EFD_421B_A61B_013774C0AA47__INCLUDED_) 41 #endif // !defined(AFX_STDAFX_H__E5D84E0E_2EFD_421B_A61B_013774C0AA47__INCLUDED_)
  1 +// chooseworkmode.cpp : implementation file
  2 +//
  3 +
  4 +#include "stdafx.h"
  5 +#include "sn writer.h"
  6 +#include "chooseworkmode.h"
  7 +
  8 +#ifdef _DEBUG
  9 +#define new DEBUG_NEW
  10 +#undef THIS_FILE
  11 +static char THIS_FILE[] = __FILE__;
  12 +#endif
  13 +
  14 +/////////////////////////////////////////////////////////////////////////////
  15 +// Cchooseworkmode dialog
  16 +
  17 +
  18 +Cchooseworkmode::Cchooseworkmode(CWnd* pParent /*=NULL*/)
  19 + : CDialog(Cchooseworkmode::IDD, pParent)
  20 +{
  21 + //{{AFX_DATA_INIT(Cchooseworkmode)
  22 + mycurindex = -1;
  23 + //}}AFX_DATA_INIT
  24 +}
  25 +
  26 +
  27 +void Cchooseworkmode::DoDataExchange(CDataExchange* pDX)
  28 +{
  29 + CDialog::DoDataExchange(pDX);
  30 + //{{AFX_DATA_MAP(Cchooseworkmode)
  31 + DDX_Control(pDX, IDC_COMBO2, mylist);
  32 + DDX_CBIndex(pDX, IDC_COMBO2, mycurindex);
  33 + //}}AFX_DATA_MAP
  34 +}
  35 +
  36 +
  37 +BEGIN_MESSAGE_MAP(Cchooseworkmode, CDialog)
  38 + //{{AFX_MSG_MAP(Cchooseworkmode)
  39 + //}}AFX_MSG_MAP
  40 +END_MESSAGE_MAP()
  41 +
  42 +/////////////////////////////////////////////////////////////////////////////
  43 +// Cchooseworkmode message handlers
  44 +
  45 +BOOL Cchooseworkmode::OnInitDialog()
  46 +{
  47 + CDialog::OnInitDialog();
  48 +
  49 + mylist.SetCurSel(0);
  50 +
  51 + return TRUE; // return TRUE unless you set the focus to a control
  52 + // EXCEPTION: OCX Property Pages should return FALSE
  53 +}
  1 +#if !defined(AFX_CHOOSEWORKMODE_H__094A8DC6_29C2_46BA_AC7E_E33CFD9B3320__INCLUDED_)
  2 +#define AFX_CHOOSEWORKMODE_H__094A8DC6_29C2_46BA_AC7E_E33CFD9B3320__INCLUDED_
  3 +
  4 +#if _MSC_VER > 1000
  5 +#pragma once
  6 +#endif // _MSC_VER > 1000
  7 +// chooseworkmode.h : header file
  8 +//
  9 +
  10 +/////////////////////////////////////////////////////////////////////////////
  11 +// Cchooseworkmode dialog
  12 +
  13 +class Cchooseworkmode : public CDialog
  14 +{
  15 +// Construction
  16 +public:
  17 + Cchooseworkmode(CWnd* pParent = NULL); // standard constructor
  18 +
  19 +// Dialog Data
  20 + //{{AFX_DATA(Cchooseworkmode)
  21 + enum { IDD = IDD_CHECK_WORKMODE };
  22 + CComboBox mylist;
  23 + int mycurindex;
  24 + //}}AFX_DATA
  25 +
  26 +
  27 +// Overrides
  28 + // ClassWizard generated virtual function overrides
  29 + //{{AFX_VIRTUAL(Cchooseworkmode)
  30 + protected:
  31 + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
  32 + //}}AFX_VIRTUAL
  33 +
  34 +// Implementation
  35 +protected:
  36 +
  37 + // Generated message map functions
  38 + //{{AFX_MSG(Cchooseworkmode)
  39 + virtual BOOL OnInitDialog();
  40 + //}}AFX_MSG
  41 + DECLARE_MESSAGE_MAP()
  42 +};
  43 +
  44 +//{{AFX_INSERT_LOCATION}}
  45 +// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
  46 +
  47 +#endif // !defined(AFX_CHOOSEWORKMODE_H__094A8DC6_29C2_46BA_AC7E_E33CFD9B3320__INCLUDED_)
Please register or login to post a comment