From 0ff0e7c9b03f836369944aef7d01e0c4d51f5c68 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Tue, 25 Jul 2023 15:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 14063 -> 14063 bytes
app/HGProductionTool/ProductionTool_zh_CN.ts | 2 +-
code/base/test_base.cpp | 5 +++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm
index 123590ef1964223b1ff102e81dc043f46078ca98..d806910aaa119c5c74aefb946410fee92b90bc92 100644
GIT binary patch
delta 17
YcmaE#`#yJr9XCr&b$It?C+@Y{082CnX8-^I
delta 17
YcmaE#`#yJr9XCsOckuVkPTXs?0Zh{ex&QzG
diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts
index 2d55dc1..c471429 100644
--- a/app/HGProductionTool/ProductionTool_zh_CN.ts
+++ b/app/HGProductionTool/ProductionTool_zh_CN.ts
@@ -95,7 +95,7 @@
- 设备型号:
+ 设备类型:
diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp
index 6ea527b..5d71997 100644
--- a/code/base/test_base.cpp
+++ b/code/base/test_base.cpp
@@ -1,4 +1,4 @@
-#include"test_base.h"
+#include"test_base.h"
#include
#include
#include
@@ -177,7 +177,7 @@ class test
/* 设置休眠 */
int test_dormancy(void* data)
{
- const wchar_t sleep_buf[8] = { 0,5,10,30,60,120,240 };
+ const wchar_t sleep_buf[8] = { 0,5,10,20,30,60,120,240 };
int sleep_time = *((int*)data);
SANE_Power power;
unsigned int len = sizeof(SANE_Power);
@@ -187,6 +187,7 @@ class test
if (sleep_buf[i] == sleep_time)
{
power = (SANE_Power)i;
+ break;
}
else
power = SANE_POWER_NONE;