编译时去掉UOS和KYLIN宏,改为在代码中动态获取
This commit is contained in:
parent
faaa5c570f
commit
4320833af3
|
@ -3172,43 +3172,47 @@ void MainWindow::on_act_help_triggered()
|
|||
QString filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf";
|
||||
#endif
|
||||
#else
|
||||
#if defined (UOS)
|
||||
#if defined(OEM_HANWANG)
|
||||
QString filename = "/opt/apps/com.hanvonchina.hanvonscan/entries/help/HanvonScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
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
|
||||
#elif defined(KYLIN)
|
||||
#if defined(OEM_HANWANG)
|
||||
QString filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
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
|
||||
#else
|
||||
#if defined(OEM_HANWANG)
|
||||
QString filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
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
|
||||
#endif
|
||||
QString filename;
|
||||
|
||||
std::string osName;
|
||||
FILE *file = popen("cat /etc/issue | cut -d\' \' -f1", "r");
|
||||
if (NULL != file)
|
||||
{
|
||||
char data[1024] = {0};
|
||||
if (NULL != fgets(data, 1024, file))
|
||||
osName = data;
|
||||
pclose(file);
|
||||
}
|
||||
|
||||
printf("osName=%s\n", osName.c_str());
|
||||
if (osName.find("UnionTech") != std::string::npos)
|
||||
{
|
||||
#if defined(OEM_HANWANG)
|
||||
filename = "/opt/apps/com.hanvonchina.hanvonscan/entries/help/HanvonScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
filename = "/opt/apps/com.lanxumchina.lanxumscan/entries/help/LanxumScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
filename = "/opt/apps/com.cumtennchina.cumtennscan/entries/help/CumtennScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
filename = "/opt/apps/com.microtekchina.microtekscan/entries/help/MicrotekScan_App_Help_manual.pdf";
|
||||
#else
|
||||
filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf";
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#if defined(OEM_HANWANG)
|
||||
filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
filename = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_App_Help_manual.pdf";
|
||||
#else
|
||||
filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf";
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
QFileInfo info(filename);
|
||||
|
|
|
@ -81,44 +81,58 @@ bool AppIsRun(const std::string& appName)
|
|||
return ret;
|
||||
|
||||
#else
|
||||
|
||||
std::string cmd;
|
||||
std::string appPath;
|
||||
#if defined (UOS)
|
||||
#if defined(OEM_HANWANG)
|
||||
|
||||
std::string osName;
|
||||
FILE *file = popen("cat /etc/issue | cut -d\' \' -f1", "r");
|
||||
if (NULL != file)
|
||||
{
|
||||
char data[1024] = {0};
|
||||
if (NULL != fgets(data, 1024, file))
|
||||
osName = data;
|
||||
pclose(file);
|
||||
}
|
||||
|
||||
printf("osName=%s\n", osName.c_str());
|
||||
if (osName.find("UnionTech") != std::string::npos)
|
||||
{
|
||||
#if defined(OEM_HANWANG)
|
||||
cmd = "ps -wef | grep HanvonScan";
|
||||
appPath = "/opt/apps/com.hanvonchina.hanvonscan/files/bin/HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
#elif defined(OEM_LISICHENG)
|
||||
cmd = "ps -wef | grep LanxumScan";
|
||||
appPath = "/opt/apps/com.lanxumchina.lanxumscan/files/bin/LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
cmd = "ps -wef | grep CumtennScan";
|
||||
appPath = "/opt/apps/com.cumtennchina.cumtennscan/files/bin/CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
cmd = "ps -wef | grep MicrotekScan";
|
||||
appPath = "/opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan";
|
||||
#else
|
||||
#else
|
||||
cmd = "ps -wef | grep HuaGoScan";
|
||||
appPath = "/opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan";
|
||||
#endif
|
||||
#else
|
||||
#if defined(OEM_HANWANG)
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#if defined(OEM_HANWANG)
|
||||
cmd = "ps -wef | grep HanvonScan";
|
||||
appPath = "/opt/apps/scanner-driver-hanvon/bin/HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
#elif defined(OEM_LISICHENG)
|
||||
cmd = "ps -wef | grep LanxumScan";
|
||||
appPath = "/opt/apps/scanner-driver-lanxum/bin/LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
cmd = "ps -wef | grep CumtennScan";
|
||||
appPath = "/opt/apps/scanner-driver-cumtenn/bin/CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
cmd = "ps -wef | grep MicrotekScan";
|
||||
appPath = "/opt/apps/scanner-driver-microtek/bin/MicrotekScan";
|
||||
#else
|
||||
#else
|
||||
cmd = "ps -wef | grep HuaGoScan";
|
||||
appPath = "/opt/apps/scanner-driver-huagao/bin/HuaGoScan";
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
bool ret = false;
|
||||
FILE *fp = popen(cmd.c_str(), "r");
|
||||
|
@ -185,33 +199,47 @@ void RunApp(const std::string& appName)
|
|||
}
|
||||
|
||||
#else
|
||||
|
||||
std::string appPath;
|
||||
#if defined (UOS)
|
||||
#if defined(OEM_HANWANG)
|
||||
|
||||
std::string osName;
|
||||
FILE *file = popen("cat /etc/issue | cut -d\' \' -f1", "r");
|
||||
if (NULL != file)
|
||||
{
|
||||
char data[1024] = {0};
|
||||
if (NULL != fgets(data, 1024, file))
|
||||
osName = data;
|
||||
pclose(file);
|
||||
}
|
||||
|
||||
printf("osName=%s\n", osName.c_str());
|
||||
if (osName.find("UnionTech") != std::string::npos)
|
||||
{
|
||||
#if defined(OEM_HANWANG)
|
||||
appPath = "sh /opt/apps/com.hanvonchina.hanvonscan/files/bin/HanvonScan.sh &";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
#elif defined(OEM_LISICHENG)
|
||||
appPath = "sh /opt/apps/com.lanxumchina.lanxumscan/files/bin/LanxumScan.sh &";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
appPath = "sh /opt/apps/com.cumtennchina.cumtennscan/files/bin/CumtennScan.sh &";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
appPath = "sh /opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan.sh &";
|
||||
#else
|
||||
#else
|
||||
appPath = "sh /opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan.sh &";
|
||||
#endif
|
||||
#else
|
||||
#if defined(OEM_HANWANG)
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#if defined(OEM_HANWANG)
|
||||
appPath = "sh /opt/apps/scanner-driver-hanvon/bin/HanvonScan.sh &";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
#elif defined(OEM_LISICHENG)
|
||||
appPath = "sh /opt/apps/scanner-driver-lanxum/bin/LanxumScan.sh &";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
appPath = "sh /opt/apps/scanner-driver-cumtenn/bin/CumtennScan.sh &";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
appPath = "sh /opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh &";
|
||||
#else
|
||||
#else
|
||||
appPath = "sh /opt/apps/scanner-driver-huagao/bin/HuaGoScan.sh &";
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
system(appPath.c_str());
|
||||
|
||||
|
|
|
@ -145,7 +145,7 @@ unix {
|
|||
|
||||
contains(DISTRIBUTION, UnionTech){
|
||||
message('UOS')
|
||||
DEFINES += UOS
|
||||
|
||||
contains(ARCH, x86_64){
|
||||
LIBS += -L../../../../release/uos/x86_64
|
||||
CONFIG(release, debug|release) {
|
||||
|
@ -184,7 +184,7 @@ unix {
|
|||
}
|
||||
} else {
|
||||
message('KYLIN')
|
||||
DEFINES += KYLIN
|
||||
|
||||
contains(ARCH, x86_64){
|
||||
LIBS += -L../../../../release/kylin/x86_64
|
||||
CONFIG(release, debug|release) {
|
||||
|
|
|
@ -140,7 +140,6 @@ unix {
|
|||
|
||||
contains(DISTRIBUTION, UnionTech){
|
||||
message('UOS')
|
||||
DEFINES += UOS
|
||||
|
||||
contains(ARCH, x86_64){
|
||||
DEFINES += x86_64
|
||||
|
@ -184,7 +183,6 @@ unix {
|
|||
}
|
||||
} else {
|
||||
message('KYLIN')
|
||||
DEFINES += KYLIN
|
||||
|
||||
contains(ARCH, x86_64){
|
||||
DEFINES += x86_64
|
||||
|
|
|
@ -114,7 +114,6 @@ unix {
|
|||
|
||||
contains(DISTRIBUTION, UnionTech){
|
||||
message('UOS')
|
||||
DEFINES += UOS
|
||||
|
||||
contains(ARCH, x86_64){
|
||||
LIBS += -L../../../../release/uos/x86_64
|
||||
|
@ -154,7 +153,6 @@ unix {
|
|||
}
|
||||
} else {
|
||||
message('KYLIN')
|
||||
DEFINES += KYLIN
|
||||
|
||||
contains(ARCH, x86_64){
|
||||
LIBS += -L../../../../release/kylin/x86_64
|
||||
|
|
Loading…
Reference in New Issue