编译时去掉UOS和KYLIN宏，改为在代码中动态获取

app/scanner/Scanner_zh_CN.ts

@@ -1004,7 +1004,7 @@ Page range will be &apos;Chosen Pages&apos;.</source>
     <message>
         <location filename="dialog_imageinfo.ui" line="14"/>
         <source>Image information</source>
-        <translation>图片信息</translation>
+        <translation>图像信息</translation>
     </message>
     <message>
         <location filename="dialog_imageinfo.cpp" line="21"/>
@@ -1358,7 +1358,7 @@ Continue to clear?</source>
     <message>
         <location filename="dialog_multirotate.ui" line="26"/>
         <source>Multiple rotation</source>
-        <translation>批量旋转</translation>
+        <translation>多页旋转</translation>
     </message>
     <message>
         <location filename="dialog_multirotate.ui" line="34"/>
@@ -1433,12 +1433,12 @@ This operation will NOT rotate the files that may contain multiple pages, such a
     <message>
         <location filename="dialog_multirotateimagefile.ui" line="14"/>
         <source>Dialog</source>
-        <translation>批量旋转进度</translation>
+        <translation>多页旋转进度</translation>
     </message>
     <message>
         <location filename="dialog_multirotateimagefile.ui" line="55"/>
         <source>stop</source>
-        <translation>停止批量旋转</translation>
+        <translation>停止多页旋转</translation>
     </message>
     <message>
         <location filename="dialog_multirotateimagefile.cpp" line="139"/>
@@ -1448,7 +1448,7 @@ This operation will NOT rotate the files that may contain multiple pages, such a
     <message>
         <location filename="dialog_multirotateimagefile.cpp" line="139"/>
         <source>multirotate operation failed: </source>
-        <translation>多流旋转操作失败： </translation>
+        <translation>多页旋转操作失败： </translation>
     </message>
     <message>
         <location filename="dialog_multirotateimagefile.cpp" line="140"/>
@@ -1465,7 +1465,7 @@ This operation will NOT rotate the files that may contain multiple pages, such a
     <message>
         <location filename="dialog_openimageindex.ui" line="14"/>
         <source>Open Page</source>
-        <translation>跳转至...</translation>
+        <translation>跳转至</translation>
     </message>
     <message>
         <location filename="dialog_openimageindex.ui" line="22"/>

app/scanner/mainwindow.cpp

@@ -662,7 +662,7 @@ void MainWindow::on_AcquireInto2()
                 m_dialogLog->updateStatus(false, false);
                 m_dialogLog->show();
 
-                if ("439" == getDevPid() || "9220" == getDevPid())
+                if ("439" == getDevPid() || "9220" == getDevPid() || "8529" == getDevPid() || "7039" == getDevPid())
                 {
                     m_dialogLog->addLog(tr("Please wake up the device manually"), true);
                     m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true);
@@ -1452,7 +1452,7 @@ void MainWindow::on_continueScan()
             m_dialogLog->updateStatus(false, false);
             m_dialogLog->show();
 
-            if ("439" == getDevPid() || "9220" == getDevPid())
+            if ("439" == getDevPid() || "9220" == getDevPid() || "8529" == getDevPid() || "7039" == getDevPid())
             {
                 m_dialogLog->addLog(tr("Please wake up the device manually"), true);
                 m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true);
@@ -3172,43 +3172,47 @@ void MainWindow::on_act_help_triggered()
         QString filename = QApplication::applicationDirPath() +  "/HuaGoScan_App_Help_manual.pdf";
     #endif
 #else
