From dfa2da91d054cb82b1091b4f775478fe5712ac22 Mon Sep 17 00:00:00 2001
From: masayume <1936714878@qq.com>
Date: Thu, 20 Oct 2022 10:40:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4usb=E9=80=9A=E4=BF=A1?=
 =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E9=95=BFreadbulk=E8=B6=85=E6=97=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=202.=E5=B1=8F=E8=94=BD3288=20=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E5=B9=85=E9=9D=A2=E5=8A=9F=E8=83=BD=203.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=98=BE=E7=A4=BAUI=E6=97=B6=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AEreset=E5=81=9C=E6=AD=A2=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E6=97=B6=E6=8C=89=E9=92=AE=E6=9C=AA=E6=AD=A3=E5=B8=B8=E5=A4=8D?=
 =?UTF-8?q?=E4=BD=8D=E9=97=AE=E9=A2=98=204.=E6=9B=B4=E6=96=B0=E9=99=A4?=
 =?UTF-8?q?=E7=A9=BF=E5=AD=94=E4=BB=A5=E5=8F=8A=E8=B7=B3=E8=BF=87=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E9=A1=B5=E7=AE=97=E6=B3=95=205.=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BE=85=E7=BA=B8=E6=89=AB=E6=8F=8F=E8=B6=85=E6=97=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=20--=2022.10.20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.txt                   |   3 +-
 huagao/CFeedPaperPage.cpp       |  22 ++++++++++--
 huagao/CSaveConfigDlg.cpp       |   7 ++++
 huagao/CSaveConfigDlg.h         |   2 +-
 huagao/CTwainUI.cpp             |  43 +++++++++++++++-------
 huagao/Device/GScan.h           |   4 ++-
 huagao/Device/GScanO1003399.cpp |  61 +++++++++++++++++++++++++-------
 huagao/Device/GScanO1003399.h   |   2 ++
 huagao/Device/IConfig.h         |   6 ++++
 huagao/Device/PublicFunc.h      |   2 ++
 huagao/GscanJsonConfig.cpp      |  12 +++++++
 huagao/HUAGO-LOGO-for UI.bmp    | Bin 98456 -> 40854 bytes
 huagao/huagaotwds.rc            | Bin 54242 -> 54578 bytes
 huagao/resource.h               | Bin 20900 -> 21084 bytes
 14 files changed, 135 insertions(+), 29 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 88bd9c0d..c32d18d3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -63,4 +63,5 @@
 	1.调整usb通信，加长readbulk超时时间
 	2.屏蔽3288 自适应幅面功能
 	3.修复显示UI时通过协议reset停止扫描时按钮未正常复位问题
-	4.更新除穿孔以及跳过空白页算法
\ No newline at end of file
+	4.更新除穿孔以及跳过空白页算法
+	5.新增待纸扫描超时设置 -- 22.10.20
\ No newline at end of file
diff --git a/huagao/CFeedPaperPage.cpp b/huagao/CFeedPaperPage.cpp
index 98bc1024..593bc637 100644
--- a/huagao/CFeedPaperPage.cpp
+++ b/huagao/CFeedPaperPage.cpp
@@ -29,6 +29,14 @@ static std::vector<CString> lowpowermode
 	_T("240分钟"),
 };
 
+static std::vector<CString> autopapertimeout
+{
+	_T("10秒"),
+	_T("15秒"),
+	_T("30秒"),
+	_T("60秒"),
+};
+
 // CFeedPaperPage 对话框
 
 IMPLEMENT_DYNAMIC(CFeedPaperPage, CTabPageSSL)
@@ -89,6 +97,11 @@ BOOL CFeedPaperPage::OnInitDialog()
 	for (int i = 0; i < lowpowermode.size(); i++)
 		((CComboBox*)GetDlgItem(IDC_CBLOWPOWERMODE))->InsertString(i, lowpowermode[i]);
 	((CComboBox*)GetDlgItem(IDC_CBLOWPOWERMODE))->SetCurSel(0);
+
+	for (int i = 0; i < autopapertimeout.size(); i++)
+		((CComboBox*)GetDlgItem(IDC_CMBAUTOPAPER))->InsertString(i, autopapertimeout[i]);
+	((CComboBox*)GetDlgItem(IDC_CMBAUTOPAPER))->SetCurSel(0);
+
 	return true;
 }
 
@@ -212,8 +225,13 @@ void CFeedPaperPage::OnBnClickedCkautopaper()
 		((CButton*)GetDlgItem(IDC_RDSPECIFYSCANNUM))->SetCheck(FALSE);
 		GetDlgItem(IDC_RDSPECIFYSCANNUM)->EnableWindow(FALSE);
 		m_editNum.EnableWindow(m_radioGroupScanMode);
