From eeaaae235635b6c339c4f3de9531ab7b3f610872 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Fri, 10 Mar 2023 18:31:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4app=E4=B8=8A=E5=B1=82?= =?UTF-8?q?=E7=B4=AB=E5=85=89=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/dialog_feedback.cpp | 2 +- app/scanner/dialog_upgrade.cpp | 2 +- app/scanner/mainwindow.cpp | 8 ++++---- app/upgrade/HGUpgrade.cpp | 8 ++++---- app/upgrade/main.cpp | 2 +- build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro | 4 ++-- build-qt/HGSolution/HGScanner/HGScanner.pro | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/scanner/dialog_feedback.cpp b/app/scanner/dialog_feedback.cpp index c8a7d8e6..04293682 100644 --- a/app/scanner/dialog_feedback.cpp +++ b/app/scanner/dialog_feedback.cpp @@ -34,7 +34,7 @@ void Dialog_Feedback::on_pbtn_submit_clicked() #elif defined(OEM_ZHONGJING) oemName = HGVERSION_OEMNAME_MICROTEK; #elif defined(OEM_ZIGUANG) - oemName = HGVERSION_OEMNAME_UNISCAN; + oemName = HGVERSION_OEMNAME_UNIS; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner/dialog_upgrade.cpp b/app/scanner/dialog_upgrade.cpp index 2068f52a..11e4eae5 100644 --- a/app/scanner/dialog_upgrade.cpp +++ b/app/scanner/dialog_upgrade.cpp @@ -28,7 +28,7 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers #elif defined(OEM_ZHONGJING) oemName = HGVERSION_OEMNAME_MICROTEK; #elif defined(OEM_ZIGUANG) - oemName = HGVERSION_OEMNAME_UNISCAN; + oemName = HGVERSION_OEMNAME_UNIS; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index dec66097..18db460b 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -115,7 +115,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) #elif defined(OEM_ZIGUANG) this->setWindowIcon(QIcon(":images/image_rsc/logo/uniscan.ico")); this->setWindowTitle(tr("UniScan")); - m_oemName = HGVERSION_OEMNAME_UNISCAN; + m_oemName = HGVERSION_OEMNAME_UNIS; #else this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowTitle(tr("HuaGoScan")); @@ -351,7 +351,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) QString password = getCfgValue("login", "password", QString("")); if (password.isEmpty()) #if defined(OEM_HANWANG) - m_password = "hanvonscan"; + m_password = "hanvon"; #elif defined(OEM_LISICHENG) m_password = "lanxum"; #elif defined(OEM_CANGTIAN) @@ -3204,7 +3204,7 @@ void MainWindow::on_act_help_triggered() #elif defined(OEM_ZHONGJING) filename = "/opt/apps/com.microtekchina.microtekscan/entries/help/MicrotekScan_App_Help_manual.pdf"; #elif defined(OEM_ZIGUANG) - filename = "/opt/apps/com.uniscanchina.uniscan/entries/help/UniScan_App_Help_manual.pdf"; + filename = "/opt/apps/com.unischina.uniscan/entries/help/UniScan_App_Help_manual.pdf"; #else filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3220,7 +3220,7 @@ void MainWindow::on_act_help_triggered() #elif defined(OEM_ZHONGJING) filename = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_App_Help_manual.pdf"; #elif defined(OEM_ZIGUANG) - filename = "/opt/apps/scanner-driver-uniscan/doc/UniScan_App_Help_manual.pdf"; + filename = "/opt/apps/scanner-driver-unis/doc/UnisScan_App_Help_manual.pdf"; #else filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf"; #endif diff --git a/app/upgrade/HGUpgrade.cpp b/app/upgrade/HGUpgrade.cpp index 12d8ae04..c8cf5ac7 100644 --- a/app/upgrade/HGUpgrade.cpp +++ b/app/upgrade/HGUpgrade.cpp @@ -113,7 +113,7 @@ bool AppIsRun(const std::string& appName) appPath = "/opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan"; #elif defined(OEM_ZIGUANG) cmd = "ps -wef | grep UniScan"; - appPath = "/opt/apps/com.uniscanchina.uniscan/files/bin/UniScan"; + appPath = "/opt/apps/com.unischina.uniscan/files/bin/UniScan"; #else cmd = "ps -wef | grep HuaGoScan"; appPath = "/opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan"; @@ -135,7 +135,7 @@ bool AppIsRun(const std::string& appName) appPath = "/opt/apps/scanner-driver-microtek/bin/MicrotekScan"; #elif defined(OEM_ZIGUANG) cmd = "ps -wef | grep UniScan"; - appPath = "/opt/apps/scanner-driver-uniscan/bin/UniScan"; + appPath = "/opt/apps/scanner-driver-unis/bin/UniScan"; #else cmd = "ps -wef | grep HuaGoScan"; appPath = "/opt/apps/scanner-driver-huagao/bin/HuaGoScan"; @@ -233,7 +233,7 @@ void RunApp(const std::string& appName) #elif defined(OEM_ZHONGJING) appPath = "sh /opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan.sh &"; #elif defined(OEM_ZIGUANG) - appPath = "sh /opt/apps/com.uniscanchina.uniscan/files/bin/UniScan.sh &"; + appPath = "sh /opt/apps/com.unischina.uniscan/files/bin/UniScan.sh &"; #else appPath = "sh /opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan.sh &"; #endif @@ -249,7 +249,7 @@ void RunApp(const std::string& appName) #elif defined(OEM_ZHONGJING) appPath = "sh /opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh &"; #elif defined(OEM_ZIGUANG) - appPath = "sh /opt/apps/scanner-driver-uniscan/bin/UniScan.sh &"; + appPath = "sh /opt/apps/scanner-driver-unis/bin/UniScan.sh &"; #else appPath = "sh /opt/apps/scanner-driver-huagao/bin/HuaGoScan.sh &"; #endif diff --git a/app/upgrade/main.cpp b/app/upgrade/main.cpp index e3d2f0ad..fb10fa48 100644 --- a/app/upgrade/main.cpp +++ b/app/upgrade/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) #elif defined(OEM_ZHONGJING) oemName = HGVERSION_OEMNAME_MICROTEK; #elif defined(OEM_ZIGUANG) - oemName = HGVERSION_OEMNAME_UNISCAN; + oemName = HGVERSION_OEMNAME_UNIS; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro index b244f3f0..f4e53574 100644 --- a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro +++ b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro @@ -88,10 +88,10 @@ win32 { LIBS += -lZGBase -lZGVersion TARGET = ZGFWUpgradeApp contains(QT_ARCH, i386) { - LIBS += -L../../../../sdk/lib/win/x86/OEM/uniscan -lsane + LIBS += -L../../../../sdk/lib/win/x86/OEM/unis -lsane } contains(QT_ARCH, x86_64){ - LIBS += -L../../../../sdk/lib/win/x64/OEM/uniscan -lsane + LIBS += -L../../../../sdk/lib/win/x64/OEM/unis -lsane } } } else { diff --git a/build-qt/HGSolution/HGScanner/HGScanner.pro b/build-qt/HGSolution/HGScanner/HGScanner.pro index 9f6c7fae..2c57691b 100644 --- a/build-qt/HGSolution/HGScanner/HGScanner.pro +++ b/build-qt/HGSolution/HGScanner/HGScanner.pro @@ -89,10 +89,10 @@ win32 { contains(DEFINES, OEM_ZIGUANG) { LIBS += -lZGBase -lZGImgFmt -lZGImgProc contains(QT_ARCH, i386) { - LIBS += -L../../../../sdk/lib/win/x86/OEM/uniscan -lsane -llang + LIBS += -L../../../../sdk/lib/win/x86/OEM/unis -lsane -llang } contains(QT_ARCH, x86_64){ - LIBS += -L../../../../sdk/lib/win/x64/OEM/uniscan -lsane -llang + LIBS += -L../../../../sdk/lib/win/x64/OEM/unis -lsane -llang } } } else {