Compare commits
2 Commits
790b5aedaf
...
098bc172a4
Author | SHA1 | Date |
---|---|---|
yangjiaxuan | 098bc172a4 | |
yangjiaxuan | f07b166326 |
|
@ -21,21 +21,22 @@
|
|||
#include "log/log.h"
|
||||
HLOG g_hLog = nullptr;
|
||||
|
||||
const char *appName = "HuaGoScan";
|
||||
#if defined(OEM_HANWANG)
|
||||
appName = "HanvonScan";
|
||||
const char *appName = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
appName = "LanxumScan";
|
||||
const char *appName = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
appName = "CumtennScan";
|
||||
const char *appName = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
appName = "MicrotekScan";
|
||||
const char *appName = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
appName = "UniScan";
|
||||
const char *appName = "UniScan";
|
||||
#elif defined(OEM_DELI)
|
||||
appName = "DeliScan";
|
||||
const char *appName = "DeliScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
appName = "NeuScan";
|
||||
const char *appName = "NeuScan";
|
||||
#else
|
||||
const char *appName = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen)
|
||||
|
|
|
@ -2,12 +2,14 @@
|
|||
#include <QApplication>
|
||||
#include "base/HGDef.h"
|
||||
#include <QTranslator>
|
||||
#include <QFile>
|
||||
|
||||
#if !defined (HG_CMP_MSC)
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#include "log/log.h"
|
||||
|
@ -27,6 +29,10 @@ const char* oem = "UniScan";
|
|||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
@ -46,22 +52,18 @@ int main(int argc, char *argv[])
|
|||
return -1;
|
||||
}
|
||||
#else
|
||||
const QString lockFilePath = "/tmp/HGScanTool.lock";
|
||||
QFile lockFile(lockFilePath);
|
||||
const char* lockFilePath = "/tmp/HGScanTool.lock";
|
||||
int fd = open(lockFilePath, O_RDONLY | O_CREAT, 666);
|
||||
chmod(lockFilePath, 666);
|
||||
|
||||
if (!lockFile.open(QIODevice::ReadWrite | QIODevice::Unbuffered))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
int fd = lockFile.handle();
|
||||
struct flock lock;
|
||||
lock.l_type = F_WRLCK;
|
||||
lock.l_type = F_RDLCK;
|
||||
lock.l_whence = SEEK_SET;
|
||||
lock.l_start = 0;
|
||||
lock.l_len = 0;
|
||||
if (fcntl(fd, F_SETLK, &lock) == -1)
|
||||
{
|
||||
lockFile.close();
|
||||
close(fd);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
@ -85,7 +87,8 @@ int main(int argc, char *argv[])
|
|||
#else
|
||||
lock.l_type = F_UNLCK;
|
||||
fcntl(fd, F_SETLK, &lock);
|
||||
lockFile.close();
|
||||
close(fd);
|
||||
unlink(lockFilePath);
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -1267,7 +1267,7 @@ void MainWindow::timerEvent(QTimerEvent *e)
|
|||
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue