From e825602e1102dccaa206bf057a0720c40c4937c4 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 14 Apr 2023 15:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner/dialog_aquireinto.cpp |  2 +-
 app/scanner/mainwindow.cpp        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp
index ca1aa546..9c6f6336 100644
--- a/app/scanner/dialog_aquireinto.cpp
+++ b/app/scanner/dialog_aquireinto.cpp
@@ -22,7 +22,7 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
 {
     ui->setupUi(this);
 
-#if !defined(OEM_HUAGAO)
+#if defined(OEM_HANWANG) || defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(OEM_ZHONGJING) || defined(OEM_ZIGUANG)
     ui->groupBox_2->setVisible(false);
     this->setFixedWidth(this->width() - ui->groupBox_2->width());
 #endif
diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp
index aa71c2f3..b6a31d07 100644
--- a/app/scanner/mainwindow.cpp
+++ b/app/scanner/mainwindow.cpp
@@ -138,7 +138,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
     ui->actionact_update->setVisible(false);
     ui->act_feedback->setVisible(false);
 
-#if defined(OEM_HUAGAO)
+#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG)
     if (m_versionDll->IsValid())
     {
         ui->actionact_update->setVisible(true);
@@ -394,8 +394,9 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
     m_pbtn_push->setGeometry(0, 0, 25, 50);
     m_widget_sideBar = new Widget_Imgproc_SideBar(this);
 
-#if defined(OEM_HUAGAO)
-    m_pbtn_push->setVisible(true);
+#if defined(OEM_HANWANG) || defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(OEM_ZHONGJING) || defined(OEM_ZIGUANG)
+    m_pbtn_push->setVisible(false);
+    m_widget_sideBar->setVisible(false);
 #endif
     connect(m_pbtn_push, SIGNAL(clicked()), this, SLOT(on_m_pbtn_push_clicked()));
     connect(m_widget_sideBar, SIGNAL(applyToImage(HGImage,int,int,double,bool)), this, SLOT(on_dialog_sideBar_applyToImage(HGImage,int,int,double,bool)));
@@ -1867,7 +1868,7 @@ void MainWindow::updateActionStatus()
 
     m_moveToAction->setEnabled(!selectIndexs.empty() && (!dev_que_.is_online() || !m_isScanning));
 
-#if defined(OEM_HUAGAO)
+#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG)
     if (m_pbtn_push != nullptr && m_widget_sideBar!= nullptr)
     {
         m_pbtn_push->setVisible(nullptr != img);
@@ -4348,10 +4349,9 @@ QString MainWindow::getDevPid()
 void MainWindow::initAcquireIntoComboBox()
 {
     m_cbtn_acquireIntoCfg = new QComboBox;
-    m_cbtn_acquireIntoCfg->setVisible(false);
 
-#if defined(OEM_HUAGAO)
-    m_cbtn_acquireIntoCfg->setVisible(true);
+#if defined(OEM_HANWANG) || defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(OEM_ZHONGJING) || defined(OEM_ZIGUANG)
+    m_cbtn_acquireIntoCfg->setVisible(false);
 #endif
 
     m_cbtn_acquireIntoCfg->setFixedWidth(150);