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

按键扫描工具支持中晶G700设备，解决其他oem维护工具编不过的问题

This commit is contained in:
yangjiaxuan 2024-08-26 16:45:32 +08:00
parent 790b5aedaf
commit f07b166326
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/fwupgrade/main.cpp
View File

@ -21,21 +21,22 @@
#include "log/log.h" #include "log/log.h"
HLOG g_hLog = nullptr; HLOG g_hLog = nullptr;
const char *appName = "HuaGoScan";
#if defined(OEM_HANWANG) #if defined(OEM_HANWANG)
appName = "HanvonScan"; const char *appName = "HanvonScan";
#elif defined(OEM_LISICHENG) #elif defined(OEM_LISICHENG)
appName = "LanxumScan"; const char *appName = "LanxumScan";
#elif defined(OEM_CANGTIAN) #elif defined(OEM_CANGTIAN)
appName = "CumtennScan"; const char *appName = "CumtennScan";
#elif defined(OEM_ZHONGJING) #elif defined(OEM_ZHONGJING)
appName = "MicrotekScan"; const char *appName = "MicrotekScan";
#elif defined(OEM_ZIGUANG) #elif defined(OEM_ZIGUANG)
appName = "UniScan"; const char *appName = "UniScan";
#elif defined(OEM_DELI) #elif defined(OEM_DELI)
appName = "DeliScan"; const char *appName = "DeliScan";
#elif defined(OEM_NEUTRAL) #elif defined(OEM_NEUTRAL)
appName = "NeuScan"; const char *appName = "NeuScan";
#else
const char *appName = "HuaGoScan";
#endif #endif
HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen) HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen)

2
app/scantool/mainwindow.cpp
View File

@ -1267,7 +1267,7 @@ void MainWindow::timerEvent(QTimerEvent *e)
void MainWindow::on_deviceArrive(QString devName) void MainWindow::on_deviceArrive(QString devName)
{ {
if (devName.contains("306") || devName.contains("307") || devName.contains("358")) if (devName.contains("306") || devName.contains("307") || devName.contains("358") || devName.contains("9225"))
ui->comboBox->addItem(devName); ui->comboBox->addItem(devName);
} }