From 4f4a522f1b9a93569a87a0ed69145acbbb2431b2 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Sun, 29 Jan 2023 17:02:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8Fapp=E5=92=8C=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=BD=AF=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=99=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../image_rsc/logo/Microtek_logo.ico | Bin 0 -> 67646 bytes app/scanner/VersionDll.cpp | 10 ++++-- app/scanner/dialog_aquireinto.cpp | 2 ++ app/scanner/dialog_feedback.cpp | 2 ++ app/scanner/dialog_upgrade.cpp | 2 ++ app/scanner/image_rsc/logo/Microtek_logo.ico | Bin 0 -> 67646 bytes app/scanner/mainwindow.cpp | 34 +++++++++++++++++- app/upgrade/HGUpgrade.cpp | 14 ++++++++ app/upgrade/image_rsc/logo/Microtek_logo.ico | Bin 0 -> 67646 bytes app/upgrade/main.cpp | 2 ++ .../HGSolution/HGFWUpgrade/HGFWUpgrade.pro | 17 ++++----- build-qt/HGSolution/HGScanner/HGScanner.pro | 8 ++--- 12 files changed, 75 insertions(+), 16 deletions(-) create mode 100644 app/fwupgrade/image_rsc/logo/Microtek_logo.ico create mode 100644 app/scanner/image_rsc/logo/Microtek_logo.ico create mode 100644 app/upgrade/image_rsc/logo/Microtek_logo.ico diff --git a/app/fwupgrade/image_rsc/logo/Microtek_logo.ico b/app/fwupgrade/image_rsc/logo/Microtek_logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..46c1adf8565151e2771c211f64a40ec869494376 GIT binary patch literal 67646 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 zV=XW!&m%I~cZko;9|!l%7;ClineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("LXScan"))); #elif defined(OEM_CANGTIAN) ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("CTSScan"))); +#elif defined(OEM_ZHONGJING) + ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("ZJScan"))); #else ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan"))); #endif diff --git a/app/scanner/dialog_feedback.cpp b/app/scanner/dialog_feedback.cpp index 6052ff07..bcf5cc31 100644 --- a/app/scanner/dialog_feedback.cpp +++ b/app/scanner/dialog_feedback.cpp @@ -31,6 +31,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked() oemName = HGVERSION_OEMNAME_LANXUM; #elif defined(OEM_CANGTIAN) oemName = HGVERSION_OEMNAME_CUMTENN; +#elif defined(OEM_ZHONGJING) + oemName = HGVERSION_OEMNAME_MICROTEK; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner/dialog_upgrade.cpp b/app/scanner/dialog_upgrade.cpp index 0cd182b3..16e695d2 100644 --- a/app/scanner/dialog_upgrade.cpp +++ b/app/scanner/dialog_upgrade.cpp @@ -25,6 +25,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers oemName = HGVERSION_OEMNAME_LANXUM; #elif defined(OEM_CANGTIAN) oemName = HGVERSION_OEMNAME_CUMTENN; +#elif defined(OEM_ZHONGJING) + oemName = HGVERSION_OEMNAME_MICROTEK; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner/image_rsc/logo/Microtek_logo.ico b/app/scanner/image_rsc/logo/Microtek_logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..46c1adf8565151e2771c211f64a40ec869494376 GIT binary patch literal 67646 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":images/image_rsc/logo/Cumtenn_logo.ico")); this->setWindowTitle(tr("CumtennScan")); m_oemName = HGVERSION_OEMNAME_CUMTENN; +#elif defined(OEM_ZHONGJING) + this->setWindowIcon(QIcon(":images/image_rsc/logo/Microtek_logo.ico")); + this->setWindowTitle(tr("MicrotekScan")); + m_oemName = HGVERSION_OEMNAME_MICROTEK; #else this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowTitle(tr("HuaGoScan")); @@ -334,8 +338,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) m_password = "hanvonscan"; #elif defined(OEM_LISICHENG) m_password = "lanxum"; -#elif defined(OEM_CANGTIAN) + #elif defined(OEM_CANGTIAN) m_password = "cumtenn"; + #elif defined(OEM_ZHONGJING) + m_password = "microtek"; #else m_password = "huagoscan"; #endif @@ -3000,6 +3006,8 @@ void MainWindow::on_act_help_triggered() QString filename = QApplication::applicationDirPath() + "/LanxumScan_App_Help_manual.pdf"; #elif defined(OEM_CANGTIAN) QString filename = QApplication::applicationDirPath() + "/CumtennScan_App_Help_manual.pdf"; + #elif defined(OEM_ZHONGJING) + QString filename = QApplication::applicationDirPath() + "/MicrotekScan_App_Help_manual.pdf"; #else QString filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3011,6 +3019,8 @@ void MainWindow::on_act_help_triggered() QString filename = "/opt/apps/com.lanxumchina.lanxumscan/entries/help/LanxumScan_App_Help_manual.pdf"; #elif defined(OEM_CANGTIAN) QString filename = "/opt/apps/com.cumtennchina.cumtennscan/entries/help/CumtennScan_App_Help_manual.pdf"; + #elif defined(OEM_ZHONGJING) + QString filename = "/opt/apps/com.microtekchina.microtekscan/entries/help/MicrotekScan_App_Help_manual.pdf"; #else QString filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3021,6 +3031,8 @@ void MainWindow::on_act_help_triggered() QString filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf"; #elif defined(OEM_CANGTIAN) QString filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf"; + #elif defined(OEM_ZHONGJING) + QString filename = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_App_Help_manual.pdf"; #else QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3031,6 +3043,8 @@ void MainWindow::on_act_help_triggered() QString filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf"; #elif defined(OEM_CANGTIAN) QString filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf"; + #elif defined(OEM_ZHONGJING) + QString filename = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_App_Help_manual.pdf"; #else QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3638,6 +3652,13 @@ void MainWindow::upgradeApp(QString pkgPath) QFile::copy(curPath + "CtsBase.dll", tmpPath + "CtsBase.dll"); QFile::remove(tmpPath + "CtsVersion.dll"); QFile::copy(curPath + "CtsVersion.dll", tmpPath + "CtsVersion.dll"); + #elif defined(OEM_ZHONGJING) + QFile::remove(tmpPath + "ZJUpgradeApp.exe"); + QFile::copy(curPath + "ZJUpgradeApp.exe", tmpPath + "ZJUpgradeApp.exe"); + QFile::remove(tmpPath + "ZJBase.dll"); + QFile::copy(curPath + "ZJBase.dll", tmpPath + "ZJBase.dll"); + QFile::remove(tmpPath + "ZJVersion.dll"); + QFile::copy(curPath + "ZJVersion.dll", tmpPath + "ZJVersion.dll"); #else QFile::remove(tmpPath + "HGUpgradeApp.exe"); QFile::copy(curPath + "HGUpgradeApp.exe", tmpPath + "HGUpgradeApp.exe"); @@ -3690,6 +3711,13 @@ void MainWindow::upgradeApp(QString pkgPath) //QFile::copy(curPath + "libCtsBase.so", tmpPath + "libCtsBase.so"); //QFile::remove(tmpPath + "libCtsVersion.so"); //QFile::copy(curPath + "libCtsVersion.so", tmpPath + "libCtsVersion.so"); + #elif defined(OEM_ZHONGJING) + QFile::remove(tmpPath + "ZjUpgradeApp"); + QFile::copy(curPath + "ZjUpgradeApp", tmpPath + "ZjUpgradeApp"); + //QFile::remove(tmpPath + "libZjBase.so"); + //QFile::copy(curPath + "libZjBase.so", tmpPath + "libZjBase.so"); + //QFile::remove(tmpPath + "libZjVersion.so"); + //QFile::copy(curPath + "libZjVersion.so", tmpPath + "libZjVersion.so"); #else QFile::remove(tmpPath + "HGUpgradeApp"); QFile::copy(curPath + "HGUpgradeApp", tmpPath + "HGUpgradeApp"); @@ -3716,6 +3744,8 @@ void MainWindow::upgradeApp(QString pkgPath) isSuccessdStart = proc.startDetached(tmpPath + "LscUpgradeApp.exe", argList); #elif defined(OEM_CANGTIAN) isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp.exe", argList); + #elif defined(OEM_ZHONGJING) + isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.exe", argList); #else isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp.exe", argList); #endif @@ -3726,6 +3756,8 @@ void MainWindow::upgradeApp(QString pkgPath) isSuccessdStart = proc.startDetached(tmpPath + "LscUpgradeApp", argList); #elif defined(OEM_CANGTIAN) isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp", argList); + #elif defined(OEM_ZHONGJING) + isSuccessdStart = proc.startDetached(tmpPath + "ZjUpgradeApp", argList); #else isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp", argList); #endif diff --git a/app/upgrade/HGUpgrade.cpp b/app/upgrade/HGUpgrade.cpp index 80deef2f..1bc36928 100644 --- a/app/upgrade/HGUpgrade.cpp +++ b/app/upgrade/HGUpgrade.cpp @@ -22,6 +22,8 @@ bool AppIsRun(const std::string& appName) std::wstring regName = L"SOFTWARE\\LanxumScan"; #elif defined(OEM_CANGTIAN) std::wstring regName = L"SOFTWARE\\CumtennScan"; + #elif defined(OEM_ZHONGJING) + std::wstring regName = L"SOFTWARE\\MicrotekScan"; #else std::wstring regName = L"SOFTWARE\\HuaGoScan"; #endif @@ -92,6 +94,9 @@ bool AppIsRun(const std::string& appName) #elif defined(OEM_CANGTIAN) cmd = "ps -wef | grep CumtennScan"; appPath = "/opt/apps/com.cumtennchina.cumtennscan/files/bin/CumtennScan"; + #elif defined(OEM_ZHONGJING) + cmd = "ps -wef | grep MicrotekScan"; + appPath = "/opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan"; #else cmd = "ps -wef | grep HuaGoScan"; appPath = "/opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan"; @@ -106,6 +111,9 @@ bool AppIsRun(const std::string& appName) #elif defined(OEM_CANGTIAN) cmd = "ps -wef | grep CumtennScan"; appPath = "/opt/apps/scanner-driver-cumtenn/bin/CumtennScan"; + #elif defined(OEM_ZHONGJING) + cmd = "ps -wef | grep MicrotekScan"; + appPath = "/opt/apps/scanner-driver-microtek/bin/MicrotekScan"; #else cmd = "ps -wef | grep HuaGoScan"; appPath = "/opt/apps/scanner-driver-huagao/bin/HuaGoScan"; @@ -151,6 +159,8 @@ void RunApp(const std::string& appName) std::wstring regName = L"SOFTWARE\\LanxumScan"; #elif defined(OEM_CANGTIAN) std::wstring regName = L"SOFTWARE\\CumtennScan"; + #elif defined(OEM_ZHONGJING) + std::wstring regName = L"SOFTWARE\\MicrotekScan"; #else std::wstring regName = L"SOFTWARE\\HuaGoScan"; #endif @@ -184,6 +194,8 @@ void RunApp(const std::string& appName) appPath = "sh /opt/apps/com.lanxumchina.lanxumscan/files/bin/LanxumScan.sh &"; #elif defined(OEM_CANGTIAN) appPath = "sh /opt/apps/com.cumtennchina.cumtennscan/files/bin/CumtennScan.sh &"; + #elif defined(OEM_ZHONGJING) + appPath = "sh /opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan.sh &"; #else appPath = "sh /opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan.sh &"; #endif @@ -194,6 +206,8 @@ void RunApp(const std::string& appName) appPath = "sh /opt/apps/scanner-driver-lanxum/bin/LanxumScan.sh &"; #elif defined(OEM_CANGTIAN) appPath = "sh /opt/apps/scanner-driver-cumtenn/bin/CumtennScan.sh &"; + #elif defined(OEM_ZHONGJING) + appPath = "sh /opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh &"; #else appPath = "sh /opt/apps/scanner-driver-huagao/bin/HuaGoScan.sh &"; #endif diff --git a/app/upgrade/image_rsc/logo/Microtek_logo.ico b/app/upgrade/image_rsc/logo/Microtek_logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..46c1adf8565151e2771c211f64a40ec869494376 GIT binary patch literal 67646 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