From 05afea0a776506ac255c35025f3776c78662f780 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 15 Jun 2023 11:13:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8B=B1=E6=96=87=E7=BD=91?= =?UTF-8?q?=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 | 24 +++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/hgdriver/hgdev/char_const.h b/hgdriver/hgdev/char_const.h index 081e428..f0613a5 100644 --- a/hgdriver/hgdev/char_const.h +++ b/hgdriver/hgdev/char_const.h @@ -27,6 +27,7 @@ // #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_COMPANY_URL_EN "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" @@ -59,6 +60,7 @@ // #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_COMPANY_URL_EN "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" @@ -90,6 +92,7 @@ // #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.cumtenn.com" + #define BRAND_COMPANY_URL_EN "www.cumtenn.com" #define BRAND_URL_COMPANY_URL "http://www.cumtenn.com" //#define BRAND_TITLE_TEL "联系电话" #define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235" @@ -121,8 +124,8 @@ // #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.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" //英文网址 //#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" @@ -184,6 +187,7 @@ // #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_COMPANY_URL_EN "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" diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index 211716e..1c2328d 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -519,6 +519,12 @@ 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++; @@ -527,22 +533,10 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne bytes += strlen(GET_LANG(BRAND_COPYRIGHT,&islang)) + 8; append_cnt++; bytes += strlen(GET_LANG(BRAND_TITE_MANUFACTOR,&islang)) + 8; append_cnt++; bytes += strlen(GET_LANG(BRAND_TITLE_URL,&islang)) + 8; append_cnt++; - bytes += strlen(GET_LANG(BRAND_COMPANY_URL,&islang)) + 8; append_cnt++; - -#ifdef OEM_ZHONGJING - string zj_lang = BRAND_URL_COMPANY_URL; - - if (20127 == lang_get_cur_code_page()) - string zj_lang = BRAND_URL_COMPANY_URL_EN; - - bytes += zj_lang.size() + 8; append_cnt++; - -#else - bytes += strlen(GET_LANG(BRAND_URL_COMPANY_URL, &islang)) + 8; append_cnt++; -#endif // OEM_ZHONGJING - + 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(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++; @@ -602,7 +596,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(BRAND_COMPANY_URL,&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(BRAND_URL_COMPANY_URL, &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)