From 098bc172a4f12cc37cfdc63480bd4cd575b86c2e Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Tue, 27 Aug 2024 14:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BD=E4=BA=A7=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=8C=89=E9=94=AE=E6=89=AB=E6=8F=8F=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=AE=8C=E6=88=90=E5=90=8E=E4=B8=8B=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E6=89=93=E5=BC=80=E8=BD=AF=E4=BB=B6=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scantool/main.cpp | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/scantool/main.cpp b/app/scantool/main.cpp
index 6b6449be..f5020744 100644
--- a/app/scantool/main.cpp
+++ b/app/scantool/main.cpp
@@ -2,33 +2,39 @@
 #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"
 HLOG g_hLog = nullptr;
 
 #if defined(OEM_HANWANG)
-const char* oem = "HanvonScan";
+    const char* oem = "HanvonScan";
 #elif defined(OEM_LISICHENG)
-const char* oem = "LanxumScan";
+    const char* oem = "LanxumScan";
 #elif defined(OEM_CANGTIAN)
-const char* oem = "CumtennScan";
+    const char* oem = "CumtennScan";
 #elif defined(OEM_ZHONGJING)
-const char* oem = "MicrotekScan";
+    const char* oem = "MicrotekScan";
 #elif defined(OEM_ZIGUANG)
-const char* oem = "UniScan";
+    const char* oem = "UniScan";
 #elif defined(OEM_NEUTRAL)
-const char* oem = "NeuScan";
+    const char* oem = "NeuScan";
 #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
-const char* oem = "HuaGoScan";
+    const char* oem = "HuaGoScan";
 #endif
 
 int main(int argc, char *argv[])
@@ -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;
 }