From b897d55b5692de2a4d7e085a85d0b59313084f33 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Fri, 19 May 2023 16:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=91=E7=9C=A0=E6=97=B6=E9=97=B4=E5=92=8C?= =?UTF-8?q?=E5=88=86=E7=BA=B8=E5=BC=BA=E5=BA=A6=EF=BC=8C=E5=9C=A8=E6=89=93?= =?UTF-8?q?=E5=BC=80app=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=9A=E4=B8=BB?= =?UTF-8?q?=E5=8A=A8=E8=8E=B7=E5=8F=96=E4=B8=80=E6=AC=A1=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 40 ++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 56fe1c6..3ff6c33 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -153,7 +153,7 @@ hg_scanner::hg_scanner(ScannerSerial serial, const char* dev_name, usb_io* io, i , async_io_(false), is_white_0_(true), isremove_left_hole(false), isremove_right_hole(false), isremove_top_hole(false), isremove_low_hole(false) , isremove_left_hole_threshold(0), isremove_right_hole_threshold(0), isremove_top_hole_threshold(0), isremove_low_hole_threshold(0) , dump_usb_path_(""), is_kernelsnap_211209_(false), dump_img_(&hg_scanner::dump_image_empty), is_kernelsnap_220830_(false), is_kernelsnap3288_221106_(false) - , is_kernelsnap_221027_(false), memory_size_(2000/*USB+JPEG压缩及图像处理图队列，总共1GB*/), isx86_Advan_(true), stop_fatal_(SCANNER_ERR_OK), is_auto_paper_scan(false) + , is_kernelsnap_221027_(false), memory_size_(4000/*USB+JPEG压缩及图像处理图队列，总共1GB*/), isx86_Advan_(true), stop_fatal_(SCANNER_ERR_OK), is_auto_paper_scan(false) , size_check(false), save_sleeptime_type_(false), is_kernelsnap_devsislock(false), is_checksum_strat_scan(false), is_cis_image(false) , is_dpi_color_check(false), save_dpi_color_check_val(0.0f), is_auto_falt(false), HGVersion_mgr_(NULL), HGVersion_Init_(NULL) , HGVersion_Islock_(NULL), HGVersion_Postlog_(NULL), HGVersion_Free_(NULL), Dynamicopen_HGVersion_pHandle_(NULL), pid_(pid), fetching_id_(-1) @@ -2618,6 +2618,44 @@ void hg_scanner::init_settings(const char* json_setting_text) change_string_2_lang_id(v.c_str(), "desc"); setting_jsn_.at(v.c_str()).at("type").get_to(val); + if (v.compare(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)) == 0) + { + int val = 0; + get_sleep_time(val); + const char* p_time = NULL; + if (val == -1 || val > 20000) + p_time = from_default_language(OPTION_VALUE_XMSJ_BXM); + else if (val > 0 && val <= 300) + p_time = from_default_language(OPTION_VALUE_XMSJ_WFZ); + else if (val > 300 && val <= 600) + p_time = from_default_language(OPTION_VALUE_XMSJ_SFZ); + else if (val > 600 && val <= 1800) + p_time = from_default_language(OPTION_VALUE_XMSJ_BXS); + else if (val > 600 && val <= 3600) + p_time = from_default_language(OPTION_VALUE_XMSJ_YXS); + else if (val > 600 && val <= 7200) + p_time = from_default_language(OPTION_VALUE_XMSJ_LXS); + else if (val > 600 && val <= 14400) + p_time = from_default_language(OPTION_VALUE_XMSJ_SXS); + if (p_time) + setting_jsn_.at(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)).at("default") = p_time; + } + 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); + + if (p_feed) + setting_jsn_.at(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)).at("default") = p_feed; + + } if (val == "string") { change_string_2_lang_id(v.c_str(), "cur");