+		GetDlgItem(IDC_CMBAUTOPAPER)->EnableWindow(TRUE);
+		GetDlgItem(IDC_STATICAUTOPAPER)->EnableWindow(TRUE);
 	}
-	else
+	else {
+		((CComboBox*)GetDlgItem(IDC_CMBAUTOPAPER))->SetCurSel(0);
 		GetDlgItem(IDC_RDSPECIFYSCANNUM)->EnableWindow(TRUE);
-
+		GetDlgItem(IDC_CMBAUTOPAPER)->EnableWindow(FALSE);
+		GetDlgItem(IDC_STATICAUTOPAPER)->EnableWindow(FALSE);
+	}
 }
diff --git a/huagao/CSaveConfigDlg.cpp b/huagao/CSaveConfigDlg.cpp
index 3442f161..7391d2f9 100644
--- a/huagao/CSaveConfigDlg.cpp
+++ b/huagao/CSaveConfigDlg.cpp
@@ -26,6 +26,13 @@ void CSaveConfigDlg::DoDataExchange(CDataExchange* pDX)
 	CDialog::DoDataExchange(pDX);
 }
 
+BOOL CSaveConfigDlg::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+	GetDlgItem(IDC_EDITSAVENAME)->SetFocus();
+	return FALSE;
+}
+
 
 BEGIN_MESSAGE_MAP(CSaveConfigDlg, CDialog)
 	ON_BN_CLICKED(IDOK, &CSaveConfigDlg::OnBnClickedOk)
diff --git a/huagao/CSaveConfigDlg.h b/huagao/CSaveConfigDlg.h
index d88cc03d..4294082d 100644
--- a/huagao/CSaveConfigDlg.h
+++ b/huagao/CSaveConfigDlg.h
@@ -17,7 +17,7 @@ public:
 
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV ֧��
-
+	virtual BOOL OnInitDialog();
 	DECLARE_MESSAGE_MAP()
 public:
 	afx_msg void OnBnClickedOk();
diff --git a/huagao/CTwainUI.cpp b/huagao/CTwainUI.cpp
index 351752c4..71a44572 100644
--- a/huagao/CTwainUI.cpp
+++ b/huagao/CTwainUI.cpp
@@ -236,7 +236,7 @@ void CTwainUI::UpdateUI()
 	m_pageBasic->m_Edit_Dpi.SetValue((int)settings->resolution_dst);
 	m_pageBasic->m_cmBoxDuplex->SetCurSel(getCmbDuplexIndex());//!< 单双面
 	m_pageBasic->m_cmBoxSS->SetCurSel(getPaparSizeIndex(settings->papertype, settings->paperAlign)); //!< 纸张类型
-	m_pageBasic->m_enableSizeCheck = settings->en_sizecheck==1?TRUE:FALSE;//!< 尺寸检测
+	m_pageBasic->m_enableSizeCheck = settings->en_sizecheck == 1 ? TRUE : FALSE;//!< 尺寸检测
 	m_pageBasic->m_bswitchfrontback = settings->is_switchfrontback ? TRUE : FALSE; //!< 交换正反面
 	((CButton*)m_pageBasic->GetDlgItem(IDC_RDQUALITYPRIORITY))->SetCheck(settings->is_high_imagequality);
 	((CButton*)m_pageBasic->GetDlgItem(IDC_RDSPEEDPRIORITY))->SetCheck(!settings->is_high_imagequality);
@@ -246,13 +246,13 @@ void CTwainUI::UpdateUI()
 	m_pageBasic->m_bUV = settings->hardwarecaps.en_uv == 1 ? TRUE : FALSE;
 #endif
 	m_pageBasic->UpdateData(FALSE);
-	if(getCmbDuplexIndex()==2|| getCmbDuplexIndex()==3)
+	if (getCmbDuplexIndex() == 2 || getCmbDuplexIndex() == 3)
 		m_pageBasic->GetDlgItem(IDC_BTNDISCARDSETTING)->EnableWindow(true);
 	else
 		m_pageBasic->GetDlgItem(IDC_BTNDISCARDSETTING)->EnableWindow(false);
 	//!< Page Breghtness
 
-	m_pageBrightness->m_cbAutoContrast = settings->is_autocontrast==TRUE?TRUE:FALSE; //!< 自动亮度对比度 
+	m_pageBrightness->m_cbAutoContrast = settings->is_autocontrast == TRUE ? TRUE : FALSE; //!< 自动亮度对比度 
 	int brt = GetMappingBrightnessValue(settings->brightness);
 	m_pageBrightness->m_Edit_Brightness.SetValue(brt); //!< 亮度
 	int crt = GetContrastLevel(settings->contrast);
