调整字符
This commit is contained in:
parent
bcc384867b
commit
52726d4fa4
|
@ -103,7 +103,7 @@
|
||||||
#define BRAND_TITLE_VERSION "\347\211\210\346\234\254"
|
#define BRAND_TITLE_VERSION "\347\211\210\346\234\254"
|
||||||
// #define BRAND_TITLE_COPYRIGHT "版权"
|
// #define BRAND_TITLE_COPYRIGHT "版权"
|
||||||
#define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203"
|
#define BRAND_TITLE_COPYRIGHT "\347\211\210\346\235\203"
|
||||||
#define BRAND_COPYRIGHT "2022 MICROTEK\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\346\235\203\345\210\251"
|
#define BRAND_COPYRIGHT "2022 MICROTEK\343\200\202\344\277\235\347\225\231\346\211\200\346\234\211\347\211\210\346\235\203"
|
||||||
// #define BRAND_TITE_MANUFACTOR "制造商/开发商"
|
// #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_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 "公司网址"
|
||||||
|
|
|
@ -60,8 +60,8 @@ g_supporting_devices[] = {
|
||||||
, {0x3308, 0x0138, SCANNER_NAME_CT_238, SCANNER_NAME_CT_238, "", &hg_scanner_mgr::create_scanner_g239}
|
, {0x3308, 0x0138, SCANNER_NAME_CT_238, SCANNER_NAME_CT_238, "", &hg_scanner_mgr::create_scanner_g239}
|
||||||
#elif defined(OEM_ZHONGJING)
|
#elif defined(OEM_ZHONGJING)
|
||||||
{0X05DA, 0x9220, SCANNER_NAME_ZJ_6005, SCANNER_NAME_ZJ_6005, "",& hg_scanner_mgr::create_scanner_g439}
|
{0X05DA, 0x9220, SCANNER_NAME_ZJ_6005, SCANNER_NAME_ZJ_6005, "",& hg_scanner_mgr::create_scanner_g439}
|
||||||
#else
|
//#else
|
||||||
{0x3072, PID_AND_NAME(100, SCANNER_NAME_HG_G100), "G100", "", &hg_scanner_mgr::create_scanner_g100}
|
, {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(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(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}
|
, {0x3072, PID_AND_NAME(239, SCANNER_NAME_HG_G200), "G200", "", &hg_scanner_mgr::create_scanner_g239}
|
||||||
|
@ -75,7 +75,7 @@ g_supporting_devices[] = {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
bool islang = false;
|
bool islang = false;
|
||||||
static std::string g_vendor = GET_LANG(COMPANY_NAME, &islang);
|
//static std::string g_vendor = GET_LANG(COMPANY_NAME, &islang);
|
||||||
|
|
||||||
#define BRAND_LOGO_SIZE 8 * 1024
|
#define BRAND_LOGO_SIZE 8 * 1024
|
||||||
|
|
||||||
|
@ -512,7 +512,8 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne
|
||||||
MOVE_TO_NEXT_STR(ptr);
|
MOVE_TO_NEXT_STR(ptr);
|
||||||
|
|
||||||
about->copyright = ptr;
|
about->copyright = ptr;
|
||||||
strcpy(ptr, GET_LANG(BRAND_COPYRIGHT,&islang));
|
std::string s = GET_LANG(BRAND_COPYRIGHT, &islang);
|
||||||
|
strcpy(ptr, s.c_str());
|
||||||
MOVE_TO_NEXT_STR(ptr);
|
MOVE_TO_NEXT_STR(ptr);
|
||||||
|
|
||||||
about->logo_bytes = sizeof(g_logo);;
|
about->logo_bytes = sizeof(g_logo);;
|
||||||
|
@ -521,7 +522,7 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne
|
||||||
ptr += about->logo_bytes + 1;
|
ptr += about->logo_bytes + 1;
|
||||||
|
|
||||||
int count = 0, rolls = 0, ret = SCANNER_ERR_OK;
|
int count = 0, rolls = 0, ret = SCANNER_ERR_OK;
|
||||||
|
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_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(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_TEL,&islang), GET_LANG(BRAND_COMPANY_TEL,&islang), NULL);
|
||||||
|
@ -582,7 +583,7 @@ scanner_err hg_scanner_mgr::hg_scanner_enum(ScannerInfo* scanner_list, long* cou
|
||||||
std::vector<OLSCANNER> devusbuf;
|
std::vector<OLSCANNER> devusbuf;
|
||||||
long size = *count;
|
long size = *count;
|
||||||
scanner_err ret = SCANNER_ERR_OK;
|
scanner_err ret = SCANNER_ERR_OK;
|
||||||
|
std::string g_vendor = GET_LANG(COMPANY_NAME, &islang);
|
||||||
get_online_devices(devusbuf);
|
get_online_devices(devusbuf);
|
||||||
*count = devusbuf.size();
|
*count = devusbuf.size();
|
||||||
if (*count > size)
|
if (*count > size)
|
||||||
|
|
Loading…
Reference in New Issue