新增待纸扫描退出时间设置，调整紫光文本方向识别不生效问题

hgdriver/hgdev/hg_scanner.cpp

@@ -158,6 +158,7 @@ hg_scanner::hg_scanner(ScannerSerial serial, const char* dev_name, usb_io* io,in
 	, is_dpi_color_check(false), save_dpi_color_check_val(0.0f), is_auto_falt(false), HGVersion_mgr_(NULL), HGVersion_Init_(NULL)
 	, HGVersion_Islock_(NULL), HGVersion_Postlog_(NULL), HGVersion_Free_(NULL), Dynamicopen_HGVersion_pHandle_(NULL), pid_(pid), fetching_id_(-1)
 	, is_kernelsnap3288_230210_(false), color_correction_(false), is_kernelsnap_3C_cccc(false), is_kernelsnap_220500_(false), is_kernelsnap3288_230303_(false)
+	, is_kernelsnap_211227_(false),is_auto_paper_scan_exit_time(60)
 {
 		#if !defined(_WIN32) && !defined(_WIN64) &&defined(x86_64)
 		isx86_Advan_ = false;
@@ -605,6 +606,7 @@ void hg_scanner::init_setting_func_map(void)
 	setting_map_[SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_B] = &hg_scanner::setting_isremove_low_hole_threshold;
 	setting_map_[SANE_STD_OPT_NAME_FOLD_TYPE] = &hg_scanner::setting_fold_type;
 	setting_map_[SANE_STD_OPT_NAME_COLOR_CORRECTION] = &hg_scanner::setting_color_correction;
+	setting_map_[SANE_STD_OPT_NAME_WAIT_SCAN_EXIT] = &hg_scanner::setting_auto_paper_scan_exit_time;
 }
 std::string hg_scanner::setting_name_from(const char* n_or_id, int* id)
 {
@@ -2246,6 +2248,11 @@ int hg_scanner::setting_color_correction(void* data)
 	}
 	return 0;
 }
+int hg_scanner::setting_auto_paper_scan_exit_time(void* data)
+{
+	is_auto_paper_scan_exit_time = *((int*)data);
+	return 0;
+}
 int hg_scanner::on_color_mode_changed(int& color_mode)
 {
 	return SCANNER_ERR_DEVICE_NOT_SUPPORT;

hgdriver/hgdev/hg_scanner.h

@@ -255,11 +255,13 @@ protected:
     int setting_isremove_low_hole_threshold(void* data);
     int setting_fold_type(void* data);
     int setting_color_correction(void* data);
+    int setting_auto_paper_scan_exit_time(void* data);
+
+
 
     virtual void on_device_reconnected(void);
     virtual int on_scanner_closing(bool force);
 
-
     virtual int on_color_mode_changed(int& color_mode) = 0; // COLOR_MODE_xxx
     virtual int on_paper_changed(int& paper) = 0;           // PAPER_xxx
     virtual int on_paper_check_changed(bool& check)=0;
@@ -352,6 +354,7 @@ protected:
     float           save_dpi_color_check_val;       //保存纵向DPI、色差检测  ,畸变自动计算 的值
     bool            is_auto_falt;                   //是否进行平场校正
     bool            color_correction_;              //是否色彩校正
+    int             is_auto_paper_scan_exit_time;   //待纸扫描退出时间
 
     SANE_DISTORTION_VAL distortion_val;             //畸变修正结构体保存
 
@@ -372,6 +375,9 @@ protected:
     bool            is_kernelsnap_3C_cccc;      //支持偏色校正的版本，自适应配置
     bool            is_kernelsnap_220500_;      //支持双张保留的版本
 
+    bool            is_kernelsnap_211227_;      //此版本以下，不支持真实dpi ，只设置1下去
+
+
     SCANCONF 	img_conf_;  //此参数外部不做任何改变，请在writedown_image_configuration做修改
     std::string img_type_;
 
@@ -534,7 +540,7 @@ public:
     #elif defined(OEM_ZHONGJING)
     static const std::string helpfile_ = "/opt/apps/com.microtekchina.microtekscan/entries/help/MicrotekScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #elif defined(OEM_ZIGUANG)
-    static const std::string helpfile_ = "/opt/apps/com.unisgroup.uniscan/entries/help/UnisScan_scanSettings_Help_manual.pdf";//帮助文档路径
+    static const std::string helpfile_ = "/opt/apps/com.unisgroup.uniscan/entries/help/UniScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #else
     static const std::string helpfile_ ="/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #endif
@@ -548,7 +554,7 @@ public:
     #elif defined(OEM_ZHONGJING)
     static const std::string helpfile_ = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #elif defined(OEM_ZIGUANG)
-    static const std::string helpfile_ = "/opt/apps/scanner-driver-unis/doc/UnisScan_scanSettings_Help_manual.pdf";//帮助文档路径
+    static const std::string helpfile_ = "/opt/apps/scanner-driver-unis/doc/UniScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #else
     static const std::string helpfile_ ="/opt/apps/scanner-driver-huagao/doc/HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #endif

hgdriver/hgdev/image_process.cpp

@@ -379,7 +379,9 @@ namespace hg_imgproc
 #elif  defined(OEM_CANGTIAN)
 			string libname = "libctsdriver.so";
 #elif  defined(OEM_ZHONGJING)
-			string libname = "libzjdriver.so";
+			string libname = "libzjdriver.so";.
+#elif  defined(OEM_ZIGUANG)
+			string libname = "libzgdriver.so";
 #else
 			string libname = "libhgdriver.so";
 #endif