From f07b166326e3eedde87157297f668006d3da70f2 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Mon, 26 Aug 2024 16:45:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=94=AE=E6=89=AB=E6=8F=8F=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=94=AF=E6=8C=81=E4=B8=AD=E6=99=B6G700=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=85=B6=E4=BB=96oem?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=B7=A5=E5=85=B7=E7=BC=96=E4=B8=8D=E8=BF=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/fwupgrade/main.cpp      | 17 +++++++++--------
 app/scantool/mainwindow.cpp |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/fwupgrade/main.cpp b/app/fwupgrade/main.cpp
index f9a3c1a7..963c9ccd 100644
--- a/app/fwupgrade/main.cpp
+++ b/app/fwupgrade/main.cpp
@@ -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)
diff --git a/app/scantool/mainwindow.cpp b/app/scantool/mainwindow.cpp
index a18190d5..3cf7905f 100644
--- a/app/scantool/mainwindow.cpp
+++ b/app/scantool/mainwindow.cpp
@@ -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);
 }