From 62a0dec39db4acb4084fe4292340e3c6b8354ade Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Wed, 6 Dec 2023 10:47:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=A6=E7=BA=B8=E6=89=AB=E6=8F=8F=20?= =?UTF-8?q?=E5=9C=A8=E8=B6=85=E6=97=B6=E6=9C=9F=E9=97=B4=E5=88=A4=E6=96=AD?= =?UTF-8?q?=20=E8=AE=BE=E5=A4=87=E6=98=AF=E5=90=A6=E8=BF=98=E5=9C=A8?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=BD=93=E4=B8=AD=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner_239.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index b9a0635..4ee7060 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -1355,7 +1355,7 @@ void hg_scanner_239::thread_get_dves_image(void) 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; 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) { - is_quit_wait_paper_scan = true;//标记待纸扫描时间到了自动结束 - do_stop(); - 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) - { - status_ = SCANNER_ERR_OK; - //break; + if ((get_status() & 0x03) == 0) + { + do_stop(); + 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)); + } + else + sw1.reset(); } if (user_cancel_ && is_auto_scan() || is_quit_wait_paper_scan) //其他直接跳过当此循坏 From 6a6b24d07a1a49ae15af154aa3e00fb38cf16dc0 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Wed, 6 Dec 2023 10:49:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner_239.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index 4ee7060..a9b3a4b 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -1355,7 +1355,7 @@ void hg_scanner_239::thread_get_dves_image(void) if (ret == SCANNER_ERR_TIMEOUT) { - if (sw.elapsed_s() > 120 && !is_auto_scan() && (get_status() & 0x03) == 0) + if (sw.elapsed_s() > 120 && !is_auto_scan()) { status_ = ret; notify_ui_working_status(from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_GET_IMAGE_OUTTIME), SANE_EVENT_ERROR, ret); // 取图通信超时