调整待纸扫描不能返回正常张数问题
This commit is contained in:
parent
69692e89f8
commit
2a0fe7e7ac
|
@ -1672,27 +1672,28 @@ void hg_scanner_239::thread_handle_usb_read(void)
|
||||||
|
|
||||||
//string str = "当前批次扫描完成(第"+to_string(++auoto_paper_indx)+"批)";
|
//string str = "当前批次扫描完成(第"+to_string(++auoto_paper_indx)+"批)";
|
||||||
string str = "\345\275\223\345\211\215\346\211\271\346\254\241\346\211\253\346\217\217\345\256\214\346\210\220(\347\254\254"+to_string(++auoto_paper_indx)+"\346\211\271)";
|
string str = "\345\275\223\345\211\215\346\211\271\346\254\241\346\211\253\346\217\217\345\256\214\346\210\220(\347\254\254"+to_string(++auoto_paper_indx)+"\346\211\271)";
|
||||||
if(is_auto_paper_scan)
|
if (is_auto_paper_scan)
|
||||||
notify_ui_working_status(str.c_str(), SANE_EVENT_WORKING, status_);
|
{
|
||||||
|
notify_ui_working_status(str.c_str(), SANE_EVENT_STATUS, status_);
|
||||||
|
if (user_cancel_)
|
||||||
|
{
|
||||||
|
status_ = ret = SCANNER_ERR_USER_CANCELED;
|
||||||
|
// VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "用户取消操作 '%s'\n", hg_scanner_err_name(status_));
|
||||||
|
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "\345\217\226\346\266\210\346\211\253\346\217\217-\345\276\205\347\272\270\346\211\253\346\217\217 '%s'\n", hg_scanner_err_name(status_));
|
||||||
|
auoto_paper_indx = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (user_cancel_ && !is_auto_paper_scan)
|
if (user_cancel_)
|
||||||
{
|
{
|
||||||
status_ = ret = SCANNER_ERR_USER_CANCELED;
|
status_ = ret = SCANNER_ERR_USER_CANCELED;
|
||||||
//VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "用户取消操作 '%s'\n", hg_scanner_err_name(status_));
|
//VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "用户取消操作 '%s'\n", hg_scanner_err_name(status_));
|
||||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "\347\224\250\346\210\267\345\217\226\346\266\210\346\223\215\344\275\234 '%s'\n", hg_scanner_err_name(status_));
|
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "\347\224\250\346\210\267\345\217\226\346\266\210\346\223\215\344\275\234 '%s'\n", hg_scanner_err_name(status_));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
if (user_cancel_ && is_auto_paper_scan)
|
|
||||||
{
|
|
||||||
status_ = ret = SCANNER_ERR_USER_CANCELED;
|
|
||||||
// VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "用户取消操作 '%s'\n", hg_scanner_err_name(status_));
|
|
||||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "\347\224\250\346\210\267\345\217\226\346\266\210\346\223\215\344\275\234 '%s'\n", hg_scanner_err_name(status_));
|
|
||||||
auoto_paper_indx = 0;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (info->From == V4L2)
|
else if (info->From == V4L2)
|
||||||
|
|
Loading…
Reference in New Issue