lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整app上层紫光命名

This commit is contained in:
yangjiaxuan 2023-03-10 18:31:39 +08:00
parent 8958ebf9bb
commit eeaaae2356
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scanner/dialog_feedback.cpp
View File

@ -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

2
app/scanner/dialog_upgrade.cpp
View File

@ -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

8
app/scanner/mainwindow.cpp
View File

@ -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

8
app/upgrade/HGUpgrade.cpp
View File

@ -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

2
app/upgrade/main.cpp
View File

@ -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

4
build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro
View File

@ -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 {

4
build-qt/HGSolution/HGScanner/HGScanner.pro
View File

@ -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 {