From 64b074e5c0147c575ffbcc323c043cbac88b443c Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Wed, 20 Jul 2022 18:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=AF=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0exe=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=A1=E6=81=AF=E8=8F=9C=E5=8D=95=E6=A0=8F?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner/dialog_updateprogress.cpp | 17 +++++++++++++++--
 app/scanner/mainwindow.ui             |  3 ++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/scanner/dialog_updateprogress.cpp b/app/scanner/dialog_updateprogress.cpp
index c807c31d..b52740eb 100644
--- a/app/scanner/dialog_updateprogress.cpp
+++ b/app/scanner/dialog_updateprogress.cpp
@@ -63,7 +63,14 @@ void Dialog_updateProgress::ThreadFunc(HGThread thread, HGPointer param)
         QFile file(curPath);
 
 #if defined(HG_CMP_MSC)
-        file.copy("HGUpgrade.exe", tmpPath);
+    #if defined(OEM_HANWANG)
+        file.copy("HWUpgradeApp.exe", tmpPath);
+    #elif defined(OEM_LISICHENG)
+        file.copy("LSCUpgradeApp.exe", tmpPath);
+    #else
+        file.copy("HGUpgradeApp.exe", tmpPath);
+    #endif
+
         file.copy("HGBase.dll", tmpPath);
         file.copy("HGVersion.dll", tmpPath);
         file.copy("msvcp140.dll", tmpPath);
@@ -72,7 +79,13 @@ void Dialog_updateProgress::ThreadFunc(HGThread thread, HGPointer param)
         file.copy("Qt5Widgets.dll", tmpPath);
         file.copy("vcruntime140.dll", tmpPath);
 #else
-        file.copy("HGUpgrade", tmpPath);
+    #if defined(OEM_HANWANG)
+        file.copy("HWUpgradeApp", tmpPath);
+    #elif defined(OEM_LISICHENG)
+        file.copy("LSCUpgradeApp", tmpPath);
+#else
+    file.copy("HGUpgradeApp", tmpPath);
+#endif
         file.copy("libHGBase.so", tmpPath);
         file.copy("libHGVersion.so", tmpPath);
 #endif
diff --git a/app/scanner/mainwindow.ui b/app/scanner/mainwindow.ui
index 35afc847..ac1e7488 100644
--- a/app/scanner/mainwindow.ui
+++ b/app/scanner/mainwindow.ui
@@ -154,9 +154,10 @@
     </property>
     <addaction name="act_help"/>
     <addaction name="separator"/>
+    <addaction name="act_feedback"/>
+    <addaction name="separator"/>
     <addaction name="actionact_update"/>
     <addaction name="act_about"/>
-    <addaction name="act_feedback"/>
    </widget>
    <widget class="device_menu" name="menu_device">
     <property name="title">