lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

帮助文档调整

This commit is contained in:
13038267101 2023-06-14 10:32:14 +08:00
parent 99854983ba
commit 52cb243310
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgdriver/hgdev/common_setting.h
View File

@ -1370,7 +1370,7 @@ namespace setting3399
#define IMGPRC_LIBNANE "HGImgProc.dll"
#define HGBASE_LIBNAME "HGBase.dll"
#define HELP_PATH "HuaGoScan_scanSettings_Help_manual.pdf"
#define HELP_PATH_EN ""
#define HELP_PATH_EN "HuaGoScan_scanSettings_Help_manual_EN.pdf"
#endif

14
hgdriver/hgdev/hg_scanner.cpp
View File

@ -1419,24 +1419,16 @@ int hg_scanner::setting_restore(void* data, long* len)
}
int hg_scanner::setting_help(void* data, long* len)
{
string scanner_path = hg_log::get_module_full_path(LIBNAME);
std::string helpfile = HELP_PATH;
std::string com = "xdg-open ";//注意空格保留
int code_page = lang_get_cur_code_page();
int ret = SCANNER_ERR_OK;
if (scanner_path.empty())
{
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
}
if (code_page == 20127)
{
helpfile = HELP_PATH_EN;
}
helpfile = scanner_path.substr(0, scanner_path.size() - strlen(LIBNAME)) + helpfile;
printf("helpfile = %s\r\n", helpfile.c_str());
#if defined(WIN32) || defined(_WIN64)
com = "";
helpfile.insert(0, hg_log::get_scanner_path());
@ -1448,7 +1440,7 @@ int hg_scanner::setting_help(void* data, long* len)
if (access(helpfile.c_str(),F_OK) == -1)
#endif
{
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO,"App_Help_pdf path is:%s system is:%d\r\n",helpfile.c_str());
VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO,"open help file fail,not find file :%d code page :%d\r\n",helpfile.c_str(), code_page);
ret = SCANNER_ERR_OPEN_FILE_FAILED;
return ret ;
}
@ -1459,7 +1451,7 @@ int hg_scanner::setting_help(void* data, long* len)
#else
system(com.c_str());
#endif
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO,"App_Help_pdf path is:%s \n",helpfile.c_str());
VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO,"App_Help_pdf Path is:%s Code Page is:%d\n",helpfile.c_str(), code_page);
return ret;
}
int hg_scanner::setting_color_mode(void* data, long* len)

9
hgdriver/hgdev/hg_scanner_302.cpp
View File

@ -1049,16 +1049,9 @@ int hg_scanner_302::start(void)
split3399_ = 0;
cb_mem_ = true;
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "scanner status: 0x%x\n", get_status());
//notify_ui_working_status(STATU_DESC_PREPARE_START);
reset();
//read_register(setting3399::SR_GET_PAPERON, &val);
//if (!val)
//{
// VLOG_MINI_1(LOG_LEVEL_WARNING, "start failed: %s\n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NO_PAPER));
// return SCANNER_ERR_DEVICE_NO_PAPER;
//}
//notify_ui_working_status(STATU_DESC_REWRITE_CONFIGURATION);
ret = writedown_device_configuration(true);
if (ret == SCANNER_ERR_OK)
writedown_image_configuration();