Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev
This commit is contained in:
commit
ce5368af5a
|
@ -1074,9 +1074,9 @@ void hg_scanner_239::thread_correction(void)
|
|||
}
|
||||
if (ret == SCANNER_ERR_TIMEOUT)
|
||||
{
|
||||
if (sw.elapsed_s() > 30)
|
||||
if (sw.elapsed_s() > 10)
|
||||
{
|
||||
status_ = ret;
|
||||
status_ = SCANNER_ERR_DEVICE_AUTO_FAIL_OVER;
|
||||
//notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_FAIL_OUTTIME), SANE_EVENT_ERROR, ret); // 通信超时
|
||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "设备校正超时 '%s'\n", hg_scanner_err_name(status_));
|
||||
break;
|
||||
|
@ -1088,6 +1088,7 @@ void hg_scanner_239::thread_correction(void)
|
|||
{
|
||||
if (setting3399::AutoCorrect ==info->From)
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(io_lock_);
|
||||
status_ == SCANNER_ERR_DEVICE_AUTO_FAIL_INFO;
|
||||
sw.reset();
|
||||
std::string sinfo;
|
||||
|
|
Loading…
Reference in New Issue