@@ -269,7 +269,7 @@ void CTwainUI::UpdateUI()
 	m_pageBasic->discardblank_percent = settings->discardblank_percent;
 
 	((CButton*)m_pageImageProc->GetDlgItem(IDC_CKCROPMODEL))->SetCheck(settings->normalCrop);
-	m_pageImageProc->m_ckbFillBlack = settings->fillbackground==TRUE ? TRUE : FALSE;//填充黑框 
+	m_pageImageProc->m_ckbFillBlack = settings->fillbackground == TRUE ? TRUE : FALSE;//填充黑框 
 	m_pageImageProc->m_ckbAutoDeskrew = settings->autodescrew ? TRUE : FALSE;//自动纠偏 
 	UpdateFilterCmbx();
 	if (settings->fillbackground || settings->autodescrew || settings->is_autocrop) {
@@ -280,8 +280,8 @@ void CTwainUI::UpdateUI()
 	}
 	m_pageImageProc->m_cmBoxSharpen.SetCurSel(settings->sharpen);
 	//UpdateSharpenCmbx();
-	m_pageImageProc->m_ckbRemoveHole = settings->fillhole.is_fillhole==TRUE?TRUE:FALSE;//除穿孔可用性
-	m_pageImageProc->m_edit_hole.SetValue(settings->fillhole.fillholeratio/ 100.0);//穿孔搜索范围比例系数
+	m_pageImageProc->m_ckbRemoveHole = settings->fillhole.is_fillhole == TRUE ? TRUE : FALSE;//除穿孔可用性
+	m_pageImageProc->m_edit_hole.SetValue(settings->fillhole.fillholeratio / 100.0);//穿孔搜索范围比例系数
 	m_pageImageProc->m_edit_hole.EnableWindow(settings->fillhole.is_fillhole == TRUE ? TRUE : FALSE);
 	m_pageImageProc->GetDlgItem(IDC_BTNHOLE)->EnableWindow(settings->fillhole.is_fillhole == TRUE ? TRUE : FALSE);
 	m_pageImageProc->m_fillhole_up = settings->fillholeratio_up;
@@ -303,10 +303,10 @@ void CTwainUI::UpdateUI()
 	m_pageImageProc->m_ckbDetachNoise = settings->detachnoise.is_detachnoise == TRUE ? TRUE : FALSE;//黑白降噪是否启用
 	((CButton*)m_pageImageProc->GetDlgItem(IDC_CHECKDETACHNOISE))->SetCheck(m_pageImageProc->m_ckbDetachNoise);
 	((CButton*)m_pageImageProc->GetDlgItem(IDC_CHECKDETACHNOISE))->EnableWindow(settings->pixtype != 2);
-	((CButton*)m_pageImageProc->GetDlgItem(IDC_CHMULTIPUT))->SetCheck(settings->pixtype != 2 ? FALSE:settings->en_multi_output); // 多流输出
+	((CButton*)m_pageImageProc->GetDlgItem(IDC_CHMULTIPUT))->SetCheck(settings->pixtype != 2 ? FALSE : settings->en_multi_output); // 多流输出
 	m_pageImageProc->GetDlgItem(IDC_CHMULTIPUT)->EnableWindow(settings->pixtype != 2);
 
-	((CComboBox*)m_pageImageProc->GetDlgItem(IDC_CMBMULTIOUT))->SetCurSel(settings->pixtype != 2 ? 0 : (settings->en_multi_output?(settings->multioutput<0?0:settings->multioutput):0)); 
+	((CComboBox*)m_pageImageProc->GetDlgItem(IDC_CMBMULTIOUT))->SetCurSel(settings->pixtype != 2 ? 0 : (settings->en_multi_output ? (settings->multioutput < 0 ? 0 : settings->multioutput) : 0));
 	m_pageImageProc->GetDlgItem(IDC_CMBMULTIOUT)->EnableWindow(settings->pixtype != 2 ? FALSE : settings->en_multi_output);
 	m_pageImageProc->m_edit_detachnoise.SetValue(settings->detachnoise.detachnoise);
 	m_pageImageProc->m_slider_detachnoise.EnableWindow(settings->detachnoise.is_detachnoise == TRUE ? TRUE : FALSE);
@@ -321,7 +321,7 @@ void CTwainUI::UpdateUI()
 	m_pageImageProc->UpdateData(FALSE);
 	m_pageFeedPaper->dogear.SetCheck(settings->is_dogeardetection);
 	//!< Page feed paper
