From 4a85f77a8530059b4bb712982dae2f2b022638b1 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 12 Jan 2023 15:11:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4oem=E5=8E=82=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/char_const.h | 189 +++++++++++++------------- hgdriver/hgdev/scanner_manager.cpp | 23 ++-- sdk/hginclude/huagaoxxx_warraper_ex.h | 128 ++++++++--------- 3 files changed, 170 insertions(+), 170 deletions(-) diff --git a/hgdriver/hgdev/char_const.h b/hgdriver/hgdev/char_const.h index 47c4e63..e68d04e 100644 --- a/hgdriver/hgdev/char_const.h +++ b/hgdriver/hgdev/char_const.h @@ -10,23 +10,23 @@ // 公司名称 & 信息 #ifdef OEM_HANWANG - // #define COMPANY_NAME "汉王科技股份有限公司" - #define COMPANY_NAME "\346\261\211\347\216\213\347\247\221\346\212\200\350\202\241\344\273\275\346\234\211\351\231\220\345\205\254\345\217\270" - // #define BRAND_APP_NAME "汉王扫描应用程序" - #define BRAND_APP_NAME "\346\261\211\347\216\213\346\211\253\346\217\217\345\272\224\347\224\250\347\250\213\345\272\217" - // #define BRAND_TITLE_VERSION "版本" - #define BRAND_TITLE_VERSION "\347\211\210\346\234\254" - // #define BRAND_TITLE_COPYRIGHT "版权" - #define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203" - #define BRAND_COPYRIGHT "1998-2022 HANVONSCAN\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\346\235\203\345\210\251" - // #define BRAND_TITE_MANUFACTOR "制造商/开发商" - #define BRAND_TITE_MANUFACTOR "\345\210\266\351\200\240\345\225\206/\345\274\200\345\217\221\345\225\206" - // #define BRAND_TITLE_URL "公司网址" - #define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200" - #define BRAND_COMPANY_URL "www.hw99.com" - #define BRAND_URL_COMPANY_URL "https://www.hw99.com/" - // #define BRAND_TITLE_TEL "联系电话" - #define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" + // #define COMPANY_NAME "汉王科技股份有限公司" + #define COMPANY_NAME "\346\261\211\347\216\213\347\247\221\346\212\200\350\202\241\344\273\275\346\234\211\351\231\220\345\205\254\345\217\270" + // #define BRAND_APP_NAME "汉王扫描应用程序" + #define BRAND_APP_NAME "\346\261\211\347\216\213\346\211\253\346\217\217\345\272\224\347\224\250\347\250\213\345\272\217" + // #define BRAND_TITLE_VERSION "版本" + #define BRAND_TITLE_VERSION "\347\211\210\346\234\254" + // #define BRAND_TITLE_COPYRIGHT "版权" + #define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203" + #define BRAND_COPYRIGHT "1998-2022 HANVONSCAN\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\346\235\203\345\210\251" + // #define BRAND_TITE_MANUFACTOR "制造商/开发商" + #define BRAND_TITE_MANUFACTOR "\345\210\266\351\200\240\345\225\206/\345\274\200\345\217\221\345\225\206" + // #define BRAND_TITLE_URL "公司网址" + #define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200" + #define BRAND_COMPANY_URL "www.hw99.com" + #define BRAND_URL_COMPANY_URL "https://www.hw99.com/" + // #define BRAND_TITLE_TEL "联系电话" + #define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" #define BRAND_COMPANY_TEL "(010)82786854" // #define BRAND_TITLE_ADDRESS "地址" #define BRAND_TITLE_ADDRESS "\345\234\260\345\235\200" @@ -39,80 +39,80 @@ #define BRAND_URL_GPS "https://j.map.baidu.com/68/idCJ" #elif defined(OEM_LISICHENG) - // #define COMPANY_NAME "北京立思辰计算机技术有限公司" - #define COMPANY_NAME "\345\214\227\344\272\254\347\253\213\346\200\235\350\276\260\350\256\241\347\256\227\346\234\272\346\212\200\346\234\257\346\234\211\351\231\220\345\205\254\345\217\270" - // #define BRAND_APP_NAME "立思辰扫描应用程序" - #define BRAND_APP_NAME "\347\253\213\346\200\235\350\276\260\346\211\253\346\217\217\345\272\224\347\224\250\347\250\213\345\272\217" - // #define BRAND_TITLE_VERSION "版本" - #define BRAND_TITLE_VERSION "\347\211\210\346\234\254" - // #define BRAND_TITLE_COPYRIGHT "版权" - #define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203" - #define BRAND_COPYRIGHT "2010-2022 LANXUM\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\346\235\203\345\210\251" - // #define BRAND_TITE_MANUFACTOR "制造商/开发商" - #define BRAND_TITE_MANUFACTOR "\345\210\266\351\200\240\345\225\206/\345\274\200\345\217\221\345\225\206" - // #define BRAND_TITLE_URL "公司网址" - #define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200" - #define BRAND_COMPANY_URL "www.lanxum.com" - #define BRAND_URL_COMPANY_URL "http://www.lanxum.com/" - // #define BRAND_TITLE_TEL "联系电话" - #define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" - #define BRAND_COMPANY_TEL "+86 010 82736600" - // #define BRAND_TITLE_ADDRESS "地址" - #define BRAND_TITLE_ADDRESS "\345\234\260\345\235\200" - // #define BRAND_COMPANY_ADDRESS "中国北京市海淀区学清路8号科技财富中心B座3A层" - #define BRAND_COMPANY_ADDRESS "\344\270\255\345\233\275\345\214\227\344\272\254\345\270\202\346\265\267\346\267\200\345\214\272\345\255\246\346\270\205\350\267\2578\345\217\267\347\247\221\346\212\200\350\264\242\345\257\214\344\270\255\345\277\203B\345\272\2473A\345\261\202" - // #define BRAND_TITLE_GPS "导航地址" - #define BRAND_TITLE_GPS "\345\257\274\350\210\252\345\234\260\345\235\200" - // #define BRAND_COMPANY_GPS "百度地图访问" - #define BRAND_COMPANY_GPS "\347\231\276\345\272\246\345\234\260\345\233\276\350\256\277\351\227\256" - #define BRAND_URL_GPS "https://j.map.baidu.com/5f/Xzh" + // #define COMPANY_NAME "北京立思辰计算机技术有限公司" + #define COMPANY_NAME "\345\214\227\344\272\254\347\253\213\346\200\235\350\276\260\350\256\241\347\256\227\346\234\272\346\212\200\346\234\257\346\234\211\351\231\220\345\205\254\345\217\270" + // #define BRAND_APP_NAME "立思辰扫描应用程序" + #define BRAND_APP_NAME "\347\253\213\346\200\235\350\276\260\346\211\253\346\217\217\345\272\224\347\224\250\347\250\213\345\272\217" + // #define BRAND_TITLE_VERSION "版本" + #define BRAND_TITLE_VERSION "\347\211\210\346\234\254" + // #define BRAND_TITLE_COPYRIGHT "版权" + #define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203" + #define BRAND_COPYRIGHT "2010-2022 LANXUM\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\346\235\203\345\210\251" + // #define BRAND_TITE_MANUFACTOR "制造商/开发商" + #define BRAND_TITE_MANUFACTOR "\345\210\266\351\200\240\345\225\206/\345\274\200\345\217\221\345\225\206" + // #define BRAND_TITLE_URL "公司网址" + #define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200" + #define BRAND_COMPANY_URL "www.lanxum.com" + #define BRAND_URL_COMPANY_URL "http://www.lanxum.com/" + // #define BRAND_TITLE_TEL "联系电话" + #define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" + #define BRAND_COMPANY_TEL "+86 010 82736600" + // #define BRAND_TITLE_ADDRESS "地址" + #define BRAND_TITLE_ADDRESS "\345\234\260\345\235\200" + // #define BRAND_COMPANY_ADDRESS "中国北京市海淀区学清路8号科技财富中心B座3A层" + #define BRAND_COMPANY_ADDRESS "\344\270\255\345\233\275\345\214\227\344\272\254\345\270\202\346\265\267\346\267\200\345\214\272\345\255\246\346\270\205\350\267\2578\345\217\267\347\247\221\346\212\200\350\264\242\345\257\214\344\270\255\345\277\203B\345\272\2473A\345\261\202" + // #define BRAND_TITLE_GPS "导航地址" + #define BRAND_TITLE_GPS "\345\257\274\350\210\252\345\234\260\345\235\200" + // #define BRAND_COMPANY_GPS "百度地图访问" + #define BRAND_COMPANY_GPS "\347\231\276\345\272\246\345\234\260\345\233\276\350\256\277\351\227\256" + #define BRAND_URL_GPS "https://j.map.baidu.com/5f/Xzh" #elif defined(OEM_CANGTIAN) - // #define COMPANY_NAME "浙江沧田智能信息科技有限公司浙江沧田智能信息科技有限公司" -#define COMPANY_NAME " \346\265\231\346\261\237\346\262\247\347\224\260\346\231\272\350\203\275\344\277\241\346\201\257\347\247\221\346\212\200\346\234\211\351\231\220\345\205\254\345\217\270\346\265\231\346\261\237\346\262\247\347\224\260\346\231\272\350\203\275\344\277\241\346\201\257\347\247\221\346\212\200\346\234\211\351\231\220\345\205\254\345\217\270" -// #define BRAND_APP_NAME "沧田扫描应用程序" -#define BRAND_APP_NAME "\346\262\247\347\224\260\346\211\253\346\217\217\345\272\224\347\224\250\347\250\213\345\272\217" -// #define BRAND_TITLE_VERSION "版本" -#define BRAND_TITLE_VERSION "\347\211\210\346\234\254" -// #define BRAND_TITLE_COPYRIGHT "版权" -#define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203" -#define BRAND_COPYRIGHT "2017 CUMTENN\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\346\235\203\345\210\251" -// #define BRAND_TITE_MANUFACTOR "制造商/开发商" -#define BRAND_TITE_MANUFACTOR "\345\210\266\351\200\240\345\225\206/\345\274\200\345\217\221\345\225\206" -// #define BRAND_TITLE_URL "公司网址" -#define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200" - #define BRAND_COMPANY_URL "www.cumtennchina.com" -#define BRAND_URL_COMPANY_URL "http://www.cumtennchina.com/" - #define BRAND_TITLE_TEL "联系电话" -#define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" -#define BRAND_COMPANY_TEL "+86 0574 27974866" - #define BRAND_TITLE_ADDRESS "地址" -#define BRAND_TITLE_ADDRESS "\345\234\260\345\235\200" -// #define BRAND_COMPANY_ADDRESS "浙江省宁波市鄞州区学士路655号（信科大厦）C栋211" -#define BRAND_COMPANY_ADDRESS "\346\265\231\346\261\237\347\234\201\345\230\211\345\205\264\345\270\202\345\230\211\345\226\204\345\216\277\351\255\217\345\241\230\350\241\227\351\201\223\345\215\227\346\230\237\350\267\257\346\265\231\346\261\237\347\234\201\345\230\211\345\205\264\345\270\202\345\230\211\345\226\204\345\216\277\351\255\217\345\241\230\350\241\227\351\201\223\345\215\227\346\230\237\350\267\257819819\345\217\267" - #define BRAND_TITLE_GPS "导航地址" -#define BRAND_TITLE_GPS "\345\257\274\350\210\252\345\234\260\345\235\200" - #define BRAND_COMPANY_GPS "百度地图访问" -#define BRAND_COMPANY_GPS "\347\231\276\345\272\246\345\234\260\345\233\276\350\256\277\351\227\256" -#define BRAND_URL_GPS "https://j.map.baidu.com/7e/1TO" + // #define COMPANY_NAME "沧田智能信息技术有限公司" + #define COMPANY_NAME "\346\262\247\347\224\260\346\231\272\350\203\275\344\277\241\346\201\257\346\212\200\346\234\257\346\234\211\351\231\220\345\205\254\345\217\270" + // #define BRAND_APP_NAME "沧田扫描应用程序" + #define BRAND_APP_NAME "\346\262\247\347\224\260\346\211\253\346\217\217\345\272\224\347\224\250\347\250\213\345\272\217" + // #define BRAND_TITLE_VERSION "版本" + #define BRAND_TITLE_VERSION "\347\211\210\346\234\254" + // #define BRAND_TITLE_COPYRIGHT "版权" + #define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203" + #define BRAND_COPYRIGHT "2017 CUMTENN\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\346\235\203\345\210\251" + // #define BRAND_TITE_MANUFACTOR "制造商/开发商" + #define BRAND_TITE_MANUFACTOR "\345\210\266\351\200\240\345\225\206/\345\274\200\345\217\221\345\225\206" + // #define BRAND_TITLE_URL "公司网址" + // #define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200" + //#define BRAND_COMPANY_URL "www.cumtennchina.com" + //#define BRAND_URL_COMPANY_URL "http://www.cumtennchina.com/" + //#define BRAND_TITLE_TEL "联系电话" + #define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" + #define BRAND_COMPANY_TEL "+86 0574 27974866" + //#define BRAND_TITLE_ADDRESS "地址" + #define BRAND_TITLE_ADDRESS "\345\234\260\345\235\200" + // #define BRAND_COMPANY_ADDRESS "浙江省嘉兴市嘉善县南星路819号" + #define BRAND_COMPANY_ADDRESS "\346\265\231\346\261\237\347\234\201\345\230\211\345\205\264\345\270\202\345\230\211\345\226\204\345\216\277\345\215\227\346\230\237\350\267\257819\345\217\267" + //#define BRAND_TITLE_GPS "导航地址" + //#define BRAND_TITLE_GPS "\345\257\274\350\210\252\345\234\260\345\235\200" + //#define BRAND_COMPANY_GPS "百度地图访问" + //#define BRAND_COMPANY_GPS "\347\231\276\345\272\246\345\234\260\345\233\276\350\256\277\351\227\256" + //#define BRAND_URL_GPS "https://j.map.baidu.com/7e/1TO" #else - // #define COMPANY_NAME "宁波华高信息科技有限公司" - #define COMPANY_NAME "\345\256\201\346\263\242\345\215\216\351\253\230\344\277\241\346\201\257\347\247\221\346\212\200\346\234\211\351\231\220\345\205\254\345\217\270" - // #define BRAND_APP_NAME "华高扫描应用程序" - #define BRAND_APP_NAME "\345\215\216\351\253\230\346\211\253\346\217\217\345\272\224\347\224\250\347\250\213\345\272\217" - // #define BRAND_TITLE_VERSION "版本" - #define BRAND_TITLE_VERSION "\347\211\210\346\234\254" - // #define BRAND_TITLE_COPYRIGHT "版权" - #define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203" - #define BRAND_COPYRIGHT "2017 HuaGoScan\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\346\235\203\345\210\251" - // #define BRAND_TITE_MANUFACTOR "制造商/开发商" - #define BRAND_TITE_MANUFACTOR "\345\210\266\351\200\240\345\225\206/\345\274\200\345\217\221\345\225\206" - // #define BRAND_TITLE_URL "公司网址" - #define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200" - #define BRAND_COMPANY_URL "www.huagaochina.com" - #define BRAND_URL_COMPANY_URL "http://www.huagaochina.com/" - // #define BRAND_TITLE_TEL "联系电话" - #define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" + // #define COMPANY_NAME "宁波华高信息科技有限公司" + #define COMPANY_NAME "\345\256\201\346\263\242\345\215\216\351\253\230\344\277\241\346\201\257\347\247\221\346\212\200\346\234\211\351\231\220\345\205\254\345\217\270" + // #define BRAND_APP_NAME "华高扫描应用程序" + #define BRAND_APP_NAME "\345\215\216\351\253\230\346\211\253\346\217\217\345\272\224\347\224\250\347\250\213\345\272\217" + // #define BRAND_TITLE_VERSION "版本" + #define BRAND_TITLE_VERSION "\347\211\210\346\234\254" + // #define BRAND_TITLE_COPYRIGHT "版权" + #define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203" + #define BRAND_COPYRIGHT "2017 HuaGoScan\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\346\235\203\345\210\251" + // #define BRAND_TITE_MANUFACTOR "制造商/开发商" + #define BRAND_TITE_MANUFACTOR "\345\210\266\351\200\240\345\225\206/\345\274\200\345\217\221\345\225\206" + // #define BRAND_TITLE_URL "公司网址" + #define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200" + #define BRAND_COMPANY_URL "www.huagaochina.com" + #define BRAND_URL_COMPANY_URL "http://www.huagaochina.com/" + // #define BRAND_TITLE_TEL "联系电话" + #define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" #define BRAND_COMPANY_TEL "+86 0574 27974866" // #define BRAND_TITLE_ADDRESS "地址" #define BRAND_TITLE_ADDRESS "\345\234\260\345\235\200" @@ -134,10 +134,9 @@ #define BRAND_TITLE_ROLLER_COUNT "\346\273\232\350\275\264\345\274\240\346\225\260" // #define BRAND_TITLE_IP "设备IP" #define BRAND_TITLE_IP "\350\256\276\345\244\207IP" -// #define BRAND_TITLE_HISTORY_COUNT "历史张数" +// #define BRAND_TITLE_HISTORY_COUNT "历史张数" #define BRAND_TITLE_HISTORY_COUNT "\345\216\206\345\217\262\345\274\240\346\225\260" - -// #define BRAND_NO_DEVICE "未连接设备" +// #define BRAND_NO_DEVICE "未连接设备" #define BRAND_NO_DEVICE "\346\234\252\350\277\236\346\216\245\350\256\276\345\244\207" // #define BRAND_COMMUNICATION_FAIL "与设备通信失败" #define BRAND_COMMUNICATION_FAIL "\344\270\216\350\256\276\345\244\207\351\200\232\344\277\241\345\244\261\350\264\245" @@ -204,7 +203,7 @@ #define SCANNER_NAME_HW_8000 "Hanvon HW-8000" #define SCANNER_NAME_HW_9000 "Hanvon HW-9000" -#define SCANNER_NAME_CT_303 "CUMTENN CT-303" -#define SCANNER_NAME_CT_404 "CUMTENN CT-404" -#define SCANNER_NAME_CT_138 "CUMTENN CT-138" -#define SCANNER_NAME_CT_238 "CUMTENN CT-238" \ No newline at end of file +#define SCANNER_NAME_CT_9020 "CUMTENN CT-9020" +#define SCANNER_NAME_CT_4520 "CUMTENN CT-4520" +#define SCANNER_NAME_CT_138 "CUMTENN CT-138" +#define SCANNER_NAME_CT_238 "CUMTENN CT-238" \ No newline at end of file diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index 5c1d423..97c379c 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -34,7 +34,7 @@ static struct hg_scanner* (* create_scanner)(const char*, usb_io*, scanner_handle*); } g_supporting_devices[] = { -//#ifdef OEM_LISICHENG +#ifdef OEM_LISICHENG {0x31c9, PID_AND_NAME(8200, SCANNER_NAME_LSC_G42S), "G42S", "", &hg_scanner_mgr::create_scanner_g300} , {0x31c9, PID_AND_NAME(8420, SCANNER_NAME_LSC_G42S), "G42S", "", &hg_scanner_mgr::create_scanner_g300} , {0x31c9, PID_AND_NAME(8429, SCANNER_NAME_LSC_G42S), "G42S", "", &hg_scanner_mgr::create_scanner_empty} @@ -45,21 +45,22 @@ g_supporting_devices[] = { , {0x31c9, PID_AND_NAME(8730, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g100} , {0x31c9, PID_AND_NAME(8739, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g239} -//#elif defined(OEM_HANWANG) - , {0x2903, 0x1000, SCANNER_NAME_HW_1000, SCANNER_NAME_HW_1000, "", &hg_scanner_mgr::create_scanner_g300} // "HW-1060A" +#elif defined(OEM_HANWANG) + {0x2903, 0x1000, SCANNER_NAME_HW_1000, SCANNER_NAME_HW_1000, "", &hg_scanner_mgr::create_scanner_g300} // "HW-1060A" , {0x2903, 0x1002, SCANNER_NAME_HW_1002, SCANNER_NAME_HW_1002, "", &hg_scanner_mgr::create_scanner_g302} // "HW-1060A" , {0x2903, 0x7000, SCANNER_NAME_HW_7000, SCANNER_NAME_HW_7000, "", &hg_scanner_mgr::create_scanner_g400} // "HW-74x0WA" , {0x2903, 0x7002, SCANNER_NAME_HW_7002, SCANNER_NAME_HW_7002, "", &hg_scanner_mgr::create_scanner_g402} // "HW-7002" , {0x2903, 0x7039, SCANNER_NAME_HW_7039, SCANNER_NAME_HW_7039, "", &hg_scanner_mgr::create_scanner_g239} // "HW-7039F" , {0x2903, 0x8000, SCANNER_NAME_HW_8000, SCANNER_NAME_HW_8000, "", &hg_scanner_mgr::create_scanner_g239} // "HW-8090F" , {0x2903, 0x9000, SCANNER_NAME_HW_9000, SCANNER_NAME_HW_9000, "", &hg_scanner_mgr::create_scanner_g239} // "HW-9110E" -//#elif defined(OEM_CANGTIAN) - , {0x3072, 0x0303, SCANNER_NAME_CT_303, SCANNER_NAME_CT_303, "", &hg_scanner_mgr::create_scanner_g300} - , {0x3072, 0x0404, SCANNER_NAME_CT_404, SCANNER_NAME_CT_404, "", &hg_scanner_mgr::create_scanner_g239} - , {0x3072, 0x0238, SCANNER_NAME_CT_138, SCANNER_NAME_CT_138, "", &hg_scanner_mgr::create_scanner_g239} - , {0x3072, 0x0138, SCANNER_NAME_CT_238, SCANNER_NAME_CT_238, "", &hg_scanner_mgr::create_scanner_g239} -//#else - , {0x3072, PID_AND_NAME(100, SCANNER_NAME_HG_G100), "G100", "", &hg_scanner_mgr::create_scanner_g100} +#elif defined(OEM_CANGTIAN) + {0x3308, 0x6006, SCANNER_NAME_CT_9020, SCANNER_NAME_CT_9020, "", &hg_scanner_mgr::create_scanner_g239} + , {0x3308, 0x6005, SCANNER_NAME_CT_4520, SCANNER_NAME_CT_4520, "", &hg_scanner_mgr::create_scanner_g300} + + , {0x3308, 0x0238, SCANNER_NAME_CT_138, SCANNER_NAME_CT_138, "", &hg_scanner_mgr::create_scanner_g239} + , {0x3308, 0x0138, SCANNER_NAME_CT_238, SCANNER_NAME_CT_238, "", &hg_scanner_mgr::create_scanner_g239} +#else + {0x3072, PID_AND_NAME(100, SCANNER_NAME_HG_G100), "G100", "", &hg_scanner_mgr::create_scanner_g100} , {0x3072, PID_AND_NAME(139, SCANNER_NAME_HG_G100), "G100", "", &hg_scanner_mgr::create_scanner_g239} , {0x3072, PID_AND_NAME(200, SCANNER_NAME_HG_G200), "G200", "", &hg_scanner_mgr::create_scanner_g239} , {0x3072, PID_AND_NAME(239, SCANNER_NAME_HG_G200), "G200", "", &hg_scanner_mgr::create_scanner_g239} @@ -70,7 +71,7 @@ g_supporting_devices[] = { , {0x3072, PID_AND_NAME(402, SCANNER_NAME_HG_G400), "G400", "", &hg_scanner_mgr::create_scanner_g402} , {0x3072, PID_AND_NAME(439, SCANNER_NAME_HG_G400), "G400", "", &hg_scanner_mgr::create_scanner_g439} , {0x064B, PID_AND_NAME(7823,SCANNER_NAME_HG_G200), "G200", "", &hg_scanner_mgr::create_scanner_g100} -//#endif +#endif }; static std::string g_vendor = COMPANY_NAME; diff --git a/sdk/hginclude/huagaoxxx_warraper_ex.h b/sdk/hginclude/huagaoxxx_warraper_ex.h index 8534210..3994075 100644 --- a/sdk/hginclude/huagaoxxx_warraper_ex.h +++ b/sdk/hginclude/huagaoxxx_warraper_ex.h @@ -88,70 +88,70 @@ /// /// 错误代码 #define MAX_NAME_LEN 256 -#ifdef OEM_HANWANG -#define hg_scanner_initialize hw_scanner_initialize -#define hg_scanner_uninitialize hw_scanner_uninitialize -#define hg_scanner_get_version hw_scanner_get_version -#define hg_scanner_enum hw_scanner_enum -#define hg_scanner_open hw_scanner_open -#define hg_scanner_close hw_scanner_close -#define hg_scanner_get_parameter hw_scanner_get_parameter -#define hg_scanner_set_parameter hw_scanner_set_parameter -#define hg_scanner_start hw_scanner_start -#define hg_scanner_stop hw_scanner_stop -#define hg_scanner_get_img_info hw_scanner_get_img_info -#define hg_scanner_read_img_data hw_scanner_read_img_data -#define hg_scanner_get_status hw_scanner_get_status -#define hg_scanner_reset hw_scanner_reset -#define hg_scanner_control hw_scanner_control -#define hg_scanner_set_sane_info hw_scanner_set_sane_info -#define hg_scanner_err_name hw_scanner_err_name -#define hg_scanner_err_description hw_scanner_err_description -#define hg_scanner_log hw_scanner_log -#define hg_scanner_log_is_enable hw_scanner_log_is_enable -#elif defined(OEM_LISICHENG) -#define hg_scanner_initialize lsc_scanner_initialize -#define hg_scanner_uninitialize lsc_scanner_uninitialize -#define hg_scanner_get_version lsc_scanner_get_version -#define hg_scanner_enum lsc_scanner_enum -#define hg_scanner_open lsc_scanner_open -#define hg_scanner_close lsc_scanner_close -#define hg_scanner_get_parameter lsc_scanner_get_parameter -#define hg_scanner_set_parameter lsc_scanner_set_parameter -#define hg_scanner_start lsc_scanner_start -#define hg_scanner_stop lsc_scanner_stop -#define hg_scanner_get_img_info lsc_scanner_get_img_info -#define hg_scanner_read_img_data lsc_scanner_read_img_data -#define hg_scanner_get_status lsc_scanner_get_status -#define hg_scanner_reset lsc_scanner_reset -#define hg_scanner_control lsc_scanner_control -#define hg_scanner_set_sane_info lsc_scanner_set_sane_info -#define hg_scanner_err_name lsc_scanner_err_name -#define hg_scanner_err_description lsc_scanner_err_description -#define hg_scanner_log lsc_scanner_log -#define hg_scanner_log_is_enable lsc_scanner_log_is_enable -#elif defined(OEM_CANGTIAN) -#define hg_scanner_initialize cts_scanner_initialize -#define hg_scanner_uninitialize cts_scanner_uninitialize -#define hg_scanner_get_version cts_scanner_get_version -#define hg_scanner_enum cts_scanner_enum -#define hg_scanner_open cts_scanner_open -#define hg_scanner_close cts_scanner_close -#define hg_scanner_get_parameter cts_scanner_get_parameter -#define hg_scanner_set_parameter cts_scanner_set_parameter -#define hg_scanner_start cts_scanner_start -#define hg_scanner_stop cts_scanner_stop -#define hg_scanner_get_img_info cts_scanner_get_img_info -#define hg_scanner_read_img_data cts_scanner_read_img_data -#define hg_scanner_get_status cts_scanner_get_status -#define hg_scanner_reset cts_scanner_reset -#define hg_scanner_control cts_scanner_control -#define hg_scanner_set_sane_info cts_scanner_set_sane_info -#define hg_scanner_err_name cts_scanner_err_name -#define hg_scanner_err_description cts_scanner_err_description -#define hg_scanner_log cts_scanner_log -#define hg_scanner_log_is_enable cts_scanner_log_is_enable -#endif +//#ifdef OEM_HANWANG +//#define hg_scanner_initialize hw_scanner_initialize +//#define hg_scanner_uninitialize hw_scanner_uninitialize +//#define hg_scanner_get_version hw_scanner_get_version +//#define hg_scanner_enum hw_scanner_enum +//#define hg_scanner_open hw_scanner_open +//#define hg_scanner_close hw_scanner_close +//#define hg_scanner_get_parameter hw_scanner_get_parameter +//#define hg_scanner_set_parameter hw_scanner_set_parameter +//#define hg_scanner_start hw_scanner_start +//#define hg_scanner_stop hw_scanner_stop +//#define hg_scanner_get_img_info hw_scanner_get_img_info +//#define hg_scanner_read_img_data hw_scanner_read_img_data +//#define hg_scanner_get_status hw_scanner_get_status +//#define hg_scanner_reset hw_scanner_reset +//#define hg_scanner_control hw_scanner_control +//#define hg_scanner_set_sane_info hw_scanner_set_sane_info +//#define hg_scanner_err_name hw_scanner_err_name +//#define hg_scanner_err_description hw_scanner_err_description +//#define hg_scanner_log hw_scanner_log +//#define hg_scanner_log_is_enable hw_scanner_log_is_enable +//#elif defined(OEM_LISICHENG) +//#define hg_scanner_initialize lsc_scanner_initialize +//#define hg_scanner_uninitialize lsc_scanner_uninitialize +//#define hg_scanner_get_version lsc_scanner_get_version +//#define hg_scanner_enum lsc_scanner_enum +//#define hg_scanner_open lsc_scanner_open +//#define hg_scanner_close lsc_scanner_close +//#define hg_scanner_get_parameter lsc_scanner_get_parameter +//#define hg_scanner_set_parameter lsc_scanner_set_parameter +//#define hg_scanner_start lsc_scanner_start +//#define hg_scanner_stop lsc_scanner_stop +//#define hg_scanner_get_img_info lsc_scanner_get_img_info +//#define hg_scanner_read_img_data lsc_scanner_read_img_data +//#define hg_scanner_get_status lsc_scanner_get_status +//#define hg_scanner_reset lsc_scanner_reset +//#define hg_scanner_control lsc_scanner_control +//#define hg_scanner_set_sane_info lsc_scanner_set_sane_info +//#define hg_scanner_err_name lsc_scanner_err_name +//#define hg_scanner_err_description lsc_scanner_err_description +//#define hg_scanner_log lsc_scanner_log +//#define hg_scanner_log_is_enable lsc_scanner_log_is_enable +//#elif defined(OEM_CANGTIAN) +//#define hg_scanner_initialize cts_scanner_initialize +//#define hg_scanner_uninitialize cts_scanner_uninitialize +//#define hg_scanner_get_version cts_scanner_get_version +//#define hg_scanner_enum cts_scanner_enum +//#define hg_scanner_open cts_scanner_open +//#define hg_scanner_close cts_scanner_close +//#define hg_scanner_get_parameter cts_scanner_get_parameter +//#define hg_scanner_set_parameter cts_scanner_set_parameter +//#define hg_scanner_start cts_scanner_start +//#define hg_scanner_stop cts_scanner_stop +//#define hg_scanner_get_img_info cts_scanner_get_img_info +//#define hg_scanner_read_img_data cts_scanner_read_img_data +//#define hg_scanner_get_status cts_scanner_get_status +//#define hg_scanner_reset cts_scanner_reset +//#define hg_scanner_control cts_scanner_control +//#define hg_scanner_set_sane_info cts_scanner_set_sane_info +//#define hg_scanner_err_name cts_scanner_err_name +//#define hg_scanner_err_description cts_scanner_err_description +//#define hg_scanner_log cts_scanner_log +//#define hg_scanner_log_is_enable cts_scanner_log_is_enable +//#endif #define _TO_STR(str) #str #define MAKE_STR(str) _TO_STR(str)