调整app上层紫光命名

app/scanner/Scanner_resource.qrc

@@ -103,5 +103,8 @@
         <file>image_rsc/scroll/vScrollSlider_Push.png</file>
         <file>image_rsc/action/btnEdit.png</file>
         <file>image_rsc/logo/Microtek_logo.ico</file>
+        <file>image_rsc/logo/uniscan.ico</file>
+        <file>image_rsc/actions/imageEdit.png</file>
+        <file>image_rsc/actions/scanInto.png</file>
     </qresource>
 </RCC>

app/scanner/VersionDll.cpp

@@ -61,6 +61,8 @@ HGResult VersionDll::Load()
         strcat(dllPath, "CTSVersion.dll");
     #elif defined(OEM_ZHONGJING)
         strcat(dllPath, "ZJVersion.dll");
+    #elif defined(OEM_ZIGUANG)
+        strcat(dllPath, "ZGVersion.dll");
     #else
         strcat(dllPath, "HGVersion.dll");
     #endif
@@ -73,6 +75,8 @@ HGResult VersionDll::Load()
         strcpy(dllPath, "libCtsVersion.so");
     #elif defined(OEM_ZHONGJING)
         strcpy(dllPath, "libZjVersion.so");
+    #elif defined(OEM_ZIGUANG)
+        strcpy(dllPath, "libZgVersion.so");
     #else
         strcpy(dllPath, "libHGVersion.so");
     #endif

app/scanner/dialog_aquireinto.cpp

@@ -43,6 +43,8 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
     ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("CTSScan")));
 #elif defined(OEM_ZHONGJING)
     ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("ZJScan")));
+#elif defined(OEM_ZIGUANG)
+    ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("ZGScan")));
 #else
     ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan")));
 #endif

app/scanner/dialog_feedback.cpp

@@ -33,6 +33,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked()
     oemName = HGVERSION_OEMNAME_CUMTENN;
 #elif defined(OEM_ZHONGJING)
     oemName = HGVERSION_OEMNAME_MICROTEK;
+#elif defined(OEM_ZIGUANG)
+    oemName = HGVERSION_OEMNAME_UNIS;
 #else
     oemName = HGVERSION_OEMNAME_HUAGO;
 #endif

app/scanner/dialog_feedback.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>383</width>
-    <height>214</height>
+    <width>488</width>
+    <height>281</height>
    </rect>
   </property>
   <property name="windowTitle">

app/scanner/dialog_upgrade.cpp

@@ -27,6 +27,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers
     oemName = HGVERSION_OEMNAME_CUMTENN;
 #elif defined(OEM_ZHONGJING)
     oemName = HGVERSION_OEMNAME_MICROTEK;
+#elif defined(OEM_ZIGUANG)
+    oemName = HGVERSION_OEMNAME_UNIS;
 #else
     oemName = HGVERSION_OEMNAME_HUAGO;
 #endif

app/scanner/hg_settingdialog.cpp

@@ -81,7 +81,7 @@ void hg_settingdialog::initUi()
 #endif
 
     setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
-    resize(690, height());
+    resize(730, height());
 }
 
 void hg_settingdialog::updateOpt()