-	if (settings->is_duplex || settings->is_autodiscradblank_normal ||settings->is_autodiscradblank_vince)
+	if (settings->is_duplex || settings->is_autodiscradblank_normal || settings->is_autodiscradblank_vince)
 	{
 		m_pageFeedPaper->m_cbRotation = settings->is_backrotate180 == TRUE ? TRUE : FALSE;//背面旋转180 
 		m_pageFeedPaper->GetDlgItem(IDC_CKBACKROTATION)->EnableWindow(settings->is_autotext ? FALSE : TRUE);
@@ -331,10 +331,14 @@ void CTwainUI::UpdateUI()
 		m_pageFeedPaper->GetDlgItem(IDC_CKBACKROTATION)->EnableWindow(FALSE);
 		m_pageFeedPaper->m_cbRotation = FALSE;
 	}
-	m_pageFeedPaper->m_cbStaple = settings->hardwarecaps.en_stapledetect==TRUE ? TRUE : FALSE;//装订检测 
-	m_pageFeedPaper->m_cbDoublePaper = settings->hardwarecaps.en_doublefeed==TRUE ? TRUE : FALSE;//双张检测 
-	m_pageFeedPaper->m_cbSkew = settings->hardwarecaps.en_skrewdetect==TRUE ? TRUE : FALSE;//歪斜检测 
+	m_pageFeedPaper->m_cbStaple = settings->hardwarecaps.en_stapledetect == TRUE ? TRUE : FALSE;//装订检测 
+	m_pageFeedPaper->m_cbDoublePaper = settings->hardwarecaps.en_doublefeed == TRUE ? TRUE : FALSE;//双张检测 
+	m_pageFeedPaper->m_cbSkew = settings->hardwarecaps.en_skrewdetect == TRUE ? TRUE : FALSE;//歪斜检测 
 	((CButton*)m_pageFeedPaper->GetDlgItem(IDC_CKAUTOPAPER))->SetCheck(settings->hardwarecaps.is_autopaper);
+	auto tmp_init_autopaper_timeout = {10,15,30,60};
+	auto tmp_autopaper_cmbindex = std::distance(tmp_init_autopaper_timeout.begin(),
+		std::find(tmp_init_autopaper_timeout.begin(), tmp_init_autopaper_timeout.end(), settings->autopaper_timeout));
+	((CComboBox*)m_pageFeedPaper->GetDlgItem(IDC_CMBAUTOPAPER))->SetCurSel(tmp_autopaper_cmbindex == tmp_init_autopaper_timeout.size() ? 0 : tmp_autopaper_cmbindex);
 	m_pageFeedPaper->m_cmBoxOrentation.SetCurSel(settings->is_autotext?4:getRotateCmbIndex(settings->imageRotateDegree));//旋转方向;
 	m_pageFeedPaper->m_sldSkrewDetecttion.SetPos(m_pageFeedPaper->m_cbSkew?settings->hardwarecaps.skrewdetectlevel:3);//歪斜检测等级
 	m_pageFeedPaper->m_sldSkrewDetecttion.EnableWindow(m_pageFeedPaper->m_cbSkew);
@@ -356,6 +360,16 @@ void CTwainUI::UpdateUI()
 		csCount.Format(_T("%d"), settings->is_duplex==TRUE?tempcount/2: tempcount);
 		m_pageFeedPaper->GetDlgItem(IDC_EDSCANNUM)->SetWindowText(csCount);
 	}
+	if (settings->hardwarecaps.is_autopaper)
+	{
+		m_pageFeedPaper->GetDlgItem(IDC_CMBAUTOPAPER)->EnableWindow(TRUE);
+		m_pageFeedPaper->GetDlgItem(IDC_STATICAUTOPAPER)->EnableWindow(TRUE);
+	}
+	else
+	{
+		m_pageFeedPaper->GetDlgItem(IDC_CMBAUTOPAPER)->EnableWindow(FALSE);
+		m_pageFeedPaper->GetDlgItem(IDC_STATICAUTOPAPER)->EnableWindow(FALSE);
+	}
 
 	m_pageFeedPaper->UpdateData(FALSE);
 	m_pageBasic->updateCmbDuplex(TRUE);
@@ -624,6 +638,9 @@ void CTwainUI::UpDateScanParam(PCONFIGPARAMS configItem, bool updateDs)
 	settings->hardwarecaps.skrewdetectlevel = (int)configItem->ScrewDetectLevel;
 	settings->hardwarecaps.en_stapledetect = configItem->EnBindingDetect;
 	settings->hardwarecaps.is_autopaper = ((CButton*)m_pageFeedPaper->GetDlgItem(IDC_CKAUTOPAPER))->GetCheck();
