lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

硬盘或内存大小不符合要求时弹窗提示，增加测试项“关机”

This commit is contained in:
yangjiaxuan 2023-12-21 09:47:30 +08:00
parent 2dfc05386d
commit 6f8ff90ba8
12 changed files with 195 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/HGProductionTool/ProductionTool_zh_CN.qm
View File

Binary file not shown.

202
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -130,35 +130,35 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="517"/>
<location filename="dialog_inputserialnum.cpp" line="524"/>
<location filename="dialog_inputserialnum.cpp" line="526"/>
<location filename="dialog_inputserialnum.cpp" line="533"/>
<location filename="dialog_inputserialnum.cpp" line="540"/>
<location filename="dialog_inputserialnum.cpp" line="542"/>
<location filename="dialog_inputserialnum.cpp" line="549"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="465"/>
<location filename="dialog_inputserialnum.cpp" line="474"/>
<source>Speed mode</source>
<translation>速度模式</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="419"/>
<location filename="dialog_inputserialnum.cpp" line="425"/>
<source>Failed!</source>
<translation>失败!</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="426"/>
<location filename="dialog_inputserialnum.cpp" line="432"/>
<source>Succeed!</source>
<translation>成功!</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="475"/>
<location filename="dialog_inputserialnum.cpp" line="484"/>
<source>Sleep time</source>
<translation>休眠时间</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="484"/>
<location filename="dialog_inputserialnum.cpp" line="493"/>
<source>Vid and Pid</source>
<translation>Vid和Pid</translation>
</message>
@ -171,32 +171,32 @@
<translation type="vanished">检测到配置%1不一致，已重新配置，请再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="503"/>
<location filename="dialog_inputserialnum.cpp" line="512"/>
<source>Consistent configuration</source>
<translation>配置一致！</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="517"/>
<location filename="dialog_inputserialnum.cpp" line="526"/>
<source>device is lost</source>
<translation>设备已丢失</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="524"/>
<location filename="dialog_inputserialnum.cpp" line="533"/>
<source>Serial num is empty</source>
<translation>序列号为空</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="533"/>
<location filename="dialog_inputserialnum.cpp" line="542"/>
<source>sn is illegal</source>
<translation>序列号不合法</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="540"/>
<location filename="dialog_inputserialnum.cpp" line="549"/>
<source>The device is testing</source>
<translation>该设备正在进行测试</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="420"/>
<location filename="dialog_inputserialnum.cpp" line="426"/>
<source>set sn failed</source>
<translation>设置序列号失败</translation>
</message>
@ -215,15 +215,15 @@
<message>
<location filename="dialog_inputserialnum.cpp" line="125"/>
<location filename="dialog_inputserialnum.cpp" line="297"/>
<location filename="dialog_inputserialnum.cpp" line="329"/>
<location filename="dialog_inputserialnum.cpp" line="579"/>
<location filename="dialog_inputserialnum.cpp" line="335"/>
<location filename="dialog_inputserialnum.cpp" line="588"/>
<source>Speep mode: %1PPM</source>
<oldsource>Speep mode: %1PPM
</oldsource>
<translation>速度模式: %1PPM</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="395"/>
<location filename="dialog_inputserialnum.cpp" line="401"/>
<source>Pass</source>
<translation>Pass</translation>
</message>
@ -238,8 +238,8 @@
<message>
<location filename="dialog_inputserialnum.cpp" line="142"/>
<location filename="dialog_inputserialnum.cpp" line="298"/>
<location filename="dialog_inputserialnum.cpp" line="330"/>
<location filename="dialog_inputserialnum.cpp" line="580"/>
<location filename="dialog_inputserialnum.cpp" line="336"/>
<location filename="dialog_inputserialnum.cpp" line="589"/>
<source>Sleep time: %1minute</source>
<oldsource>Sleep time: %1minute
</oldsource>
@ -248,8 +248,8 @@
<message>
<location filename="dialog_inputserialnum.cpp" line="166"/>
<location filename="dialog_inputserialnum.cpp" line="299"/>
<location filename="dialog_inputserialnum.cpp" line="331"/>
<location filename="dialog_inputserialnum.cpp" line="581"/>
<location filename="dialog_inputserialnum.cpp" line="337"/>
<location filename="dialog_inputserialnum.cpp" line="590"/>
<source>Vid: %1 Pid: %2</source>
<oldsource>Vid: %1 Pid: %2
</oldsource>
@ -258,42 +258,42 @@
<message>
<location filename="dialog_inputserialnum.cpp" line="182"/>
<location filename="dialog_inputserialnum.cpp" line="295"/>
<location filename="dialog_inputserialnum.cpp" line="327"/>
<location filename="dialog_inputserialnum.cpp" line="577"/>
<location filename="dialog_inputserialnum.cpp" line="333"/>
<location filename="dialog_inputserialnum.cpp" line="586"/>
<source>Device model: %1</source>
<translation>设备型号: %1</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="324"/>
<location filename="dialog_inputserialnum.cpp" line="330"/>
<source>Current Configration of device:</source>
<translation>当前设备配置:</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="400"/>
<location filename="dialog_inputserialnum.cpp" line="406"/>
<source>Fail</source>
<translation>Fail</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="415"/>
<location filename="dialog_inputserialnum.cpp" line="419"/>
<location filename="dialog_inputserialnum.cpp" line="426"/>
<location filename="dialog_inputserialnum.cpp" line="421"/>
<location filename="dialog_inputserialnum.cpp" line="425"/>
<location filename="dialog_inputserialnum.cpp" line="432"/>
<source>Set serial number: %1 </source>
<translation>设置序列号: %1 </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="455"/>
<location filename="dialog_inputserialnum.cpp" line="463"/>
<source>Device model</source>
<translation>设备型号</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="495"/>
<location filename="dialog_inputserialnum.cpp" line="591"/>
<location filename="dialog_inputserialnum.cpp" line="504"/>
<location filename="dialog_inputserialnum.cpp" line="600"/>
<source>Detected that the current device&apos;s vid-pid and device object are not consistent. </source>
<translation>检测到当前设备的vid-pid和设备对象不一致. </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="496"/>
<location filename="dialog_inputserialnum.cpp" line="592"/>
<location filename="dialog_inputserialnum.cpp" line="505"/>
<location filename="dialog_inputserialnum.cpp" line="601"/>
<source>Please reboot device to update. </source>
<translation>请重启设备刷新. </translation>
</message>
@ -314,24 +314,24 @@
<translation type="vanished">测试结果：成功！</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="459"/>
<location filename="dialog_inputserialnum.cpp" line="469"/>
<location filename="dialog_inputserialnum.cpp" line="467"/>
<location filename="dialog_inputserialnum.cpp" line="478"/>
<location filename="dialog_inputserialnum.cpp" line="487"/>
<source>Inconsistent configuration %1detected, please reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重新配置后再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="487"/>
<location filename="dialog_inputserialnum.cpp" line="496"/>
<source>Inconsistent configuration %1detected, please reboot and reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重启后再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="583"/>
<location filename="dialog_inputserialnum.cpp" line="592"/>
<source>Set configuration to device </source>
<translation>将目标配置设置到设备 </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="584"/>
<location filename="dialog_inputserialnum.cpp" line="593"/>
<source>Test content: </source>
<translation>测试内容： </translation>
</message>
@ -342,19 +342,19 @@
<message>
<location filename="dialog_inputserialnum.cpp" line="142"/>
<location filename="dialog_inputserialnum.cpp" line="298"/>
<location filename="dialog_inputserialnum.cpp" line="330"/>
<location filename="dialog_inputserialnum.cpp" line="580"/>
<location filename="dialog_inputserialnum.cpp" line="336"/>
<location filename="dialog_inputserialnum.cpp" line="589"/>
<source>Sleep time: Not sleeping</source>
<translation>休眠时间: 不休眠</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="415"/>
<location filename="dialog_inputserialnum.cpp" line="583"/>
<location filename="dialog_inputserialnum.cpp" line="421"/>
<location filename="dialog_inputserialnum.cpp" line="592"/>
<source>Tester: %1, Test item: %2</source>
<translation>测试员: %1, 测试项: %2</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="427"/>
<location filename="dialog_inputserialnum.cpp" line="433"/>
<source>set sn succeed</source>
<translation>设置序列号成功</translation>
</message>
@ -1386,7 +1386,7 @@
</message>
<message>
<location filename="form_maininterface.cpp" line="270"/>
<location filename="form_maininterface.cpp" line="616"/>
<location filename="form_maininterface.cpp" line="629"/>
<source>Not sleeping</source>
<translation>不休眠</translation>
</message>
@ -1413,21 +1413,21 @@
<translation type="vanished">设备序列号: %1, 测试项: %2, 测试结果: 通过!</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="783"/>
<location filename="form_maininterface.cpp" line="854"/>
<location filename="form_maininterface.cpp" line="796"/>
<location filename="form_maininterface.cpp" line="867"/>
<source>device history scan count:</source>
<translation>设备历史扫描张数：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="675"/>
<location filename="form_maininterface.cpp" line="679"/>
<location filename="form_maininterface.cpp" line="683"/>
<location filename="form_maininterface.cpp" line="687"/>
<location filename="form_maininterface.cpp" line="688"/>
<location filename="form_maininterface.cpp" line="692"/>
<location filename="form_maininterface.cpp" line="696"/>
<location filename="form_maininterface.cpp" line="700"/>
<source>Prompt</source>
<translation>提示</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="287"/>
<location filename="form_maininterface.cpp" line="295"/>
<source>please verify the size of the device&apos;s cpu and disk:</source>
<translation>请验证设备内存和硬盘容量大小：</translation>
</message>
@ -1444,32 +1444,32 @@
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="366"/>
<location filename="form_maininterface.cpp" line="379"/>
<source>Tester: %1, Test item: %2, Test result: Failed! Reason: %3</source>
<translation>测试员: %1, 测试项: %2, 测试结果: 不通过! 原因: %3</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="391"/>
<location filename="form_maininterface.cpp" line="404"/>
<source>Tester: %1, Test item: %2, Test result: Pass!</source>
<translation>测试员: %1, 测试项: %2, 测试结果: 通过!</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="675"/>
<location filename="form_maininterface.cpp" line="688"/>
<source>No paper</source>
<translation>无纸</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="679"/>
<location filename="form_maininterface.cpp" line="692"/>
<source>Device is sleeping</source>
<translation>设备处于休眠模式</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="683"/>
<location filename="form_maininterface.cpp" line="696"/>
<source>Counting mode</source>
<translation>设备处于计数模式</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="687"/>
<location filename="form_maininterface.cpp" line="700"/>
<source>Other error</source>
<translation>其他错误</translation>
</message>
@ -1478,39 +1478,54 @@
<translation type="vanished">设备序列号：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="434"/>
<location filename="form_maininterface.cpp" line="447"/>
<source>ID</source>
<translation>序号</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="434"/>
<location filename="form_maininterface.cpp" line="447"/>
<source>Test items</source>
<translation>测试项</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="434"/>
<location filename="form_maininterface.cpp" line="447"/>
<source>status</source>
<translation>测试状态</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="510"/>
<location filename="form_maininterface.cpp" line="523"/>
<source>not test</source>
<translation>未测试</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="356"/>
<location filename="form_maininterface.cpp" line="510"/>
<location filename="form_maininterface.cpp" line="369"/>
<location filename="form_maininterface.cpp" line="523"/>
<source>not pass</source>
<translation>不通过</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="510"/>
<location filename="form_maininterface.cpp" line="299"/>
<source>Actual cpu size:%1</source>
<translation>实际内存容量：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="305"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="305"/>
<source>Device hard drive or memory detected to be too small!</source>
<translation>检测到设备硬盘或内存过小！</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="523"/>
<source>not support</source>
<translation>不支持</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="386"/>
<location filename="form_maininterface.cpp" line="510"/>
<location filename="form_maininterface.cpp" line="399"/>
<location filename="form_maininterface.cpp" line="523"/>
<source>pass</source>
<translation>通过</translation>
</message>
@ -1536,14 +1551,14 @@
<translation type="vanished">Pid：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="777"/>
<location filename="form_maininterface.cpp" line="848"/>
<location filename="form_maininterface.cpp" line="790"/>
<location filename="form_maininterface.cpp" line="861"/>
<source>device roller count:</source>
<translation>设备滚轴张数：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="203"/>
<location filename="form_maininterface.cpp" line="576"/>
<location filename="form_maininterface.cpp" line="589"/>
<source>image pixel: </source>
<translation>标准圆:宽 * 高: </translation>
</message>
@ -1568,27 +1583,28 @@
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="288"/>
<source>Target cpu size:%1</source>
<translation>目标内存大小：%1</translation>
<location filename="form_maininterface.cpp" line="296"/>
<source>Target cpu size:&gt;%1</source>
<oldsource>Target cpu size:%1</oldsource>
<translation>目标内存大小：&gt;%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="289"/>
<source>Target disk size:%1</source>
<translation>目标硬盘容量：%1</translation>
<location filename="form_maininterface.cpp" line="297"/>
<source>Target disk size:&gt;%1</source>
<oldsource>Target disk size:%1</oldsource>
<translation>目标硬盘容量：&gt;%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="291"/>
<source>Actual pu size:%1</source>
<translation>实际内存大小：%1</translation>
<translation type="vanished">实际内存大小：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="292"/>
<location filename="form_maininterface.cpp" line="300"/>
<source>Actual disk size:%1</source>
<translation>实际硬盘容量：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="618"/>
<location filename="form_maininterface.cpp" line="631"/>
<source> minute</source>
<translation> 分钟</translation>
</message>
@ -1709,38 +1725,38 @@
<translation type="vanished">数据库错误</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="323"/>
<location filename="mainwindow.cpp" line="551"/>
<location filename="mainwindow.cpp" line="591"/>
<location filename="mainwindow.cpp" line="603"/>
<location filename="mainwindow.cpp" line="680"/>
<location filename="mainwindow.cpp" line="326"/>
<location filename="mainwindow.cpp" line="568"/>
<location filename="mainwindow.cpp" line="608"/>
<location filename="mainwindow.cpp" line="620"/>
<location filename="mainwindow.cpp" line="697"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="59"/>
<location filename="mainwindow.cpp" line="60"/>
<source>production tool-burn station</source>
<translation>华高生产工具-烧录工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="103"/>
<location filename="mainwindow.cpp" line="104"/>
<source>production tool-init test station</source>
<translation>华高生产工具-初检工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="105"/>
<location filename="mainwindow.cpp" line="106"/>
<source>production tool-image test station</source>
<translation>华高生产工具-图像测试工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="107"/>
<location filename="mainwindow.cpp" line="108"/>
<source>production tool-pressure test station</source>
<translation>华高生产工具-压力测试工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="323"/>
<location filename="mainwindow.cpp" line="591"/>
<location filename="mainwindow.cpp" line="603"/>
<location filename="mainwindow.cpp" line="326"/>
<location filename="mainwindow.cpp" line="608"/>
<location filename="mainwindow.cpp" line="620"/>
<source>Is testing, do not close!</source>
<translation>测试中，请勿关闭！</translation>
</message>
@ -1762,8 +1778,8 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="551"/>
<location filename="mainwindow.cpp" line="680"/>
<location filename="mainwindow.cpp" line="568"/>
<location filename="mainwindow.cpp" line="697"/>
<source>cannot create more table</source>
<translation>不能创建更多项目</translation>
</message>

