diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index 123590e..d806910 100644 Binary files a/app/HGProductionTool/ProductionTool_zh_CN.qm and b/app/HGProductionTool/ProductionTool_zh_CN.qm differ 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 @@ devType : - 设备型号: + 设备类型: 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;