From 2f87ca5106a46072b9bc2056076e1b98e529058f Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Sat, 4 Nov 2023 16:09:58 +0800
Subject: [PATCH] =?UTF-8?q?scannerlib=E5=AE=8C=E5=96=84=E8=B5=83=E7=89=A9?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E3=80=81=E8=B7=B3=E8=BF=87=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E9=A1=B5=E5=92=8C=E4=B8=8A=E4=BC=A0=E5=9B=BE=E5=83=8F=E5=B9=B6?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdk/scannerlib/HGLibDeviceImpl.cpp                   | 10 ++++++++--
 sdk/scannerlib/HGScannerLib.h                        | 12 ++++++++++++
 .../huagao/java/com/easing/java/HGScannerLib.java    |  6 ++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/sdk/scannerlib/HGLibDeviceImpl.cpp b/sdk/scannerlib/HGLibDeviceImpl.cpp
index 1c61ca67..178ee5d0 100644
--- a/sdk/scannerlib/HGLibDeviceImpl.cpp
+++ b/sdk/scannerlib/HGLibDeviceImpl.cpp
@@ -84,7 +84,11 @@ const char* OPTION_NAME[] = {
 	SANE_STD_OPT_NAME_REVERSE_01,
 	SANE_STD_OPT_NAME_FOLD_TYPE,
 	SANE_STD_OPT_NAME_COLOR_CORRECTION,
-	SANE_STD_OPT_NAME_WAIT_SCAN_EXIT
+    SANE_STD_OPT_NAME_WAIT_SCAN_EXIT,
+    SANE_STD_OPT_NAME_DISCARDBLANK,
+    SANE_STD_OPT_NAME_LENS_DIRTY,
+    SANE_STD_OPT_NAME_RID_HOLE,
+    SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE
 };
 
 const char* OPTION_ENUMVALUE[] = {
@@ -177,7 +181,9 @@ const char* OPTION_ENUMVALUE[] = {
 	"60s",
 	"2min",
 	"4min",
-	"8min"
+    "8min",
+    OPTION_VALUE_SMYM_TGKBYJYWJDX,
+    OPTION_VALUE_SZTPCL_SCTXBJY
 };
 
 struct DeviceParam
diff --git a/sdk/scannerlib/HGScannerLib.h b/sdk/scannerlib/HGScannerLib.h
index 6b44a5bf..61b5946b 100644
--- a/sdk/scannerlib/HGScannerLib.h
+++ b/sdk/scannerlib/HGScannerLib.h
@@ -206,6 +206,14 @@ HG_DECLARE_HANDLE(HGLibDevice);
 #define HGLIB_OPTION_NAME_SPJZ			70L
 // 待纸扫描退出时间
 #define HGLIB_OPTION_NAME_DZSMTCSJ		71L
+// 跳过空白页
+#define HGLIB_OPTION_NAME_TGKBY         72L
+// 镜头脏污检测
+#define HGLIB_OPTION_NAME_JTZWJC        73L
+// 穿孔移除
+#define HGLIB_OPTION_NAME_CKYC          74L
+// 穿孔搜索范围占幅面比例
+#define HGLIB_OPTION_NAME_CKSSFWZFMBL	75L
 
 /* 配置枚举值 */
 // "无"
@@ -386,6 +394,10 @@ HG_DECLARE_HANDLE(HGLibDevice);
 #define HGLIB_OPTION_ENUMVALUE_DZSMTCSJ_4MIN		88L
 // 待纸扫描退出时间8min
 #define HGLIB_OPTION_ENUMVALUE_DZSMTCSJ_8MIN		89L
+// 跳过空白页-基于文件大小
+#define HGLIB_OPTION_ENUMVALUE_SMYM_TGKBYJYWJDX		90L
+// 上传图像并校验
+#define HGLIB_OPTION_ENUMVALUE_SZTPCL_SCTXBJY		91L
 
 /* 配置值类型 */
 #define HGLIB_OPTION_VALUETYPE_INT				1L
diff --git a/test/scannerlib/huagao/java/com/easing/java/HGScannerLib.java b/test/scannerlib/huagao/java/com/easing/java/HGScannerLib.java
index 796eb50e..6861ae35 100644
--- a/test/scannerlib/huagao/java/com/easing/java/HGScannerLib.java
+++ b/test/scannerlib/huagao/java/com/easing/java/HGScannerLib.java
@@ -161,7 +161,6 @@ public class HGScannerLib {
 			String fwVersion = inst.GetDeviceFWVersion(dev);
 			System.out.println("fwVersion=" + fwVersion);
 			
-			/*
 			HGLibDeviceParamGroup[] devParamGroups = inst.GetDeviceParamGroupList(dev);
 			for (int i = 0; i < devParamGroups.length; ++i)
 			{
@@ -220,7 +219,6 @@ public class HGScannerLib {
 					}
 				}
 			}
-			*/
 			
 			HGLibDeviceSetParam deviceSetParam = new HGLibDeviceSetParam();
 			deviceSetParam.option = 27;
@@ -236,9 +234,9 @@ public class HGScannerLib {
 			int code = inst.GetDeviceOperateCode(dev);
 			System.out.println("code=" + code);
 			
-			//inst.StartDeviceScan(dev);
+			inst.StartDeviceScan(dev);
 			
-			//inst.StopDeviceScan(dev);
+			inst.StopDeviceScan(dev);
 			
 			inst.CloseDevice(dev);
 		}