From 1229deeae3bca2feb5ac1d4396ad3a1373e75ba5 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 29 Dec 2022 11:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AD=AA=E6=96=9C=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/base/test_base.cpp | 62 +++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp index 5f58e31..cff804e 100644 --- a/code/base/test_base.cpp +++ b/code/base/test_base.cpp @@ -288,7 +288,7 @@ public: unsigned int len = sizeof(SANE_Bool); int num = 0; void* get_data = NULL; - parameter * ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_INT, NAME,L"请歪斜放纸...设置阈值：1 - 5,值越小越容易检测"); + parameter * ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_INT, NAME,L"请歪斜放纸...设置阈值：0 - 5,值越小越容易检测,0为关闭歪斜检测"); if (ptr) { get_data = ptr->get_data(); @@ -299,22 +299,20 @@ public: } num = *((int*)get_data); } - if (num == 0) - num = 1; - + else + { + helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出歪斜检测流程", false); + return -1; + } + type = num == 0 ? false:true; + ptr->release(); int ret = helper_->io_control(IO_CTRL_CODE_SET_SKEW_CHECK, &type, &len); - if (ret != SCANNER_ERR_OK) - { - return ret; - } - - ret = helper_->io_control(IO_CTRL_CODE_SET_SKEW_CHECK_VAL, &num, &len); - if (ret != SCANNER_ERR_OK) - { - return ret; - } - ret = helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL); + if (ret != SCANNER_ERR_OK)return ret; + ret = helper_->io_control(IO_CTRL_CODE_SET_SKEW_CHECK_VAL, &num, &len); + if (ret != SCANNER_ERR_OK)return ret; + + ret = helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL); return ret; } /* 分纸电机检测 */ @@ -355,17 +353,28 @@ public: unsigned int len = sizeof(SANE_Bool); void* get_data = NULL; int ret = SCANNER_ERR_OK; - parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_BOOL, NAME, L"请确认是否已放双张测试纸..."); + parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_BOOL, NAME, + L"请选择是否开启超声波检查，并且请放置双张纸"); if (ptr) { get_data = ptr->get_data(); - if (!get_data || (*((bool*)get_data) == false)) + if (!get_data) { helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出超声波模块检测流程", false); return -1; } + else + type = *((bool*)get_data); } + else + { + helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出超声波模块检测流程", false); + return -1; + } + ptr->release(); + ret = helper_->io_control(IO_CTRL_CODE_SET_ULTRASONIC_MODULE, &type, &len); + if (ret != SCANNER_ERR_OK) { return ret; @@ -389,23 +398,8 @@ public: return helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL); } /* 开盖传感器检查 */ - int test_cover_sensor(void *data) //int端点返回 使用单张扫描测试 + int test_cover_sensor(void *data) //端点返回 使用单张扫描测试 { - const wchar_t* NAME = (wchar_t*)data; - SANE_Bool type = true; - unsigned int len = sizeof(SANE_Bool); - void* get_data = NULL; - int ret = SCANNER_ERR_OK; - parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_BOOL, NAME, L"请确认是否已打开扫描仪盖..."); - if (ptr) - { - get_data = ptr->get_data(); - if (!get_data || (*((bool*)get_data) == false)) - { - helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出开盖传感器检测流程", false); - return -1; - } - } return helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL); } /* 扫描传感器检查 */ @@ -461,6 +455,7 @@ public: helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出--->设置速度模式...", type); return -1; } + ptr->release(); int ret = helper_->io_control(IO_CTRL_CODE_SET_SPEED_MODE, &speed_mode, &len); if (ret != SCANNER_ERR_OK) { @@ -510,6 +505,7 @@ public: /* 重启设备 */ int test_reboot_device(void *data) { + return SCANNER_ERR_OK; } /* 扫描图像质量确认 */