调整 最大尺寸裁切三米超时设置

hgdriver/hgdev/common_setting.h

@@ -732,7 +732,8 @@ namespace setting3288dsp
 		V4L2_IMAGE_EMPTY = 80,		//扫描仪内部图片丢失
 		SLEEPING = 81,				//处于休眠中
 		HAVE_DOGEAR = 82,			//检测到有折角
-		AUTO_FLATTING = 198,//自动校正中
+		HAVE_HOLE = 84 ,			//检测到纸张有孔洞， 注意不是穿孔，类似于中间破损一块
+		AUTO_FLATTING = 198,		//自动校正中
 		USB_DISCONNECTED = 200,		//USB 未连接
 		USER_STOP = 201,			//用户点击停止
 		AUTO_FLAT_FINISHED = 202,	//自动校正完成

hgdriver/hgdev/hg_scanner.cpp

@@ -1094,6 +1094,9 @@ void hg_scanner::working_done(void*)
 	case SCANNER_ERR_DEVICE_DISTORTION:
 		notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_DISTORTION), SANE_EVENT_SCAN_FINISHED, status_);
 		break;
+	case SCANNER_ERR_DEVICE_MAYBE_IS_HOLE:
+		notify_ui_working_status(from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_MAYBE_IS_HOLE), SANE_EVENT_SCAN_FINISHED, status_);
+		break;
 	default:
 			notify_ui_working_status(user_cancel_ ? hg_log::lang_load(ID_STATU_DESC_SCAN_CANCELED) : hg_log::lang_load(ID_STATU_DESC_SCAN_STOPPED), SANE_EVENT_SCAN_FINISHED, status_);
 			break;
@@ -3868,7 +3871,10 @@ void hg_scanner::image_process(std::shared_ptr<tiny_buffer>& buffer, uint32_t id
 
 		VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "Set distortion val is:h:%f w:%f distortion val is:%f\n", distortion_val.h, distortion_val.w, distortion_val.scaleXY);
 	}
-	else if (param.cis_image || (img_conf_.papertype == TwSS::MaxSize && pid_ == 0x0300 && is_kernelsnap3288_230210_))
+	else if (param.cis_image 
+		|| ((img_conf_.papertype == TwSS::MaxSize || img_conf_.papertype == TwSS::USStatement) 
+		&& pid_ == 0x0300 
+		&& is_kernelsnap3288_230210_))
 	{
 		printf("cis 原图测试无需任何算法\r\n");
 	}

hgdriver/hgdev/hg_scanner_300.cpp

@@ -63,6 +63,9 @@ namespace settingsdsp_300
 		case setting3288dsp::AUTO_FLATTING:
 			code = SCANNER_ERR_DEVICE_AUTO_FAIL_INFO;
 			break;
+		case setting3288dsp::HAVE_HOLE:
+			code = SCANNER_ERR_DEVICE_MAYBE_IS_HOLE;
+			break;
 		default:
 			code = SCANNER_ERR_NO_DATA;
 			break;
@@ -205,7 +208,7 @@ void hg_scanner_300::thread_handle_usb_read(void)
 		}
 		if (sw.elapsed_ms() > 30000 && img_conf_.resolution_dst != 600)//防止状态信息一直取不上来导致卡死
 		{
-			if (img_conf_.papertype == TwSS::MaxSize && pid_ == 0x0300 && is_kernelsnap3288_230210_)
+			if ((img_conf_.papertype == TwSS::MaxSize || img_conf_.papertype == TwSS::USStatement) && pid_ == 0x0300 && is_kernelsnap3288_230210_)
 			{
 				hg_log::log(LOG_LEVEL_WARNING, "while 30S\n");
 			}
@@ -482,7 +485,7 @@ int hg_scanner_300::writedown_device_configuration(bool type,setting_hardware::H
 	}
 	if (paper_size_ == TwSS::USStatement || paper_size_ == TwSS::MaxSize)
 	{
-		d->params_3288.pageSize = setting3288dsp::G400_MAXSIZE;
+		//d->params_3288.pageSize = setting3288dsp::G400_MAXSIZE;
 	}
 
 	if (is_quality_ == IMG_SPEED && resolution_ >= 300)

hgdriver/wrapper/huagaoxxx_warraper_ex.cpp

@@ -248,6 +248,7 @@ extern "C"
 		RETURN_IF(err, SCANNER_ERR_DEVICE_SCANN_ERROR);
 		RETURN_IF(err, SCANNER_ERR_DEVICE_PC_BUSY);
 		RETURN_IF(err, SCANNER_ERR_DEVICE_ISLOCK);
+		RETURN_IF(err, SCANNER_ERR_DEVICE_MAYBE_IS_HOLE);
 
 		if (err == SCANNER_ERR_LANG_PAK_LOST)
 			return "SCANNER_ERR_LANG_PAK_LOST";
@@ -318,6 +319,7 @@ extern "C"
 		RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_SCANN_ERROR);
 		RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_PC_BUSY);
 		RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_ISLOCK);
+		RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_MAYBE_IS_HOLE);
 
 		if (err == SCANNER_ERR_LANG_PAK_LOST)
 			return "SCANNER_ERR_LANG_PAK_LOST";