From 1faab9ddf95e30c8d44746df30f939e3e9aaf4cc Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Wed, 14 Jun 2023 18:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E6=99=B6=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=B0=83=E6=95=B4=E8=89=B2?= =?UTF-8?q?=E5=81=8F=E6=A0=A1=E6=AD=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/char_const.h | 7 ++++--- hgdriver/hgdev/hg_scanner.cpp | 7 +++++-- hgdriver/hgdev/hg_scanner_239.cpp | 3 ++- hgdriver/hgdev/scanner_manager.cpp | 22 ++++++++++++++++++++-- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/hgdriver/hgdev/char_const.h b/hgdriver/hgdev/char_const.h index acd88fe..081e428 100644 --- a/hgdriver/hgdev/char_const.h +++ b/hgdriver/hgdev/char_const.h @@ -122,6 +122,7 @@ #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_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" @@ -130,10 +131,10 @@ // #define BRAND_COMPANY_ADDRESS "上海市徐汇区桂平路680号35号楼" #define BRAND_COMPANY_ADDRESS "\344\270\212\346\265\267\345\270\202\345\276\220\346\261\207\345\214\272\346\241\202\345\271\263\350\267\257680\345\217\26735\345\217\267\346\245\274" //#define BRAND_TITLE_GPS "导航地址" - #define BRAND_TITLE_GPS "\345\257\274\350\210\252\345\234\260\345\235\200" + #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/67/BWSu" + #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/67/BWSu" #elif defined(OEM_ZIGUANG) #define ADMIN_NAME "user" #define ADMIN_PWD "uniscan" diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 4fca5a9..3b0a16d 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -2363,11 +2363,14 @@ int hg_scanner::setting_fold_type(void* data, long* len) int hg_scanner::setting_color_correction(void* data, long* len) { color_correction_ = *((bool*)data); + if (!color_correction_) + { + return SCANNER_ERR_OK; + } if (pid_ == 0x239 || pid_ == 0x439) { - if ((!is_kernelsnap_239_3C_ || !is_kernelsnap_439_3C0606) && color_correction_) + if (is_kernelsnap_239_3C_) { - //notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_NOT_SUPPORT), SANE_EVENT_ERROR, SCANNER_ERR_DEVICE_NOT_SUPPORT); *((bool*)data) = color_correction_ = false; return SCANNER_ERR_DEVICE_NOT_SUPPORT; } diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index b8a3806..b4a0bd5 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -500,7 +500,8 @@ void hg_scanner_239::init_version(void) else { is_kernelsnap_439_220430_ = date >= "B0430" ? true : false; - is_kernelsnap_439_3C0606 = date >= "C0606" ? true : false; + //is_kernelsnap_439_3C0606 = date >= "C0606" ? true : false; + is_kernelsnap_239_3C_ = date >= "C0606" ? true : false; VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO \ , "is_kernelsnap_439_3C0606:%d \ , is_kernelsnap_439_220430_:%d\r\n" \ diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index 56ef697..211716e 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -528,7 +528,21 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne 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++; - bytes += strlen(GET_LANG(BRAND_URL_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(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++; @@ -591,7 +605,11 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne 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_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); - set_appendix_info_for_about(about, ptr, count, GET_LANG(BRAND_TITLE_GPS,&islang), GET_LANG(BRAND_COMPANY_GPS,&islang), GET_LANG(BRAND_URL_GPS,&islang)); + if (strlen(BRAND_TITLE_GPS) > 1) + { + set_appendix_info_for_about(about, ptr, count, GET_LANG(BRAND_TITLE_GPS, &islang), GET_LANG(BRAND_COMPANY_GPS, &islang), GET_LANG(BRAND_URL_GPS, &islang)); + + } if (scanner) {