From 3142557fff5727368f67aa073b9742dab61ba84c Mon Sep 17 00:00:00 2001
From: 13038267101 <mo1027728827@qq.com>
Date: Sat, 26 Nov 2022 19:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96=E5=BC=A0?=
 =?UTF-8?q?=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner_200.cpp | 20 ++++++++++++++++----
 hgdriver/hgdev/hg_scanner_300.cpp | 20 ++++++++++++++++----
 hgdriver/hgdev/hg_scanner_400.cpp | 20 ++++++++++++++++----
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp
index 3e01872..a70cf24 100644
--- a/hgdriver/hgdev/hg_scanner_200.cpp
+++ b/hgdriver/hgdev/hg_scanner_200.cpp
@@ -853,15 +853,27 @@ int hg_scanner_200::get_history_roller_count(int& num)
 {
 	int ret = SCANNER_ERR_OK,
 		len = 0;
-	USBCB usbcb = { setting3288dsp::GET_SCANN_NUM,len, 0 };
-	ret = io_->read_bulk(&usbcb, &num);
+	USBCB usbcb = { setting3288dsp::GET_SCANN_NUM,0, 0 };
+	len = sizeof(usbcb);
+	ret = io_->read_bulk(&usbcb, &len);
+	if (ret != SCANNER_ERR_OK)
+	{
+		return ret;
+	}
+	num = usbcb.u32_Data;
 	return ret;
 }
 int hg_scanner_200::get_roller_num(int& val)
 {
 	int ret = SCANNER_ERR_OK,
 		len = 0;
-	USBCB usbcb = { setting3288dsp::GET_ROLLER_NUM,len, 0 };
-	ret = io_->read_bulk(&usbcb, &val);
+	USBCB usbcb = { setting3288dsp::GET_ROLLER_NUM,0, 0 };
+	len = sizeof(usbcb);
+	ret = io_->read_bulk(&usbcb, &len);
+	if (ret != SCANNER_ERR_OK)
+	{
+		return ret;
+	}
+	val = usbcb.u32_Data;
 	return ret;
 }
\ No newline at end of file
diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp
index 9473f2f..66d0381 100644
--- a/hgdriver/hgdev/hg_scanner_300.cpp
+++ b/hgdriver/hgdev/hg_scanner_300.cpp
@@ -775,15 +775,27 @@ int hg_scanner_300::get_history_roller_count(int& num)
 {
 	int ret = SCANNER_ERR_OK,
 		len = 0;
-	USBCB usbcb = { setting3288dsp::GET_SCANN_NUM,len, 0 };
-	ret = io_->read_bulk(&usbcb, &num);
+	USBCB usbcb = { setting3288dsp::GET_SCANN_NUM,0, 0 };
+	len = sizeof(usbcb);
+	ret = io_->read_bulk(&usbcb, &len);
+	if (ret != SCANNER_ERR_OK)
+	{
+		return ret;
+	}
+	num = usbcb.u32_Data;
 	return ret;
 }
 int hg_scanner_300::get_roller_num(int& val)
 {
 	int ret = SCANNER_ERR_OK,
 		len = 0;
-	USBCB usbcb = { setting3288dsp::GET_ROLLER_NUM,len, 0 };
-	ret = io_->read_bulk(&usbcb, &val);
+	USBCB usbcb = { setting3288dsp::GET_ROLLER_NUM,0, 0 };
+	len = sizeof(usbcb);
+	ret = io_->read_bulk(&usbcb, &len);
+	if (ret != SCANNER_ERR_OK)
+	{
+		return ret;
+	}
+	val = usbcb.u32_Data;
 	return ret;
 }
\ No newline at end of file
diff --git a/hgdriver/hgdev/hg_scanner_400.cpp b/hgdriver/hgdev/hg_scanner_400.cpp
index 2b66084..9238c35 100644
--- a/hgdriver/hgdev/hg_scanner_400.cpp
+++ b/hgdriver/hgdev/hg_scanner_400.cpp
@@ -778,15 +778,27 @@ int hg_scanner_400::get_history_roller_count(int& num)
 {
 	int ret = SCANNER_ERR_OK,
 		len = 0;
-	USBCB usbcb = { setting3288dsp::GET_SCANN_NUM,len, 0 };
-	ret = io_->read_bulk(&usbcb, &num);
+	USBCB usbcb = { setting3288dsp::GET_SCANN_NUM,0, 0 };
+	len = sizeof(usbcb);
+	ret = io_->read_bulk(&usbcb, &len);
+	if (ret != SCANNER_ERR_OK)
+	{
+		return ret;
+	}
+	num = usbcb.u32_Data;
 	return ret;
 }
 int hg_scanner_400::get_roller_num(int& val)
 {
 	int ret = SCANNER_ERR_OK,
 		len = 0;
-	USBCB usbcb = { setting3288dsp::GET_ROLLER_NUM,len, 0 };
-	ret = io_->read_bulk(&usbcb, &val);
+	USBCB usbcb = { setting3288dsp::GET_ROLLER_NUM,0, 0 };
+	len = sizeof(usbcb);
+	ret = io_->read_bulk(&usbcb, &len);
+	if (ret != SCANNER_ERR_OK)
+	{
+		return ret;
+	}
+	val = usbcb.u32_Data;
 	return ret;
 }
\ No newline at end of file