diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index b28318b..6b2a052 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -1392,6 +1392,10 @@ int hg_scanner::setting_go_on_when_double_checked(int sn, void* data) double_paper_handle_ = double_paper_flag_from_option_value(val, &ok); + // 此处需要通知设备双张处理方式 !!! + // OPTION_VALUE_SZTPCL_xxx 共4种选择,目前只支持出现双张后停止的两种方式 + // 若要上传出现双张的图片,请确保双张信号在图片之前发出来 !!! + if(ok) return SCANNER_ERR_OK; else @@ -2674,27 +2678,18 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len) return SCANNER_ERR_OK; } - else if(code == IO_CTRL_CODE_GET_LOG_FILE && len && *len == LOG_FILE_DRIVER) + else if(code == IO_CTRL_CODE_GET_LOG_FILE && len && *len == LOG_FILE_DEVICE) { - string save_path = hg_log::temporary_path() + "/device.log"; + string save_path = hg_log::temporary_path() + PATH_SEPARATOR + "device.log"; int ret = get_device_log(save_path); + *(char*)data = 0; if (ret != SCANNER_ERR_OK) { return ret; - } - - FILE* src = fopen(save_path.c_str(), "rb"); - if (src) - { - ret = SCANNER_ERR_OK; - fclose(src); - } - else - { - ret = SCANNER_ERR_WRITE_FILE_FAILED; - } + } + strcpy((char*)data, save_path.c_str()); return ret; } @@ -2719,7 +2714,7 @@ int hg_scanner::get_roller_num(void) } int hg_scanner::get_device_log(string &log) { - return -2; + return SCANNER_ERR_DEVICE_NOT_SUPPORT; } int hg_scanner::clear_roller_num(void) diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index b9ad166..61e315a 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -1913,7 +1913,7 @@ int hg_scanner_239::notify_sleep() } int hg_scanner_239::get_history_count() { - return SCANNER_ERR_DEVICE_NOT_SUPPORT; + return -2; } int hg_scanner_239::get_device_log(string &log) { diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index d55395d..2e5fe94 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -1329,7 +1329,7 @@ int hg_scanner_300::on_get_feedmode(int &feedmode) } int hg_scanner_300::get_device_log(string &log) { - return -2; + return SCANNER_ERR_DEVICE_NOT_SUPPORT; } int hg_scanner_300::notify_sleep() { diff --git a/hgdriver/hgdev/hg_scanner_400.cpp b/hgdriver/hgdev/hg_scanner_400.cpp index bd01dcd..ea6702b 100644 --- a/hgdriver/hgdev/hg_scanner_400.cpp +++ b/hgdriver/hgdev/hg_scanner_400.cpp @@ -1316,7 +1316,7 @@ int hg_scanner_400::on_get_feedmode(int &feedmode) /////////////////////////////////////over/////////////////////////// int hg_scanner_400::get_device_log(string &log) { - return -2; + return SCANNER_ERR_DEVICE_NOT_SUPPORT; } int hg_scanner_400::notify_sleep() { diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index 34db6f8..45a9977 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -438,7 +438,7 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne { set_appendix_info_for_about(about, ptr, count, BRAND_TITLE_FIRM_VERSION, scanner->get_firmware_version().c_str(), NULL); set_appendix_info_for_about(about, ptr, count, BRAND_TITLE_SERIAL_NUM, scanner->get_serial_num().c_str(), NULL); - set_appendix_info_for_about(about, ptr, count, BRAND_TITLE_IP, scanner->get_ip().c_str(), NULL); + //set_appendix_info_for_about(about, ptr, count, BRAND_TITLE_IP, scanner->get_ip().c_str(), NULL); rolls = scanner->get_roller_num(); if (rolls >= 0) {