帮助文档调整
This commit is contained in:
parent
99854983ba
commit
52cb243310
|
@ -1370,7 +1370,7 @@ namespace setting3399
|
||||||
#define IMGPRC_LIBNANE "HGImgProc.dll"
|
#define IMGPRC_LIBNANE "HGImgProc.dll"
|
||||||
#define HGBASE_LIBNAME "HGBase.dll"
|
#define HGBASE_LIBNAME "HGBase.dll"
|
||||||
#define HELP_PATH "HuaGoScan_scanSettings_Help_manual.pdf"
|
#define HELP_PATH "HuaGoScan_scanSettings_Help_manual.pdf"
|
||||||
#define HELP_PATH_EN ""
|
#define HELP_PATH_EN "HuaGoScan_scanSettings_Help_manual_EN.pdf"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1419,24 +1419,16 @@ int hg_scanner::setting_restore(void* data, long* len)
|
||||||
}
|
}
|
||||||
int hg_scanner::setting_help(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 helpfile = HELP_PATH;
|
||||||
std::string com = "xdg-open ";//注意空格保留
|
std::string com = "xdg-open ";//注意空格保留
|
||||||
int code_page = lang_get_cur_code_page();
|
int code_page = lang_get_cur_code_page();
|
||||||
int ret = SCANNER_ERR_OK;
|
int ret = SCANNER_ERR_OK;
|
||||||
|
|
||||||
if (scanner_path.empty())
|
|
||||||
{
|
|
||||||
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (code_page == 20127)
|
if (code_page == 20127)
|
||||||
{
|
{
|
||||||
helpfile = HELP_PATH_EN;
|
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)
|
#if defined(WIN32) || defined(_WIN64)
|
||||||
com = "";
|
com = "";
|
||||||
helpfile.insert(0, hg_log::get_scanner_path());
|
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)
|
if (access(helpfile.c_str(),F_OK) == -1)
|
||||||
#endif
|
#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;
|
ret = SCANNER_ERR_OPEN_FILE_FAILED;
|
||||||
return ret ;
|
return ret ;
|
||||||
}
|
}
|
||||||
|
@ -1459,7 +1451,7 @@ int hg_scanner::setting_help(void* data, long* len)
|
||||||
#else
|
#else
|
||||||
system(com.c_str());
|
system(com.c_str());
|
||||||
#endif
|
#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;
|
return ret;
|
||||||
}
|
}
|
||||||
int hg_scanner::setting_color_mode(void* data, long* len)
|
int hg_scanner::setting_color_mode(void* data, long* len)
|
||||||
|
|
|
@ -1049,16 +1049,9 @@ int hg_scanner_302::start(void)
|
||||||
split3399_ = 0;
|
split3399_ = 0;
|
||||||
cb_mem_ = true;
|
cb_mem_ = true;
|
||||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "scanner status: 0x%x\n", get_status());
|
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "scanner status: 0x%x\n", get_status());
|
||||||
//notify_ui_working_status(STATU_DESC_PREPARE_START);
|
|
||||||
|
|
||||||
reset();
|
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);
|
ret = writedown_device_configuration(true);
|
||||||
if (ret == SCANNER_ERR_OK)
|
if (ret == SCANNER_ERR_OK)
|
||||||
writedown_image_configuration();
|
writedown_image_configuration();
|
||||||
|
|
Loading…
Reference in New Issue