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-12-06 10:47:11 +08:00
parent cf1f7621e5
commit 62a0dec39d
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -1355,7 +1355,7 @@ void hg_scanner_239::thread_get_dves_image(void)
if (ret == SCANNER_ERR_TIMEOUT) if (ret == SCANNER_ERR_TIMEOUT)
{ {
if (sw.elapsed_s() > 120 && !is_auto_scan()) if (sw.elapsed_s() > 120 && !is_auto_scan() && (get_status() & 0x03) == 0)
{ {
status_ = ret; status_ = ret;
notify_ui_working_status(from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_GET_IMAGE_OUTTIME), SANE_EVENT_ERROR, ret); // 取图通信超时 notify_ui_working_status(from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_GET_IMAGE_OUTTIME), SANE_EVENT_ERROR, ret); // 取图通信超时
@ -1365,16 +1365,15 @@ void hg_scanner_239::thread_get_dves_image(void)
if (is_auto_scan() && sw1.elapsed_s() >= is_auto_paper_scan_exit_time && is_auto_paper_scan_exit_time != 0) if (is_auto_scan() && sw1.elapsed_s() >= is_auto_paper_scan_exit_time && is_auto_paper_scan_exit_time != 0)
{ {
is_quit_wait_paper_scan = true;//标记待纸扫描时间到了自动结束 if ((get_status() & 0x03) == 0)
do_stop(); {
notify_ui_working_status(from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_EXIT_WAIT_SCAN), SANE_EVENT_ERROR, status_); do_stop();
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "auto paper scan exit :%s\n", from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_EXIT_WAIT_SCAN)); is_quit_wait_paper_scan = true;//标记待纸扫描时间到了自动结束
} notify_ui_working_status(from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_EXIT_WAIT_SCAN), SANE_EVENT_ERROR, status_);
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "auto paper scan exit :%s\n", from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_EXIT_WAIT_SCAN));
if ((get_status() & 0x03) == 0) }
{ else
status_ = SCANNER_ERR_OK; sw1.reset();
//break;
} }
if (user_cancel_ && is_auto_scan() || is_quit_wait_paper_scan) //其他直接跳过当此循坏 if (user_cancel_ && is_auto_scan() || is_quit_wait_paper_scan) //其他直接跳过当此循坏