From c09d6eeba80b46b6b99c82c568c1520c9858f015 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Thu, 7 Sep 2023 10:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B43288=E5=92=8C3399=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8C=B9=E9=85=8D=E5=8E=9F=E5=A7=8B=E5=B0=BA=E5=AF=B8?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=BA=E5=AF=B8=E6=A3=80=E6=B5=8B=E4=BB=8D=E7=84=B6?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C300?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=94=AF=E6=8C=81=E5=AF=BC=E5=87=BA=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=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_200.cpp |  5 +++
 hgdriver/hgdev/hg_scanner_239.cpp | 13 +++++++
 hgdriver/hgdev/hg_scanner_300.cpp | 57 ++++++++++++++++++++++++++++++-
 hgdriver/hgdev/hg_scanner_302.cpp | 13 +++++++
 4 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp
index 3a0578a..fcdef0f 100644
--- a/hgdriver/hgdev/hg_scanner_200.cpp
+++ b/hgdriver/hgdev/hg_scanner_200.cpp
@@ -480,6 +480,11 @@ int hg_scanner_200::writedown_device_configuration(bool type,setting_hardware::H
 		d->params_dsp.color = 1;
 	}
 
+	if (paper_size_ == TwSS::None || paper_size_ == TwSS::USStatement || paper_size_ == TwSS::MaxSize || paper_size_ == TwSS::Trigeminy)
+	{
+		d->params_dsp.enable_sizecheck = false;
+	}
+
 	{
 		std::lock_guard<std::mutex>      lock(io_lock_);
 
diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp
index ba8642c..26778e7 100644
--- a/hgdriver/hgdev/hg_scanner_239.cpp
+++ b/hgdriver/hgdev/hg_scanner_239.cpp
@@ -602,6 +602,19 @@ int  hg_scanner_239::writedown_image_configuration(void)
 	}
 	ic.contrast = (contrast_ - 4) * 333.0;
 	ic.brightness = (bright_ - 128) * (2000.0 / 254.0);
+
+	if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
+		|| image_prc_param_.bits.paper == PAPER_MAX_SIZE
+		|| image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
+		|| image_prc_param_.bits.paper == PAPER_TRIGEMINY
+		|| image_prc_param_.bits.paper == PAPER_16K
+		|| image_prc_param_.bits.paper == PAPER_8K
+		|| image_prc_param_.bits.paper == PAPER_16K_LATERAL
+		)
+	{
+		ic.en_sizecheck = false;
+	}
+
 	image_configuration(ic);
 
 	{
diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp
index d483924..2f09ba7 100644
--- a/hgdriver/hgdev/hg_scanner_300.cpp
+++ b/hgdriver/hgdev/hg_scanner_300.cpp
@@ -1122,7 +1122,62 @@ int hg_scanner_300::on_get_feedmode(int &feedmode)
 }
 int hg_scanner_300::get_device_log(string &log)
 {
-	return SCANNER_ERR_DEVICE_NOT_SUPPORT;
+	int ret = SCANNER_ERR_OK,
+		len = 0;
+	string 	save_path = hg_log::temporary_path() + PATH_SEPARATOR + "device.log";
+	string	str;
+	string	str2;
+	USBCB usbcb = { setting3288dsp::GET_LOG_FILES_INFO, 0, 0 };
+	len = sizeof(USBCB);
+	{
+		std::lock_guard<std::mutex>      lock(io_lock_);
+
+		ret = writeusb(usbcb);
+		if (ret == SCANNER_ERR_OK)
+		{
+			ret = readusb(usbcb);
+		}
+
+		int block = usbcb.u32_Count,
+			total = usbcb.u32_Count,
+			index = 0;
+
+		if (total == 0)
+		{
+			return SCANNER_ERR_NO_DATA;
+		}
+		str.resize(total);
+		str2.resize(total);
+		ret = io_->read_bulk(&str[index], &block);
+		//while (ret == SCANNER_ERR_TIMEOUT)   ///设备代码是进行了第二次 write 条件是len > 0  如果出现问题这个地方需要打开
+		//{
+		//	block = 1024 * 1024;
+		//	if (total < block)
+		//	{
+		//		block = total;
+		//	}
+		//	ret = io_->read_bulk(&str2[index], &block);
+		//	//if (ret != SCANNER_ERR_OK)
+		//		//return ret;
+
+		//	index += block;
+		//	total -= block;
+		//}
+	}
+
+	if (ret != SCANNER_ERR_OK)
+		return ret;
+
+	ofstream f;
+	f.open(save_path, ios::out | ios::trunc);
+	if (!f.is_open())
+		return SCANNER_ERR_CREATE_FILE_FAILED;
+
+	f << str << endl;
+	f.close();
+	log = save_path;
+
+	return SCANNER_ERR_OK;
 }
 int hg_scanner_300::set_devreboot(int data)
 {
diff --git a/hgdriver/hgdev/hg_scanner_302.cpp b/hgdriver/hgdev/hg_scanner_302.cpp
index 80c5602..429969f 100644
--- a/hgdriver/hgdev/hg_scanner_302.cpp
+++ b/hgdriver/hgdev/hg_scanner_302.cpp
@@ -519,6 +519,19 @@ int hg_scanner_302::writedown_image_configuration(void)
 	}
 	ic.contrast = contrast_;//(contrast_ - 4) * 333.0;
 	ic.brightness = bright_;// (bright_ - 128)* (2000.0 / 254.0);
+
+	if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
+		|| image_prc_param_.bits.paper == PAPER_MAX_SIZE
+		|| image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
+		|| image_prc_param_.bits.paper == PAPER_TRIGEMINY
+		|| image_prc_param_.bits.paper == PAPER_16K
+		|| image_prc_param_.bits.paper == PAPER_8K
+		|| image_prc_param_.bits.paper == PAPER_16K_LATERAL
+		)
+	{
+		ic.en_sizecheck = false;
+	}
+
 	image_configuration(ic);
 
 	{