+	CString tmp_autopaper_timeout;
+	m_pageFeedPaper->GetDlgItem(IDC_CMBAUTOPAPER)->GetWindowTextW(tmp_autopaper_timeout);
+	settings->autopaper_timeout = _wtoi(tmp_autopaper_timeout);
 	settings->hardwarecaps.en_doublefeed = configItem->EnUltrasonicDetect;
 	settings->dogeardistance = m_pageFeedPaper->m_slider_dogear.GetPos();
 	settings->en_fold = configItem->EnFlod ? 1 : 0;
@@ -774,6 +791,8 @@ void CTwainUI::setvisable_dogear(bool flag)
 void CTwainUI::setvisable_autopaper(bool flag)
 {
 	((CButton*)m_pageFeedPaper->GetDlgItem(IDC_CKAUTOPAPER))->ShowWindow(flag ? SW_SHOW : SW_HIDE);
+	m_pageFeedPaper->GetDlgItem(IDC_STATICAUTOPAPER)->ShowWindow(flag ? SW_SHOW : SW_HIDE);
+	m_pageFeedPaper->GetDlgItem(IDC_CMBAUTOPAPER)->ShowWindow(flag ? SW_SHOW : SW_HIDE);
 	if (!flag)
 		((CButton*)m_pageFeedPaper->GetDlgItem(IDC_CKAUTOPAPER))->SetCheck(false);
 }