@@ -326,14 +326,14 @@ void hg_settingdialog::createUI()
             if (strcmp(opt->name, SANE_STD_OPT_NAME_CUSTOM_AREA) == 0)
             {
                 QWidget* widget_cbtn_pbtn = new QWidget;
-                widget_cbtn_pbtn->setMaximumWidth(150);
+                widget_cbtn_pbtn->setMaximumWidth(200);
 
                 QLabel  *label = new QLabel;
                 label->setText(QString::fromStdString(opt->title) + QString(" : "));
 
                 btn_cut_area_ = new QPushButton;
                 btn_cut_area_->setText(tr("regional crop"));
-                btn_cut_area_->setFixedWidth(120);
+                btn_cut_area_->setFixedWidth(150);
 
                 QHBoxLayout *hLayout = new QHBoxLayout;
                 hLayout->addWidget(checkBoxCreation);
@@ -349,10 +349,10 @@ void hg_settingdialog::createUI()
             else if (strcmp(opt->name, SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA) == 0)
             {
                 QWidget* widget_cbtn_pbtn = new QWidget(scrollArea);
-                widget_cbtn_pbtn->setMaximumWidth(150);
+                widget_cbtn_pbtn->setMaximumWidth(200);
                 btn_gamma_ = new QPushButton(widget_cbtn_pbtn);
                 btn_gamma_->setText(tr("custom tone curve"));
-                btn_gamma_->setFixedWidth(120);
+                btn_gamma_->setFixedWidth(150);
 
                 QHBoxLayout *hLayout = new QHBoxLayout;
                 hLayout->addWidget(checkBoxCreation);

app/scanner/mainwindow.cpp

@@ -112,6 +112,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
     this->setWindowIcon(QIcon(":images/image_rsc/logo/Microtek_logo.ico"));
     this->setWindowTitle(tr("MicrotekScan"));
     m_oemName = HGVERSION_OEMNAME_MICROTEK;
+#elif defined(OEM_ZIGUANG)
+    this->setWindowIcon(QIcon(":images/image_rsc/logo/uniscan.ico"));
+    this->setWindowTitle(tr("UniScan"));
+    m_oemName = HGVERSION_OEMNAME_UNIS;
 #else
     this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
     this->setWindowTitle(tr("HuaGoScan"));
@@ -151,7 +155,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
 
     ui->toolBar->addAction(ui->act_scannerSettings);
     ui->toolBar->addAction(ui->act_acquire);
-    m_act_acquireInto2 = new QAction(QIcon(":/images/image_rsc/actions/scan.png"), tr("act_acquireInto"), this);
+    m_act_acquireInto2 = new QAction(QIcon(":/images/image_rsc/actions/scanInto.png"), tr("act_acquireInto"), this);
     connect(m_act_acquireInto2, SIGNAL(triggered()), this, SLOT(on_AcquireInto2()));
     ui->toolBar->addAction(m_act_acquireInto2);
     ui->toolBar->addSeparator();
@@ -347,13 +351,15 @@ 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)
         m_password = "cumtenn";
     #elif defined(OEM_ZHONGJING)
         m_password = "microtek";
+    #elif defined(OEM_ZIGUANG)
+        m_password = "uniscan";
     #else
         m_password = "huagoscan";
     #endif
@@ -3168,6 +3174,8 @@ void MainWindow::on_act_help_triggered()
         QString filename = QApplication::applicationDirPath() + "/CumtennScan_App_Help_manual.pdf";
     #elif defined(OEM_ZHONGJING)
         QString filename = QApplication::applicationDirPath() + "/MicrotekScan_App_Help_manual.pdf";
+    #elif defined(OEM_ZIGUANG)
+        QString filename = QApplication::applicationDirPath() + "/UniScan_App_Help_manual.pdf";
     #else
         QString filename = QApplication::applicationDirPath() +  "/HuaGoScan_App_Help_manual.pdf";
     #endif
@@ -3195,6 +3203,8 @@ void MainWindow::on_act_help_triggered()
         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";
+#elif defined(OEM_ZIGUANG)
+        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
@@ -3209,6 +3219,8 @@ void MainWindow::on_act_help_triggered()
         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";
+#elif defined(OEM_ZIGUANG)
+        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
@@ -3905,6 +3917,13 @@ void MainWindow::upgradeApp(QString pkgPath)
 //        QFile::copy(curPath + "ZJBase.dll", tmpPath + "ZJBase.dll");
 //        QFile::remove(tmpPath + "ZJVersion.dll");
 //        QFile::copy(curPath + "ZJVersion.dll", tmpPath + "ZJVersion.dll");
+//        #elif defined(OEM_ZIGUANG)
+//            QFile::remove(tmpPath + "ZGUpgradeApp.exe");
+//            QFile::copy(curPath + "ZGUpgradeApp.exe", tmpPath + "ZGUpgradeApp.exe");
+//            QFile::remove(tmpPath + "ZGBase.dll");
+//            QFile::copy(curPath + "ZGBase.dll", tmpPath + "ZGBase.dll");
+//            QFile::remove(tmpPath + "ZGVersion.dll");
+//            QFile::copy(curPath + "ZGVersion.dll", tmpPath + "ZGVersion.dll");
 //    #else
 
         QFile::remove(tmpPath + "HGUpgradeApp.exe");
@@ -3965,6 +3984,13 @@ void MainWindow::upgradeApp(QString pkgPath)
 //        //QFile::copy(curPath + "libZjBase.so", tmpPath + "libZjBase.so");
 //        //QFile::remove(tmpPath + "libZjVersion.so");
 //        //QFile::copy(curPath + "libZjVersion.so", tmpPath + "libZjVersion.so");
+//        #elif defined(OEM_ZIGUANG)
+//            QFile::remove(tmpPath + "ZgUpgradeApp");
+//            QFile::copy(curPath + "ZgUpgradeApp", tmpPath + "ZgUpgradeApp");
+//            //QFile::remove(tmpPath + "libZgBase.so");
+//            //QFile::copy(curPath + "libZgBase.so", tmpPath + "libZgBase.so");
+//            //QFile::remove(tmpPath + "libZgVersion.so");
+//            //QFile::copy(curPath + "libZgVersion.so", tmpPath + "libZgVersion.so");
 //    #else
         QFile::remove(tmpPath + "HGUpgradeApp");
         QFile::copy(curPath + "HGUpgradeApp", tmpPath + "HGUpgradeApp");
@@ -3993,6 +4019,8 @@ void MainWindow::upgradeApp(QString pkgPath)
 //        isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp.exe", argList);
 //    #elif defined(OEM_ZHONGJING)
 //        isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.exe", argList);
+//        #elif defined(OEM_ZIGUANG)
+//            isSuccessdStart = proc.startDetached(tmpPath + "ZGUpgradeApp.exe", argList);
 //    #else
         isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp.exe", argList);
 //    #endif
@@ -4005,6 +4033,8 @@ void MainWindow::upgradeApp(QString pkgPath)
 //        isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp", argList);
 //    #elif defined(OEM_ZHONGJING)
 //        isSuccessdStart = proc.startDetached(tmpPath + "ZjUpgradeApp", argList);
+//        #elif defined(OEM_ZIGUANG)
+//            isSuccessdStart = proc.startDetached(tmpPath + "ZgUpgradeApp", argList);
 //    #else
         isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp", argList);
 //    #endif

app/scanner/mainwindow.ui

@@ -301,7 +301,7 @@
   <action name="act_acquireInto">
    <property name="icon">
     <iconset resource="Scanner_resource.qrc">
-     <normaloff>:/images/image_rsc/actions/scan.png</normaloff>:/images/image_rsc/actions/scan.png</iconset>
+     <normaloff>:/images/image_rsc/actions/scanInto.png</normaloff>:/images/image_rsc/actions/scanInto.png</iconset>
    </property>
    <property name="text">
     <string>act_acquireInto</string>
@@ -570,7 +570,7 @@
   <action name="act_imageEdit">
    <property name="icon">
     <iconset resource="Scanner_resource.qrc">
-     <normaloff>:/images/image_rsc/action/btnEdit.png</normaloff>:/images/image_rsc/action/btnEdit.png</iconset>
+     <normaloff>:/images/image_rsc/actions/imageEdit.png</normaloff>:/images/image_rsc/actions/imageEdit.png</iconset>
    </property>
    <property name="text">
     <string>act_imageEdit</string>

app/upgrade/HGUpgrade.cpp

@@ -24,6 +24,8 @@ bool AppIsRun(const std::string& appName)
         std::wstring regName = L"SOFTWARE\\CumtennScan";
     #elif defined(OEM_ZHONGJING)
         std::wstring regName = L"SOFTWARE\\MicrotekScan";
+    #elif defined(OEM_ZIGUANG)
+        std::wstring regName = L"SOFTWARE\\UniScan";
     #else
         std::wstring regName = L"SOFTWARE\\HuaGoScan";
     #endif
@@ -109,6 +111,9 @@ bool AppIsRun(const std::string& appName)
 #elif defined(OEM_ZHONGJING)
             cmd = "ps -wef | grep MicrotekScan";
             appPath = "/opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan";
+#elif defined(OEM_ZIGUANG)
+            cmd = "ps -wef | grep 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";
@@ -128,6 +133,9 @@ bool AppIsRun(const std::string& appName)
 #elif defined(OEM_ZHONGJING)
             cmd = "ps -wef | grep MicrotekScan";
             appPath = "/opt/apps/scanner-driver-microtek/bin/MicrotekScan";
+#elif defined(OEM_ZIGUANG)
+            cmd = "ps -wef | grep UniScan";
+            appPath = "/opt/apps/scanner-driver-unis/bin/UniScan";
 #else
             cmd = "ps -wef | grep HuaGoScan";
             appPath = "/opt/apps/scanner-driver-huagao/bin/HuaGoScan";
@@ -175,6 +183,8 @@ void RunApp(const std::string& appName)
         std::wstring regName = L"SOFTWARE\\CumtennScan";
     #elif defined(OEM_ZHONGJING)
         std::wstring regName = L"SOFTWARE\\MicrotekScan";
+    #elif defined(OEM_ZIGUANG)
+        std::wstring regName = L"SOFTWARE\\UniScan";
     #else
         std::wstring regName = L"SOFTWARE\\HuaGoScan";
     #endif
@@ -222,6 +232,8 @@ void RunApp(const std::string& appName)
             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 &";
+#elif defined(OEM_ZIGUANG)
+            appPath = "sh /opt/apps/com.unischina.uniscan/files/bin/UniScan.sh &";
 #else
             appPath = "sh /opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan.sh &";
 #endif
@@ -236,6 +248,8 @@ void RunApp(const std::string& appName)
             appPath = "sh /opt/apps/scanner-driver-cumtenn/bin/CumtennScan.sh &";
 #elif defined(OEM_ZHONGJING)
             appPath = "sh /opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh &";
+#elif defined(OEM_ZIGUANG)
+            appPath = "sh /opt/apps/scanner-driver-unis/bin/UniScan.sh &";
 #else
             appPath = "sh /opt/apps/scanner-driver-huagao/bin/HuaGoScan.sh &";
 #endif

app/upgrade/main.cpp

@@ -48,6 +48,8 @@ int main(int argc, char *argv[])
     oemName = HGVERSION_OEMNAME_CUMTENN;
 #elif defined(OEM_ZHONGJING)
     oemName = HGVERSION_OEMNAME_MICROTEK;
+#elif defined(OEM_ZIGUANG)
+    oemName = HGVERSION_OEMNAME_UNIS;
 #else
     oemName = HGVERSION_OEMNAME_HUAGO;
 #endif

build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro

@@ -19,7 +19,7 @@ DEFINES += OEM_HUAGAO
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
+if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
     contains(DEFINES, OEM_HANWANG) {
         RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico
     }
@@ -32,6 +32,9 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai
     contains(DEFINES, OEM_ZHONGJING) {
         RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico
     }
+    contains(DEFINES, OEM_ZIGUANG) {
+        RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico
+    }
 } else {
     RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
 }