-    #if defined (UOS)
+    QString filename;
-        #if defined(OEM_HANWANG)
+
-            QString filename = "/opt/apps/com.hanvonchina.hanvonscan/entries/help/HanvonScan_App_Help_manual.pdf";
+    std::string osName;
-        #elif defined(OEM_LISICHENG)
+    FILE *file = popen("cat /etc/issue | cut -d\' \' -f1", "r");
-            QString filename = "/opt/apps/com.lanxumchina.lanxumscan/entries/help/LanxumScan_App_Help_manual.pdf";
+    if (NULL != file)
-        #elif defined(OEM_CANGTIAN)
+    {
-            QString filename = "/opt/apps/com.cumtennchina.cumtennscan/entries/help/CumtennScan_App_Help_manual.pdf";
+        char data[1024] = {0};
-        #elif defined(OEM_ZHONGJING)
+        if (NULL != fgets(data, 1024, file))
-            QString filename = "/opt/apps/com.microtekchina.microtekscan/entries/help/MicrotekScan_App_Help_manual.pdf";
+            osName = data;
-        #else
+        pclose(file);
-            QString filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf";
+    }
-        #endif
+
-    #elif defined(KYLIN)
+    printf("osName=%s\n", osName.c_str());
-        #if defined(OEM_HANWANG)
+    if (osName.find("UnionTech") != std::string::npos)
-            QString filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf";
+    {
-        #elif defined(OEM_LISICHENG)
+#if defined(OEM_HANWANG)
-            QString filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf";
+        filename = "/opt/apps/com.hanvonchina.hanvonscan/entries/help/HanvonScan_App_Help_manual.pdf";
-        #elif defined(OEM_CANGTIAN)
+#elif defined(OEM_LISICHENG)
-            QString filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf";
+        filename = "/opt/apps/com.lanxumchina.lanxumscan/entries/help/LanxumScan_App_Help_manual.pdf";
-        #elif defined(OEM_ZHONGJING)
+#elif defined(OEM_CANGTIAN)
-            QString filename = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_App_Help_manual.pdf";
+        filename = "/opt/apps/com.cumtennchina.cumtennscan/entries/help/CumtennScan_App_Help_manual.pdf";
-        #else
+#elif defined(OEM_ZHONGJING)
-            QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf";
+        filename = "/opt/apps/com.microtekchina.microtekscan/entries/help/MicrotekScan_App_Help_manual.pdf";
-        #endif
+#else
-    #else
+        filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf";
-        #if defined(OEM_HANWANG)
+#endif
-            QString filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf";
+    }
-        #elif defined(OEM_LISICHENG)
+    else
-            QString filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf";
+    {
-        #elif defined(OEM_CANGTIAN)
+#if defined(OEM_HANWANG)
-            QString filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf";
+        filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf";
-        #elif defined(OEM_ZHONGJING)
+#elif defined(OEM_LISICHENG)
-            QString filename = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_App_Help_manual.pdf";
+        filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf";
-        #else
+#elif defined(OEM_CANGTIAN)
-            QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf";
+        filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf";
-        #endif
+#elif defined(OEM_ZHONGJING)
-     #endif
+        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);
@@ -3400,7 +3404,7 @@ void MainWindow::on_act_acquire_triggered()
             m_dialogLog->updateStatus(false, false);
             m_dialogLog->show();
 
-            if ("439" == getDevPid() || "9220" == getDevPid())
+            if ("439" == getDevPid() || "9220" == getDevPid() || "8529" == getDevPid() || "7039" == getDevPid())//The 439 device can only be wakened manually when sleeping.
             {
                 m_dialogLog->addLog(tr("Please wake up the device manually"), true);
                 m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true);
@@ -3478,7 +3482,7 @@ void MainWindow::on_act_acquireSingle_triggered()
             m_dialogLog->updateStatus(false, false);
             m_dialogLog->show();
 
-            if ("439" == getDevPid() || "9220" == getDevPid())
+            if ("439" == getDevPid() || "9220" == getDevPid() || "8529" == getDevPid() || "7039" == getDevPid())
             {
                 m_dialogLog->addLog(tr("Please wake up the device manually"), true);
                 m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true);
@@ -3572,7 +3576,7 @@ void MainWindow::on_act_acquireInto_triggered()
                 m_dialogLog->updateStatus(false, false);
                 m_dialogLog->show();
 
-                if ("439" == getDevPid() || "9220" == getDevPid())
+                if ("439" == getDevPid() || "9220" == getDevPid() || "8529" == getDevPid() || "7039" == getDevPid())
                 {
                     m_dialogLog->addLog(tr("Please wake up the device manually"), true);
                     m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true);
@@ -3665,7 +3669,7 @@ void MainWindow::on_act_insertFromScanner_triggered()
                 m_dialogLog->updateStatus(false, false);
                 m_dialogLog->show();
 
-                if ("439" == getDevPid() || "9220" == getDevPid())
+                if ("439" == getDevPid() || "9220" == getDevPid() || "8529" == getDevPid() || "7039" == getDevPid())
                 {
                     m_dialogLog->addLog(tr("Please wake up the device manually"), true);
                     m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true);

app/scanner/ocrPdf.cpp

@@ -2,7 +2,6 @@
 #include "base/HGBase.h"
 #ifdef HG_CMP_MSC
 #include <Windows.h>
-#include <atlstr.h>
 #endif
 #include <string>
 #include "base/HGUtility.h"

app/upgrade/HGUpgrade.cpp

@@ -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
+#endif
-    #else
+        }
-        #if defined(OEM_HANWANG)
+        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
+#endif
-    #else
+        }
-        #if defined(OEM_HANWANG)
+        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());
 

build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro

@@ -99,7 +99,6 @@ win32 {
                         QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
                 }
                 CONFIG(debug, debug|release) {
-
                 }
         }
         contains(QT_ARCH, x86_64){
@@ -109,7 +108,6 @@ win32 {
                         QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
                 }
                 CONFIG(debug, debug|release) {
-
                 }
         }
 }