diff --git a/huagao/Device/GScan.h b/huagao/Device/GScan.h
index ee46a078..f76d3064 100644
--- a/huagao/Device/GScan.h
+++ b/huagao/Device/GScan.h
@@ -101,7 +101,8 @@ typedef enum tagUsbSupported {
 	AUTO_FLAT_FINISHED = 202,
 	//usb ������
 	USB_CONNECTED,
-	HAVE_PAPER
+	HAVE_PAPER,
+	DEVICE_LOCKED,
 } UsbSupported, * PUsbSupported;
 
 static  map<UsbSupported, string> msgs = {
@@ -132,6 +133,7 @@ static  map<UsbSupported, string> msgs = {
 	{UsbSupported::HAVE_DOGEAR,"��⵽���۽ǣ�ֹͣɨ�裡"},
 	{UsbSupported::MLTOP_TIMEOUT,"����̨̧��δ����ָ��λ�ã�"},
 	{UsbSupported::PAPER_HOLE,"ֽ�������пף���ʹ�ô���ģʽɨ�裡"},
+	{UsbSupported::DEVICE_LOCKED,"�豸��������"},
 };
 
 enum tagEventIndex
diff --git a/huagao/Device/GScanO1003399.cpp b/huagao/Device/GScanO1003399.cpp
index de4be307..42f33ca3 100644
--- a/huagao/Device/GScanO1003399.cpp
+++ b/huagao/Device/GScanO1003399.cpp
@@ -61,7 +61,9 @@ GScanO1003399::~GScanO1003399()
 	scanflag = false;
 	b_imgprothread = false;
 	imgs.ShutDown();
-
+	m_autopaper_timeout = false;
+	if (m_autopaper_ft.valid())
+		m_autopaper_ft.get();
 	while (m_paths.Size() > 0)
 	{
 		remove(m_paths.Take().c_str());
@@ -434,6 +436,7 @@ void GScanO1003399::Stop_scan()
 	stop();
 	if (m_param.hardwarecaps.is_autopaper)
 	{
+		m_autopaper_timeout = false;
 		autopaperstop = true;
 		if (!is_scan() && imagecount == 0)
 			scanflag = false;
@@ -517,10 +520,15 @@ void GScanO1003399::usb_run()
 			HGEIntInfo info = *(HGEIntInfo*)&buff;
 			switch (info.From)
 			{
-			case IMG:
-				if (is_runing() && (im_dev_count()>0))
+			case IMG: 
+			{
+				if (m_param.hardwarecaps.is_autopaper) {
+					m_autopaper_timeout = false;
+				}
+				if (is_runing() && (im_dev_count() > 0))
 					im_rx();
-				break;
+				break; 
+			}
 			case MtBoard:
 				FileTools::writelog(log_ERROR, "Got MotorBoard error code = " + to_string(info.Code));
 				break;
@@ -576,10 +584,26 @@ void GScanO1003399::usb_run()
 				}
 				else
 					scanflag = false;
-				
+				if (m_param.hardwarecaps.is_autopaper) {
+					if ((devState != DEV_WRONG) && (!autopaperstop))
+					{
+						m_autopaper_ft = std::async(std::launch::async, [this] {
+							m_autopaper_timeout = true;
+							StopWatch sw;
+							while (sw.elapsed_s() < m_param.autopaper_timeout)
+							{
+								std::this_thread::sleep_for(std::chrono::milliseconds(10));
+								if (m_autopaper_timeout == false)
+									return;
+							}
+							if ((m_autopaper_timeout == false) || scanner_read_reg(m_usb, SR_STATUS))
+								return;
+							else
+								Stop_scan();
+							});			
+					}
+				}
 			}
-
-
 			this_thread::sleep_for(chrono::microseconds(10));
 		}
 
@@ -588,6 +612,7 @@ void GScanO1003399::usb_run()
 
 void GScanO1003399::start()
 {
+
 	scanner_cmd(m_usb, SC_START);
 }
 
@@ -660,10 +685,18 @@ void GScanO1003399::im_rx()
 	std::shared_ptr<std::vector<char>> buffi(new std::vector<char>);
 	//auto& buffi = im_data;
 	int count = front_datasize();
+	int recv_count = 0;
 	buffi->resize(count);
 	rx_cmd();
-	std::this_thread::sleep_for(std::chrono::milliseconds(10));
-	count = read_data(buffi->data(), count, count / (0.005 * 1024 * 1024)); //
+	std::this_thread::sleep_for(std::chrono::milliseconds(50));
+	recv_count = read_data(buffi->data(), count, count / (0.005 * 1024 * 1024)); //
+	if (count != recv_count)
+	{
+		FileTools::writelog(log_INFO, "SR_IM_ABORT ");
+		scanner_write_reg(m_usb, SR_IM_ABORT, 0);
+		std::this_thread::sleep_for(std::chrono::milliseconds(200));
+		return;
+	}
 	pop_dev_im();
 	//vector<cv::Mat> mats;
 	//m_param.multi_output_red? imagecount += 2: imagecount++;
@@ -693,10 +726,10 @@ int GScanO1003399::read_data(void* data, int length, int timeout)
 {
 	if (!m_usb.get() && !m_usb->is_connected())
 	{
-		FileTools::writelog(log_INFO, "if (!m_usb.get() && !m_usb->is_connected())");
+		FileTools::writelog(log_INFO, "!m_usb->is_connected");
 		return 0;
 	}
-	timeout = std::max(1000, timeout);
+	timeout = std::max(1500, timeout);
 
 	int readed = 0;
 	int reading = 0;
@@ -956,6 +989,8 @@ int GScanO1003399::codeconvter(HGEIntInfo code)
 			return DETECT_STAPLE;
 		case 0x00080:
 			return PAPER_SKEW;
+		case 0x00100:
+			return DEVICE_LOCKED;
 		case 0x10000:
 			return AQUIRE_IMAGE_TIMEOUT;
 		case 0x20000:
@@ -998,8 +1033,10 @@ int GScanO1003399::codeconvter(HGEIntInfo code)
 	{
 		switch (code.Code)
 		{
-		case 0:
+		case 0: 
+		{
 			return -1;
+		}
 		case 1:
 			if (m_param.hardwarecaps.is_autopaper)
 			{
diff --git a/huagao/Device/GScanO1003399.h b/huagao/Device/GScanO1003399.h
index 8e2df037..673fddb6 100644
--- a/huagao/Device/GScanO1003399.h
+++ b/huagao/Device/GScanO1003399.h
@@ -104,6 +104,8 @@ private:
 	volatile bool keeplastimg;
 	volatile bool autopaperstop;
 	volatile bool is_kernelsnap_211209;
+	volatile bool m_autopaper_timeout;
+	std::future<void> m_autopaper_ft;
 	GScanCap m_param;
 	std::shared_ptr<IUsb> m_usb;
 	volatile bool b_imgprothread;
diff --git a/huagao/Device/IConfig.h b/huagao/Device/IConfig.h
index 0bbbdb25..f9dc1c81 100644
--- a/huagao/Device/IConfig.h
+++ b/huagao/Device/IConfig.h
@@ -199,6 +199,12 @@ enum Scanner_Reg_Defs
 	SR_SET_AUTOMATICCONTROLFEEDMODE_THRESHOLD,
 	SR_GET_TRAYPOSITION,
 	SR_SET_TRAYPOSITION,
+	SR_GET_LOCK_STATES,
+	SR_SET_LOCK_STATES,
+	SR_GET_TOKEN,
+	SR_SET_TOKEN,
+	SR_GET_TOKEN_LENGHT,
+	SR_DECODE_TOKEN,
 	SR_GET_CUO_ERROR = 0x50,
 	SR_GET_DOU_ERROR,
 	SR_GET_JAM_ERROR,
diff --git a/huagao/Device/PublicFunc.h b/huagao/Device/PublicFunc.h
index 6a2d0b7d..0846e6b9 100644
--- a/huagao/Device/PublicFunc.h
+++ b/huagao/Device/PublicFunc.h
@@ -85,6 +85,7 @@ const std::string   HSVCORRECT = "bHsvCorrect";
 const std::string   ULTRADETECT = "bUltrasonicDetect";
 const std::string   BINDINGDETECT = "bBindingDetect";
 const std::string   AUTOPAPER = "bautopaper";
+const std::string   AUTOPAPERTIMEOUT = "iautopapertimeout";
 const std::string   SCANCOUNT = "ScanCount";
 const std::string   DOCORIENTATION = "bOrientation";
 const std::string   AUTO_TEXT = "bAutoText";
@@ -298,6 +299,7 @@ struct GScanCap
 	bool				en_fillholeratio_down;
 	bool				en_fillholeratio_left;
 	bool				en_fillholeratio_right;
+	int					autopaper_timeout;
 	std::string			Caption;
 	std::string			SavePath;
 };
diff --git a/huagao/GscanJsonConfig.cpp b/huagao/GscanJsonConfig.cpp
index a8c6b18e..5afb1cb0 100644
--- a/huagao/GscanJsonConfig.cpp
+++ b/huagao/GscanJsonConfig.cpp
@@ -144,6 +144,7 @@ void GscanJsonConfig::SaveGscanCapConfig(const GScanCap & gcap, const std::strin
 	outJson["Config"].Add(ULTRADETECT, (bool)(gcap.hardwarecaps.en_doublefeed), false);
 	outJson["Config"].Add(BINDINGDETECT, (bool)(gcap.hardwarecaps.en_stapledetect), false);
 	outJson["Config"].Add(AUTOPAPER, (bool)(gcap.hardwarecaps.is_autopaper), false);
+	outJson["Config"].Add(AUTOPAPERTIMEOUT, (int)(gcap.autopaper_timeout));
 	outJson["Config"].Add(SCANCOUNT, (int)(gcap.scannum));
 	outJson["Config"].Add(DOCORIENTATION, (int)(gcap.imageRotateDegree));
 	outJson["Config"].Add(AUTO_TEXT, (bool)(gcap.is_autotext),false);
@@ -293,6 +294,7 @@ void GscanJsonConfig::WriteJsonArrayToFile(std::vector<GScanCap> cfgArray, const
 		root["Config"][ULTRADETECT].Add(i, (bool)cfgArray[i].hardwarecaps.en_doublefeed);
 		root["Config"][BINDINGDETECT].Add(i, (bool)cfgArray[i].hardwarecaps.en_stapledetect);
 		root["Config"][AUTOPAPER].Add(i, (bool)cfgArray[i].hardwarecaps.is_autopaper);
+		root["Config"][AUTOPAPERTIMEOUT].Add((int)cfgArray[i].autopaper_timeout);
 		root["Config"][SCANCOUNT].Add((int)cfgArray[i].scannum);
 		root["Config"][DOCORIENTATION].Add((int)cfgArray[i].imageRotateDegree);
 		root["Config"][AUTO_TEXT].Add(i, (bool)cfgArray[i].is_autotext);
@@ -513,6 +515,8 @@ std::vector<GScanCap> GscanJsonConfig::parseJsonFromString(const std::string str
 		root["Config"].Get(BINDINGDETECT, itmBingdingDetect);
 		neb::CJsonObject itmAutoPaper;
 		root["Config"].Get(AUTOPAPER, itmAutoPaper);
+		neb::CJsonObject itmAutoPaperTimeOut;
+		root["Config"].Get(AUTOPAPERTIMEOUT, itmAutoPaperTimeOut);
 		neb::CJsonObject itmScanCount;
 		root["Config"].Get(SCANCOUNT, itmScanCount);
 		neb::CJsonObject itmDocOrientation;
@@ -661,6 +665,8 @@ std::vector<GScanCap> GscanJsonConfig::parseJsonFromString(const std::string str
 			cfp.hardwarecaps.en_stapledetect = b_value ? 1 : 0;
 			itmAutoPaper.Get(i, b_value);
 			cfp.hardwarecaps.is_autopaper = b_value ? 1 : 0;
+			itmAutoPaperTimeOut.Get(i, i_value);
+			cfp.autopaper_timeout = i_value;
 			itmScanCount.Get(i, i_value);
 			cfp.scannum = i_value;
 			itmDocOrientation.Get(i, i_value);
@@ -814,6 +820,8 @@ std::vector<GScanCap> GscanJsonConfig::parseJsonFromString(const std::string str
 		cfp.hardwarecaps.en_stapledetect = bvalue ? 1 : 0;
 		root["Config"].Get(AUTOPAPER, bvalue);
 		cfp.hardwarecaps.is_autopaper = bvalue ? 1 : 0;
+		root["Config"].Get(AUTOPAPERTIMEOUT, index);
+		cfp.autopaper_timeout = index;
 		root["Config"].Get(SCANCOUNT, index);
 		cfp.scannum = index;
 		root["Config"].Get(DOCORIENTATION, index);
@@ -921,6 +929,7 @@ json GscanJsonConfig::GscancapToJson(GScanCap& cap)
 	js[CONFIG][ULTRADETECT] = cap.hardwarecaps.en_doublefeed;
 	js[CONFIG][BINDINGDETECT] = cap.hardwarecaps.en_stapledetect;
 	js[CONFIG][AUTOPAPER] = cap.hardwarecaps.is_autopaper;
+	js[CONFIG][AUTOPAPERTIMEOUT] = cap.autopaper_timeout;
 	js[CONFIG][SCANCOUNT] = cap.scannum;
 	js[CONFIG][DOCORIENTATION] = cap.imageRotateDegree;
 	js[CONFIG][AUTO_TEXT] = cap.is_autotext;
@@ -997,6 +1006,7 @@ GScanCap GscanJsonConfig::JsonToGscancap(json& js)
 	cap.hardwarecaps.en_doublefeed = json_cast(js[CONFIG][ULTRADETECT]).to_int();
 	cap.hardwarecaps.en_stapledetect = json_cast(js[CONFIG][BINDINGDETECT]).to_int();
 	cap.hardwarecaps.is_autopaper = json_cast(js[CONFIG][AUTOPAPER]).to_int();
+	cap.autopaper_timeout = json_cast(js[CONFIG][AUTOPAPERTIMEOUT]).to_int();
 	cap.scannum = json_cast(js[CONFIG][SCANCOUNT]).to_int();
 	cap.imageRotateDegree = json_cast(js[CONFIG][DOCORIENTATION]).to_int();
 	cap.is_autotext = json_cast(js[CONFIG][AUTO_TEXT]).to_int();
@@ -1068,6 +1078,7 @@ json GscanJsonConfig::GetDefaultJson()
 		"bUltrasonicDetect":	 true ,
 		"bBindingDetect":	 false ,
 		"bautopaper": false ,
+		"iautopapertimeout" :  15 ,
 		"ScanCount":	 65535 ,
 		"bOrientation":	 0 ,
 		"bAutoText":	 false ,
@@ -1136,6 +1147,7 @@ json GscanJsonConfig::GetDefaultJson()
 		"bUltrasonicDetect":	 true ,
 		"bBindingDetect":	 false ,
 		"bautopaper": false ,
+		"iautopapertimeout" :  15 ,
 		"ScanCount":	 65535 ,
 		"bOrientation":	 0 ,
 		"bAutoText":	 false ,
diff --git a/huagao/HUAGO-LOGO-for UI.bmp b/huagao/HUAGO-LOGO-for UI.bmp
index 090f5676c27101a092e161911865d50aaa519e55..d04d9f79aa3a90c12653d4e2aba2363b62b376f2 100644
GIT binary patch
literal 40854
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
J%N+IkKLL{@?G*q3

literal 98456
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
NtEI_RU4IJ;`yXq%C_w-K

diff --git a/huagao/huagaotwds.rc b/huagao/huagaotwds.rc
index e7c0a3f4f662125d0c274d06171dcf9e450730c9..daebd817d07a5f30a5f0a8dc68703ccfecbabc07 100644
GIT binary patch
delta 152
zcmaE~oO#nK<_%rGj7F2!Ti9+s;j17z`GGmdWWK4&Jn=i~T6@2xeoOr_)oSuXSxHq#
zhERqO27iVC21g)vWe8%>VK8JcW-tfSra;n^!DupLq44B?qB`2xRa*kpfOMGvNizlm
bAZgBEGFdUoesYbt(PXnzVw?XZJt+VH$0aEJ

delta 31
ncmdnAiuuuU<_%rG%!Ul6lQ&veZ$9CxAUfGbNo=!U%98>B$v6y9

diff --git a/huagao/resource.h b/huagao/resource.h
index 944d604828e191adc4ecc30ce1f5c23d86ac82b6..1ccf0b72df0d9a9063464447146bb57655528fbe 100644
GIT binary patch
delta 89
zcmZ3onDNdM#trLaCfiB#Ocs;%o4mlBh1HkAiNSxeJ+tm+JK0HGlNTuPOnxD#GdVz=
rZE};j0y9v0@^e9BFkehpYO(?k$L1^Q0h*JISj8qc1c*%b3k(AQ67d`T

delta 59
zcmV-B0L1^?qyeO(0kEzd2S@-#07C#vlQ9_^lRyU;lZ+gEli(U2vw|H?3X@O;1hb4N
RP$`qv8y1t^P!y8}QdUtW6W9O%