From c4c81a14655b8a7970034b8f6d41dc91ffbc61ea Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 15 Jun 2023 11:56:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E7=BD=91=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/char_const.h | 6 ++++++ hgdriver/hgdev/scanner_manager.cpp | 21 ++++++++++++--------- hgdriver/hgdev/scanner_manager.h | 2 ++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/hgdriver/hgdev/char_const.h b/hgdriver/hgdev/char_const.h index f0613a5..4a7c25b 100644 --- a/hgdriver/hgdev/char_const.h +++ b/hgdriver/hgdev/char_const.h @@ -29,6 +29,7 @@ #define BRAND_COMPANY_URL "www.hw99.com" #define BRAND_COMPANY_URL_EN "www.hw99.com" #define BRAND_URL_COMPANY_URL "https://www.hw99.com" + #define BRAND_URL_COMPANY_URL_EN "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" @@ -62,6 +63,7 @@ #define BRAND_COMPANY_URL "www.lanxum.com" #define BRAND_COMPANY_URL_EN "www.lanxum.com" #define BRAND_URL_COMPANY_URL "http://www.lanxum.com" + #define BRAND_URL_COMPANY_URL_EN "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" @@ -94,6 +96,7 @@ #define BRAND_COMPANY_URL "www.cumtenn.com" #define BRAND_COMPANY_URL_EN "www.cumtenn.com" #define BRAND_URL_COMPANY_URL "http://www.cumtenn.com" + #define BRAND_URL_COMPANY_URL_EN "http://www.cumtenn.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 "400-008-1300" @@ -126,6 +129,7 @@ #define BRAND_COMPANY_URL "www.microtek.com.cn" #define BRAND_COMPANY_URL_EN "www.microtek.com" #define BRAND_URL_COMPANY_URL "http://www.microtek.com.cn" + #define BRAND_URL_COMPANY_URL_EN "http://www.microtek.com.cn" //#define BRAND_TITLE_TEL "联系电话" #define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" #define BRAND_COMPANY_TEL "886-3-5772155" @@ -157,6 +161,7 @@ #define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200" #define BRAND_COMPANY_URL "www.uniscan.com" #define BRAND_URL_COMPANY_URL "http://www.unisscan.com" + #define BRAND_URL_COMPANY_URL_EN "http://www.unisscan.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 "400-700-8188" @@ -189,6 +194,7 @@ #define BRAND_COMPANY_URL "www.huagaochina.com" #define BRAND_COMPANY_URL_EN "www.huagaochina.com" #define BRAND_URL_COMPANY_URL "http://www.huagaochina.com" + #define BRAND_URL_COMPANY_URL_EN "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" diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index 1c2328d..5705ff8 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -143,6 +143,14 @@ hg_scanner_mgr::hg_scanner_mgr() : same_ind_(1), user_(""), pwd_(""), cf_name("" { cf_name = hg_log::ini_get("devs_name", "name"); usb_manager::instance()->register_hotplug(&hg_scanner_mgr::usb_event_handle, this); + int code_page = lang_get_cur_code_page(); + url_en = BRAND_COMPANY_URL; + url_link_en = BRAND_URL_COMPANY_URL; + if (code_page == 20127) + { + url_en = BRAND_COMPANY_URL_EN; + url_link_en = BRAND_URL_COMPANY_URL_EN; + } } hg_scanner_mgr::~hg_scanner_mgr() { @@ -519,12 +527,7 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne unsigned bytes = sizeof(SANE_About) + 40; SANE_About tmp; size_t append_cnt = 1; - int code_page = lang_get_cur_code_page(); - string url_en = BRAND_COMPANY_URL; - if (code_page == 20127) - { - url_en = BRAND_COMPANY_URL_EN; - } + bytes += sizeof(g_logo); bytes += strlen(GET_LANG(BRAND_APP_NAME, &islang)) + 8; append_cnt++; @@ -536,7 +539,7 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne bytes += strlen(GET_LANG(url_en.c_str(), &islang)) + 8; append_cnt++; - bytes += strlen(GET_LANG(BRAND_URL_COMPANY_URL, &islang)) + 8; append_cnt++; + bytes += strlen(GET_LANG(url_link_en.c_str(), &islang)) + 8; append_cnt++; bytes += strlen(GET_LANG(BRAND_TITLE_TEL,&islang)) + 8; append_cnt++; bytes += strlen(GET_LANG(BRAND_COMPANY_TEL,&islang)) + 8; append_cnt++; bytes += strlen(GET_LANG(BRAND_TITLE_ADDRESS,&islang)) + 8; append_cnt++; @@ -596,7 +599,7 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne #endif std::string g_vendor = GET_LANG(COMPANY_NAME, &islang); set_appendix_info_for_about(about, ptr, count, GET_LANG(BRAND_TITE_MANUFACTOR,&islang), g_vendor.c_str(), NULL); - set_appendix_info_for_about(about, ptr, count, GET_LANG(BRAND_TITLE_URL,&islang), GET_LANG(url_en.c_str(), &islang), GET_LANG(BRAND_URL_COMPANY_URL, &islang)); + set_appendix_info_for_about(about, ptr, count, GET_LANG(BRAND_TITLE_URL,&islang), GET_LANG(url_en.c_str(), &islang), GET_LANG(url_link_en.c_str(), &islang)); set_appendix_info_for_about(about, ptr, count, GET_LANG(BRAND_TITLE_TEL,&islang), GET_LANG(BRAND_COMPANY_TEL,&islang), NULL); set_appendix_info_for_about(about, ptr, count, GET_LANG(BRAND_TITLE_ADDRESS,&islang), GET_LANG(BRAND_COMPANY_ADDRESS,&islang), NULL); if (strlen(BRAND_TITLE_GPS) > 1) @@ -833,7 +836,7 @@ scanner_err hg_scanner_mgr::hg_scanner_get_parameter(scanner_handle h, const cha TRY_STR_OPT(MANUFACTURER, COMPANY_NAME); TRY_STR_OPT(COPYRIGHT, BRAND_COPYRIGHT); - TRY_STR_OPT(CO_URL, BRAND_URL_COMPANY_URL); + TRY_STR_OPT(CO_URL, url_link_en.c_str()); TRY_STR_OPT(CO_TEL, BRAND_COMPANY_TEL); TRY_STR_OPT(CO_ADDR, BRAND_COMPANY_ADDRESS); TRY_STR_OPT(CO_GPS, BRAND_URL_GPS); diff --git a/hgdriver/hgdev/scanner_manager.h b/hgdriver/hgdev/scanner_manager.h index 02a7f34..22692c8 100644 --- a/hgdriver/hgdev/scanner_manager.h +++ b/hgdriver/hgdev/scanner_manager.h @@ -92,6 +92,8 @@ class hg_scanner_mgr scanner_err get_about_info(scanner_handle h, void* data, unsigned* len); string cf_name; + string url_en; + string url_link_en; protected: hg_scanner_mgr(); ~hg_scanner_mgr();