4
app/HGProductionTool/analysisjson.cpp
View File

@ -57,8 +57,8 @@ AnalysisJson::json_global AnalysisJson::GetGlobal()
obj["speed-mode"].toInt(),
obj["sleep-time"].toInt(),
obj["device-model"].toString(),
obj["cpu-size"].toString(),
obj["disk-size"].toString()};
obj["cpu-size"].toInt(),
obj["disk-size"].toInt()};
}

4
app/HGProductionTool/analysisjson.h
View File

@ -26,8 +26,8 @@ public:
std::int32_t speed_mode;
std::int32_t sleep_time;
QString device_model;
QString cpu_size;
QString disk_size;
std::int32_t cpu_size;
std::int32_t disk_size;
};
AnalysisJson() = delete ;

29
app/HGProductionTool/form_maininterface.cpp
View File

@ -59,7 +59,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
connect(this, SIGNAL(testCorrectInfo(QString)), this, SLOT(on_testCorrectInfo(QString)), Qt::QueuedConnection);
connect(this, SIGNAL(testGetDevCfgInfo(int,int,int,int,QString,QString,QString)), this, SLOT(on_testGetDevCfgInfo(int,int,int,int,QString,QString,QString)), Qt::QueuedConnection);
connect(this, SIGNAL(testOpenCacheFile(QString)), this, SLOT(on_testOpenCacheFile(QString)), Qt::QueuedConnection);
connect(this, SIGNAL(testGetDevCpuDisk(QString,QString)), this, SLOT(on_testGetDevCpuDisk(QString,QString)), Qt::QueuedConnection);
connect(this, SIGNAL(testGetDevCpuDisk(int,int)), this, SLOT(on_testGetDevCpuDisk(int,int)), Qt::QueuedConnection);
if (m_handle)
{
@ -277,20 +277,33 @@ void Form_mainInterface::on_testGetDevCfgInfo(int vid, int pid, int sleepTime, i
m_textTips->setViewContent(str);
}
void Form_mainInterface::on_testGetDevCpuDisk(QString cpu, QString disk)
void Form_mainInterface::on_testGetDevCpuDisk(int cpu, int disk)
{
AnalysisJson analysisJson(m_profileName);
AnalysisJson::json_global jsonGlobal = analysisJson.GetGlobal();
QString cpu_size = jsonGlobal.cpu_size;
QString disk_size = jsonGlobal.disk_size;
int cpu_size = jsonGlobal.cpu_size;
int disk_size = jsonGlobal.disk_size;
float devCpuSize = (float)cpu / 1024 / 1024;
char buf[10] = { 0 };
sprintf(buf, "%.2f", devCpuSize);
float devDiskSize = (float)disk / 1024 / 1024;
char buf2[10] = { 0 };
sprintf(buf2, "%.2f", devDiskSize);
QString str = (tr("please verify the size of the device's cpu and disk:") + "\n\n\t");
str.append(tr("Target cpu size:%1").arg(cpu_size) + "\n\t");
str.append(tr("Target disk size:%1").arg(disk_size) + "\n\n\t");
str.append(tr("Target cpu size:>%1").arg(QString::number(cpu_size)) + "GB\n\t");
str.append(tr("Target disk size:>%1").arg(QString::number(disk_size)) + "GB\n\n\t");
str.append(tr("Actual pu size:%1").arg(cpu) + "\n\t");
str.append(tr("Actual disk size:%1").arg(disk) + "\n\t");
str.append(tr("Actual cpu size:%1").arg(buf) + "GB\n\t");
str.append(tr("Actual disk size:%1").arg(buf2) + "GB\n\t");
m_textTips->setViewContent(str);
if (cpu_size * 1024 * 1024 > cpu || disk_size * 1024 * 1024 > disk)
{
QMessageBox::warning(this, tr("Warning"), tr("Device hard drive or memory detected to be too small!"));
}
}
void Form_mainInterface::on_testOpenCacheFile(QString name)

4
app/HGProductionTool/form_maininterface.h
View File

@ -41,7 +41,7 @@ signals:
void testDistortion(SANE_DISTORTION_VAL data);
void testCorrectInfo(QString info);
void testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn, QString devFw, QString devModel);
void testGetDevCpuDisk(QString cpu, QString disk);
void testGetDevCpuDisk(int cpu, int disk);
void testOpenCacheFile(QString name);
private slots:
@ -50,7 +50,7 @@ private slots:
void on_testDistortion(SANE_DISTORTION_VAL data);
void on_testCorrectInfo(QString info);
void on_testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn, QString devFw, QString devModel);
void on_testGetDevCpuDisk(QString cpu, QString disk);
void on_testGetDevCpuDisk(int cpu, int disk);
void on_testOpenCacheFile(QString name);
void on_viewerDblClick();

