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

添加各个版本的运行upgradeApp目录

This commit is contained in:
yangjiaxuan 2022-07-20 19:14:01 +08:00
parent 64b074e5c0
commit 5a2ee5b634
3 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/scanner/VersionDll.cpp
View File

@ -31,8 +31,25 @@ HGResult VersionDll::Load()
{
return HGBASE_ERR_FAIL;
}
#if defined(HG_CMP_MSC)
#if defined(OEM_HANWANG)
HGBase_CreateDll("HwVersion.dll", &m_dll);
#elif defined(OEM_LISICHENG)
HGBase_CreateDll("LscVersion.dll", &m_dll);
#else
HGBase_CreateDll("HGVersion.dll", &m_dll);
#endif
#else
#if defined(OEM_HANWANG)
HGBase_CreateDll("libHwVersion.so", &m_dll);
#elif defined(OEM_LISICHENG)
HGBase_CreateDll("libLscVersion.dll", &m_dll);
#else
HGBase_CreateDll("libHGVersion.dll", &m_dll);
#endif
#endif
HGBase_CreateDll("HGVersion.dll", &m_dll);
if (NULL == m_dll)
{
return HGBASE_ERR_FAIL;

26
app/scanner/dialog_updateprogress.cpp
View File

@ -64,15 +64,19 @@ void Dialog_updateProgress::ThreadFunc(HGThread thread, HGPointer param)
#if defined(HG_CMP_MSC)
#if defined(OEM_HANWANG)
file.copy("HWUpgradeApp.exe", tmpPath);
file.copy("HwUpgradeApp.exe", tmpPath);
file.copy("HwBase.dll", tmpPath);
file.copy("HwVersion.dll", tmpPath);
#elif defined(OEM_LISICHENG)
file.copy("LSCUpgradeApp.exe", tmpPath);
file.copy("LscUpgradeApp.exe", tmpPath);
file.copy("LscBase.dll", tmpPath);
file.copy("LscVersion.dll", tmpPath);
#else
file.copy("HGUpgradeApp.exe", tmpPath);
#endif
file.copy("HGBase.dll", tmpPath);
file.copy("HGVersion.dll", tmpPath);
#endif
file.copy("msvcp140.dll", tmpPath);
file.copy("Qt5Core.dll", tmpPath);
file.copy("Qt5Gui.dll", tmpPath);
@ -80,14 +84,18 @@ void Dialog_updateProgress::ThreadFunc(HGThread thread, HGPointer param)
file.copy("vcruntime140.dll", tmpPath);
#else
#if defined(OEM_HANWANG)
file.copy("HWUpgradeApp", tmpPath);
file.copy("HwUpgradeApp", tmpPath);
file.copy("libHwBase.so", tmpPath);
file.copy("libHwVersion.so", tmpPath);
#elif defined(OEM_LISICHENG)
file.copy("LSCUpgradeApp", tmpPath);
#else
file.copy("HGUpgradeApp", tmpPath);
#endif
file.copy("LscUpgradeApp", tmpPath);
file.copy("libLscBase.so", tmpPath);
file.copy("libLscVersion.so", tmpPath);
#else
file.copy("HGUpgradeApp", tmpPath);
file.copy("libHGBase.so", tmpPath);
file.copy("libHGVersion.so", tmpPath);
#endif
#endif
emit p->finish();

19
app/scanner/mainwindow.cpp
View File

@ -1102,7 +1102,24 @@ void MainWindow::on_upgradeApp(QString pkgPath)
argList.push_back(QString("-appName=%1").arg(HGVERSION_APPNAME_SCANNER));
argList.push_back(QString("-pkgpath=%1").arg(pkgPath.toStdString().c_str()));
argList.push_back(QString("-type=%1").arg("upgrade"));
proc.startDetached("HGUpgrade.exe", argList);
#if defined(HG_CMP_MSC)
#if defined(OEM_HANWANG)
proc.startDetached("HwUpgradeApp.exe", argList);
#elif defined(OEM_LISICHENG)
proc.startDetached("LscUpgradeApp.exe", argList);
#else
proc.startDetached("HGUpgradeApp.exe", argList);
#endif
#else
#if defined(OEM_HANWANG)
proc.startDetached("HwUpgradeApp", argList);
#elif defined(OEM_LISICHENG)
proc.startDetached("LscUpgradeApp", argList);
#else
proc.startDetached("HGUpgradeApp", argList);
#endif
#endif
m_closeTip = false;
close();