@@ -40,7 +43,7 @@ win32 {
         DEFINES += _CRT_SECURE_NO_WARNINGS
         LIBS += -ladvapi32 -lpsapi
 
-        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
+        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
             contains(DEFINES, OEM_HANWANG) {
                 LIBS += -lHWBase -lHWVersion
                 TARGET = HWFWUpgradeApp
@@ -81,6 +84,16 @@ win32 {
                         LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek -lsane
                 }
             }
+            contains(DEFINES, OEM_ZIGUANG) {
+                LIBS += -lZGBase -lZGVersion
+                TARGET = ZGFWUpgradeApp
+                contains(QT_ARCH, i386) {
+                        LIBS += -L../../../../sdk/lib/win/x86/OEM/unis -lsane
+                }
+                contains(QT_ARCH, x86_64){
+                        LIBS += -L../../../../sdk/lib/win/x64/OEM/unis -lsane
+                }
+            }
         } else {
             LIBS += -lHGBase -lHGVersion
             TARGET = HGFWUpgradeApp
@@ -121,7 +134,7 @@ unix {
         message($$ARCH)
         QMAKE_LFLAGS += -Wl,-rpath=.
 
-        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
+        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
             contains(DEFINES, OEM_HANWANG){
                 LIBS += -lHwBase -lHwVersion -lsane-hwsane -lhwdriver
                 TARGET = HwFWUpgradeApp
@@ -138,6 +151,10 @@ unix {
                 LIBS += -lZjBase -lZjVersion -lsane-zjsane -lzjdriver
                 TARGET = ZjFWUpgradeApp
             }
+            contains(DEFINES, OEM_ZIGUANG){
+                LIBS += -lZgBase -lZgVersion -lsane-zgsane -lzgdriver
+                TARGET = ZgFWUpgradeApp
+            }
         } else {
             LIBS += -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
             TARGET = HGFWUpgradeApp

build-qt/HGSolution/HGScanner/HGScanner.pro

@@ -19,7 +19,7 @@ DEFINES += OEM_HUAGAO
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
+if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
     contains(DEFINES, OEM_HANWANG) {
         RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico
         TARGET = HanvonScan
@@ -36,6 +36,10 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai
         RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico
         TARGET = MicrotekScan
     }
+    contains(DEFINES, OEM_ZIGUANG) {
+        RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico
+        TARGET = UniScan
+    }
 } else {
     RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
     TARGET = HuaGoScan
@@ -45,7 +49,7 @@ 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)) {
+        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
             contains(DEFINES, OEM_HANWANG) {
                 LIBS += -lHWBase -lHWImgFmt -lHWImgProc
                 contains(QT_ARCH, i386) {
@@ -82,6 +86,15 @@ win32 {
                         LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek -lsane -llang
                 }
             }
+            contains(DEFINES, OEM_ZIGUANG) {
+                LIBS += -lZGBase -lZGImgFmt -lZGImgProc
+                contains(QT_ARCH, i386) {
+                        LIBS += -L../../../../sdk/lib/win/x86/OEM/unis -lsane -llang
+                }
+                contains(QT_ARCH, x86_64){
+                        LIBS += -L../../../../sdk/lib/win/x64/OEM/unis -lsane -llang
+                }
+            }
         } else {
             LIBS += -lHGBase -lHGImgFmt -lHGImgProc
             contains(QT_ARCH, i386) {
@@ -121,7 +134,7 @@ unix {
         message($$ARCH)
         QMAKE_LFLAGS += -Wl,-rpath=.
 
-        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
+        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
             contains(DEFINES, OEM_HANWANG){
                 LIBS += -lHwBase -lHwImgFmt -lHwImgProc -lsane-hwsane -lhwdriver
             }
@@ -134,6 +147,9 @@ unix {
             contains(DEFINES, OEM_ZHONGJING){
                 LIBS += -lZjBase -lZjImgFmt -lZjImgProc -lsane-zjsane -lzjdriver
             }
+            contains(DEFINES, OEM_ZIGUANG){
+                LIBS += -lZgBase -lZgImgFmt -lZgImgProc -lsane-zgsane -lzgdriver
+            }
         } else {
             LIBS += -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
         }

build-qt/HGSolution/HGUpgrade/HGUpgrade.pro

@@ -19,7 +19,7 @@ DEFINES += OEM_HUAGAO
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
+if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
     contains(DEFINES, OEM_HANWANG) {
         RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico
     }
@@ -32,6 +32,9 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai
     contains(DEFINES, OEM_ZHONGJING) {
         RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico
     }
+    contains(DEFINES, OEM_ZIGUANG) {
+        RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico
+    }
 } else {
     RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
 }
@@ -59,7 +62,7 @@ win32 {
                 }
         }
 
-        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
+        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
             contains(DEFINES, OEM_HANWANG) {
                 LIBS += -lHWBase -lHWVersion
                 TARGET = HWUpgradeApp
@@ -76,6 +79,10 @@ win32 {
                 LIBS += -lZJBase -lZJVersion
                 TARGET = ZJUpgradeApp
             }
+            contains(DEFINES, OEM_ZIGUANG) {
+                LIBS += -lZGBase -lZGVersion
+                TARGET = ZGUpgradeApp
+            }
         } else {
             LIBS += -lHGBase -lHGVersion
             TARGET = HGUpgradeApp
@@ -90,7 +97,7 @@ unix {
         message($$ARCH)
         QMAKE_LFLAGS += -Wl,-rpath=.
 
-        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
+        if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
             contains(DEFINES, OEM_HANWANG){
                 LIBS += -lHwBase -lHwVersion
                 TARGET = HwUpgradeApp
@@ -107,6 +114,10 @@ unix {
                 LIBS += -lZjBase -lZjVersion
                 TARGET = ZjUpgradeApp
             }
+            contains(DEFINES, OEM_ZIGUANG){
+                LIBS += -lZgBase -lZgVersion
+                TARGET = ZgUpgradeApp
+            }
         } else {
             LIBS += -lHGBase -lHGVersion
             TARGET = HGUpgradeApp

build.bat

@@ -103,7 +103,7 @@ if "%OEM%" == "hw" (
 						cd /d ZGScanner32
 						%QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro
 					)
-					MSBuild.exe UniscanScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH%
+					MSBuild.exe UniScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH%
 					cd /d ../
 				) else (
 					mkdir HGScanner32

build/windows/HGScannerLib/HGScannerLib.vcxproj

@@ -380,7 +380,7 @@ copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\</
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <ModuleDefinitionFile>HGScannerLib.def</ModuleDefinitionFile>
-      <AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/unis/sane.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -592,7 +592,7 @@ copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x64\Release\</
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <ModuleDefinitionFile>HGScannerLib.def</ModuleDefinitionFile>
-      <AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/unis/sane.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>

build/windows/HGWebScan/HGWebScan.vcxproj

@@ -370,7 +370,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
@@ -538,7 +538,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>

build/windows/HGWebService/HGWebService.vcxproj

@@ -391,7 +391,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
@@ -559,7 +559,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>

modules/version/HGVersion.h

@@ -13,7 +13,7 @@ HG_DECLARE_HANDLE(HGVersionMgr);
 #define HGVERSION_OEMNAME_LANXUM	"Lanxum"
 #define HGVERSION_OEMNAME_CUMTENN	"Cumtenn"
 #define HGVERSION_OEMNAME_MICROTEK	"Microtek"
-#define HGVERSION_OEMNAME_UNISCAN	"Uniscan"
+#define HGVERSION_OEMNAME_UNIS		"Unis"
 
 #pragma pack(push)
 #pragma pack(4)

modules/version/HGVersionImpl.cpp

@@ -419,6 +419,8 @@ static std::string GetCurrVersion(const std::string& appName, const std::string&
             regName = "SOFTWARE\\CumtennScan";
         else if (oemName == HGVERSION_OEMNAME_MICROTEK)
             regName = "SOFTWARE\\MicrotekScan";
+        else if (oemName == HGVERSION_OEMNAME_UNIS)
+            regName = "SOFTWARE\\UniScan";
         else
             regName = "SOFTWARE\\HuaGoScan";
 
@@ -448,6 +450,8 @@ static std::string GetCurrVersion(const std::string& appName, const std::string&
                 appName = "com.cumtennchina.cumtennscan";
             else if (oemName == HGVERSION_OEMNAME_MICROTEK)
                 appName = "com.microtekchina.microtekscan";
+            else if (oemName == HGVERSION_OEMNAME_UNIS)
+                appName = "com.unischina.uniscan";
             else
                 appName = "com.huagaochina.huagoscan";
         }
@@ -461,6 +465,8 @@ static std::string GetCurrVersion(const std::string& appName, const std::string&
                 appName = "scanner-driver-cumtenn";
             else if (oemName == HGVERSION_OEMNAME_MICROTEK)
                 appName = "scanner-driver-microtek";
+            else if (oemName == HGVERSION_OEMNAME_UNIS)
+                appName = "scanner-driver-unis";
             else
                 appName = "scanner-driver-huagao";
         }