From d4da991cbd3be78f0881934f7a470ab14fa89b16 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Fri, 30 Dec 2022 14:35:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B5=B0=E7=BA=B8=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E5=92=8C=E5=BC=80=E7=9B=96=E4=BC=A0=E6=84=9F=E5=99=A8?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/base/test_base.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp index cf73e75..99fe5b3 100644 --- a/code/base/test_base.cpp +++ b/code/base/test_base.cpp @@ -146,6 +146,18 @@ public: else type = true; } + else if (wcscmp(set_test_name_.c_str(), HGPDTTOOLDB_NAME_COVER_SENSOR) == 0) + { + if (strcmp((char*)data, STATU_DESC_SCANNER_ERR_DEVICE_COVER_OPENNED) != 0) + { + type = false; + wchar_t buf[128] = L"未检测到设备开盖,原因--->"; + wcscat(buf, wstr.c_str()); + wstr = buf; + } + else + type = true; + } h->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT, (void*)wstr.c_str(), type); } @@ -159,8 +171,8 @@ public: { if (wcscmp(set_test_name_.c_str(), HGPDTTOOLDB_NAME_AUTO_FLAT_FIELD) == 0) { - //std::string str = StringToUtf((char*)data); - //h->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_FALT_INFO, (void*)&str[0], type); + std::string str = StringToUtf((char*)data); + h->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_FALT_INFO, (void*)&str[0], type); } } break; @@ -450,7 +462,7 @@ public: /* 走纸检查 */ int test_paper_feed(void *data) //使用单张扫描测试 { - return helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL); + return helper_->io_control(IO_CTRL_CODE_GET_IMAGE, NULL, NULL); } /* 开盖传感器检查 */ int test_cover_sensor(void *data) //端点返回 使用单张扫描测试 @@ -595,7 +607,7 @@ public: if (ret != SCANNER_ERR_OK) return ret; - helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_DISTORTION, (void*)L"设备重启中，请观察设备是否重启", true); + helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT, (void*)L"设备重启中，请观察设备是否重启", true); return ret; } /* 扫描图像质量确认 */