From d6b891456fac8f66847c0257741dceee1ecec021 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Sat, 17 Jun 2023 16:01:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4DPS=20=E8=AE=BE=E5=A4=87usb?= =?UTF-8?q?=E5=9B=BE=E4=B8=8D=E6=98=AFjpg=E7=9A=84=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=E8=B0=83=E6=95=B4dsp=20=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=BC=82=E5=B8=B8=E4=B8=8D=E4=BC=9A=E8=BF=94=E5=9B=9E?= =?UTF-8?q?stop=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 2 +- hgdriver/hgdev/hg_scanner_200.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index b5bbe94..61cfca6 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -3055,7 +3055,7 @@ int hg_scanner::save_usb_data(std::shared_ptr data) usb_img_index_++; VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "USB read one picture with %u bytes\n", data->size()); - if (dump_usb_path_.length()) + if (dump_usb_path_.length() && pid_ != 0x0200 && pid_ != 0x100) //这两台设备不是jpg的图 所以不能直接处理 { char name[80] = { 0 }; FILE* dst = nullptr; diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp index d6a89ba..066f60f 100644 --- a/hgdriver/hgdev/hg_scanner_200.cpp +++ b/hgdriver/hgdev/hg_scanner_200.cpp @@ -256,12 +256,14 @@ void hg_scanner_200::thread_handle_usb_read(void) else { // notify_ui_working_status(hg_scanner::error_description((scanner_err)prev_err).c_str(), SANE_EVENT_ERROR, prev_err); - VLOG_MINI_1(LOG_LEVEL_WARNING, "-x-x-x-: USB thread error: %s\n", hg_scanner_err_name(prev_err)); + } - prev_err = ret; + status_ = prev_err = ret; + break; //dsp 设备错误消息不会发stop } this_thread::sleep_for(chrono::milliseconds(2)); } + VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO, "USB thread exit with code: %s, status = %s\n", hg_scanner_err_name(ret), hg_scanner_err_description(status_)); } int hg_scanner_200::start(void) {