8
app/HGProductionTool/hgscanner.cpp
View File

@ -17,8 +17,8 @@ hgscanner::hgscanner(Form_mainInterface *form, Form_BurnMode *burnMode, Dialog_I
, m_devSn("")
, m_devFw("")
, m_devModel("")
, m_cpu("")
, m_disk("")
, m_cpu(0)
, m_disk(0)
{
cb_ = nullptr;
}
@ -75,11 +75,11 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
if(ev == TEST_EVEB_GET_DEVICE_DEVS_CPU)
{
m_cpu = QString::fromStdWString((const wchar_t*)data);
m_cpu = *(int*)data;
}
else if (ev == TEST_EVEB_GET_DEVICE_DEVS_DISK)
{
m_disk = QString::fromStdWString((const wchar_t*)data);
m_disk = *(int*)data;
}
if (ev == TEST_EVENT_TIPS)

4
app/HGProductionTool/hgscanner.h
View File

@ -47,7 +47,7 @@ private:
QString m_devSn;
QString m_devFw;
QString m_devModel;
QString m_cpu;
QString m_disk;
int m_cpu;
int m_disk;
};

29
app/HGProductionTool/mainwindow.cpp
View File

@ -280,22 +280,27 @@ bool MainWindow::RemoveInterface(Form_mainInterface * mainInterface)
delete mainInterface;
mainInterface = nullptr;
m_testingRef = 0;
updateActionStatus(true);
//HGBase_LeaveLock(m_lock);
updateSplitter();
return true;
}
void MainWindow::updateActionStatus(bool enable)
{
ui->act_refreshDevice->setEnabled(enable);
ui->act_close->setEnabled(enable);
ui->act_manage->setEnabled(enable);
ui->act_logOut->setEnabled(enable);
ui->act_changePwd->setEnabled(enable);
ui->act_export->setEnabled(enable);
ui->act_upload->setEnabled(enable);
}
void MainWindow::addTestingRef()
{
++m_testingRef;
ui->act_refreshDevice->setEnabled(false);
ui->act_close->setEnabled(false);
ui->act_manage->setEnabled(false);
ui->act_logOut->setEnabled(false);
ui->act_changePwd->setEnabled(false);
ui->act_export->setEnabled(false);
ui->act_upload->setEnabled(false);
updateActionStatus(false);
}
void MainWindow::releaseTesting()
@ -304,13 +309,7 @@ void MainWindow::releaseTesting()
if (0 == m_testingRef)
{
ui->act_refreshDevice->setEnabled(true);
ui->act_close->setEnabled(true);
ui->act_manage->setEnabled(true);
ui->act_logOut->setEnabled(true);
ui->act_changePwd->setEnabled(true);
ui->act_export->setEnabled(true);
ui->act_upload->setEnabled(true);
updateActionStatus(true);
}
}