@@ -147,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) {
@@ -186,7 +184,7 @@ unix {
                 }
         } else {
                 message('KYLIN')
-                DEFINES += KYLIN
+
                 contains(ARCH, x86_64){
                         LIBS += -L../../../../release/kylin/x86_64
                         CONFIG(release, debug|release) {

build-qt/HGSolution/HGScanner/HGScanner.pro

@@ -43,51 +43,52 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai
 
 win32 {
         DEFINES += _CRT_SECURE_NO_WARNINGS
+        LIBS += -ladvapi32
 
         if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
             contains(DEFINES, OEM_HANWANG) {
                 LIBS += -lHWBase -lHWImgFmt -lHWImgProc
                 contains(QT_ARCH, i386) {
-                        LIBS += -L../../../../sdk/lib/win/x86/OEM/hanvon -lsane
+                        LIBS += -L../../../../sdk/lib/win/x86/OEM/hanvon -lsane -llang
                 }
                 contains(QT_ARCH, x86_64){
-                        LIBS += -L../../../../sdk/lib/win/x64/OEM/hanvon -lsane
+                        LIBS += -L../../../../sdk/lib/win/x64/OEM/hanvon -lsane -llang
                 }
             }
             contains(DEFINES, OEM_LISICHENG) {
                 LIBS += -lLSCBase -lLSCImgFmt -lLSCImgProc
                 contains(QT_ARCH, i386) {
-                        LIBS += -L../../../../sdk/lib/win/x86/OEM/lanxum -lsane
+                        LIBS += -L../../../../sdk/lib/win/x86/OEM/lanxum -lsane -llang
                 }
                 contains(QT_ARCH, x86_64){
-                        LIBS += -L../../../../sdk/lib/win/x64/OEM/lanxum -lsane
+                        LIBS += -L../../../../sdk/lib/win/x64/OEM/lanxum -lsane -llang
                 }
             }
             contains(DEFINES, OEM_CANGTIAN) {
                 LIBS += -lCTSBase -lCTSImgFmt -lCTSImgProc
                 contains(QT_ARCH, i386) {
-                        LIBS += -L../../../../sdk/lib/win/x86/OEM/cumtenn -lsane
+                        LIBS += -L../../../../sdk/lib/win/x86/OEM/cumtenn -lsane -llang
                 }
                 contains(QT_ARCH, x86_64){
-                        LIBS += -L../../../../sdk/lib/win/x64/OEM/cumtenn -lsane
+                        LIBS += -L../../../../sdk/lib/win/x64/OEM/cumtenn -lsane -llang
                 }
             }
             contains(DEFINES, OEM_ZHONGJING) {
                 LIBS += -lZJBase -lZJImgFmt -lZJImgProc
                 contains(QT_ARCH, i386) {
-                        LIBS += -L../../../../sdk/lib/win/x86/OEM/microtek -lsane
+                        LIBS += -L../../../../sdk/lib/win/x86/OEM/microtek -lsane -llang
                 }
                 contains(QT_ARCH, x86_64){
-                        LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek -lsane
+                        LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek -lsane -llang
                 }
             }
         } else {
             LIBS += -lHGBase -lHGImgFmt -lHGImgProc
             contains(QT_ARCH, i386) {
-                    LIBS += -L../../../../sdk/lib/win/x86/OEM/huagao -lsane
+                    LIBS += -L../../../../sdk/lib/win/x86/OEM/huagao -lsane -llang
             }
             contains(QT_ARCH, x86_64){
-                    LIBS += -L../../../../sdk/lib/win/x64/OEM/huagao -lsane
+                    LIBS += -L../../../../sdk/lib/win/x64/OEM/huagao -lsane -llang
             }
         }
 
@@ -98,7 +99,6 @@ win32 {
                         QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
                 }
                 CONFIG(debug, debug|release) {
-
                 }
         }
         contains(QT_ARCH, x86_64){
@@ -108,7 +108,6 @@ win32 {
                         QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
                 }
                 CONFIG(debug, debug|release) {
-
                 }
         }
 }
@@ -141,7 +140,6 @@ unix {
 
         contains(DISTRIBUTION, UnionTech){
                 message('UOS')
-                DEFINES += UOS
 
                 contains(ARCH, x86_64){
                         DEFINES += x86_64
@@ -185,7 +183,6 @@ unix {
                 }
         } else {
                 message('KYLIN')
-                DEFINES += KYLIN
 
                 contains(ARCH, x86_64){
                         DEFINES += x86_64

build-qt/HGSolution/HGUpgrade/HGUpgrade.pro

@@ -47,7 +47,6 @@ win32 {
                         DESTDIR = ../../../../release/win/x86/Release/
                 }
                 CONFIG(debug, debug|release) {
-
                 }
         }
         contains(QT_ARCH, x86_64){
@@ -57,7 +56,6 @@ win32 {
                         DESTDIR = ../../../../release/win/x64/Release/
                 }
                 CONFIG(debug, debug|release) {
-
                 }
         }
 
@@ -116,7 +114,6 @@ unix {
 
         contains(DISTRIBUTION, UnionTech){
                 message('UOS')
-                DEFINES += UOS
 
                 contains(ARCH, x86_64){
                         LIBS += -L../../../../release/uos/x86_64
@@ -156,7 +153,6 @@ unix {
                 }
         } else {
                 message('KYLIN')
-                DEFINES += KYLIN
 
                 contains(ARCH, x86_64){
                         LIBS += -L../../../../release/kylin/x86_64