From dc5be3ddfe412d2f77cc34034bcf4bd7f0babba8 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 15 Jun 2023 16:27:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 24 +++++++++++++----------- hgdriver/hgdev/hg_scanner_239.cpp | 30 +++++++++++++++--------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index aa0d09e..968e17e 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -2667,18 +2667,20 @@ void hg_scanner::init_settings(const char* json_setting_text) if (v.compare(from_default_language(SANE_STD_OPT_NAME_FEED_STRENGTH)) == 0) { int val = 0; - on_get_feedmode(val); - const char* p_feed = NULL; - if (val == 0) - p_feed = from_default_language(OPTION_VALUE_FZQD_R); - else if (val ==1) - p_feed = from_default_language(OPTION_VALUE_FZQD_YB); - else if (val ==2) - p_feed = from_default_language(OPTION_VALUE_FZQD_Q); + int ret = on_get_feedmode(val); + if (ret == SCANNER_ERR_OK) + { + const char* p_feed = NULL; + if (val == 0) + p_feed = from_default_language(OPTION_VALUE_FZQD_R); + else if (val == 1) + p_feed = from_default_language(OPTION_VALUE_FZQD_YB); + else if (val == 2) + p_feed = from_default_language(OPTION_VALUE_FZQD_Q); - if (p_feed) - setting_jsn_.at(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)).at("default") = p_feed; - + if (p_feed) + setting_jsn_.at(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)).at("default") = p_feed; + } } if (val == "string") { diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index 9fe8bc4..d247fdf 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -253,11 +253,9 @@ int hg_scanner_239::get_scan_mode(bool &type) int val = 0, ret = read_register(setting3399::SR_OS, &val); //val == 1计数模式 type =val == 1 ? false : true; - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "get scan mode error: %s\n", hg_scanner_err_name(ret)); - //if (val == 1) - //{ - //return SCANNER_ERR_DEVICE_COUNT_MODE; - //} + + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "get_scan_mode: %s\n", type ? hg_scanner_err_description(SCANNER_ERR_DEVICE_COUNT_MODE) : hg_scanner_err_description(SCANNER_ERR_OK)); + return ret; } int hg_scanner_239::set_speed_mode(int data) @@ -466,7 +464,7 @@ void hg_scanner_239::init_version(void) if (!is_kernelsnap_devsislock) { - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT)); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_description(SCANNER_ERR_DEVICE_NOT_SUPPORT)); } VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware version: %s\n", fv.c_str()); @@ -1275,7 +1273,7 @@ void hg_scanner_239::thread_get_dves_image(void) else status_ = ret = SCANNER_ERR_USER_CANCELED; - VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO, "%s:%s\n", hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_GET_USER_CANCEL_SCAN), hg_scanner_err_name(status_)); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "%s\n", hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_GET_USER_CANCEL_SCAN)); auoto_paper_indx = 0; break; } @@ -1667,7 +1665,7 @@ int hg_scanner_239::get_scanner_paperon(SANE_Bool& type) { type = val == 0 ? false : true; } - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "get_scanner_paperon = %s\n", hg_scanner_err_name(ret)); + VLOG_MINI_1(LOG_LEVEL_WARNING, "get_scanner_paperon is(%s)\n", !type ? hg_scanner_err_description(SCANNER_ERR_DEVICE_NO_PAPER) : hg_scanner_err_description(SCANNER_ERR_OK)); return ret; } @@ -1682,6 +1680,8 @@ int hg_scanner_239::get_scan_is_sleep(SANE_Bool& type) { type = val == 1 ? true : false; } + VLOG_MINI_1(LOG_LEVEL_WARNING, "get_scanner_paperon is(%s)\n", !type ? hg_scanner_err_description(SCANNER_ERR_DEVICE_SLEEPING) : hg_scanner_err_description(SCANNER_ERR_OK)); + return ret; } int hg_scanner_239::set_notify_sleep() @@ -1792,13 +1792,13 @@ int hg_scanner_239::set_scan_islock(SANE_Bool set_islock) if (!is_kernelsnap_devsislock) { - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT)); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_description(SCANNER_ERR_DEVICE_NOT_SUPPORT)); return SCANNER_ERR_DEVICE_NOT_SUPPORT; } if (set_islock != 0 && set_islock != 1) { - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_INVALID_PARAMETER)); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_description(SCANNER_ERR_INVALID_PARAMETER)); return SCANNER_ERR_INVALID_PARAMETER; } @@ -1814,7 +1814,7 @@ int hg_scanner_239::get_scan_islock(SANE_Bool& islock) if (!is_kernelsnap_devsislock) { - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT)); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_description(SCANNER_ERR_DEVICE_NOT_SUPPORT)); return SCANNER_ERR_DEVICE_NOT_SUPPORT; } @@ -1834,7 +1834,7 @@ int hg_scanner_239::set_scan_lock_check_val(string check_str) { if (!is_kernelsnap_devsislock) { - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT)); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_description(SCANNER_ERR_DEVICE_NOT_SUPPORT)); return SCANNER_ERR_DEVICE_NOT_SUPPORT; } @@ -1988,7 +1988,7 @@ int hg_scanner_239::get_dev_islock_file(int& islockfile) if (!is_kernelsnap_devsislock) { - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT)); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_description(SCANNER_ERR_DEVICE_NOT_SUPPORT)); return SCANNER_ERR_DEVICE_NOT_SUPPORT; } @@ -2020,7 +2020,7 @@ int hg_scanner_239::get_dev_islock_file(int& islockfile) else islockfile = -1; - VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "get list file is:%s ret:%s buffersize: %d\n", device_log_path.c_str(), hg_scanner_err_name(ret), buffersize); + VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "get list file is:%s ret:%s buffersize: %d\n", device_log_path.c_str(), hg_scanner_err_description(ret), buffersize); return ret; } int hg_scanner_239::set_dev_islock_file(int islockfile) @@ -2029,7 +2029,7 @@ int hg_scanner_239::set_dev_islock_file(int islockfile) if (!is_kernelsnap_devsislock) { - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT)); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_description(SCANNER_ERR_DEVICE_NOT_SUPPORT)); return SCANNER_ERR_DEVICE_NOT_SUPPORT; } if (islockfile != 0 && islockfile != 1)