1
app/HGProductionTool/mainwindow.h
View File

@ -32,6 +32,7 @@ public:
Form_mainInterface* FindInterface(SANE_Handle handle);
bool AddInterface(Form_mainInterface * mainInterface);
bool RemoveInterface(Form_mainInterface *mainInterface);
void updateActionStatus(bool enable);
void addTestingRef();
void releaseTesting();
bool isTesting();

57
code/base/test_base.cpp
View File

@ -47,7 +47,8 @@ static struct Test_Map
{HGPDTTOOLDB_NAME_DORMANCY ,HGPDTTOOLDB_TITLE_DORMANCY},
{HGPDTTOOLDB_NAME_GET_DEVICE_CONFIG ,HGPDTTOOLDB_TITLE_GET_DEVICE_CONFIG},
{HGPDTTOOLDB_NAME_GET_DEVICE_CPU_DISK ,HGPDTTOOLDB_TITLE_GET_DEVICE_CPU_DISK},
{HGPDTTOOLDB_NAME_BACKUP ,HGPDTTOOLDB_TITLE_BACKUP}
{HGPDTTOOLDB_NAME_BACKUP ,HGPDTTOOLDB_TITLE_BACKUP},
{HGPDTTOOLDB_NAME_SHUTDOWN ,HGPDTTOOLDB_TITLE_SHUTDOWN}
};
static std::string StringToUtf(std::string strValue)
@ -593,6 +594,7 @@ public:
test_map_[HGPDTTOOLDB_NAME_GET_DEVICE_CONFIG] = &test::test_get_device_config;
test_map_[HGPDTTOOLDB_NAME_GET_DEVICE_CPU_DISK] = &test::test_get_device_cpu_disk;
test_map_[HGPDTTOOLDB_NAME_BACKUP] = &test::test_backup;
test_map_[HGPDTTOOLDB_NAME_SHUTDOWN] = &test::test_shutdown;
}
int set_test(const wchar_t* name,const wchar_t* oper)
{
@ -1481,42 +1483,32 @@ public:
/*获取设备内存和硬盘容量大小*/
int test_get_device_cpu_disk(void* data)
{
std::string cpu;
int cpu = 0;
unsigned len = 0;
std::wstring wstr;
size_t size = 0;
int ret = helper_->io_control(IO_CTRL_CODE_GET_DEVS_CPU, &cpu[0], &len);
ret = str_to_wchar(cpu.c_str(), (wchar_t*)wstr.c_str(), &size);
if (ret == ERROR_INSUFFICIENT_BUFFER)
{
wstr.resize(size);
ret = str_to_wchar(cpu.c_str(), (wchar_t*)wstr.c_str(), &size);
}
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVEB_GET_DEVICE_DEVS_CPU, (void*)wstr.c_str(), true);
int ret = helper_->io_control(IO_CTRL_CODE_GET_DEVS_CPU, &cpu, &len);
std::string disk;
if (0 != cpu)
{
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVEB_GET_DEVICE_DEVS_CPU, (void*)&cpu, true);
}
int disk = 0;
unsigned len2 = 0;
std::wstring wstr2;
size_t size2 = 0;
ret = helper_->io_control(IO_CTRL_CODE_GET_DEVS_DISK, &disk[0], &len2);
ret = str_to_wchar(disk.c_str(), (wchar_t*)wstr2.c_str(), &size2);
if (ret == ERROR_INSUFFICIENT_BUFFER)
{
wstr2.resize(size2);
ret = str_to_wchar(disk.c_str(), (wchar_t*)wstr2.c_str(), &size2);
}
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVEB_GET_DEVICE_DEVS_CPU, (void*)wstr2.c_str(), true);
ret = helper_->io_control(IO_CTRL_CODE_GET_DEVS_DISK, &disk, &len2);
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVEB_GET_DEVICE_DEVS_CPU, wstr.empty() ? (void*)L"获取失败，设备不支持" : (void*)wstr.c_str(), wstr.empty() ? false : true);
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVEB_GET_DEVICE_DEVS_DISK, wstr2.empty() ? (void*)L"获取失败，设备不支持" : (void*)wstr2.c_str(), wstr2.empty() ? false : true);
if (wstr.empty() || wstr2.empty())
if (0 != disk)
{
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT, (void*)(L"获取失败"), false);
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVEB_GET_DEVICE_DEVS_DISK, (void*)&disk, true);
}
if (0 == cpu || 0 == disk)
{
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT, nullptr, false);
return -1;
}
else
{
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT, (void*)(L"获取完成"), true);
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT, nullptr, true);
return -1;
}
@ -1539,7 +1531,14 @@ public:
}
return ret;
}
/* 关机 */
int test_shutdown(void *data)
{
int val = 0;
unsigned int len = 0;
int ret = helper_->io_control(IO_CTRL_CODE_SET_DEVS_SHUTDOWN, &val, &len);
return ret;
}
/*设置设备型号*/
int test_set_devs_model(void* data)
{

4
code/base/test_base.h
View File

@ -94,6 +94,8 @@
#define HGPDTTOOLDB_TITLE_GET_DEVICE_CPU_DISK L"获取设备内存和硬盘容量大小"
/*备份设备配置*/
#define HGPDTTOOLDB_TITLE_BACKUP L"备份设备配置"
/*关机*/
#define HGPDTTOOLDB_TITLE_SHUTDOWN L"关机"
//////////////////////////////////////NAME//////////////////////////////////////
#define WRITE_CFG_NAME L"write-cfg"
/* 设置json序列号 */
@ -194,6 +196,8 @@
#define HGPDTTOOLDB_NAME_GET_DEVICE_CPU_DISK L"GET_DEVICE_CPU_DISK"
/*备份设备配置*/
#define HGPDTTOOLDB_NAME_BACKUP L"BACKUP"
/*关机*/
#define HGPDTTOOLDB_NAME_SHUTDOWN L"SHUTDOWN"
#define TEST_DLL
#ifdef TEST_DLL