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:
luoliangyi 2023-01-29 17:02:57 +08:00
parent bcb18408a0
commit 4f4a522f1b
12 changed files with 75 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/fwupgrade/image_rsc/logo/Microtek_logo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

10
app/scanner/VersionDll.cpp
View File

@ -54,11 +54,13 @@ HGResult VersionDll::Load()
#if defined(HG_CMP_MSC)
#if defined(OEM_HANWANG)
strcat(dllPath, "HwVersion.dll");
strcat(dllPath, "HWVersion.dll");
#elif defined(OEM_LISICHENG)
strcat(dllPath, "LscVersion.dll");
strcat(dllPath, "LSCVersion.dll");
#elif defined(OEM_CANGTIAN)
strcat(dllPath, "CtsVersion.dll");
strcat(dllPath, "CTSVersion.dll");
#elif defined(OEM_ZHONGJING)
strcat(dllPath, "ZJVersion.dll");
#else
strcat(dllPath, "HGVersion.dll");
#endif
@ -69,6 +71,8 @@ HGResult VersionDll::Load()
strcpy(dllPath, "libLscVersion.so");
#elif defined(OEM_CANGTIAN)
strcpy(dllPath, "libCtsVersion.so");
#elif defined(OEM_ZHONGJING)
strcpy(dllPath, "libZjVersion.so");
#else
strcpy(dllPath, "libHGVersion.so");
#endif

2
app/scanner/dialog_aquireinto.cpp
View File

@ -39,6 +39,8 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
ui->lineEdit_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

2
app/scanner/dialog_feedback.cpp
View File

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

2
app/scanner/dialog_upgrade.cpp
View File

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

BIN
app/scanner/image_rsc/logo/Microtek_logo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

34
app/scanner/mainwindow.cpp
View File

@ -104,6 +104,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
this->setWindowIcon(QIcon(":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

14
app/upgrade/HGUpgrade.cpp
View File

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

BIN
app/upgrade/image_rsc/logo/Microtek_logo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

2
app/upgrade/main.cpp
View File

@ -46,6 +46,8 @@ int main(int argc, char *argv[])
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

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

@ -57,13 +57,14 @@ unix {
ARCH = $$system(arch)
message($$ARCH)
LIBS += -lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang
QMAKE_LFLAGS += -Wl,-rpath=.
contains(DISTRIBUTION, UnionTech){
message('UOS')
DEFINES += UOS
contains(ARCH, x86_64){
LIBS += -L../../../../release/uos/x86_64 -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/uos/x86_64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/uos/x86_64/
}
@ -72,7 +73,7 @@ unix {
}
}
contains(ARCH, aarch64){
LIBS += -L../../../../release/uos/aarch64 -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/uos/aarch64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/uos/aarch64/
}
@ -81,7 +82,7 @@ unix {
}
}
contains(ARCH, mips64){
LIBS += -L../../../../release/uos/mips64 -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/uos/mips64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/uos/mips64/
}
@ -90,7 +91,7 @@ unix {
}
}
contains(ARCH, loongarch64){
LIBS += -L../../../../release/uos/loongarch64 -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/uos/loongarch64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/uos/loongarch64/
}
@ -102,7 +103,7 @@ unix {
message('KYLIN')
DEFINES += KYLIN
contains(ARCH, x86_64){
LIBS += -L../../../../release/kylin/x86_64 -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/x86_64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/x86_64/
}
@ -111,7 +112,7 @@ unix {
}
}
contains(ARCH, aarch64){
LIBS += -L../../../../release/kylin/aarch64 -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/aarch64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/aarch64/
}
@ -120,7 +121,7 @@ unix {
}
}
contains(ARCH, mips64){
LIBS += -L../../../../release/kylin/mips64 -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/mips64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/mips64/
}
@ -129,7 +130,7 @@ unix {
}
}
contains(ARCH, loongarch64){
LIBS += -L../../../../release/kylin/loongarch64 -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/loongarch64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/loongarch64/
}

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

@ -50,7 +50,7 @@ win32 {
}
unix {
LIBS += -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
LIBS += -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1)
message($$DISTRIBUTION)
@ -117,7 +117,7 @@ unix {
}
contains(ARCH, aarch64){
DEFINES += aarch64
LIBS += -L../../../../release/kylin/aarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/aarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/aarch64/
}
@ -127,7 +127,7 @@ unix {
}
contains(ARCH, mips64){
DEFINES += mips64
LIBS += -L../../../../release/kylin/mips64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/mips64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/mips64/
}
@ -137,7 +137,7 @@ unix {
}
contains(ARCH, loongarch64){
DEFINES += loongarch64
LIBS += -L../../../../release/kylin/loongarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/loongarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/loongarch64/
}