Compare commits
2 Commits
790b5aedaf
...
098bc172a4
Author | SHA1 | Date |
---|---|---|
yangjiaxuan | 098bc172a4 | |
yangjiaxuan | f07b166326 |
|
@ -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,33 +2,39 @@
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include "base/HGDef.h"
|
#include "base/HGDef.h"
|
||||||
#include <QTranslator>
|
#include <QTranslator>
|
||||||
#include <QFile>
|
|
||||||
|
|
||||||
#if !defined (HG_CMP_MSC)
|
#if !defined (HG_CMP_MSC)
|
||||||
|
#include <stdio.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/file.h>
|
#include <sys/file.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "log/log.h"
|
#include "log/log.h"
|
||||||
HLOG g_hLog = nullptr;
|
HLOG g_hLog = nullptr;
|
||||||
|
|
||||||
#if defined(OEM_HANWANG)
|
#if defined(OEM_HANWANG)
|
||||||
const char* oem = "HanvonScan";
|
const char* oem = "HanvonScan";
|
||||||
#elif defined(OEM_LISICHENG)
|
#elif defined(OEM_LISICHENG)
|
||||||
const char* oem = "LanxumScan";
|
const char* oem = "LanxumScan";
|
||||||
#elif defined(OEM_CANGTIAN)
|
#elif defined(OEM_CANGTIAN)
|
||||||
const char* oem = "CumtennScan";
|
const char* oem = "CumtennScan";
|
||||||
#elif defined(OEM_ZHONGJING)
|
#elif defined(OEM_ZHONGJING)
|
||||||
const char* oem = "MicrotekScan";
|
const char* oem = "MicrotekScan";
|
||||||
#elif defined(OEM_ZIGUANG)
|
#elif defined(OEM_ZIGUANG)
|
||||||
const char* oem = "UniScan";
|
const char* oem = "UniScan";
|
||||||
#elif defined(OEM_NEUTRAL)
|
#elif defined(OEM_NEUTRAL)
|
||||||
const char* oem = "NeuScan";
|
const char* oem = "NeuScan";
|
||||||
#elif defined(OEM_DELI)
|
#elif defined(OEM_DELI)
|
||||||
const char* oem = "DeliScan";
|
const char* oem = "DeliScan";
|
||||||
|
#elif defined(OEM_MEISONGDA)
|
||||||
|
const char *oem = "MaxsoundScan";
|
||||||
|
#elif defined(OEM_GUANGDIANTONG)
|
||||||
|
const char *oem = "ToecScan";
|
||||||
#else
|
#else
|
||||||
const char* oem = "HuaGoScan";
|
const char* oem = "HuaGoScan";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
|
@ -46,22 +52,18 @@ int main(int argc, char *argv[])
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
const QString lockFilePath = "/tmp/HGScanTool.lock";
|
const char* lockFilePath = "/tmp/HGScanTool.lock";
|
||||||
QFile lockFile(lockFilePath);
|
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;
|
struct flock lock;
|
||||||
lock.l_type = F_WRLCK;
|
lock.l_type = F_RDLCK;
|
||||||
lock.l_whence = SEEK_SET;
|
lock.l_whence = SEEK_SET;
|
||||||
lock.l_start = 0;
|
lock.l_start = 0;
|
||||||
lock.l_len = 0;
|
lock.l_len = 0;
|
||||||
if (fcntl(fd, F_SETLK, &lock) == -1)
|
if (fcntl(fd, F_SETLK, &lock) == -1)
|
||||||
{
|
{
|
||||||
lockFile.close();
|
close(fd);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -85,7 +87,8 @@ int main(int argc, char *argv[])
|
||||||
#else
|
#else
|
||||||
lock.l_type = F_UNLCK;
|
lock.l_type = F_UNLCK;
|
||||||
fcntl(fd, F_SETLK, &lock);
|
fcntl(fd, F_SETLK, &lock);
|
||||||
lockFile.close();
|
close(fd);
|
||||||
|
unlink(lockFilePath);
|
||||||
#endif
|
#endif
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue