hlp:更新翻译，开机报警不可以开回收槽，运行中报警缺少3h后自动收 喷嘴;新增粘度阈值设置界面，提醒粘度异常情况，严重越界自动收喷嘴

InkJetPrinter.cpp

@@ -144,9 +144,7 @@ void InkJetPrinter::init()
     connect(m_CounterVarSet,&CounterVarSet::sig_updateSelectedCounter,this,&InkJetPrinter::slt_counterVarUpdate);
     
     connect(m_MainInstruction,&MainInstruction::newFileBtnClick,m_TestPrintWidget,&TestPrintWidget::on_newfileButton_pressed);
-
     connect(m_MainInstruction, &MainInstruction::superJmAccepted, this, &InkJetPrinter::resetRFIDStatus);
-
 //    connect(myInputMethod,&MyInputMethod::sendEnterClickedSignal,&TestPrintWidget::onEditItemDone);
     // connect(myInputMethod,SIGNAL(sendEnterClickedSignal()),m_TestPrintWidget,SLOT(onEditItemDone()));
     connect(m_DateVarSet,SIGNAL(backSpaceBtn()),myInputMethod,SLOT(backSapceButtonDel()));
@@ -956,9 +954,7 @@ void InkJetPrinter::timerHandler(void){
             if(gearPumpRunFlag || sysPara->para.gearPumpEnable == 0)
             {
                 if(!sysPara->status.selfCheckDone && sysPara->status.isPrinting){
-                    // sysPara->status.selfCheckDone = true;
                     m_MainWidget->updatePrintDisplayLabel();
-//                    sysPara->status.flagOfAbnormalStatus = true;
                     qDebug()<<"打印过程中死机了!!!";
                     
                     m_MainWidget->on_m_StopBtn_clicked();
@@ -978,7 +974,6 @@ void InkJetPrinter::timerHandler(void){
                         m_MainWidget->setReclaimOpenBtnStatus(false);
                         m_MainWidget->setReclaimCloseBtnStatus(false);
 
-//                        m_MainWidget->enablePrintButton(false);
                         sysPara->devOp->mainInkCtrl();
                         sysPara->para.TrunOnPowerCnt++;// 20151218 开机次数加1
                         sysPara->saveParaToFile();     // 保存开机次数值
@@ -999,6 +994,7 @@ void InkJetPrinter::timerHandler(void){
                     if(sysPara->status.selfCheckCnt >= MAX_SELF_CHECK_CNT)
 #endif
                     {
+                        // 自检完成 selfCheckDone=true
                         // 通过状态管理器发送事件，在 onStateChanged 中更新 sysPara
                         if (m_stateManager && m_stateManager->isState(PrinterState::IDLE)) {
                             m_stateManager->requestTransition(PrinterEvent::PowerOn);
@@ -1114,7 +1110,6 @@ void InkJetPrinter::timerHandler(void){
 #endif
             //reserved
             QWidget *widget = m_StackedWidget->currentWidget();  
-            static bool read_flag =  false;    
             if((widget == m_MainWidget || widget == m_LogInfo) && pulse_100ms) {
                 m_MainWidget->updateSysStatusToUI();
                 m_MainWidget->updateGeneralState(m_MainWidget->alarmStatus);
@@ -1124,11 +1119,6 @@ void InkJetPrinter::timerHandler(void){
             else if(widget == m_PrintSetting)
             {
                 m_PrintSetting->updateSysStatusToUI();
-//                if(!read_flag)
-//                {
-//                    emit sendPicScene(ui->tabMainWindow->getPicScene());
-//                }
-                read_flag = true;
             }
             else if(widget == m_SystemSetting){
 
@@ -1146,10 +1136,6 @@ void InkJetPrinter::timerHandler(void){
 //                    ui->tabNetworkManager->updateSysStatusToUI();
 //                }
 //            }
-            if(widget  !=  m_PrintSetting)
-            {
-                read_flag = false;
-            }
 
             //  20140306
             static int last_lesslen_warn=0,lesslen_cnt=0;
@@ -1207,7 +1193,6 @@ void InkJetPrinter::timerHandler(void){
 //            if(sysPara->status.needMaintenanceRemind){
 //                warningHandler(3);
 //            }
-//            LogInfo::setRunStatusText(tr("处理警告:%1").arg(QDateTime::currentDateTime()));
 
             handleWarnInk(); // 处理墨水警告
             handleWarnSolvent(); // 处理溶剂警告
@@ -1814,6 +1799,7 @@ void InkJetPrinter::initStateManager()
     connect(m_stateManager, &PrinterStateManager::sig_infoMsg,
             this, [=](QString msg){m_MainWidget->setRunStatus(msg);});
 
+
     // ============ 开机时重置状态 ============
     m_stateManager->initFromSysPara();
     sysPara->status.selfCheckDone = false;      // 自检是否完成
@@ -1937,6 +1923,11 @@ void InkJetPrinter::slt_enableCloseTank(bool able)
     m_MainWidget->setReclaimCloseBtnStatus(able);
 }
 
+void InkJetPrinter::slt_infoBox(QString msg)
+{
+    QMessageBox::information(this, tr("提示"), msg);
+}
+
 /*************************FPGA通过串口读取状态赋值给status-start******************************************/
 void InkJetPrinter::saveFPGAVersionNum(unsigned int data){
     sysPara->status.fpgaVersionNum=data;
@@ -3212,12 +3203,6 @@ void InkJetPrinter::initRFIDManager()
     connect(manager_rfid,SIGNAL(sig_maintenanceShow()),
             m_MainInstruction,SLOT(maintenanceDialogShow()));
 
-    auto checkReclaimOpenBtn = [this]() {
-        // if(sysPara->status.selfCheckDone && (sysPara->status.reclaimTankstatus == 2 || sysPara->status.reclaimTankstatus == 6)) {
-        //     m_MainWidget->setReclaimOpenBtnStatus(true);
-        // }
-    };
-
     connect(manager_rfid, &RFIDManager::sig_inkCardProgressFinished, this, [this](){
         sysPara->RFIDPara.needInkCard = false;
         sysPara->saveRFIDPara();
@@ -3245,7 +3230,8 @@ void InkJetPrinter::initRFIDManager()
 
 
 #define MAX_WARNING_TIME_HOUR 48
-#define WARNING_INTERVAL_SEC 3600
+//#define WARNING_INTERVAL_SEC 3600
+#define WARNING_INTERVAL_SEC 10
 
 #ifdef BNS_DEBUG
 
@@ -3281,6 +3267,39 @@ void InkJetPrinter::resetRFIDStatus()
     QMessageBox::information(this, "", "RFID progress has been cleaned.", QMessageBox::Ok);
 }
 
+void InkJetPrinter::slt_close(bool height)
+{
+    QString str = "";
+    if (height) {
+        str = tr("粘度过高,即将关闭喷嘴");
+    } else {
+        str = tr("粘度过低,即将关闭喷嘴");
+    }
+    if (sysPara && sysPara->status.selfCheckDone) {
+        QMessageBox::warning(this, tr("警告"), str);
+        if (sysPara->status.reclainTankReachEnd || sysPara->status.reclaimTankstatus == 1) {
+            // 关闭喷嘴
+            m_MainWidget->on_m_LeftBtn_clicked();
+        }
+    }
+
+    return;
+}
+
+void InkJetPrinter::slt_alert(bool height)
+{
+    QString str = "";
+    if (height) {
+        str = tr("粘度较高,请注意调整粘度");
+    } else {
+        str = tr("粘度较低,请注意调整粘度");
+    }
+    if (sysPara && sysPara->status.selfCheckDone)
+        QMessageBox::information(this, tr("提示"), str);
+
+    return;
+}
+
 /**
  * @brief 处理墨水警告
  * 如果发生墨水警告，则进入 加墨水&刷卡 流程。
@@ -3315,11 +3334,16 @@ void InkJetPrinter::handleWarnInk()
             if(sysPara->RFIDPara.needInkCard) {
                 slt_showMsg(tr("请及时使用墨水盒附带的IC卡激活墨水盒"));
             }
+            m_MainWidget->powerOnWarn = false;
         }
     }
 
     // 墨水盒空，进入 刷卡&加墨水 流程
     if(sysPara->status.inkWarningCnt >= DETECT_WARNING_TIME && sysPara->RFIDPara.inInkAndRFIDProgress == 0) {
+        // 只处理自检期间出现的问题
+        if (!sysPara->status.selfCheckDone) {
+            m_MainWidget->powerOnWarn = true;
+        }
 
         sysPara->RFIDPara.addedInk = false;
         sysPara->RFIDPara.needInkCard = true;
@@ -3386,10 +3410,23 @@ void InkJetPrinter::handleWarnInk()
 
             // 理论上differHours只会比 sysPara->status.showInkWarningNumber 大 1， 如果大于1，说明系统时间被被往后修改过或者关过机。
 
-            if(differHours > MAX_WARNING_TIME_HOUR)
-                slt_showMsg(tr("墨水液位报警超过%1小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!").arg(MAX_WARNING_TIME_HOUR));
-            else 
+            if(differHours > MAX_WARNING_TIME_HOUR) {
+                slt_showMsg(tr("墨水液位报警超过%1小时,机器无法正常打印,请添加墨水并刷卡.").arg(MAX_WARNING_TIME_HOUR));
+            }
+            else {
+                // 累计 3 小时未补充，自动关喷嘴
+                if ((differHours > 0 && differHours % 3 == 0)
+                        && differHours < MAX_WARNING_TIME_HOUR
+                        && (sysPara->status.statWarn & WARN_STATUS_INK_WARN)) {
+                    slt_showMsg(tr("墨水告警已累计3小时，自动关喷嘴。"));
+                    if (sysPara->status.isPrinting)
+                        m_MainWidget->on_m_StopBtn_clicked();
+                    if (sysPara->status.reclaimTankstatus != 2)
+                        m_MainWidget->on_m_LeftBtn_clicked();
+                } else {
                     slt_showMsg(tr("请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!").arg(MAX_WARNING_TIME_HOUR - differHours));
+                }
+            }
 
             sysPara->status.showInkWarningNumber = differHours;
             sysPara->saveRFIDPara();
@@ -3442,11 +3479,17 @@ void InkJetPrinter::handleWarnSolvent()
             if(sysPara->RFIDPara.needSolventCard) {
                 slt_showMsg(tr("请及时使用溶剂盒附带的IC卡激活溶剂盒"));
             }
+            m_MainWidget->powerOnWarn = false;
         }
     }
 
     // 溶剂盒空，进入 刷卡&加溶剂 流程
     if(sysPara->status.solventWarningCnt >= DETECT_WARNING_TIME && sysPara->RFIDPara.inSolventAndRFIDProgress == 0) {
+        // 只处理自检期间出现的问题
+        if (!sysPara->status.selfCheckDone) {
+            m_MainWidget->powerOnWarn = true;
+        }
+
         QDateTime curDateTime = QDateTime::currentDateTime();
         QString strCurDateTime = curDateTime.toString("yyMMddhhmmss");
         LogInfo::setRunStatusText("Solvent warning.");
@@ -3505,10 +3548,22 @@ void InkJetPrinter::handleWarnSolvent()
         }
 
         if(differHours > sysPara->status.showSolventWarningNumber) {
-            if(differHours > MAX_WARNING_TIME_HOUR) 
-                slt_showMsg(tr("溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!").arg(MAX_WARNING_TIME_HOUR));
-            else 
+            if(differHours > MAX_WARNING_TIME_HOUR) {
+                slt_showMsg(tr("溶剂液位报警超过%1小时,机器无法正常打印,请添加溶剂并刷卡.").arg(MAX_WARNING_TIME_HOUR));
+            }else {
+                // 累计 3 小时未补充，自动关喷嘴
+                if ((differHours > 0 && differHours % 3 == 0)
+                        && differHours < MAX_WARNING_TIME_HOUR
+                        && (sysPara->status.statWarn & WARN_STATUS_SOLV_WARN)) {
+                    slt_showMsg(tr("溶剂告警已累计3小时，自动关喷嘴。"));
+                    if (sysPara->status.isPrinting)
+                        m_MainWidget->on_m_StopBtn_clicked();
+                    if (sysPara->status.reclaimTankstatus != 2)
+                        m_MainWidget->on_m_LeftBtn_clicked();
+                } else {
                     slt_showMsg(tr("请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!").arg(MAX_WARNING_TIME_HOUR - differHours));
+                }
+            }
 
             sysPara->status.showSolventWarningNumber = differHours;
             sysPara->saveRFIDPara();
@@ -3522,7 +3577,8 @@ void InkJetPrinter::handleWarnSolvent()
     }
 
     // 如果用户已经刷了溶剂卡，并且加了溶剂，则清除 刷卡&加溶剂 流程
-    if(sysPara->RFIDPara.addedSolvent && !sysPara->RFIDPara.needSolventCard && sysPara->RFIDPara.inSolventAndRFIDProgress != 0) {
+    if(sysPara->RFIDPara.addedSolvent && !sysPara->RFIDPara.needSolventCard
+            && sysPara->RFIDPara.inSolventAndRFIDProgress != 0) {
         sysPara->status.showSolventWarningNumber = 0;
         sysPara->RFIDPara.inSolventAndRFIDProgress = 0;
         sysPara->RFIDPara.solventCardTimeOut = false;

InkJetPrinter.h

@@ -170,6 +170,9 @@ private:
 private slots:
 
     void resetRFIDStatus();
+    // 粘度告警
+    void slt_close(bool);
+    void slt_alert(bool);
 
     void onDlgFileOpen(const QString& filename);
 
@@ -313,4 +316,6 @@ private slots:
     void slt_enableStopPrint(bool);
     void slt_enableOpenTank(bool);
     void slt_enableCloseTank(bool);
+    // 处理告警
+    void slt_infoBox(QString);
 };

MainInstruction.cpp

@@ -84,6 +84,7 @@ MainInstruction::~MainInstruction()
 
 void MainInstruction::bindSysPara(SysPara *sysPara){
     this->sysPara = sysPara;
+    initDlgVis();
 }
 
 void MainInstruction::onGraphicsEditBtnClicked()
@@ -189,7 +190,7 @@ void MainInstruction::ondialogAuthorizationAccepted(){
     } else {
         QMessageBox box(QMessageBox::Warning, tr("警告"),
                 tr("密码错误:%1").arg(authString), QMessageBox::Ok,
-                this);
+                0);
         box.exec();
     }
 }
@@ -427,9 +428,20 @@ void MainInstruction::applyStyleSheet()
 }
 void MainInstruction::on_visSetBtn_clicked()
 {
-    if (dlgVisSetting == nullptr) {
-        dlgVisSetting = new DlgViscositySetting(this);
-    }
+    initDlgVis();
     if (dlgVisSetting)
         dlgVisSetting->show();
 }
+
+
+void MainInstruction::initDlgVis()
+{
+    if (dlgVisSetting == nullptr) {
+        dlgVisSetting = new DlgViscositySetting(this);
+        dlgVisSetting->bindSysPara(sysPara);
+        connect(dlgVisSetting, &DlgViscositySetting::sig_alert,
+                this, &MainInstruction::sig_alert);
+        connect(dlgVisSetting, &DlgViscositySetting::sig_close,
+                this, &MainInstruction::sig_close);
+    }
+}

MainInstruction.h

@@ -39,6 +39,8 @@ signals:
 
     void superJmAccepted();
 
+    void sig_close(bool);
+    void sig_alert(bool);
 private slots:
     void onGraphicsEditBtnClicked();
 
@@ -62,7 +64,6 @@ private slots:
     void onCanvasCfgBtnClicked();
 
     void on_visSetBtn_clicked();
-
 private:
     Ui::MainInstruction *ui;
     SysPara* sysPara = nullptr;
@@ -78,8 +79,9 @@ private:
     // 时间设置
     TimeSettingDialog timeDia;
 
-    //
+    //粘度预警界面
     DlgViscositySetting* dlgVisSetting = nullptr;
+    void initDlgVis();
 
     void applyStyleSheet();    // 应用样式表
 };

MainWidget.ui

@@ -217,7 +217,7 @@ QScrollBar::add-line:horizontal { bottom: 0px; }</string>
            <x>0</x>
            <y>0</y>
            <width>780</width>
-           <height>177</height>
+           <height>169</height>
           </rect>
          </property>
         </widget>
@@ -255,7 +255,7 @@ QScrollBar::add-line:horizontal { bottom: 0px; }</string>
               <property name="minimumSize">
                <size>
                 <width>150</width>
-                <height>130</height>
+                <height>128</height>
                </size>
               </property>
               <property name="maximumSize">
@@ -439,7 +439,7 @@ QScrollBar::add-line:horizontal { bottom: 0px; }</string>
               <property name="minimumSize">
                <size>
                 <width>0</width>
-                <height>130</height>
+                <height>128</height>
                </size>
               </property>
               <property name="maximumSize">

StateMachine/printerstatemanager.h

@@ -74,6 +74,10 @@ signals:
     void sig_closeTank();
     // 提示信息
     void sig_infoMsg(QString);
+
+    // 墨水告警
+    void sig_infoBox(QString);
+
 private:
     PrinterStateManager();
     ~PrinterStateManager();
@@ -119,10 +123,10 @@ private:
     // 检查是否无故障
     bool guardNoError();
 
-    // 检查是否无墨水警告
+    // 检查是否无墨水警告 true:正常
     bool guardNoInkWarn();
 
-    // 检查是否无溶剂警告
+    // 检查是否无溶剂警告 true:正常
     bool guardNoSolventWarn();
 
     // 检查自检是否已完成

chinese.ts

@@ -194,15 +194,15 @@
         <location filename="countervarset.ui" line="84"/>
         <location filename="countervarset.ui" line="273"/>
         <location filename="CounterVarSet.cpp" line="168"/>
-        <location filename="CounterVarSet.cpp" line="183"/>
+        <location filename="CounterVarSet.cpp" line="187"/>
         <source>计数器1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="countervarset.ui" line="112"/>
         <location filename="countervarset.ui" line="655"/>
-        <location filename="CounterVarSet.cpp" line="176"/>
-        <location filename="CounterVarSet.cpp" line="185"/>
+        <location filename="CounterVarSet.cpp" line="178"/>
+        <location filename="CounterVarSet.cpp" line="189"/>
         <source>计数器2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1596,6 +1596,50 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DlgViscositySetting</name>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="14"/>
+        <source>告警浮动范围设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="26"/>
+        <source>✕</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="39"/>
+        <source>✓</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="52"/>
+        <source>告警阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="68"/>
+        <source>关喷嘴阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="167"/>
+        <source>设定值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="183"/>
+        <location filename="dlgviscositysetting.ui" line="196"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="209"/>
+        <source>当前值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FileLogger</name>
     <message>
@@ -1925,197 +1969,231 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="993"/>
+        <location filename="InkJetPrinter.cpp" line="988"/>
         <source>开始自检,请等待%1秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1830"/>
-        <location filename="InkJetPrinter.cpp" line="1831"/>
+        <location filename="InkJetPrinter.cpp" line="1816"/>
+        <location filename="InkJetPrinter.cpp" line="1817"/>
         <location filename="mainwidget.cpp" line="444"/>
         <source>自检完成!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3147"/>
+        <location filename="InkJetPrinter.cpp" line="3138"/>
+        <location filename="InkJetPrinter.cpp" line="3279"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="InkJetPrinter.cpp" line="101"/>
-        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <location filename="InkJetPrinter.cpp" line="1928"/>
+        <location filename="InkJetPrinter.cpp" line="3298"/>
+        <location filename="InkJetPrinter.cpp" line="3608"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="276"/>
+        <location filename="InkJetPrinter.cpp" line="274"/>
         <source>保养期还有%1小时到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="280"/>
+        <location filename="InkJetPrinter.cpp" line="278"/>
         <source>保养期已超过%1小时,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="976"/>
+        <location filename="InkJetPrinter.cpp" line="972"/>
         <source>开始自检,请等待60秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2792"/>
-        <location filename="InkJetPrinter.cpp" line="2825"/>
-        <location filename="InkJetPrinter.cpp" line="2851"/>
+        <location filename="InkJetPrinter.cpp" line="2783"/>
+        <location filename="InkJetPrinter.cpp" line="2816"/>
+        <location filename="InkJetPrinter.cpp" line="2842"/>
         <source>正在准备重启,请等待%1秒......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="769"/>
-        <location filename="InkJetPrinter.cpp" line="1227"/>
+        <location filename="InkJetPrinter.cpp" line="767"/>
+        <location filename="InkJetPrinter.cpp" line="1212"/>
         <source>压力泄漏或压力传感器故障!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="772"/>
+        <location filename="InkJetPrinter.cpp" line="770"/>
         <source>运行中压力泄漏，停齿轮泵!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="794"/>
-        <location filename="InkJetPrinter.cpp" line="878"/>
+        <location filename="InkJetPrinter.cpp" line="792"/>
+        <location filename="InkJetPrinter.cpp" line="876"/>
         <source>定时开机循环完成，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="871"/>
+        <location filename="InkJetPrinter.cpp" line="869"/>
         <source>waitPowerOffTime: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="879"/>
+        <location filename="InkJetPrinter.cpp" line="877"/>
         <source>准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1060"/>
-        <location filename="InkJetPrinter.cpp" line="1062"/>
+        <location filename="InkJetPrinter.cpp" line="1056"/>
+        <location filename="InkJetPrinter.cpp" line="1058"/>
         <source>缺少墨水,喷码机不能正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1286"/>
+        <location filename="InkJetPrinter.cpp" line="1271"/>
         <location filename="mainwidget.cpp" line="445"/>
         <source>停止打印，自动关闭高压.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2087"/>
+        <location filename="InkJetPrinter.cpp" line="2078"/>
         <source>flagOfPowerOnMode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2677"/>
-        <location filename="InkJetPrinter.cpp" line="2678"/>
+        <location filename="InkJetPrinter.cpp" line="2668"/>
+        <location filename="InkJetPrinter.cpp" line="2669"/>
         <source>电机故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2695"/>
+        <location filename="InkJetPrinter.cpp" line="2686"/>
         <source>回收槽到头</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2744"/>
-        <location filename="InkJetPrinter.cpp" line="2745"/>
+        <location filename="InkJetPrinter.cpp" line="2735"/>
+        <location filename="InkJetPrinter.cpp" line="2736"/>
         <source>回收槽卡住或者回收槽开关时间设置错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2963"/>
+        <location filename="InkJetPrinter.cpp" line="2954"/>
         <source>压力过高,请检查管路是否堵塞,然后点击故障恢复按钮</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3048"/>
-        <location filename="InkJetPrinter.cpp" line="3336"/>
-        <location filename="InkJetPrinter.cpp" line="3392"/>
+        <location filename="InkJetPrinter.cpp" line="3039"/>
+        <location filename="InkJetPrinter.cpp" line="3360"/>
+        <location filename="InkJetPrinter.cpp" line="3427"/>
         <source>请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3050"/>
+        <location filename="InkJetPrinter.cpp" line="3041"/>
         <source>墨水液位报警超过48小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3058"/>
-        <location filename="InkJetPrinter.cpp" line="3463"/>
-        <location filename="InkJetPrinter.cpp" line="3511"/>
+        <location filename="InkJetPrinter.cpp" line="3049"/>
+        <location filename="InkJetPrinter.cpp" line="3506"/>
+        <location filename="InkJetPrinter.cpp" line="3564"/>
         <source>请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3060"/>
+        <location filename="InkJetPrinter.cpp" line="3051"/>
         <source>溶剂液位报警超过48小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3068"/>
+        <location filename="InkJetPrinter.cpp" line="3059"/>
         <source>保养期还有%1天到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3070"/>
+        <location filename="InkJetPrinter.cpp" line="3061"/>
         <source>保养期已超过%1天,请进行保养以恢复喷码机的正常使用</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3226"/>
+        <location filename="InkJetPrinter.cpp" line="3211"/>
         <source>刷墨水卡成功, 请及时将该墨水卡对应的墨水添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3229"/>
+        <location filename="InkJetPrinter.cpp" line="3214"/>
         <source>刷墨水卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3238"/>
+        <location filename="InkJetPrinter.cpp" line="3223"/>
         <source>刷溶剂卡成功, 请及时将该溶剂卡对应的溶剂添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3241"/>
+        <location filename="InkJetPrinter.cpp" line="3226"/>
         <source>刷溶剂卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3316"/>
+        <location filename="InkJetPrinter.cpp" line="3274"/>
+        <source>粘度过高,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3276"/>
+        <source>粘度过低,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3293"/>
+        <source>粘度较高,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3295"/>
+        <source>粘度较低,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3335"/>
         <source>请及时使用墨水盒附带的IC卡激活墨水盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3390"/>
-        <source>墨水液位报警超过%1小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3414"/>
+        <source>墨水液位报警超过%1小时,机器无法正常打印,请添加墨水并刷卡.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3443"/>
+        <location filename="InkJetPrinter.cpp" line="3421"/>
+        <source>墨水告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3480"/>
         <source>请及时使用溶剂盒附带的IC卡激活溶剂盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3509"/>
-        <source>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <source>溶剂液位报警超过%1小时,机器无法正常打印,请添加溶剂并刷卡.</source>
+        <oldsource>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3576"/>
+        <location filename="InkJetPrinter.cpp" line="3558"/>
+        <source>溶剂告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3632"/>
         <source>File not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3099"/>
+        <location filename="InkJetPrinter.cpp" line="3090"/>
         <source>刷卡倒计时起始时间文件不存在</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2898,7 +2976,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="266"/>
-        <location filename="MainInstruction.cpp" line="187"/>
+        <location filename="MainInstruction.cpp" line="188"/>
         <source>额外设置</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +2997,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="205"/>
-        <location filename="MainInstruction.cpp" line="200"/>
+        <location filename="MainInstruction.cpp" line="201"/>
         <source>系统授权</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2934,7 +3012,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.ui" line="325"/>
+        <location filename="MainInstruction.ui" line="317"/>
+        <source>粘度设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="MainInstruction.ui" line="338"/>
         <source>✕</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2944,28 +3027,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>RFID卡清零!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="188"/>
-        <location filename="MainInstruction.cpp" line="199"/>
+        <location filename="MainInstruction.cpp" line="189"/>
+        <location filename="MainInstruction.cpp" line="200"/>
         <source>取消授权</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="190"/>
+        <location filename="MainInstruction.cpp" line="191"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="191"/>
+        <location filename="MainInstruction.cpp" line="192"/>
         <source>密码错误:%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,8 +3202,8 @@
     <message>
         <location filename="mainwidget.cpp" line="264"/>
         <location filename="mainwidget.cpp" line="283"/>
-        <location filename="mainwidget.cpp" line="1430"/>
-        <location filename="mainwidget.cpp" line="1448"/>
+        <location filename="mainwidget.cpp" line="1438"/>
+        <location filename="mainwidget.cpp" line="1456"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3152,36 +3235,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
-        <location filename="mainwidget.cpp" line="2478"/>
-        <location filename="mainwidget.cpp" line="2482"/>
-        <location filename="mainwidget.cpp" line="2491"/>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2474"/>
+        <location filename="mainwidget.cpp" line="2485"/>
+        <location filename="mainwidget.cpp" line="2489"/>
+        <location filename="mainwidget.cpp" line="2498"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
+        <location filename="mainwidget.cpp" line="2474"/>
         <source>喷印间隔过短,应高于%1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2478"/>
+        <location filename="mainwidget.cpp" line="2485"/>
         <source>喷头盖未关,请先关喷头盖!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2482"/>
+        <location filename="mainwidget.cpp" line="2489"/>
         <source>墨线未开，请先开墨线开关!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2491"/>
+        <location filename="mainwidget.cpp" line="2498"/>
         <source>当前总列数 %1 ,支持的总列数为 %2,请减少打印串的长度</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>打印耗时 %1ms ,触发间隔 :%2ms ,触发间隔至少应当大于打印耗时3ms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3218,72 +3301,72 @@
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1188"/>
-        <location filename="mainwidget.cpp" line="1416"/>
+        <location filename="mainwidget.cpp" line="1424"/>
         <source>正在排气...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1724"/>
-        <location filename="mainwidget.cpp" line="1761"/>
-        <source>高压故障</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1728"/>
-        <location filename="mainwidget.cpp" line="1765"/>
-        <source>相位故障</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwidget.cpp" line="1732"/>
         <location filename="mainwidget.cpp" line="1769"/>
-        <source>粘度故障</source>
+        <source>高压故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1736"/>
         <location filename="mainwidget.cpp" line="1773"/>
-        <source>回收故障</source>
+        <source>相位故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1740"/>
         <location filename="mainwidget.cpp" line="1777"/>
-        <source>溶液液位</source>
+        <source>粘度故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1744"/>
         <location filename="mainwidget.cpp" line="1781"/>
-        <source>墨水液位</source>
+        <source>回收故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1748"/>
         <location filename="mainwidget.cpp" line="1785"/>
-        <source>墨水缸满</source>
+        <source>溶液液位</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1752"/>
         <location filename="mainwidget.cpp" line="1789"/>
+        <source>墨水液位</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1756"/>
+        <location filename="mainwidget.cpp" line="1793"/>
+        <source>墨水缸满</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1760"/>
+        <location filename="mainwidget.cpp" line="1797"/>
         <source>墨线开关</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1808"/>
         <location filename="mainwidget.cpp" line="1816"/>
+        <location filename="mainwidget.cpp" line="1824"/>
         <source>正常</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2359"/>
         <source>相位故障, 关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2353"/>
-        <location filename="mainwidget.cpp" line="2354"/>
+        <location filename="mainwidget.cpp" line="2360"/>
+        <location filename="mainwidget.cpp" line="2361"/>
         <source>相位故障，关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3293,106 +3376,111 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1431"/>
-        <location filename="mainwidget.cpp" line="1449"/>
+        <location filename="mainwidget.cpp" line="1394"/>
+        <source>墨水或溶剂不足,请先添加</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1439"/>
+        <location filename="mainwidget.cpp" line="1457"/>
         <source>回收槽之前发生阻塞或回收槽时间设置错误，是否强制将当前位置设为到顶位置?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1571"/>
-        <location filename="mainwidget.cpp" line="1572"/>
+        <location filename="mainwidget.cpp" line="1579"/>
+        <location filename="mainwidget.cpp" line="1580"/>
         <source>%1.%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2145"/>
+        <location filename="mainwidget.cpp" line="2153"/>
         <source>墨水缸满报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2155"/>
+        <location filename="mainwidget.cpp" line="2163"/>
         <source>墨水液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2162"/>
+        <location filename="mainwidget.cpp" line="2170"/>
         <source>溶剂液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2189"/>
-        <location filename="mainwidget.cpp" line="2190"/>
+        <location filename="mainwidget.cpp" line="2196"/>
+        <location filename="mainwidget.cpp" line="2197"/>
         <source>高压故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2191"/>
+        <location filename="mainwidget.cpp" line="2198"/>
         <source>高压故障，暂停打印.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2203"/>
+        <location filename="mainwidget.cpp" line="2210"/>
         <source>高压故障，关回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2204"/>
+        <location filename="mainwidget.cpp" line="2211"/>
         <source>高压故障，关回收槽和墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2250"/>
-        <location filename="mainwidget.cpp" line="2251"/>
+        <location filename="mainwidget.cpp" line="2257"/>
+        <location filename="mainwidget.cpp" line="2258"/>
         <source>回收故障，关闭回收槽，关墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2255"/>
+        <location filename="mainwidget.cpp" line="2262"/>
         <source>回收故障.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2264"/>
+        <location filename="mainwidget.cpp" line="2271"/>
         <source>回收异常,墨线可能偏离.(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2272"/>
+        <location filename="mainwidget.cpp" line="2279"/>
         <source>正在喷印.......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2317"/>
+        <location filename="mainwidget.cpp" line="2324"/>
         <source>相位故障:飞行时间错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2321"/>
+        <location filename="mainwidget.cpp" line="2328"/>
         <source>相位故障:相位检测错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2329"/>
-        <location filename="mainwidget.cpp" line="2330"/>
-        <location filename="mainwidget.cpp" line="2331"/>
+        <location filename="mainwidget.cpp" line="2336"/>
+        <location filename="mainwidget.cpp" line="2337"/>
+        <location filename="mainwidget.cpp" line="2338"/>
         <source>相位故障，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2337"/>
-        <location filename="mainwidget.cpp" line="2338"/>
-        <location filename="mainwidget.cpp" line="2339"/>
+        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2345"/>
+        <location filename="mainwidget.cpp" line="2346"/>
         <source>相位故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2351"/>
         <source>相位故障，屏蔽DAC输出</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2345"/>
-        <location filename="mainwidget.cpp" line="2346"/>
+        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2353"/>
         <source>相位故障，屏蔽充电</source>
         <translation type="unfinished"></translation>
     </message>

dlgviscositysetting.cpp

@@ -1,6 +1,12 @@
 #include "dlgviscositysetting.h"
 #include "ui_dlgviscositysetting.h"
 
+#include <QDir>
+#include <QSettings>
+#include <QDebug>
+
+#define WAITTIMEMAX 20
+
 DlgViscositySetting::DlgViscositySetting(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::DlgViscositySetting)
@@ -10,5 +16,200 @@ DlgViscositySetting::DlgViscositySetting(QWidget *parent) :
 
 DlgViscositySetting::~DlgViscositySetting()
 {
+    if (timer) {
+        timer->stop();
+        delete timer;
+        timer = nullptr;
+    }
     delete ui;
 }
+
+void DlgViscositySetting::bindSysPara(SysPara *sysPara)
+{
+    this->sysPara = sysPara;
+    init();
+}
+
+int DlgViscositySetting::getAlertValue()
+{
+    return ui->sb_alert->value();
+}
+
+int DlgViscositySetting::getCloseValue()
+{
+    return ui->sb_close->value();
+}
+
+void DlgViscositySetting::init()
+{
+    if (sysPara) {
+        loadConfig();
+        initTimer();
+    }
+}
+
+void DlgViscositySetting::initTimer()
+{
+    if (timer == nullptr) {
+        timer = new QTimer(this);
+        connect(timer, &QTimer::timeout,
+                this, &DlgViscositySetting::onTimeOut);
+        timer->start(1000);
+    }
+}
+
+void DlgViscositySetting::loadConfig()
+{
+    QSettings settings(kConfDir+kConfFile, QSettings::IniFormat);
+
+    // 若 ini 中没有值，使用 SpinBox 当前默认值
+    alertV = settings.value(kGroupViscosity + "/" + kKeyAlertThreshold,
+                               ui->sb_alert->value()).toInt();
+    closeV = settings.value(kGroupViscosity + "/" + kKeyCloseThreshold,
+                               ui->sb_close->value()).toInt();
+    if (alertV < 100) alertV = 250;
+    if (closeV < 160) closeV = 300;
+    ui->sb_alert->setValue(alertV);
+    ui->sb_close->setValue(closeV);
+}
+
+void DlgViscositySetting::saveConfig()
+{
+    // 确保目录存在
+    QDir dir(kConfDir);
+    if (!dir.exists()) {
+        if (!dir.mkpath(".")) {
+//            qWarning() << "无法创建配置目录:" << kConfDir;
+            return;
+        }
+    }
+
+    QSettings settings(kConfDir+kConfFile, QSettings::IniFormat);
+    settings.setValue(kGroupViscosity + "/" + kKeyAlertThreshold, ui->sb_alert->value());
+    settings.setValue(kGroupViscosity + "/" + kKeyCloseThreshold, ui->sb_close->value());
+    settings.sync();
+
+    if (settings.status() != QSettings::NoError) {
+        qWarning() << "写入配置文件失败:" << kConfDir+kConfFile;
+    } else {
+        qDebug() << "配置已保存到:" << kConfDir+kConfFile;
+    }
+}
+
+short DlgViscositySetting::checkClose(int visCurr, int visSetting)
+{
+    if (visCurr == 0) return 0;
+
+    if (visCurr - closeV >= visSetting) {
+        return 1;
+    } else if (visCurr + closeV <= visSetting) {
+        return 2;
+    }
+    return 0;
+}
+
+short DlgViscositySetting::checkAlert(int visCurr, int visSetting)
+{
+    if (visCurr == 0) return 0;
+
+    if (visCurr - alertV >= visSetting) {
+        return 1;
+    } else if (visCurr + alertV <= visSetting) {
+        return 2;
+    }
+    return 0;
+}
+
+static short alertTimes = 0;
+static short closeTimes = 0;
+// 如果提示了，就等10分钟后再重新检查,WAITTIMEMAX = 600
+static short waitTimes = 0;
+void DlgViscositySetting::onTimeOut()
+{
+    // 1秒一次，5秒防抖
+    if (sysPara) {
+        visSetting = sysPara->para.viscosity;
+        visCurr = sysPara->status.viscosity;
+        // test
+//        sysPara->status.viscosity = 1000;
+//        sysPara->status.selfCheckDone = 1;
+//        visCurr = sysPara->status.viscosity;
+
+        ui->lb_settings->setText(QString::number(visSetting));
+        ui->lb_current->setText(QString::number(visCurr));
+
+        if (waitTimes-- > 0) {
+            return;
+        }
+
+        // 虽然处理并不严谨，但是直接最低值切换到最高值的情况几乎不会发生
+        // 是否触发关闭喷嘴
+        short closeV = checkClose(visCurr, visSetting);
+        if (closeV != 0) {
+            if (closeTimes++ > 5) {
+                bool closeFlag = closeV == 1? true : false;
+                emit sig_close(closeFlag);
+                closeTimes = 0;
+                waitTimes = WAITTIMEMAX;
+                alertTimes = 0;
+                return;
+            }
+        } else {
+            closeTimes = 0;
+        }
+
+        // 是否触发报警
+        short alertV = checkAlert(visCurr, visSetting);
+        if (alertV != 0) {
+            if (alertTimes++ > 5) {
+                bool alertFlag = alertV == 1? true : false;
+                emit sig_alert(alertFlag);
+                alertTimes = 0;
+                waitTimes = WAITTIMEMAX;
+            }
+        } else {
+            alertTimes = 0;
+        }
+    }
+}
+
+
+void DlgViscositySetting::on_checkBtn_clicked()
+{
+    saveConfig();
+    visSetting = sysPara->para.viscosity;
+    visCurr = sysPara->status.viscosity;
+    closeV = ui->sb_close->value();
+    alertV = ui->sb_alert->value();
+}
+
+void DlgViscositySetting::on_closeBtn_clicked()
+{
+    this->hide();
+}
+
+void DlgViscositySetting::on_sb_alert_editingFinished()
+{
+    int tmp = ui->sb_alert->value();
+    // 告警阈值最小100，关闭阈值至少比告警大60
+    if (tmp < 100) {
+        ui->sb_alert->setValue(100);
+        tmp = 100;
+    }
+    if (tmp > ui->sb_close->value()) {
+        ui->sb_close->setValue(tmp+60);
+    }
+}
+
+void DlgViscositySetting::on_sb_close_editingFinished()
+{
+    int tmp = ui->sb_close->value();
+    // 告警阈值最小100，关闭阈值至少比告警大60
+    if (tmp < 160) {
+        ui->sb_close->setValue(160);
+        tmp = 160;
+    }
+    if (tmp < ui->sb_alert->value()) {
+        ui->sb_alert->setValue(tmp-60);
+    }
+}

dlgviscositysetting.h

@@ -1,7 +1,16 @@
 #ifndef DLGVISCOSITYSETTING_H
 #define DLGVISCOSITYSETTING_H
 
+#include "SysPara.h"
+
 #include <QDialog>
+#include <QTimer>
+
+/**
+ 功能简单，不分层实现功能
+ 在此界面设置告警阈值和关回收槽阈值
+ 定时器连续5次检测报警，就发出对应信号
+*/
 
 namespace Ui {
 class DlgViscositySetting;
@@ -15,8 +24,51 @@ public:
     explicit DlgViscositySetting(QWidget *parent = 0);
     ~DlgViscositySetting();
 
+    void bindSysPara(SysPara *sysPara);
+
+    int getAlertValue();
+    int getCloseValue();
+private slots:
+    void on_checkBtn_clicked();
+
 private:
     Ui::DlgViscositySetting *ui;
+    SysPara* sysPara = nullptr;
+    // 公共配置目录与文件名
+    const QString kConfDir  = QStringLiteral("/home/plg/conf/");
+    const QString kConfFile = QStringLiteral("software_ui.ini");
+    // ini 中的分组与键名
+    const QString kGroupViscosity     = QStringLiteral("Viscosity");
+    const QString kKeyAlertThreshold  = QStringLiteral("alertThreshold");
+    const QString kKeyCloseThreshold  = QStringLiteral("closeThreshold");
+
+    QTimer* timer = nullptr;
+    int visSetting = 0;
+    int visCurr = 0;
+    int closeV = 0;
+    int alertV = 0;
+
+private:
+    void init();
+    void initTimer();
+    void loadConfig();       // 从 ini 读取
+    void saveConfig();       // 写入 ini
+
+    short checkClose(int visCurr, int visSetting);
+    short checkAlert(int visCurr, int visSetting);
+private slots:
+    void onTimeOut();
+
+    void on_closeBtn_clicked();
+
+    void on_sb_alert_editingFinished();
+
+    void on_sb_close_editingFinished();
+
+signals:
+    // true:比设定值高 false:比设定值低
+    void sig_alert(bool);
+    void sig_close(bool);
 };
 
 #endif // DLGVISCOSITYSETTING_H

dlgviscositysetting.ui

@@ -6,14 +6,246 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>421</width>
-    <height>266</height>
+    <width>430</width>
+    <height>233</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>告警浮动范围设置</string>
+  </property>
+  <widget class="QPushButton" name="closeBtn">
+   <property name="geometry">
+    <rect>
+     <x>310</x>
+     <y>170</y>
+     <width>101</width>
+     <height>50</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>✕</string>
    </property>
   </widget>
+  <widget class="QPushButton" name="checkBtn">
+   <property name="geometry">
+    <rect>
+     <x>170</x>
+     <y>170</y>
+     <width>101</width>
+     <height>50</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>✓</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="lb_alertThreshold">
+   <property name="geometry">
+    <rect>
+     <x>60</x>
+     <y>60</y>
+     <width>141</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>告警阈值:</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="lb_closeThreshold">
+   <property name="geometry">
+    <rect>
+     <x>60</x>
+     <y>110</y>
+     <width>141</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>关喷嘴阈值:</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
+  </widget>
+  <widget class="QSpinBox" name="sb_alert">
+   <property name="geometry">
+    <rect>
+     <x>220</x>
+     <y>60</y>
+     <width>91</width>
+     <height>37</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>37</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>16777215</width>
+     <height>37</height>
+    </size>
+   </property>
+   <property name="minimum">
+    <number>80</number>
+   </property>
+   <property name="maximum">
+    <number>750</number>
+   </property>
+   <property name="singleStep">
+    <number>10</number>
+   </property>
+   <property name="value">
+    <number>250</number>
+   </property>
+   <property name="displayIntegerBase">
+    <number>10</number>
+   </property>
+  </widget>
+  <widget class="QSpinBox" name="sb_close">
+   <property name="geometry">
+    <rect>
+     <x>220</x>
+     <y>110</y>
+     <width>91</width>
+     <height>37</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>37</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>16777215</width>
+     <height>37</height>
+    </size>
+   </property>
+   <property name="minimum">
+    <number>80</number>
+   </property>
+   <property name="maximum">
+    <number>750</number>
+   </property>
+   <property name="singleStep">
+    <number>10</number>
+   </property>
+   <property name="value">
+    <number>310</number>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>10</y>
+     <width>81</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>设定值:</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="lb_settings">
+   <property name="geometry">
+    <rect>
+     <x>120</x>
+     <y>10</y>
+     <width>81</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>TextLabel</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="lb_current">
+   <property name="geometry">
+    <rect>
+     <x>320</x>
+     <y>10</y>
+     <width>81</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>TextLabel</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_4">
+   <property name="geometry">
+    <rect>
+     <x>220</x>
+     <y>10</y>
+     <width>81</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>当前值:</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
+  </widget>
+ </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>checkBtn</sender>
+   <signal>clicked()</signal>
+   <receiver>DlgViscositySetting</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>220</x>
+     <y>174</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>214</x>
+     <y>116</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>closeBtn</sender>
+   <signal>clicked()</signal>
+   <receiver>DlgViscositySetting</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>360</x>
+     <y>174</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>214</x>
+     <y>116</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

english.ts

@@ -194,15 +194,15 @@
         <location filename="countervarset.ui" line="84"/>
         <location filename="countervarset.ui" line="273"/>
         <location filename="CounterVarSet.cpp" line="168"/>
-        <location filename="CounterVarSet.cpp" line="183"/>
+        <location filename="CounterVarSet.cpp" line="187"/>
         <source>计数器1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="countervarset.ui" line="112"/>
         <location filename="countervarset.ui" line="655"/>
-        <location filename="CounterVarSet.cpp" line="176"/>
-        <location filename="CounterVarSet.cpp" line="185"/>
+        <location filename="CounterVarSet.cpp" line="178"/>
+        <location filename="CounterVarSet.cpp" line="189"/>
         <source>计数器2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1596,6 +1596,50 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DlgViscositySetting</name>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="14"/>
+        <source>告警浮动范围设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="26"/>
+        <source>✕</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="39"/>
+        <source>✓</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="52"/>
+        <source>告警阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="68"/>
+        <source>关喷嘴阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="167"/>
+        <source>设定值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="183"/>
+        <location filename="dlgviscositysetting.ui" line="196"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="209"/>
+        <source>当前值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FileLogger</name>
     <message>
@@ -1925,197 +1969,231 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="993"/>
+        <location filename="InkJetPrinter.cpp" line="988"/>
         <source>开始自检,请等待%1秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1830"/>
-        <location filename="InkJetPrinter.cpp" line="1831"/>
+        <location filename="InkJetPrinter.cpp" line="1816"/>
+        <location filename="InkJetPrinter.cpp" line="1817"/>
         <location filename="mainwidget.cpp" line="444"/>
         <source>自检完成!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3147"/>
+        <location filename="InkJetPrinter.cpp" line="3138"/>
+        <location filename="InkJetPrinter.cpp" line="3279"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="InkJetPrinter.cpp" line="101"/>
-        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <location filename="InkJetPrinter.cpp" line="1928"/>
+        <location filename="InkJetPrinter.cpp" line="3298"/>
+        <location filename="InkJetPrinter.cpp" line="3608"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="276"/>
+        <location filename="InkJetPrinter.cpp" line="274"/>
         <source>保养期还有%1小时到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="280"/>
+        <location filename="InkJetPrinter.cpp" line="278"/>
         <source>保养期已超过%1小时,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="976"/>
+        <location filename="InkJetPrinter.cpp" line="972"/>
         <source>开始自检,请等待60秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2792"/>
-        <location filename="InkJetPrinter.cpp" line="2825"/>
-        <location filename="InkJetPrinter.cpp" line="2851"/>
+        <location filename="InkJetPrinter.cpp" line="2783"/>
+        <location filename="InkJetPrinter.cpp" line="2816"/>
+        <location filename="InkJetPrinter.cpp" line="2842"/>
         <source>正在准备重启,请等待%1秒......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="769"/>
-        <location filename="InkJetPrinter.cpp" line="1227"/>
+        <location filename="InkJetPrinter.cpp" line="767"/>
+        <location filename="InkJetPrinter.cpp" line="1212"/>
         <source>压力泄漏或压力传感器故障!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="772"/>
+        <location filename="InkJetPrinter.cpp" line="770"/>
         <source>运行中压力泄漏，停齿轮泵!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="794"/>
-        <location filename="InkJetPrinter.cpp" line="878"/>
+        <location filename="InkJetPrinter.cpp" line="792"/>
+        <location filename="InkJetPrinter.cpp" line="876"/>
         <source>定时开机循环完成，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="871"/>
+        <location filename="InkJetPrinter.cpp" line="869"/>
         <source>waitPowerOffTime: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="879"/>
+        <location filename="InkJetPrinter.cpp" line="877"/>
         <source>准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1060"/>
-        <location filename="InkJetPrinter.cpp" line="1062"/>
+        <location filename="InkJetPrinter.cpp" line="1056"/>
+        <location filename="InkJetPrinter.cpp" line="1058"/>
         <source>缺少墨水,喷码机不能正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1286"/>
+        <location filename="InkJetPrinter.cpp" line="1271"/>
         <location filename="mainwidget.cpp" line="445"/>
         <source>停止打印，自动关闭高压.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2087"/>
+        <location filename="InkJetPrinter.cpp" line="2078"/>
         <source>flagOfPowerOnMode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2677"/>
-        <location filename="InkJetPrinter.cpp" line="2678"/>
+        <location filename="InkJetPrinter.cpp" line="2668"/>
+        <location filename="InkJetPrinter.cpp" line="2669"/>
         <source>电机故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2695"/>
+        <location filename="InkJetPrinter.cpp" line="2686"/>
         <source>回收槽到头</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2744"/>
-        <location filename="InkJetPrinter.cpp" line="2745"/>
+        <location filename="InkJetPrinter.cpp" line="2735"/>
+        <location filename="InkJetPrinter.cpp" line="2736"/>
         <source>回收槽卡住或者回收槽开关时间设置错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2963"/>
+        <location filename="InkJetPrinter.cpp" line="2954"/>
         <source>压力过高,请检查管路是否堵塞,然后点击故障恢复按钮</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3048"/>
-        <location filename="InkJetPrinter.cpp" line="3336"/>
-        <location filename="InkJetPrinter.cpp" line="3392"/>
+        <location filename="InkJetPrinter.cpp" line="3039"/>
+        <location filename="InkJetPrinter.cpp" line="3360"/>
+        <location filename="InkJetPrinter.cpp" line="3427"/>
         <source>请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3050"/>
+        <location filename="InkJetPrinter.cpp" line="3041"/>
         <source>墨水液位报警超过48小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3058"/>
-        <location filename="InkJetPrinter.cpp" line="3463"/>
-        <location filename="InkJetPrinter.cpp" line="3511"/>
+        <location filename="InkJetPrinter.cpp" line="3049"/>
+        <location filename="InkJetPrinter.cpp" line="3506"/>
+        <location filename="InkJetPrinter.cpp" line="3564"/>
         <source>请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3060"/>
+        <location filename="InkJetPrinter.cpp" line="3051"/>
         <source>溶剂液位报警超过48小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3068"/>
+        <location filename="InkJetPrinter.cpp" line="3059"/>
         <source>保养期还有%1天到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3070"/>
+        <location filename="InkJetPrinter.cpp" line="3061"/>
         <source>保养期已超过%1天,请进行保养以恢复喷码机的正常使用</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3226"/>
+        <location filename="InkJetPrinter.cpp" line="3211"/>
         <source>刷墨水卡成功, 请及时将该墨水卡对应的墨水添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3229"/>
+        <location filename="InkJetPrinter.cpp" line="3214"/>
         <source>刷墨水卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3238"/>
+        <location filename="InkJetPrinter.cpp" line="3223"/>
         <source>刷溶剂卡成功, 请及时将该溶剂卡对应的溶剂添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3241"/>
+        <location filename="InkJetPrinter.cpp" line="3226"/>
         <source>刷溶剂卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3316"/>
+        <location filename="InkJetPrinter.cpp" line="3274"/>
+        <source>粘度过高,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3276"/>
+        <source>粘度过低,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3293"/>
+        <source>粘度较高,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3295"/>
+        <source>粘度较低,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3335"/>
         <source>请及时使用墨水盒附带的IC卡激活墨水盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3390"/>
-        <source>墨水液位报警超过%1小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3414"/>
+        <source>墨水液位报警超过%1小时,机器无法正常打印,请添加墨水并刷卡.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3443"/>
+        <location filename="InkJetPrinter.cpp" line="3421"/>
+        <source>墨水告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3480"/>
         <source>请及时使用溶剂盒附带的IC卡激活溶剂盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3509"/>
-        <source>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <source>溶剂液位报警超过%1小时,机器无法正常打印,请添加溶剂并刷卡.</source>
+        <oldsource>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3576"/>
+        <location filename="InkJetPrinter.cpp" line="3558"/>
+        <source>溶剂告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3632"/>
         <source>File not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3099"/>
+        <location filename="InkJetPrinter.cpp" line="3090"/>
         <source>刷卡倒计时起始时间文件不存在</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2898,7 +2976,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="266"/>
-        <location filename="MainInstruction.cpp" line="187"/>
+        <location filename="MainInstruction.cpp" line="188"/>
         <source>额外设置</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +2997,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="205"/>
-        <location filename="MainInstruction.cpp" line="200"/>
+        <location filename="MainInstruction.cpp" line="201"/>
         <source>系统授权</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2934,7 +3012,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.ui" line="325"/>
+        <location filename="MainInstruction.ui" line="317"/>
+        <source>粘度设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="MainInstruction.ui" line="338"/>
         <source>✕</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2944,28 +3027,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>RFID卡清零!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="188"/>
-        <location filename="MainInstruction.cpp" line="199"/>
+        <location filename="MainInstruction.cpp" line="189"/>
+        <location filename="MainInstruction.cpp" line="200"/>
         <source>取消授权</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="190"/>
+        <location filename="MainInstruction.cpp" line="191"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="191"/>
+        <location filename="MainInstruction.cpp" line="192"/>
         <source>密码错误:%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,8 +3202,8 @@
     <message>
         <location filename="mainwidget.cpp" line="264"/>
         <location filename="mainwidget.cpp" line="283"/>
-        <location filename="mainwidget.cpp" line="1430"/>
-        <location filename="mainwidget.cpp" line="1448"/>
+        <location filename="mainwidget.cpp" line="1438"/>
+        <location filename="mainwidget.cpp" line="1456"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3152,36 +3235,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
-        <location filename="mainwidget.cpp" line="2478"/>
-        <location filename="mainwidget.cpp" line="2482"/>
-        <location filename="mainwidget.cpp" line="2491"/>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2474"/>
+        <location filename="mainwidget.cpp" line="2485"/>
+        <location filename="mainwidget.cpp" line="2489"/>
+        <location filename="mainwidget.cpp" line="2498"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
+        <location filename="mainwidget.cpp" line="2474"/>
         <source>喷印间隔过短,应高于%1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2478"/>
+        <location filename="mainwidget.cpp" line="2485"/>
         <source>喷头盖未关,请先关喷头盖!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2482"/>
+        <location filename="mainwidget.cpp" line="2489"/>
         <source>墨线未开，请先开墨线开关!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2491"/>
+        <location filename="mainwidget.cpp" line="2498"/>
         <source>当前总列数 %1 ,支持的总列数为 %2,请减少打印串的长度</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>打印耗时 %1ms ,触发间隔 :%2ms ,触发间隔至少应当大于打印耗时3ms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3218,72 +3301,72 @@
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1188"/>
-        <location filename="mainwidget.cpp" line="1416"/>
+        <location filename="mainwidget.cpp" line="1424"/>
         <source>正在排气...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1724"/>
-        <location filename="mainwidget.cpp" line="1761"/>
-        <source>高压故障</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1728"/>
-        <location filename="mainwidget.cpp" line="1765"/>
-        <source>相位故障</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwidget.cpp" line="1732"/>
         <location filename="mainwidget.cpp" line="1769"/>
-        <source>粘度故障</source>
+        <source>高压故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1736"/>
         <location filename="mainwidget.cpp" line="1773"/>
-        <source>回收故障</source>
+        <source>相位故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1740"/>
         <location filename="mainwidget.cpp" line="1777"/>
-        <source>溶液液位</source>
+        <source>粘度故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1744"/>
         <location filename="mainwidget.cpp" line="1781"/>
-        <source>墨水液位</source>
+        <source>回收故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1748"/>
         <location filename="mainwidget.cpp" line="1785"/>
-        <source>墨水缸满</source>
+        <source>溶液液位</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1752"/>
         <location filename="mainwidget.cpp" line="1789"/>
+        <source>墨水液位</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1756"/>
+        <location filename="mainwidget.cpp" line="1793"/>
+        <source>墨水缸满</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1760"/>
+        <location filename="mainwidget.cpp" line="1797"/>
         <source>墨线开关</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1808"/>
         <location filename="mainwidget.cpp" line="1816"/>
+        <location filename="mainwidget.cpp" line="1824"/>
         <source>正常</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2359"/>
         <source>相位故障, 关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2353"/>
-        <location filename="mainwidget.cpp" line="2354"/>
+        <location filename="mainwidget.cpp" line="2360"/>
+        <location filename="mainwidget.cpp" line="2361"/>
         <source>相位故障，关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3293,106 +3376,111 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1431"/>
-        <location filename="mainwidget.cpp" line="1449"/>
+        <location filename="mainwidget.cpp" line="1394"/>
+        <source>墨水或溶剂不足,请先添加</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1439"/>
+        <location filename="mainwidget.cpp" line="1457"/>
         <source>回收槽之前发生阻塞或回收槽时间设置错误，是否强制将当前位置设为到顶位置?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1571"/>
-        <location filename="mainwidget.cpp" line="1572"/>
+        <location filename="mainwidget.cpp" line="1579"/>
+        <location filename="mainwidget.cpp" line="1580"/>
         <source>%1.%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2145"/>
+        <location filename="mainwidget.cpp" line="2153"/>
         <source>墨水缸满报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2155"/>
+        <location filename="mainwidget.cpp" line="2163"/>
         <source>墨水液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2162"/>
+        <location filename="mainwidget.cpp" line="2170"/>
         <source>溶剂液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2189"/>
-        <location filename="mainwidget.cpp" line="2190"/>
+        <location filename="mainwidget.cpp" line="2196"/>
+        <location filename="mainwidget.cpp" line="2197"/>
         <source>高压故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2191"/>
+        <location filename="mainwidget.cpp" line="2198"/>
         <source>高压故障，暂停打印.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2203"/>
+        <location filename="mainwidget.cpp" line="2210"/>
         <source>高压故障，关回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2204"/>
+        <location filename="mainwidget.cpp" line="2211"/>
         <source>高压故障，关回收槽和墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2250"/>
-        <location filename="mainwidget.cpp" line="2251"/>
+        <location filename="mainwidget.cpp" line="2257"/>
+        <location filename="mainwidget.cpp" line="2258"/>
         <source>回收故障，关闭回收槽，关墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2255"/>
+        <location filename="mainwidget.cpp" line="2262"/>
         <source>回收故障.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2264"/>
+        <location filename="mainwidget.cpp" line="2271"/>
         <source>回收异常,墨线可能偏离.(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2272"/>
+        <location filename="mainwidget.cpp" line="2279"/>
         <source>正在喷印.......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2317"/>
+        <location filename="mainwidget.cpp" line="2324"/>
         <source>相位故障:飞行时间错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2321"/>
+        <location filename="mainwidget.cpp" line="2328"/>
         <source>相位故障:相位检测错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2329"/>
-        <location filename="mainwidget.cpp" line="2330"/>
-        <location filename="mainwidget.cpp" line="2331"/>
+        <location filename="mainwidget.cpp" line="2336"/>
+        <location filename="mainwidget.cpp" line="2337"/>
+        <location filename="mainwidget.cpp" line="2338"/>
         <source>相位故障，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2337"/>
-        <location filename="mainwidget.cpp" line="2338"/>
-        <location filename="mainwidget.cpp" line="2339"/>
+        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2345"/>
+        <location filename="mainwidget.cpp" line="2346"/>
         <source>相位故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2351"/>
         <source>相位故障，屏蔽DAC输出</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2345"/>
-        <location filename="mainwidget.cpp" line="2346"/>
+        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2353"/>
         <source>相位故障，屏蔽充电</source>
         <translation type="unfinished"></translation>
     </message>

farsi.ts

@@ -194,15 +194,15 @@
         <location filename="countervarset.ui" line="84"/>
         <location filename="countervarset.ui" line="273"/>
         <location filename="CounterVarSet.cpp" line="168"/>
-        <location filename="CounterVarSet.cpp" line="183"/>
+        <location filename="CounterVarSet.cpp" line="187"/>
         <source>计数器1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="countervarset.ui" line="112"/>
         <location filename="countervarset.ui" line="655"/>
-        <location filename="CounterVarSet.cpp" line="176"/>
-        <location filename="CounterVarSet.cpp" line="185"/>
+        <location filename="CounterVarSet.cpp" line="178"/>
+        <location filename="CounterVarSet.cpp" line="189"/>
         <source>计数器2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1596,6 +1596,50 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DlgViscositySetting</name>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="14"/>
+        <source>告警浮动范围设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="26"/>
+        <source>✕</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="39"/>
+        <source>✓</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="52"/>
+        <source>告警阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="68"/>
+        <source>关喷嘴阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="167"/>
+        <source>设定值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="183"/>
+        <location filename="dlgviscositysetting.ui" line="196"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="209"/>
+        <source>当前值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FileLogger</name>
     <message>
@@ -1925,197 +1969,231 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="993"/>
+        <location filename="InkJetPrinter.cpp" line="988"/>
         <source>开始自检,请等待%1秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1830"/>
-        <location filename="InkJetPrinter.cpp" line="1831"/>
+        <location filename="InkJetPrinter.cpp" line="1816"/>
+        <location filename="InkJetPrinter.cpp" line="1817"/>
         <location filename="mainwidget.cpp" line="444"/>
         <source>自检完成!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3147"/>
+        <location filename="InkJetPrinter.cpp" line="3138"/>
+        <location filename="InkJetPrinter.cpp" line="3279"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="InkJetPrinter.cpp" line="101"/>
-        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <location filename="InkJetPrinter.cpp" line="1928"/>
+        <location filename="InkJetPrinter.cpp" line="3298"/>
+        <location filename="InkJetPrinter.cpp" line="3608"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="276"/>
+        <location filename="InkJetPrinter.cpp" line="274"/>
         <source>保养期还有%1小时到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="280"/>
+        <location filename="InkJetPrinter.cpp" line="278"/>
         <source>保养期已超过%1小时,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="976"/>
+        <location filename="InkJetPrinter.cpp" line="972"/>
         <source>开始自检,请等待60秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2792"/>
-        <location filename="InkJetPrinter.cpp" line="2825"/>
-        <location filename="InkJetPrinter.cpp" line="2851"/>
+        <location filename="InkJetPrinter.cpp" line="2783"/>
+        <location filename="InkJetPrinter.cpp" line="2816"/>
+        <location filename="InkJetPrinter.cpp" line="2842"/>
         <source>正在准备重启,请等待%1秒......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="769"/>
-        <location filename="InkJetPrinter.cpp" line="1227"/>
+        <location filename="InkJetPrinter.cpp" line="767"/>
+        <location filename="InkJetPrinter.cpp" line="1212"/>
         <source>压力泄漏或压力传感器故障!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="772"/>
+        <location filename="InkJetPrinter.cpp" line="770"/>
         <source>运行中压力泄漏，停齿轮泵!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="794"/>
-        <location filename="InkJetPrinter.cpp" line="878"/>
+        <location filename="InkJetPrinter.cpp" line="792"/>
+        <location filename="InkJetPrinter.cpp" line="876"/>
         <source>定时开机循环完成，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="871"/>
+        <location filename="InkJetPrinter.cpp" line="869"/>
         <source>waitPowerOffTime: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="879"/>
+        <location filename="InkJetPrinter.cpp" line="877"/>
         <source>准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1060"/>
-        <location filename="InkJetPrinter.cpp" line="1062"/>
+        <location filename="InkJetPrinter.cpp" line="1056"/>
+        <location filename="InkJetPrinter.cpp" line="1058"/>
         <source>缺少墨水,喷码机不能正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1286"/>
+        <location filename="InkJetPrinter.cpp" line="1271"/>
         <location filename="mainwidget.cpp" line="445"/>
         <source>停止打印，自动关闭高压.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2087"/>
+        <location filename="InkJetPrinter.cpp" line="2078"/>
         <source>flagOfPowerOnMode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2677"/>
-        <location filename="InkJetPrinter.cpp" line="2678"/>
+        <location filename="InkJetPrinter.cpp" line="2668"/>
+        <location filename="InkJetPrinter.cpp" line="2669"/>
         <source>电机故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2695"/>
+        <location filename="InkJetPrinter.cpp" line="2686"/>
         <source>回收槽到头</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2744"/>
-        <location filename="InkJetPrinter.cpp" line="2745"/>
+        <location filename="InkJetPrinter.cpp" line="2735"/>
+        <location filename="InkJetPrinter.cpp" line="2736"/>
         <source>回收槽卡住或者回收槽开关时间设置错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2963"/>
+        <location filename="InkJetPrinter.cpp" line="2954"/>
         <source>压力过高,请检查管路是否堵塞,然后点击故障恢复按钮</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3048"/>
-        <location filename="InkJetPrinter.cpp" line="3336"/>
-        <location filename="InkJetPrinter.cpp" line="3392"/>
+        <location filename="InkJetPrinter.cpp" line="3039"/>
+        <location filename="InkJetPrinter.cpp" line="3360"/>
+        <location filename="InkJetPrinter.cpp" line="3427"/>
         <source>请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3050"/>
+        <location filename="InkJetPrinter.cpp" line="3041"/>
         <source>墨水液位报警超过48小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3058"/>
-        <location filename="InkJetPrinter.cpp" line="3463"/>
-        <location filename="InkJetPrinter.cpp" line="3511"/>
+        <location filename="InkJetPrinter.cpp" line="3049"/>
+        <location filename="InkJetPrinter.cpp" line="3506"/>
+        <location filename="InkJetPrinter.cpp" line="3564"/>
         <source>请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3060"/>
+        <location filename="InkJetPrinter.cpp" line="3051"/>
         <source>溶剂液位报警超过48小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3068"/>
+        <location filename="InkJetPrinter.cpp" line="3059"/>
         <source>保养期还有%1天到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3070"/>
+        <location filename="InkJetPrinter.cpp" line="3061"/>
         <source>保养期已超过%1天,请进行保养以恢复喷码机的正常使用</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3226"/>
+        <location filename="InkJetPrinter.cpp" line="3211"/>
         <source>刷墨水卡成功, 请及时将该墨水卡对应的墨水添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3229"/>
+        <location filename="InkJetPrinter.cpp" line="3214"/>
         <source>刷墨水卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3238"/>
+        <location filename="InkJetPrinter.cpp" line="3223"/>
         <source>刷溶剂卡成功, 请及时将该溶剂卡对应的溶剂添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3241"/>
+        <location filename="InkJetPrinter.cpp" line="3226"/>
         <source>刷溶剂卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3316"/>
+        <location filename="InkJetPrinter.cpp" line="3274"/>
+        <source>粘度过高,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3276"/>
+        <source>粘度过低,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3293"/>
+        <source>粘度较高,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3295"/>
+        <source>粘度较低,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3335"/>
         <source>请及时使用墨水盒附带的IC卡激活墨水盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3390"/>
-        <source>墨水液位报警超过%1小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3414"/>
+        <source>墨水液位报警超过%1小时,机器无法正常打印,请添加墨水并刷卡.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3443"/>
+        <location filename="InkJetPrinter.cpp" line="3421"/>
+        <source>墨水告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3480"/>
         <source>请及时使用溶剂盒附带的IC卡激活溶剂盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3509"/>
-        <source>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <source>溶剂液位报警超过%1小时,机器无法正常打印,请添加溶剂并刷卡.</source>
+        <oldsource>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3576"/>
+        <location filename="InkJetPrinter.cpp" line="3558"/>
+        <source>溶剂告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3632"/>
         <source>File not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3099"/>
+        <location filename="InkJetPrinter.cpp" line="3090"/>
         <source>刷卡倒计时起始时间文件不存在</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2898,7 +2976,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="266"/>
-        <location filename="MainInstruction.cpp" line="187"/>
+        <location filename="MainInstruction.cpp" line="188"/>
         <source>额外设置</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +2997,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="205"/>
-        <location filename="MainInstruction.cpp" line="200"/>
+        <location filename="MainInstruction.cpp" line="201"/>
         <source>系统授权</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2934,7 +3012,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.ui" line="325"/>
+        <location filename="MainInstruction.ui" line="317"/>
+        <source>粘度设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="MainInstruction.ui" line="338"/>
         <source>✕</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2944,28 +3027,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>RFID卡清零!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="188"/>
-        <location filename="MainInstruction.cpp" line="199"/>
+        <location filename="MainInstruction.cpp" line="189"/>
+        <location filename="MainInstruction.cpp" line="200"/>
         <source>取消授权</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="190"/>
+        <location filename="MainInstruction.cpp" line="191"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="191"/>
+        <location filename="MainInstruction.cpp" line="192"/>
         <source>密码错误:%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,8 +3202,8 @@
     <message>
         <location filename="mainwidget.cpp" line="264"/>
         <location filename="mainwidget.cpp" line="283"/>
-        <location filename="mainwidget.cpp" line="1430"/>
-        <location filename="mainwidget.cpp" line="1448"/>
+        <location filename="mainwidget.cpp" line="1438"/>
+        <location filename="mainwidget.cpp" line="1456"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3152,36 +3235,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
-        <location filename="mainwidget.cpp" line="2478"/>
-        <location filename="mainwidget.cpp" line="2482"/>
-        <location filename="mainwidget.cpp" line="2491"/>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2474"/>
+        <location filename="mainwidget.cpp" line="2485"/>
+        <location filename="mainwidget.cpp" line="2489"/>
+        <location filename="mainwidget.cpp" line="2498"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
+        <location filename="mainwidget.cpp" line="2474"/>
         <source>喷印间隔过短,应高于%1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2478"/>
+        <location filename="mainwidget.cpp" line="2485"/>
         <source>喷头盖未关,请先关喷头盖!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2482"/>
+        <location filename="mainwidget.cpp" line="2489"/>
         <source>墨线未开，请先开墨线开关!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2491"/>
+        <location filename="mainwidget.cpp" line="2498"/>
         <source>当前总列数 %1 ,支持的总列数为 %2,请减少打印串的长度</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>打印耗时 %1ms ,触发间隔 :%2ms ,触发间隔至少应当大于打印耗时3ms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3218,72 +3301,72 @@
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1188"/>
-        <location filename="mainwidget.cpp" line="1416"/>
+        <location filename="mainwidget.cpp" line="1424"/>
         <source>正在排气...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1724"/>
-        <location filename="mainwidget.cpp" line="1761"/>
-        <source>高压故障</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1728"/>
-        <location filename="mainwidget.cpp" line="1765"/>
-        <source>相位故障</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwidget.cpp" line="1732"/>
         <location filename="mainwidget.cpp" line="1769"/>
-        <source>粘度故障</source>
+        <source>高压故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1736"/>
         <location filename="mainwidget.cpp" line="1773"/>
-        <source>回收故障</source>
+        <source>相位故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1740"/>
         <location filename="mainwidget.cpp" line="1777"/>
-        <source>溶液液位</source>
+        <source>粘度故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1744"/>
         <location filename="mainwidget.cpp" line="1781"/>
-        <source>墨水液位</source>
+        <source>回收故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1748"/>
         <location filename="mainwidget.cpp" line="1785"/>
-        <source>墨水缸满</source>
+        <source>溶液液位</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1752"/>
         <location filename="mainwidget.cpp" line="1789"/>
+        <source>墨水液位</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1756"/>
+        <location filename="mainwidget.cpp" line="1793"/>
+        <source>墨水缸满</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1760"/>
+        <location filename="mainwidget.cpp" line="1797"/>
         <source>墨线开关</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1808"/>
         <location filename="mainwidget.cpp" line="1816"/>
+        <location filename="mainwidget.cpp" line="1824"/>
         <source>正常</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2359"/>
         <source>相位故障, 关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2353"/>
-        <location filename="mainwidget.cpp" line="2354"/>
+        <location filename="mainwidget.cpp" line="2360"/>
+        <location filename="mainwidget.cpp" line="2361"/>
         <source>相位故障，关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3293,106 +3376,111 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1431"/>
-        <location filename="mainwidget.cpp" line="1449"/>
+        <location filename="mainwidget.cpp" line="1394"/>
+        <source>墨水或溶剂不足,请先添加</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1439"/>
+        <location filename="mainwidget.cpp" line="1457"/>
         <source>回收槽之前发生阻塞或回收槽时间设置错误，是否强制将当前位置设为到顶位置?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1571"/>
-        <location filename="mainwidget.cpp" line="1572"/>
+        <location filename="mainwidget.cpp" line="1579"/>
+        <location filename="mainwidget.cpp" line="1580"/>
         <source>%1.%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2145"/>
+        <location filename="mainwidget.cpp" line="2153"/>
         <source>墨水缸满报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2155"/>
+        <location filename="mainwidget.cpp" line="2163"/>
         <source>墨水液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2162"/>
+        <location filename="mainwidget.cpp" line="2170"/>
         <source>溶剂液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2189"/>
-        <location filename="mainwidget.cpp" line="2190"/>
+        <location filename="mainwidget.cpp" line="2196"/>
+        <location filename="mainwidget.cpp" line="2197"/>
         <source>高压故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2191"/>
+        <location filename="mainwidget.cpp" line="2198"/>
         <source>高压故障，暂停打印.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2203"/>
+        <location filename="mainwidget.cpp" line="2210"/>
         <source>高压故障，关回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2204"/>
+        <location filename="mainwidget.cpp" line="2211"/>
         <source>高压故障，关回收槽和墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2250"/>
-        <location filename="mainwidget.cpp" line="2251"/>
+        <location filename="mainwidget.cpp" line="2257"/>
+        <location filename="mainwidget.cpp" line="2258"/>
         <source>回收故障，关闭回收槽，关墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2255"/>
+        <location filename="mainwidget.cpp" line="2262"/>
         <source>回收故障.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2264"/>
+        <location filename="mainwidget.cpp" line="2271"/>
         <source>回收异常,墨线可能偏离.(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2272"/>
+        <location filename="mainwidget.cpp" line="2279"/>
         <source>正在喷印.......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2317"/>
+        <location filename="mainwidget.cpp" line="2324"/>
         <source>相位故障:飞行时间错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2321"/>
+        <location filename="mainwidget.cpp" line="2328"/>
         <source>相位故障:相位检测错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2329"/>
-        <location filename="mainwidget.cpp" line="2330"/>
-        <location filename="mainwidget.cpp" line="2331"/>
+        <location filename="mainwidget.cpp" line="2336"/>
+        <location filename="mainwidget.cpp" line="2337"/>
+        <location filename="mainwidget.cpp" line="2338"/>
         <source>相位故障，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2337"/>
-        <location filename="mainwidget.cpp" line="2338"/>
-        <location filename="mainwidget.cpp" line="2339"/>
+        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2345"/>
+        <location filename="mainwidget.cpp" line="2346"/>
         <source>相位故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2351"/>
         <source>相位故障，屏蔽DAC输出</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2345"/>
-        <location filename="mainwidget.cpp" line="2346"/>
+        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2353"/>
         <source>相位故障，屏蔽充电</source>
         <translation type="unfinished"></translation>
     </message>

korean.ts

@@ -202,15 +202,15 @@
         <location filename="countervarset.ui" line="84"/>
         <location filename="countervarset.ui" line="273"/>
         <location filename="CounterVarSet.cpp" line="168"/>
-        <location filename="CounterVarSet.cpp" line="183"/>
+        <location filename="CounterVarSet.cpp" line="187"/>
         <source>计数器1</source>
         <translation>카운터1</translation>
     </message>
     <message>
         <location filename="countervarset.ui" line="112"/>
         <location filename="countervarset.ui" line="655"/>
-        <location filename="CounterVarSet.cpp" line="176"/>
-        <location filename="CounterVarSet.cpp" line="185"/>
+        <location filename="CounterVarSet.cpp" line="178"/>
+        <location filename="CounterVarSet.cpp" line="189"/>
         <source>计数器2</source>
         <translation>카운터2</translation>
     </message>
@@ -2669,6 +2669,50 @@
         <translation type="vanished">가변 길이 허용</translation>
     </message>
 </context>
+<context>
+    <name>DlgViscositySetting</name>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="14"/>
+        <source>告警浮动范围设置</source>
+        <translation>경고 변동 범위 설정</translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="26"/>
+        <source>✕</source>
+        <translation>✕</translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="39"/>
+        <source>✓</source>
+        <translation>✓</translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="52"/>
+        <source>告警阈值:</source>
+        <translation>경보 임계값:</translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="68"/>
+        <source>关喷嘴阈值:</source>
+        <translation>노즐 닫기 임계값:</translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="167"/>
+        <source>设定值:</source>
+        <translation>설정값:</translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="183"/>
+        <location filename="dlgviscositysetting.ui" line="196"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="209"/>
+        <source>当前值:</source>
+        <translation>현재 값:</translation>
+    </message>
+</context>
 <context>
     <name>FileLogger</name>
     <message>
@@ -3208,18 +3252,18 @@
         <translation type="vanished">로그 정보</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="794"/>
-        <location filename="InkJetPrinter.cpp" line="878"/>
+        <location filename="InkJetPrinter.cpp" line="792"/>
+        <location filename="InkJetPrinter.cpp" line="876"/>
         <source>定时开机循环完成，准备关机</source>
         <translation>타이머 가동 사이클 완료, 시스템 종료 준비 중</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="871"/>
+        <location filename="InkJetPrinter.cpp" line="869"/>
         <source>waitPowerOffTime: %1</source>
         <translation>waitPowerOffTime: %1</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="879"/>
+        <location filename="InkJetPrinter.cpp" line="877"/>
         <source>准备关机</source>
         <translation>시스템 종료 준비 중</translation>
     </message>
@@ -3232,25 +3276,25 @@
         <translation type="vanished">FPGA 통신 복구</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="976"/>
+        <location filename="InkJetPrinter.cpp" line="972"/>
         <source>开始自检,请等待60秒...</source>
         <translation>자체 진단 시작 60초 대기</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="993"/>
+        <location filename="InkJetPrinter.cpp" line="988"/>
         <source>开始自检,请等待%1秒...</source>
         <translation>자체 진단 시작 %1초 대기</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1830"/>
-        <location filename="InkJetPrinter.cpp" line="1831"/>
+        <location filename="InkJetPrinter.cpp" line="1816"/>
+        <location filename="InkJetPrinter.cpp" line="1817"/>
         <location filename="mainwidget.cpp" line="444"/>
         <source>自检完成!!!</source>
         <translation>자체 진단 완료!!!</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1060"/>
-        <location filename="InkJetPrinter.cpp" line="1062"/>
+        <location filename="InkJetPrinter.cpp" line="1056"/>
+        <location filename="InkJetPrinter.cpp" line="1058"/>
         <source>缺少墨水,喷码机不能正常工作!</source>
         <translation>잉크 부족으로 작동 불가!</translation>
     </message>
@@ -3283,7 +3327,7 @@
         <translation type="vanished">압력 변동이 설정값 5 초과</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1286"/>
+        <location filename="InkJetPrinter.cpp" line="1271"/>
         <location filename="mainwidget.cpp" line="445"/>
         <source>停止打印，自动关闭高压.</source>
         <translation>인쇄 중지, 고전압 자동 종료</translation>
@@ -3314,7 +3358,9 @@
     </message>
     <message>
         <location filename="InkJetPrinter.cpp" line="101"/>
-        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <location filename="InkJetPrinter.cpp" line="1928"/>
+        <location filename="InkJetPrinter.cpp" line="3298"/>
+        <location filename="InkJetPrinter.cpp" line="3608"/>
         <source>提示</source>
         <translation>팁</translation>
     </message>
@@ -3379,13 +3425,13 @@
         <translation type="vanished">13.카드 리더기 고장!</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="769"/>
-        <location filename="InkJetPrinter.cpp" line="1227"/>
+        <location filename="InkJetPrinter.cpp" line="767"/>
+        <location filename="InkJetPrinter.cpp" line="1212"/>
         <source>压力泄漏或压力传感器故障!</source>
         <translation>압력 누출 또는 압력 센서 고장</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="772"/>
+        <location filename="InkJetPrinter.cpp" line="770"/>
         <source>运行中压力泄漏，停齿轮泵!</source>
         <translation>작동 중 압력 누출이 발생하여 기어 펌프를 정지합니다!</translation>
     </message>
@@ -3406,7 +3452,7 @@
         <translation type="vanished">솔벤트 TAG을 리드하겠습니까? %1초 후 자동 확인</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3241"/>
+        <location filename="InkJetPrinter.cpp" line="3226"/>
         <source>刷溶剂卡成功!</source>
         <oldsource>确认要刷卡吗?</oldsource>
         <translation>솔벤트 TAG 리드 성공!</translation>
@@ -3428,7 +3474,7 @@
         <translation type="vanished">먼저 잉크을 보충한 후 TAG을 사용하십시오!</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3229"/>
+        <location filename="InkJetPrinter.cpp" line="3214"/>
         <source>刷墨水卡成功!</source>
         <translation>잉크 TAG 리드 성공!</translation>
     </message>
@@ -3474,29 +3520,29 @@
         <translation type="vanished">재부팅을 준비하는 중입니다. %1 초 동안 기다려 주십시오...</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3068"/>
+        <location filename="InkJetPrinter.cpp" line="3059"/>
         <source>保养期还有%1天到期,请及时保养,否则喷码机容易损坏</source>
         <translation>유지보수 주기 만료까지 %1일 남았습니다. 제때 유지보수를 실시하십시오. </translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3070"/>
+        <location filename="InkJetPrinter.cpp" line="3061"/>
         <source>保养期已超过%1天,请进行保养以恢复喷码机的正常使用</source>
         <translation>유지보수 주기가 %1일 초과되었습니다. 잉크젯 프린터의 정상 사용을 복구하려면 유지보수를 실시하십시오.</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3048"/>
-        <location filename="InkJetPrinter.cpp" line="3336"/>
-        <location filename="InkJetPrinter.cpp" line="3392"/>
+        <location filename="InkJetPrinter.cpp" line="3039"/>
+        <location filename="InkJetPrinter.cpp" line="3360"/>
+        <location filename="InkJetPrinter.cpp" line="3427"/>
         <source>请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!</source>
         <translation>잉크 TAG를 인식해 주세요. 정품 잉크를 사용해 주세요. 그렇지 않을 경우  %1시간 후 사용이 중지됩니다!</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2087"/>
+        <location filename="InkJetPrinter.cpp" line="2078"/>
         <source>flagOfPowerOnMode: %1</source>
         <translation>flagOfPowerOnMode: %1</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2963"/>
+        <location filename="InkJetPrinter.cpp" line="2954"/>
         <source>压力过高,请检查管路是否堵塞,然后点击故障恢复按钮</source>
         <translation>압력이 너무 높습니다. 배관이 막혔는지 확인한 후 오류 복구 버튼을 누르십시오.</translation>
     </message>
@@ -3601,54 +3647,84 @@
         <translation type="vanished">기어 펌프 회전 속도가 너무 높습니다. 즉시 정지하고 공급업체에 연락하십시오.</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3050"/>
+        <location filename="InkJetPrinter.cpp" line="3041"/>
         <source>墨水液位报警超过48小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
         <translation>잉크 레벨 경보가 48시간을 초과했습니다. 장비의 정상 작동을 복구하기 위해 잉크를 추가하고 잉크 TAG을 리드하세요</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3058"/>
-        <location filename="InkJetPrinter.cpp" line="3463"/>
-        <location filename="InkJetPrinter.cpp" line="3511"/>
+        <location filename="InkJetPrinter.cpp" line="3049"/>
+        <location filename="InkJetPrinter.cpp" line="3506"/>
+        <location filename="InkJetPrinter.cpp" line="3564"/>
         <source>请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!</source>
         <translation>솔벤트 TAG를 리드하시고 정품 솔벤트를 사용하십시오. 그렇지 않으면 %1시간 후에 장비 사용이 금지됩니다!</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3060"/>
+        <location filename="InkJetPrinter.cpp" line="3051"/>
         <source>溶剂液位报警超过48小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
         <translation>솔벤트 수위 경보가 48시간을 초과했습니다. 장비의 정상 작동을 복구하기 위해 솔벤트를 추가하고 솔벤트 TAG를 리드하세요</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3226"/>
+        <location filename="InkJetPrinter.cpp" line="3211"/>
         <source>刷墨水卡成功, 请及时将该墨水卡对应的墨水添加到机器中</source>
         <translation>잉크 TAG 리드 성공, 해당 잉크 카드에 대응하는 잉크를 장비에 즉시 보충해 주세요</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3238"/>
+        <location filename="InkJetPrinter.cpp" line="3223"/>
         <source>刷溶剂卡成功, 请及时将该溶剂卡对应的溶剂添加到机器中</source>
         <translation>솔벤트 TAG 리드 성공, 해당 솔벤트 카드에 대응하는 솔벤트를 장비에 즉시 보충해 주세요</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3316"/>
+        <location filename="InkJetPrinter.cpp" line="3274"/>
+        <source>粘度过高,即将关闭喷嘴</source>
+        <translation>점도가 너무 높아 곧 노즐을 닫습니다</translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3276"/>
+        <source>粘度过低,即将关闭喷嘴</source>
+        <translation>점도가 너무 낮아 곧 노즐을 닫습니다</translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3293"/>
+        <source>粘度较高,请注意调整粘度</source>
+        <translation>점도가 비교적 높으므로 점도를 조절하는 데 주의하십시오</translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3295"/>
+        <source>粘度较低,请注意调整粘度</source>
+        <translation>점도가 낮으니 점도 조정에 주의하십시오</translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3335"/>
         <source>请及时使用墨水盒附带的IC卡激活墨水盒</source>
         <translation>잉크 용기에 동봉된 IC 카드로 잉크 용기를 즉시 활성화해 주세요</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3390"/>
-        <source>墨水液位报警超过%1小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
-        <translation></translation>
+        <location filename="InkJetPrinter.cpp" line="3414"/>
+        <source>墨水液位报警超过%1小时,机器无法正常打印,请添加墨水并刷卡.</source>
+        <translation>잉크 잔량 경보가 %1시간 이상 지속되면, 기계가 정상적으로 인쇄되지 않으니 잉크를 추가하고 카드를 스와이프하세요.</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3443"/>
+        <location filename="InkJetPrinter.cpp" line="3421"/>
+        <source>墨水告警已累计3小时，自动关喷嘴。</source>
+        <translation>잉크 경고가 3시간 누적되어 자동으로 노즐이 꺼졌습니다.</translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3480"/>
         <source>请及时使用溶剂盒附带的IC卡激活溶剂盒</source>
         <translation>솔벤트 용기에 동봉된 IC 카드로 솔벤트 용기를 즉시 활성화해 주세요</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3509"/>
-        <source>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
-        <translation></translation>
+        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <source>溶剂液位报警超过%1小时,机器无法正常打印,请添加溶剂并刷卡.</source>
+        <translation>용제 액위 경보가 %1시간을 초과하면 기계가 정상적으로 인쇄되지 않으므로, 용제를 추가하고 카드를 스와이프하십시오.</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3576"/>
+        <location filename="InkJetPrinter.cpp" line="3558"/>
+        <source>溶剂告警已累计3小时，自动关喷嘴。</source>
+        <translation>용제 경보가 이미 3시간 누적되어 자동으로 노즐을 차단합니다.</translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3632"/>
         <source>File not found: %1</source>
         <translation>File not found: %1</translation>
     </message>
@@ -3657,7 +3733,7 @@
         <translation type="obsolete">유지보수 주기가 %1일 초과되었습니다. 제때 유지보수를 실시하십시오. 그렇지 않으면 잉크젯 프린터가 손상될 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3099"/>
+        <location filename="InkJetPrinter.cpp" line="3090"/>
         <source>刷卡倒计时起始时间文件不存在</source>
         <translation>카드 사용 카운트다운 시작 시간 파일이 존재하지 않습니다.</translation>
     </message>
@@ -3842,7 +3918,8 @@
         <translation type="obsolete">잉크 선 빠른 닫기 완료</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3147"/>
+        <location filename="InkJetPrinter.cpp" line="3138"/>
+        <location filename="InkJetPrinter.cpp" line="3279"/>
         <source>警告</source>
         <translation>경고</translation>
     </message>
@@ -3851,12 +3928,12 @@
         <translation type="vanished">유지 보수 카드 사용 확인?</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="276"/>
+        <location filename="InkJetPrinter.cpp" line="274"/>
         <source>保养期还有%1小时到期,请及时保养,否则喷码机容易损坏</source>
         <translation>유지 보수 기간 %1시간 남았습니다, 유지 보수 해주세요.</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="280"/>
+        <location filename="InkJetPrinter.cpp" line="278"/>
         <source>保养期已超过%1小时,请及时保养,否则喷码机容易损坏</source>
         <translation>유 보수 기간 %1시간 초과, 유지 보수 해주세요.</translation>
     </message>
@@ -3921,9 +3998,9 @@
         <translation type="vanished">%1/%2/%3</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2792"/>
-        <location filename="InkJetPrinter.cpp" line="2825"/>
-        <location filename="InkJetPrinter.cpp" line="2851"/>
+        <location filename="InkJetPrinter.cpp" line="2783"/>
+        <location filename="InkJetPrinter.cpp" line="2816"/>
+        <location filename="InkJetPrinter.cpp" line="2842"/>
         <source>正在准备重启,请等待%1秒......</source>
         <translation>재시작 준비 중, %1초 대기...</translation>
     </message>
@@ -3964,8 +4041,8 @@
         <translation type="obsolete">오류!!!!!!!!!!!점도 이상</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2677"/>
-        <location filename="InkJetPrinter.cpp" line="2678"/>
+        <location filename="InkJetPrinter.cpp" line="2668"/>
+        <location filename="InkJetPrinter.cpp" line="2669"/>
         <source>电机故障</source>
         <translation>모터 에러</translation>
     </message>
@@ -3974,13 +4051,13 @@
         <translation type="vanished">모터 에러!!!</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2695"/>
+        <location filename="InkJetPrinter.cpp" line="2686"/>
         <source>回收槽到头</source>
         <translation>거터 최대 위치 도달</translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2744"/>
-        <location filename="InkJetPrinter.cpp" line="2745"/>
+        <location filename="InkJetPrinter.cpp" line="2735"/>
+        <location filename="InkJetPrinter.cpp" line="2736"/>
         <source>回收槽卡住或者回收槽开关时间设置错误</source>
         <translation>거터가 걸렸거나 거터 개폐 시간 설정이 잘못되었습니다.</translation>
     </message>
@@ -4957,7 +5034,7 @@ Char</translation>
     </message>
     <message>
         <location filename="MainInstruction.ui" line="266"/>
-        <location filename="MainInstruction.cpp" line="187"/>
+        <location filename="MainInstruction.cpp" line="188"/>
         <source>额外设置</source>
         <translation>추가 설정</translation>
     </message>
@@ -4977,7 +5054,7 @@ Char</translation>
     </message>
     <message>
         <location filename="MainInstruction.ui" line="205"/>
-        <location filename="MainInstruction.cpp" line="200"/>
+        <location filename="MainInstruction.cpp" line="201"/>
         <source>系统授权</source>
         <translation>시스템 권한</translation>
     </message>
@@ -4997,7 +5074,12 @@ Char</translation>
         <translation>창 도트 매트릭스 설정</translation>
     </message>
     <message>
-        <location filename="MainInstruction.ui" line="325"/>
+        <location filename="MainInstruction.ui" line="317"/>
+        <source>粘度设置</source>
+        <translation>점도 설정</translation>
+    </message>
+    <message>
+        <location filename="MainInstruction.ui" line="338"/>
         <source>✕</source>
         <translation>✕</translation>
     </message>
@@ -5023,28 +5105,28 @@ Char</translation>
         <translation>RFID 설정</translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>提示</source>
         <translation>팁</translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>RFID卡清零!</source>
         <translation>RFID 카드 초기화!</translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="188"/>
-        <location filename="MainInstruction.cpp" line="199"/>
+        <location filename="MainInstruction.cpp" line="189"/>
+        <location filename="MainInstruction.cpp" line="200"/>
         <source>取消授权</source>
         <translation>권한 해제</translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="190"/>
+        <location filename="MainInstruction.cpp" line="191"/>
         <source>警告</source>
         <translation>경고</translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="191"/>
+        <location filename="MainInstruction.cpp" line="192"/>
         <source>密码错误:%1</source>
         <translation>비밀번호 오류:%1</translation>
     </message>
@@ -5234,8 +5316,8 @@ Char</translation>
     <message>
         <location filename="mainwidget.cpp" line="264"/>
         <location filename="mainwidget.cpp" line="283"/>
-        <location filename="mainwidget.cpp" line="1430"/>
-        <location filename="mainwidget.cpp" line="1448"/>
+        <location filename="mainwidget.cpp" line="1438"/>
+        <location filename="mainwidget.cpp" line="1456"/>
         <source>警告</source>
         <translation>경고</translation>
     </message>
@@ -5291,36 +5373,36 @@ Char</translation>
         <translation type="vanished">경고: 인터페이스에 일부 변수가 표시되지 않습니다.</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
-        <location filename="mainwidget.cpp" line="2478"/>
-        <location filename="mainwidget.cpp" line="2482"/>
-        <location filename="mainwidget.cpp" line="2491"/>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2474"/>
+        <location filename="mainwidget.cpp" line="2485"/>
+        <location filename="mainwidget.cpp" line="2489"/>
+        <location filename="mainwidget.cpp" line="2498"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>错误</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
+        <location filename="mainwidget.cpp" line="2474"/>
         <source>喷印间隔过短,应高于%1!</source>
         <translation>인쇄 간격이 너무 짧습니다. %1 이상으로 설정하세요!</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2478"/>
+        <location filename="mainwidget.cpp" line="2485"/>
         <source>喷头盖未关,请先关喷头盖!</source>
         <translation>헤드 커버 닫기 필요!</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2482"/>
+        <location filename="mainwidget.cpp" line="2489"/>
         <source>墨线未开，请先开墨线开关!</source>
         <translation>잉크 스위치 켜십시오!</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2491"/>
+        <location filename="mainwidget.cpp" line="2498"/>
         <source>当前总列数 %1 ,支持的总列数为 %2,请减少打印串的长度</source>
         <translation>최대 %2열 지원, 현재 %1열 → 길이 축소</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>打印耗时 %1ms ,触发间隔 :%2ms ,触发间隔至少应当大于打印耗时3ms</source>
         <translation>트리거 간격 %1ms → %2ms 이상 필요</translation>
     </message>
@@ -5361,7 +5443,7 @@ Char</translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1188"/>
-        <location filename="mainwidget.cpp" line="1416"/>
+        <location filename="mainwidget.cpp" line="1424"/>
         <source>正在排气...</source>
         <translation>블리딩 중...</translation>
     </message>
@@ -5371,56 +5453,61 @@ Char</translation>
         <translation>압력 안정 대기 중...</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1724"/>
-        <location filename="mainwidget.cpp" line="1761"/>
-        <source>高压故障</source>
-        <translation>고전압에러</translation>
-    </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1728"/>
-        <location filename="mainwidget.cpp" line="1765"/>
-        <source>相位故障</source>
-        <translation>위상 에러</translation>
+        <location filename="mainwidget.cpp" line="1394"/>
+        <source>墨水或溶剂不足,请先添加</source>
+        <translation>잉크 또는 용제가 부족합니다. 먼저 추가해 주세요.</translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1732"/>
         <location filename="mainwidget.cpp" line="1769"/>
-        <source>粘度故障</source>
-        <translation>점도 에러</translation>
+        <source>高压故障</source>
+        <translation>고전압에러</translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1736"/>
         <location filename="mainwidget.cpp" line="1773"/>
-        <source>回收故障</source>
-        <translation>석션 에러</translation>
+        <source>相位故障</source>
+        <translation>위상 에러</translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1740"/>
         <location filename="mainwidget.cpp" line="1777"/>
-        <source>溶液液位</source>
-        <translation>솔벤트 레벨</translation>
+        <source>粘度故障</source>
+        <translation>점도 에러</translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1744"/>
         <location filename="mainwidget.cpp" line="1781"/>
-        <source>墨水液位</source>
-        <translation>잉크 레벨 오류</translation>
+        <source>回收故障</source>
+        <translation>석션 에러</translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1748"/>
         <location filename="mainwidget.cpp" line="1785"/>
-        <source>墨水缸满</source>
-        <translation>잉크 통 가득 참</translation>
+        <source>溶液液位</source>
+        <translation>솔벤트 레벨</translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1752"/>
         <location filename="mainwidget.cpp" line="1789"/>
+        <source>墨水液位</source>
+        <translation>잉크 레벨 오류</translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1756"/>
+        <location filename="mainwidget.cpp" line="1793"/>
+        <source>墨水缸满</source>
+        <translation>잉크 통 가득 참</translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1760"/>
+        <location filename="mainwidget.cpp" line="1797"/>
         <source>墨线开关</source>
         <translation>잉크선 스위치</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1808"/>
         <location filename="mainwidget.cpp" line="1816"/>
+        <location filename="mainwidget.cpp" line="1824"/>
         <source>正常</source>
         <translation>정상</translation>
     </message>
@@ -5449,8 +5536,8 @@ Char</translation>
         <translation type="vanished">열기 중지</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1431"/>
-        <location filename="mainwidget.cpp" line="1449"/>
+        <location filename="mainwidget.cpp" line="1439"/>
+        <location filename="mainwidget.cpp" line="1457"/>
         <source>回收槽之前发生阻塞或回收槽时间设置错误，是否强制将当前位置设为到顶位置?</source>
         <translation>거터가 이전에 걸렸거나 거터 개폐 시간 설정이 잘못되었습니다. 현재 위치를 강제로 상한 위치로 설정하시겠습니까?</translation>
     </message>
@@ -5463,8 +5550,8 @@ Char</translation>
         <translation type="vanished">닫기 중지</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1571"/>
-        <location filename="mainwidget.cpp" line="1572"/>
+        <location filename="mainwidget.cpp" line="1579"/>
+        <location filename="mainwidget.cpp" line="1580"/>
         <source>%1.%2</source>
         <translation>%1.%2</translation>
     </message>
@@ -5485,105 +5572,105 @@ Char</translation>
         <translation type="vanished">프린트 헤드 커버가 열려 인쇄 불가!</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2145"/>
+        <location filename="mainwidget.cpp" line="2153"/>
         <source>墨水缸满报警</source>
         <translation>잉크통 만료 경보</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2155"/>
+        <location filename="mainwidget.cpp" line="2163"/>
         <source>墨水液位报警</source>
         <translation>잉크 레벨 경보</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2162"/>
+        <location filename="mainwidget.cpp" line="2170"/>
         <source>溶剂液位报警</source>
         <translation>솔벤트 레벨 경보</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2189"/>
-        <location filename="mainwidget.cpp" line="2190"/>
+        <location filename="mainwidget.cpp" line="2196"/>
+        <location filename="mainwidget.cpp" line="2197"/>
         <source>高压故障，暂停打印</source>
         <translation>고전압 오류로 인쇄 일시 정지</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2191"/>
+        <location filename="mainwidget.cpp" line="2198"/>
         <source>高压故障，暂停打印.</source>
         <translation>고전압 고장, 인쇄 일시정지</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2203"/>
+        <location filename="mainwidget.cpp" line="2210"/>
         <source>高压故障，关回收槽</source>
         <translation>고전압 오류로 수집기 자동 종료</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2204"/>
+        <location filename="mainwidget.cpp" line="2211"/>
         <source>高压故障，关回收槽和墨线</source>
         <translation>고압 오류가 발생했습니다. 거터를 닫고 잉크 선을 정지하십시오.</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2250"/>
-        <location filename="mainwidget.cpp" line="2251"/>
+        <location filename="mainwidget.cpp" line="2257"/>
+        <location filename="mainwidget.cpp" line="2258"/>
         <source>回收故障，关闭回收槽，关墨线</source>
         <translation> 회수 오류가 발생했습니다. 거터를 닫고 잉크 선을 정지하십시오.</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2255"/>
+        <location filename="mainwidget.cpp" line="2262"/>
         <source>回收故障.</source>
         <translation>회수 에러</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2264"/>
+        <location filename="mainwidget.cpp" line="2271"/>
         <source>回收异常,墨线可能偏离.(%1)</source>
         <translation>회수 이상, 잉크 선 편향 가능성 (%1)</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2272"/>
+        <location filename="mainwidget.cpp" line="2279"/>
         <source>正在喷印.......</source>
         <translation>인쇄 중...</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2317"/>
+        <location filename="mainwidget.cpp" line="2324"/>
         <source>相位故障:飞行时间错误!</source>
         <translation>위상 이상: 비행 시간 오류!</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2321"/>
+        <location filename="mainwidget.cpp" line="2328"/>
         <source>相位故障:相位检测错误!</source>
         <translation>위상 이상: 검출 오류!</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2329"/>
-        <location filename="mainwidget.cpp" line="2330"/>
-        <location filename="mainwidget.cpp" line="2331"/>
+        <location filename="mainwidget.cpp" line="2336"/>
+        <location filename="mainwidget.cpp" line="2337"/>
+        <location filename="mainwidget.cpp" line="2338"/>
         <source>相位故障，准备关机</source>
         <translation>위상 오류로 시스템 종료 준비</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2337"/>
-        <location filename="mainwidget.cpp" line="2338"/>
-        <location filename="mainwidget.cpp" line="2339"/>
+        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2345"/>
+        <location filename="mainwidget.cpp" line="2346"/>
         <source>相位故障，暂停打印</source>
         <translation>위상 오류로 인쇄 일시 정지</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2351"/>
         <source>相位故障，屏蔽DAC输出</source>
         <translation>위상 오류로 DAC 출력 차단</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2345"/>
-        <location filename="mainwidget.cpp" line="2346"/>
+        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2353"/>
         <source>相位故障，屏蔽充电</source>
         <translation>위상 오류로 충전 차단</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2359"/>
         <source>相位故障, 关闭回收槽</source>
         <translation>Phase fault, close the reclaim tank</translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2353"/>
-        <location filename="mainwidget.cpp" line="2354"/>
+        <location filename="mainwidget.cpp" line="2360"/>
+        <location filename="mainwidget.cpp" line="2361"/>
         <source>相位故障，关闭回收槽</source>
         <translation>Phase fault, close the reclaim tank</translation>
     </message>

mainwidget.cpp

@@ -1388,6 +1388,14 @@ void MainWidget::changeHighLight(bool isStart)
 void MainWidget::on_m_RightBtn_clicked()
 {
     if(sysPara){
+        if ((sysPara->status.statWarn & WARN_STATUS_INK_WARN) ||
+                (sysPara->status.statWarn & WARN_STATUS_SOLV_WARN)
+                && powerOnWarn){
+            setRunStatus(tr("墨水或溶剂不足,请先添加"));
+            return;
+        }
+        if (powerOnWarn) powerOnWarn = false;
+
         if (!sysPara->status.reclaimTankBlockedAppending) {
             if (sysPara->status.canRunAirPushing &&
                     (sysPara->status.currReclaimTankPos == 0)) { //2019/10/24 当回收槽未在顶的位置，不需要排气
@@ -2160,7 +2168,6 @@ void MainWidget::RefreshStatusLight(){//100ms
             else {
                 alarmStatus.solveLevelWarn = DEV_STATUS_RED;
                 strTitle = tr("溶剂液位报警");
-
             }
 
             if(!(sysPara->status.statWarn & WARN_STATUS_RECYCLE_FAULT) ){

mainwidget.h

@@ -138,8 +138,7 @@ public:
     bool flagOfClearHighVltageWarnning;
 
     AlarmStatus alarmStatus;
-
-//    void mouseDoubleClickEvent(QMouseEvent *event) override;
+    bool powerOnWarn = false;
 
 private:
     // UI对象

rfid/rfidmanager.h

@@ -196,6 +196,7 @@ private:
     std::function<void()> m_confirmCallback;
     int waitStatus();
     bool waitCard();
+
 signals:
     void sig_showMsg(QString msg);
 
@@ -207,6 +208,8 @@ signals:
     // 溶剂流程已完成
     void sig_solventProgressFinished();
 
+    // 告警累计 3 小时，请求关喷嘴
+    void sig_warnTimeout(QString);
 
 private slots:
     //接收刷卡数据槽函数

spanish.ts

@@ -194,15 +194,15 @@
         <location filename="countervarset.ui" line="84"/>
         <location filename="countervarset.ui" line="273"/>
         <location filename="CounterVarSet.cpp" line="168"/>
-        <location filename="CounterVarSet.cpp" line="183"/>
+        <location filename="CounterVarSet.cpp" line="187"/>
         <source>计数器1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="countervarset.ui" line="112"/>
         <location filename="countervarset.ui" line="655"/>
-        <location filename="CounterVarSet.cpp" line="176"/>
-        <location filename="CounterVarSet.cpp" line="185"/>
+        <location filename="CounterVarSet.cpp" line="178"/>
+        <location filename="CounterVarSet.cpp" line="189"/>
         <source>计数器2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1596,6 +1596,50 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DlgViscositySetting</name>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="14"/>
+        <source>告警浮动范围设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="26"/>
+        <source>✕</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="39"/>
+        <source>✓</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="52"/>
+        <source>告警阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="68"/>
+        <source>关喷嘴阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="167"/>
+        <source>设定值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="183"/>
+        <location filename="dlgviscositysetting.ui" line="196"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="209"/>
+        <source>当前值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FileLogger</name>
     <message>
@@ -1925,197 +1969,231 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="993"/>
+        <location filename="InkJetPrinter.cpp" line="988"/>
         <source>开始自检,请等待%1秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1830"/>
-        <location filename="InkJetPrinter.cpp" line="1831"/>
+        <location filename="InkJetPrinter.cpp" line="1816"/>
+        <location filename="InkJetPrinter.cpp" line="1817"/>
         <location filename="mainwidget.cpp" line="444"/>
         <source>自检完成!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3147"/>
+        <location filename="InkJetPrinter.cpp" line="3138"/>
+        <location filename="InkJetPrinter.cpp" line="3279"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="InkJetPrinter.cpp" line="101"/>
-        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <location filename="InkJetPrinter.cpp" line="1928"/>
+        <location filename="InkJetPrinter.cpp" line="3298"/>
+        <location filename="InkJetPrinter.cpp" line="3608"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="276"/>
+        <location filename="InkJetPrinter.cpp" line="274"/>
         <source>保养期还有%1小时到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="280"/>
+        <location filename="InkJetPrinter.cpp" line="278"/>
         <source>保养期已超过%1小时,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="976"/>
+        <location filename="InkJetPrinter.cpp" line="972"/>
         <source>开始自检,请等待60秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2792"/>
-        <location filename="InkJetPrinter.cpp" line="2825"/>
-        <location filename="InkJetPrinter.cpp" line="2851"/>
+        <location filename="InkJetPrinter.cpp" line="2783"/>
+        <location filename="InkJetPrinter.cpp" line="2816"/>
+        <location filename="InkJetPrinter.cpp" line="2842"/>
         <source>正在准备重启,请等待%1秒......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="769"/>
-        <location filename="InkJetPrinter.cpp" line="1227"/>
+        <location filename="InkJetPrinter.cpp" line="767"/>
+        <location filename="InkJetPrinter.cpp" line="1212"/>
         <source>压力泄漏或压力传感器故障!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="772"/>
+        <location filename="InkJetPrinter.cpp" line="770"/>
         <source>运行中压力泄漏，停齿轮泵!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="794"/>
-        <location filename="InkJetPrinter.cpp" line="878"/>
+        <location filename="InkJetPrinter.cpp" line="792"/>
+        <location filename="InkJetPrinter.cpp" line="876"/>
         <source>定时开机循环完成，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="871"/>
+        <location filename="InkJetPrinter.cpp" line="869"/>
         <source>waitPowerOffTime: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="879"/>
+        <location filename="InkJetPrinter.cpp" line="877"/>
         <source>准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1060"/>
-        <location filename="InkJetPrinter.cpp" line="1062"/>
+        <location filename="InkJetPrinter.cpp" line="1056"/>
+        <location filename="InkJetPrinter.cpp" line="1058"/>
         <source>缺少墨水,喷码机不能正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1286"/>
+        <location filename="InkJetPrinter.cpp" line="1271"/>
         <location filename="mainwidget.cpp" line="445"/>
         <source>停止打印，自动关闭高压.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2087"/>
+        <location filename="InkJetPrinter.cpp" line="2078"/>
         <source>flagOfPowerOnMode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2677"/>
-        <location filename="InkJetPrinter.cpp" line="2678"/>
+        <location filename="InkJetPrinter.cpp" line="2668"/>
+        <location filename="InkJetPrinter.cpp" line="2669"/>
         <source>电机故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2695"/>
+        <location filename="InkJetPrinter.cpp" line="2686"/>
         <source>回收槽到头</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2744"/>
-        <location filename="InkJetPrinter.cpp" line="2745"/>
+        <location filename="InkJetPrinter.cpp" line="2735"/>
+        <location filename="InkJetPrinter.cpp" line="2736"/>
         <source>回收槽卡住或者回收槽开关时间设置错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2963"/>
+        <location filename="InkJetPrinter.cpp" line="2954"/>
         <source>压力过高,请检查管路是否堵塞,然后点击故障恢复按钮</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3048"/>
-        <location filename="InkJetPrinter.cpp" line="3336"/>
-        <location filename="InkJetPrinter.cpp" line="3392"/>
+        <location filename="InkJetPrinter.cpp" line="3039"/>
+        <location filename="InkJetPrinter.cpp" line="3360"/>
+        <location filename="InkJetPrinter.cpp" line="3427"/>
         <source>请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3050"/>
+        <location filename="InkJetPrinter.cpp" line="3041"/>
         <source>墨水液位报警超过48小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3058"/>
-        <location filename="InkJetPrinter.cpp" line="3463"/>
-        <location filename="InkJetPrinter.cpp" line="3511"/>
+        <location filename="InkJetPrinter.cpp" line="3049"/>
+        <location filename="InkJetPrinter.cpp" line="3506"/>
+        <location filename="InkJetPrinter.cpp" line="3564"/>
         <source>请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3060"/>
+        <location filename="InkJetPrinter.cpp" line="3051"/>
         <source>溶剂液位报警超过48小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3068"/>
+        <location filename="InkJetPrinter.cpp" line="3059"/>
         <source>保养期还有%1天到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3070"/>
+        <location filename="InkJetPrinter.cpp" line="3061"/>
         <source>保养期已超过%1天,请进行保养以恢复喷码机的正常使用</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3226"/>
+        <location filename="InkJetPrinter.cpp" line="3211"/>
         <source>刷墨水卡成功, 请及时将该墨水卡对应的墨水添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3229"/>
+        <location filename="InkJetPrinter.cpp" line="3214"/>
         <source>刷墨水卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3238"/>
+        <location filename="InkJetPrinter.cpp" line="3223"/>
         <source>刷溶剂卡成功, 请及时将该溶剂卡对应的溶剂添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3241"/>
+        <location filename="InkJetPrinter.cpp" line="3226"/>
         <source>刷溶剂卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3316"/>
+        <location filename="InkJetPrinter.cpp" line="3274"/>
+        <source>粘度过高,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3276"/>
+        <source>粘度过低,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3293"/>
+        <source>粘度较高,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3295"/>
+        <source>粘度较低,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3335"/>
         <source>请及时使用墨水盒附带的IC卡激活墨水盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3390"/>
-        <source>墨水液位报警超过%1小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3414"/>
+        <source>墨水液位报警超过%1小时,机器无法正常打印,请添加墨水并刷卡.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3443"/>
+        <location filename="InkJetPrinter.cpp" line="3421"/>
+        <source>墨水告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3480"/>
         <source>请及时使用溶剂盒附带的IC卡激活溶剂盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3509"/>
-        <source>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <source>溶剂液位报警超过%1小时,机器无法正常打印,请添加溶剂并刷卡.</source>
+        <oldsource>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3576"/>
+        <location filename="InkJetPrinter.cpp" line="3558"/>
+        <source>溶剂告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3632"/>
         <source>File not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3099"/>
+        <location filename="InkJetPrinter.cpp" line="3090"/>
         <source>刷卡倒计时起始时间文件不存在</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2898,7 +2976,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="266"/>
-        <location filename="MainInstruction.cpp" line="187"/>
+        <location filename="MainInstruction.cpp" line="188"/>
         <source>额外设置</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +2997,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="205"/>
-        <location filename="MainInstruction.cpp" line="200"/>
+        <location filename="MainInstruction.cpp" line="201"/>
         <source>系统授权</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2934,7 +3012,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.ui" line="325"/>
+        <location filename="MainInstruction.ui" line="317"/>
+        <source>粘度设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="MainInstruction.ui" line="338"/>
         <source>✕</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2944,28 +3027,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>RFID卡清零!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="188"/>
-        <location filename="MainInstruction.cpp" line="199"/>
+        <location filename="MainInstruction.cpp" line="189"/>
+        <location filename="MainInstruction.cpp" line="200"/>
         <source>取消授权</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="190"/>
+        <location filename="MainInstruction.cpp" line="191"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="191"/>
+        <location filename="MainInstruction.cpp" line="192"/>
         <source>密码错误:%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,8 +3202,8 @@
     <message>
         <location filename="mainwidget.cpp" line="264"/>
         <location filename="mainwidget.cpp" line="283"/>
-        <location filename="mainwidget.cpp" line="1430"/>
-        <location filename="mainwidget.cpp" line="1448"/>
+        <location filename="mainwidget.cpp" line="1438"/>
+        <location filename="mainwidget.cpp" line="1456"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3152,36 +3235,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
-        <location filename="mainwidget.cpp" line="2478"/>
-        <location filename="mainwidget.cpp" line="2482"/>
-        <location filename="mainwidget.cpp" line="2491"/>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2474"/>
+        <location filename="mainwidget.cpp" line="2485"/>
+        <location filename="mainwidget.cpp" line="2489"/>
+        <location filename="mainwidget.cpp" line="2498"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
+        <location filename="mainwidget.cpp" line="2474"/>
         <source>喷印间隔过短,应高于%1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2478"/>
+        <location filename="mainwidget.cpp" line="2485"/>
         <source>喷头盖未关,请先关喷头盖!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2482"/>
+        <location filename="mainwidget.cpp" line="2489"/>
         <source>墨线未开，请先开墨线开关!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2491"/>
+        <location filename="mainwidget.cpp" line="2498"/>
         <source>当前总列数 %1 ,支持的总列数为 %2,请减少打印串的长度</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>打印耗时 %1ms ,触发间隔 :%2ms ,触发间隔至少应当大于打印耗时3ms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3218,72 +3301,72 @@
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1188"/>
-        <location filename="mainwidget.cpp" line="1416"/>
+        <location filename="mainwidget.cpp" line="1424"/>
         <source>正在排气...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1724"/>
-        <location filename="mainwidget.cpp" line="1761"/>
-        <source>高压故障</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1728"/>
-        <location filename="mainwidget.cpp" line="1765"/>
-        <source>相位故障</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwidget.cpp" line="1732"/>
         <location filename="mainwidget.cpp" line="1769"/>
-        <source>粘度故障</source>
+        <source>高压故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1736"/>
         <location filename="mainwidget.cpp" line="1773"/>
-        <source>回收故障</source>
+        <source>相位故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1740"/>
         <location filename="mainwidget.cpp" line="1777"/>
-        <source>溶液液位</source>
+        <source>粘度故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1744"/>
         <location filename="mainwidget.cpp" line="1781"/>
-        <source>墨水液位</source>
+        <source>回收故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1748"/>
         <location filename="mainwidget.cpp" line="1785"/>
-        <source>墨水缸满</source>
+        <source>溶液液位</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1752"/>
         <location filename="mainwidget.cpp" line="1789"/>
+        <source>墨水液位</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1756"/>
+        <location filename="mainwidget.cpp" line="1793"/>
+        <source>墨水缸满</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1760"/>
+        <location filename="mainwidget.cpp" line="1797"/>
         <source>墨线开关</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1808"/>
         <location filename="mainwidget.cpp" line="1816"/>
+        <location filename="mainwidget.cpp" line="1824"/>
         <source>正常</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2359"/>
         <source>相位故障, 关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2353"/>
-        <location filename="mainwidget.cpp" line="2354"/>
+        <location filename="mainwidget.cpp" line="2360"/>
+        <location filename="mainwidget.cpp" line="2361"/>
         <source>相位故障，关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3293,106 +3376,111 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1431"/>
-        <location filename="mainwidget.cpp" line="1449"/>
+        <location filename="mainwidget.cpp" line="1394"/>
+        <source>墨水或溶剂不足,请先添加</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1439"/>
+        <location filename="mainwidget.cpp" line="1457"/>
         <source>回收槽之前发生阻塞或回收槽时间设置错误，是否强制将当前位置设为到顶位置?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1571"/>
-        <location filename="mainwidget.cpp" line="1572"/>
+        <location filename="mainwidget.cpp" line="1579"/>
+        <location filename="mainwidget.cpp" line="1580"/>
         <source>%1.%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2145"/>
+        <location filename="mainwidget.cpp" line="2153"/>
         <source>墨水缸满报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2155"/>
+        <location filename="mainwidget.cpp" line="2163"/>
         <source>墨水液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2162"/>
+        <location filename="mainwidget.cpp" line="2170"/>
         <source>溶剂液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2189"/>
-        <location filename="mainwidget.cpp" line="2190"/>
+        <location filename="mainwidget.cpp" line="2196"/>
+        <location filename="mainwidget.cpp" line="2197"/>
         <source>高压故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2191"/>
+        <location filename="mainwidget.cpp" line="2198"/>
         <source>高压故障，暂停打印.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2203"/>
+        <location filename="mainwidget.cpp" line="2210"/>
         <source>高压故障，关回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2204"/>
+        <location filename="mainwidget.cpp" line="2211"/>
         <source>高压故障，关回收槽和墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2250"/>
-        <location filename="mainwidget.cpp" line="2251"/>
+        <location filename="mainwidget.cpp" line="2257"/>
+        <location filename="mainwidget.cpp" line="2258"/>
         <source>回收故障，关闭回收槽，关墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2255"/>
+        <location filename="mainwidget.cpp" line="2262"/>
         <source>回收故障.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2264"/>
+        <location filename="mainwidget.cpp" line="2271"/>
         <source>回收异常,墨线可能偏离.(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2272"/>
+        <location filename="mainwidget.cpp" line="2279"/>
         <source>正在喷印.......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2317"/>
+        <location filename="mainwidget.cpp" line="2324"/>
         <source>相位故障:飞行时间错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2321"/>
+        <location filename="mainwidget.cpp" line="2328"/>
         <source>相位故障:相位检测错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2329"/>
-        <location filename="mainwidget.cpp" line="2330"/>
-        <location filename="mainwidget.cpp" line="2331"/>
+        <location filename="mainwidget.cpp" line="2336"/>
+        <location filename="mainwidget.cpp" line="2337"/>
+        <location filename="mainwidget.cpp" line="2338"/>
         <source>相位故障，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2337"/>
-        <location filename="mainwidget.cpp" line="2338"/>
-        <location filename="mainwidget.cpp" line="2339"/>
+        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2345"/>
+        <location filename="mainwidget.cpp" line="2346"/>
         <source>相位故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2351"/>
         <source>相位故障，屏蔽DAC输出</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2345"/>
-        <location filename="mainwidget.cpp" line="2346"/>
+        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2353"/>
         <source>相位故障，屏蔽充电</source>
         <translation type="unfinished"></translation>
     </message>

textEdit2.html

@@ -1,5 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'songti'; font-size:12pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">f</p></body></html>

textEdit3.html

@@ -1,5 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'songti'; font-size:12pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fdafdsa</p></body></html>

textEditnew.html

@@ -1,5 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'songti'; font-size:12pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">化公为私于机构改革讨价还价液恭恭敬敬用同方</p></body></html>

textEditnew3.html

@@ -1,5 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'songti'; font-size:12pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'helvetica'; font-size:8pt; font-weight:200;">yujhfdddeef</span><img src=":/6/image/digitalWidth2.png" width="10" height="8" /></p></body></html>

thai.ts

@@ -194,15 +194,15 @@
         <location filename="countervarset.ui" line="84"/>
         <location filename="countervarset.ui" line="273"/>
         <location filename="CounterVarSet.cpp" line="168"/>
-        <location filename="CounterVarSet.cpp" line="183"/>
+        <location filename="CounterVarSet.cpp" line="187"/>
         <source>计数器1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="countervarset.ui" line="112"/>
         <location filename="countervarset.ui" line="655"/>
-        <location filename="CounterVarSet.cpp" line="176"/>
-        <location filename="CounterVarSet.cpp" line="185"/>
+        <location filename="CounterVarSet.cpp" line="178"/>
+        <location filename="CounterVarSet.cpp" line="189"/>
         <source>计数器2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1596,6 +1596,50 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DlgViscositySetting</name>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="14"/>
+        <source>告警浮动范围设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="26"/>
+        <source>✕</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="39"/>
+        <source>✓</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="52"/>
+        <source>告警阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="68"/>
+        <source>关喷嘴阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="167"/>
+        <source>设定值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="183"/>
+        <location filename="dlgviscositysetting.ui" line="196"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="209"/>
+        <source>当前值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FileLogger</name>
     <message>
@@ -1925,197 +1969,231 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="993"/>
+        <location filename="InkJetPrinter.cpp" line="988"/>
         <source>开始自检,请等待%1秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1830"/>
-        <location filename="InkJetPrinter.cpp" line="1831"/>
+        <location filename="InkJetPrinter.cpp" line="1816"/>
+        <location filename="InkJetPrinter.cpp" line="1817"/>
         <location filename="mainwidget.cpp" line="444"/>
         <source>自检完成!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3147"/>
+        <location filename="InkJetPrinter.cpp" line="3138"/>
+        <location filename="InkJetPrinter.cpp" line="3279"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="InkJetPrinter.cpp" line="101"/>
-        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <location filename="InkJetPrinter.cpp" line="1928"/>
+        <location filename="InkJetPrinter.cpp" line="3298"/>
+        <location filename="InkJetPrinter.cpp" line="3608"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="276"/>
+        <location filename="InkJetPrinter.cpp" line="274"/>
         <source>保养期还有%1小时到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="280"/>
+        <location filename="InkJetPrinter.cpp" line="278"/>
         <source>保养期已超过%1小时,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="976"/>
+        <location filename="InkJetPrinter.cpp" line="972"/>
         <source>开始自检,请等待60秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2792"/>
-        <location filename="InkJetPrinter.cpp" line="2825"/>
-        <location filename="InkJetPrinter.cpp" line="2851"/>
+        <location filename="InkJetPrinter.cpp" line="2783"/>
+        <location filename="InkJetPrinter.cpp" line="2816"/>
+        <location filename="InkJetPrinter.cpp" line="2842"/>
         <source>正在准备重启,请等待%1秒......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="769"/>
-        <location filename="InkJetPrinter.cpp" line="1227"/>
+        <location filename="InkJetPrinter.cpp" line="767"/>
+        <location filename="InkJetPrinter.cpp" line="1212"/>
         <source>压力泄漏或压力传感器故障!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="772"/>
+        <location filename="InkJetPrinter.cpp" line="770"/>
         <source>运行中压力泄漏，停齿轮泵!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="794"/>
-        <location filename="InkJetPrinter.cpp" line="878"/>
+        <location filename="InkJetPrinter.cpp" line="792"/>
+        <location filename="InkJetPrinter.cpp" line="876"/>
         <source>定时开机循环完成，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="871"/>
+        <location filename="InkJetPrinter.cpp" line="869"/>
         <source>waitPowerOffTime: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="879"/>
+        <location filename="InkJetPrinter.cpp" line="877"/>
         <source>准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1060"/>
-        <location filename="InkJetPrinter.cpp" line="1062"/>
+        <location filename="InkJetPrinter.cpp" line="1056"/>
+        <location filename="InkJetPrinter.cpp" line="1058"/>
         <source>缺少墨水,喷码机不能正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1286"/>
+        <location filename="InkJetPrinter.cpp" line="1271"/>
         <location filename="mainwidget.cpp" line="445"/>
         <source>停止打印，自动关闭高压.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2087"/>
+        <location filename="InkJetPrinter.cpp" line="2078"/>
         <source>flagOfPowerOnMode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2677"/>
-        <location filename="InkJetPrinter.cpp" line="2678"/>
+        <location filename="InkJetPrinter.cpp" line="2668"/>
+        <location filename="InkJetPrinter.cpp" line="2669"/>
         <source>电机故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2695"/>
+        <location filename="InkJetPrinter.cpp" line="2686"/>
         <source>回收槽到头</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2744"/>
-        <location filename="InkJetPrinter.cpp" line="2745"/>
+        <location filename="InkJetPrinter.cpp" line="2735"/>
+        <location filename="InkJetPrinter.cpp" line="2736"/>
         <source>回收槽卡住或者回收槽开关时间设置错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2963"/>
+        <location filename="InkJetPrinter.cpp" line="2954"/>
         <source>压力过高,请检查管路是否堵塞,然后点击故障恢复按钮</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3048"/>
-        <location filename="InkJetPrinter.cpp" line="3336"/>
-        <location filename="InkJetPrinter.cpp" line="3392"/>
+        <location filename="InkJetPrinter.cpp" line="3039"/>
+        <location filename="InkJetPrinter.cpp" line="3360"/>
+        <location filename="InkJetPrinter.cpp" line="3427"/>
         <source>请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3050"/>
+        <location filename="InkJetPrinter.cpp" line="3041"/>
         <source>墨水液位报警超过48小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3058"/>
-        <location filename="InkJetPrinter.cpp" line="3463"/>
-        <location filename="InkJetPrinter.cpp" line="3511"/>
+        <location filename="InkJetPrinter.cpp" line="3049"/>
+        <location filename="InkJetPrinter.cpp" line="3506"/>
+        <location filename="InkJetPrinter.cpp" line="3564"/>
         <source>请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3060"/>
+        <location filename="InkJetPrinter.cpp" line="3051"/>
         <source>溶剂液位报警超过48小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3068"/>
+        <location filename="InkJetPrinter.cpp" line="3059"/>
         <source>保养期还有%1天到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3070"/>
+        <location filename="InkJetPrinter.cpp" line="3061"/>
         <source>保养期已超过%1天,请进行保养以恢复喷码机的正常使用</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3226"/>
+        <location filename="InkJetPrinter.cpp" line="3211"/>
         <source>刷墨水卡成功, 请及时将该墨水卡对应的墨水添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3229"/>
+        <location filename="InkJetPrinter.cpp" line="3214"/>
         <source>刷墨水卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3238"/>
+        <location filename="InkJetPrinter.cpp" line="3223"/>
         <source>刷溶剂卡成功, 请及时将该溶剂卡对应的溶剂添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3241"/>
+        <location filename="InkJetPrinter.cpp" line="3226"/>
         <source>刷溶剂卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3316"/>
+        <location filename="InkJetPrinter.cpp" line="3274"/>
+        <source>粘度过高,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3276"/>
+        <source>粘度过低,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3293"/>
+        <source>粘度较高,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3295"/>
+        <source>粘度较低,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3335"/>
         <source>请及时使用墨水盒附带的IC卡激活墨水盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3390"/>
-        <source>墨水液位报警超过%1小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3414"/>
+        <source>墨水液位报警超过%1小时,机器无法正常打印,请添加墨水并刷卡.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3443"/>
+        <location filename="InkJetPrinter.cpp" line="3421"/>
+        <source>墨水告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3480"/>
         <source>请及时使用溶剂盒附带的IC卡激活溶剂盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3509"/>
-        <source>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <source>溶剂液位报警超过%1小时,机器无法正常打印,请添加溶剂并刷卡.</source>
+        <oldsource>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3576"/>
+        <location filename="InkJetPrinter.cpp" line="3558"/>
+        <source>溶剂告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3632"/>
         <source>File not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3099"/>
+        <location filename="InkJetPrinter.cpp" line="3090"/>
         <source>刷卡倒计时起始时间文件不存在</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2898,7 +2976,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="266"/>
-        <location filename="MainInstruction.cpp" line="187"/>
+        <location filename="MainInstruction.cpp" line="188"/>
         <source>额外设置</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +2997,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="205"/>
-        <location filename="MainInstruction.cpp" line="200"/>
+        <location filename="MainInstruction.cpp" line="201"/>
         <source>系统授权</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2934,7 +3012,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.ui" line="325"/>
+        <location filename="MainInstruction.ui" line="317"/>
+        <source>粘度设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="MainInstruction.ui" line="338"/>
         <source>✕</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2944,28 +3027,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>RFID卡清零!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="188"/>
-        <location filename="MainInstruction.cpp" line="199"/>
+        <location filename="MainInstruction.cpp" line="189"/>
+        <location filename="MainInstruction.cpp" line="200"/>
         <source>取消授权</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="190"/>
+        <location filename="MainInstruction.cpp" line="191"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="191"/>
+        <location filename="MainInstruction.cpp" line="192"/>
         <source>密码错误:%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,8 +3202,8 @@
     <message>
         <location filename="mainwidget.cpp" line="264"/>
         <location filename="mainwidget.cpp" line="283"/>
-        <location filename="mainwidget.cpp" line="1430"/>
-        <location filename="mainwidget.cpp" line="1448"/>
+        <location filename="mainwidget.cpp" line="1438"/>
+        <location filename="mainwidget.cpp" line="1456"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3152,36 +3235,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
-        <location filename="mainwidget.cpp" line="2478"/>
-        <location filename="mainwidget.cpp" line="2482"/>
-        <location filename="mainwidget.cpp" line="2491"/>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2474"/>
+        <location filename="mainwidget.cpp" line="2485"/>
+        <location filename="mainwidget.cpp" line="2489"/>
+        <location filename="mainwidget.cpp" line="2498"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
+        <location filename="mainwidget.cpp" line="2474"/>
         <source>喷印间隔过短,应高于%1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2478"/>
+        <location filename="mainwidget.cpp" line="2485"/>
         <source>喷头盖未关,请先关喷头盖!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2482"/>
+        <location filename="mainwidget.cpp" line="2489"/>
         <source>墨线未开，请先开墨线开关!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2491"/>
+        <location filename="mainwidget.cpp" line="2498"/>
         <source>当前总列数 %1 ,支持的总列数为 %2,请减少打印串的长度</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>打印耗时 %1ms ,触发间隔 :%2ms ,触发间隔至少应当大于打印耗时3ms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3218,72 +3301,72 @@
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1188"/>
-        <location filename="mainwidget.cpp" line="1416"/>
+        <location filename="mainwidget.cpp" line="1424"/>
         <source>正在排气...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1724"/>
-        <location filename="mainwidget.cpp" line="1761"/>
-        <source>高压故障</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1728"/>
-        <location filename="mainwidget.cpp" line="1765"/>
-        <source>相位故障</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwidget.cpp" line="1732"/>
         <location filename="mainwidget.cpp" line="1769"/>
-        <source>粘度故障</source>
+        <source>高压故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1736"/>
         <location filename="mainwidget.cpp" line="1773"/>
-        <source>回收故障</source>
+        <source>相位故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1740"/>
         <location filename="mainwidget.cpp" line="1777"/>
-        <source>溶液液位</source>
+        <source>粘度故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1744"/>
         <location filename="mainwidget.cpp" line="1781"/>
-        <source>墨水液位</source>
+        <source>回收故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1748"/>
         <location filename="mainwidget.cpp" line="1785"/>
-        <source>墨水缸满</source>
+        <source>溶液液位</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1752"/>
         <location filename="mainwidget.cpp" line="1789"/>
+        <source>墨水液位</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1756"/>
+        <location filename="mainwidget.cpp" line="1793"/>
+        <source>墨水缸满</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1760"/>
+        <location filename="mainwidget.cpp" line="1797"/>
         <source>墨线开关</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1808"/>
         <location filename="mainwidget.cpp" line="1816"/>
+        <location filename="mainwidget.cpp" line="1824"/>
         <source>正常</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2359"/>
         <source>相位故障, 关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2353"/>
-        <location filename="mainwidget.cpp" line="2354"/>
+        <location filename="mainwidget.cpp" line="2360"/>
+        <location filename="mainwidget.cpp" line="2361"/>
         <source>相位故障，关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3293,106 +3376,111 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1431"/>
-        <location filename="mainwidget.cpp" line="1449"/>
+        <location filename="mainwidget.cpp" line="1394"/>
+        <source>墨水或溶剂不足,请先添加</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1439"/>
+        <location filename="mainwidget.cpp" line="1457"/>
         <source>回收槽之前发生阻塞或回收槽时间设置错误，是否强制将当前位置设为到顶位置?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1571"/>
-        <location filename="mainwidget.cpp" line="1572"/>
+        <location filename="mainwidget.cpp" line="1579"/>
+        <location filename="mainwidget.cpp" line="1580"/>
         <source>%1.%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2145"/>
+        <location filename="mainwidget.cpp" line="2153"/>
         <source>墨水缸满报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2155"/>
+        <location filename="mainwidget.cpp" line="2163"/>
         <source>墨水液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2162"/>
+        <location filename="mainwidget.cpp" line="2170"/>
         <source>溶剂液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2189"/>
-        <location filename="mainwidget.cpp" line="2190"/>
+        <location filename="mainwidget.cpp" line="2196"/>
+        <location filename="mainwidget.cpp" line="2197"/>
         <source>高压故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2191"/>
+        <location filename="mainwidget.cpp" line="2198"/>
         <source>高压故障，暂停打印.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2203"/>
+        <location filename="mainwidget.cpp" line="2210"/>
         <source>高压故障，关回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2204"/>
+        <location filename="mainwidget.cpp" line="2211"/>
         <source>高压故障，关回收槽和墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2250"/>
-        <location filename="mainwidget.cpp" line="2251"/>
+        <location filename="mainwidget.cpp" line="2257"/>
+        <location filename="mainwidget.cpp" line="2258"/>
         <source>回收故障，关闭回收槽，关墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2255"/>
+        <location filename="mainwidget.cpp" line="2262"/>
         <source>回收故障.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2264"/>
+        <location filename="mainwidget.cpp" line="2271"/>
         <source>回收异常,墨线可能偏离.(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2272"/>
+        <location filename="mainwidget.cpp" line="2279"/>
         <source>正在喷印.......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2317"/>
+        <location filename="mainwidget.cpp" line="2324"/>
         <source>相位故障:飞行时间错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2321"/>
+        <location filename="mainwidget.cpp" line="2328"/>
         <source>相位故障:相位检测错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2329"/>
-        <location filename="mainwidget.cpp" line="2330"/>
-        <location filename="mainwidget.cpp" line="2331"/>
+        <location filename="mainwidget.cpp" line="2336"/>
+        <location filename="mainwidget.cpp" line="2337"/>
+        <location filename="mainwidget.cpp" line="2338"/>
         <source>相位故障，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2337"/>
-        <location filename="mainwidget.cpp" line="2338"/>
-        <location filename="mainwidget.cpp" line="2339"/>
+        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2345"/>
+        <location filename="mainwidget.cpp" line="2346"/>
         <source>相位故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2351"/>
         <source>相位故障，屏蔽DAC输出</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2345"/>
-        <location filename="mainwidget.cpp" line="2346"/>
+        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2353"/>
         <source>相位故障，屏蔽充电</source>
         <translation type="unfinished"></translation>
     </message>

turkey.ts

@@ -194,15 +194,15 @@
         <location filename="countervarset.ui" line="84"/>
         <location filename="countervarset.ui" line="273"/>
         <location filename="CounterVarSet.cpp" line="168"/>
-        <location filename="CounterVarSet.cpp" line="183"/>
+        <location filename="CounterVarSet.cpp" line="187"/>
         <source>计数器1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="countervarset.ui" line="112"/>
         <location filename="countervarset.ui" line="655"/>
-        <location filename="CounterVarSet.cpp" line="176"/>
-        <location filename="CounterVarSet.cpp" line="185"/>
+        <location filename="CounterVarSet.cpp" line="178"/>
+        <location filename="CounterVarSet.cpp" line="189"/>
         <source>计数器2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1596,6 +1596,50 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DlgViscositySetting</name>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="14"/>
+        <source>告警浮动范围设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="26"/>
+        <source>✕</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="39"/>
+        <source>✓</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="52"/>
+        <source>告警阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="68"/>
+        <source>关喷嘴阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="167"/>
+        <source>设定值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="183"/>
+        <location filename="dlgviscositysetting.ui" line="196"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="209"/>
+        <source>当前值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FileLogger</name>
     <message>
@@ -1925,197 +1969,231 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="993"/>
+        <location filename="InkJetPrinter.cpp" line="988"/>
         <source>开始自检,请等待%1秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1830"/>
-        <location filename="InkJetPrinter.cpp" line="1831"/>
+        <location filename="InkJetPrinter.cpp" line="1816"/>
+        <location filename="InkJetPrinter.cpp" line="1817"/>
         <location filename="mainwidget.cpp" line="444"/>
         <source>自检完成!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3147"/>
+        <location filename="InkJetPrinter.cpp" line="3138"/>
+        <location filename="InkJetPrinter.cpp" line="3279"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="InkJetPrinter.cpp" line="101"/>
-        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <location filename="InkJetPrinter.cpp" line="1928"/>
+        <location filename="InkJetPrinter.cpp" line="3298"/>
+        <location filename="InkJetPrinter.cpp" line="3608"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="276"/>
+        <location filename="InkJetPrinter.cpp" line="274"/>
         <source>保养期还有%1小时到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="280"/>
+        <location filename="InkJetPrinter.cpp" line="278"/>
         <source>保养期已超过%1小时,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="976"/>
+        <location filename="InkJetPrinter.cpp" line="972"/>
         <source>开始自检,请等待60秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2792"/>
-        <location filename="InkJetPrinter.cpp" line="2825"/>
-        <location filename="InkJetPrinter.cpp" line="2851"/>
+        <location filename="InkJetPrinter.cpp" line="2783"/>
+        <location filename="InkJetPrinter.cpp" line="2816"/>
+        <location filename="InkJetPrinter.cpp" line="2842"/>
         <source>正在准备重启,请等待%1秒......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="769"/>
-        <location filename="InkJetPrinter.cpp" line="1227"/>
+        <location filename="InkJetPrinter.cpp" line="767"/>
+        <location filename="InkJetPrinter.cpp" line="1212"/>
         <source>压力泄漏或压力传感器故障!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="772"/>
+        <location filename="InkJetPrinter.cpp" line="770"/>
         <source>运行中压力泄漏，停齿轮泵!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="794"/>
-        <location filename="InkJetPrinter.cpp" line="878"/>
+        <location filename="InkJetPrinter.cpp" line="792"/>
+        <location filename="InkJetPrinter.cpp" line="876"/>
         <source>定时开机循环完成，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="871"/>
+        <location filename="InkJetPrinter.cpp" line="869"/>
         <source>waitPowerOffTime: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="879"/>
+        <location filename="InkJetPrinter.cpp" line="877"/>
         <source>准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1060"/>
-        <location filename="InkJetPrinter.cpp" line="1062"/>
+        <location filename="InkJetPrinter.cpp" line="1056"/>
+        <location filename="InkJetPrinter.cpp" line="1058"/>
         <source>缺少墨水,喷码机不能正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1286"/>
+        <location filename="InkJetPrinter.cpp" line="1271"/>
         <location filename="mainwidget.cpp" line="445"/>
         <source>停止打印，自动关闭高压.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2087"/>
+        <location filename="InkJetPrinter.cpp" line="2078"/>
         <source>flagOfPowerOnMode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2677"/>
-        <location filename="InkJetPrinter.cpp" line="2678"/>
+        <location filename="InkJetPrinter.cpp" line="2668"/>
+        <location filename="InkJetPrinter.cpp" line="2669"/>
         <source>电机故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2695"/>
+        <location filename="InkJetPrinter.cpp" line="2686"/>
         <source>回收槽到头</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2744"/>
-        <location filename="InkJetPrinter.cpp" line="2745"/>
+        <location filename="InkJetPrinter.cpp" line="2735"/>
+        <location filename="InkJetPrinter.cpp" line="2736"/>
         <source>回收槽卡住或者回收槽开关时间设置错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2963"/>
+        <location filename="InkJetPrinter.cpp" line="2954"/>
         <source>压力过高,请检查管路是否堵塞,然后点击故障恢复按钮</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3048"/>
-        <location filename="InkJetPrinter.cpp" line="3336"/>
-        <location filename="InkJetPrinter.cpp" line="3392"/>
+        <location filename="InkJetPrinter.cpp" line="3039"/>
+        <location filename="InkJetPrinter.cpp" line="3360"/>
+        <location filename="InkJetPrinter.cpp" line="3427"/>
         <source>请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3050"/>
+        <location filename="InkJetPrinter.cpp" line="3041"/>
         <source>墨水液位报警超过48小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3058"/>
-        <location filename="InkJetPrinter.cpp" line="3463"/>
-        <location filename="InkJetPrinter.cpp" line="3511"/>
+        <location filename="InkJetPrinter.cpp" line="3049"/>
+        <location filename="InkJetPrinter.cpp" line="3506"/>
+        <location filename="InkJetPrinter.cpp" line="3564"/>
         <source>请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3060"/>
+        <location filename="InkJetPrinter.cpp" line="3051"/>
         <source>溶剂液位报警超过48小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3068"/>
+        <location filename="InkJetPrinter.cpp" line="3059"/>
         <source>保养期还有%1天到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3070"/>
+        <location filename="InkJetPrinter.cpp" line="3061"/>
         <source>保养期已超过%1天,请进行保养以恢复喷码机的正常使用</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3226"/>
+        <location filename="InkJetPrinter.cpp" line="3211"/>
         <source>刷墨水卡成功, 请及时将该墨水卡对应的墨水添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3229"/>
+        <location filename="InkJetPrinter.cpp" line="3214"/>
         <source>刷墨水卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3238"/>
+        <location filename="InkJetPrinter.cpp" line="3223"/>
         <source>刷溶剂卡成功, 请及时将该溶剂卡对应的溶剂添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3241"/>
+        <location filename="InkJetPrinter.cpp" line="3226"/>
         <source>刷溶剂卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3316"/>
+        <location filename="InkJetPrinter.cpp" line="3274"/>
+        <source>粘度过高,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3276"/>
+        <source>粘度过低,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3293"/>
+        <source>粘度较高,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3295"/>
+        <source>粘度较低,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3335"/>
         <source>请及时使用墨水盒附带的IC卡激活墨水盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3390"/>
-        <source>墨水液位报警超过%1小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3414"/>
+        <source>墨水液位报警超过%1小时,机器无法正常打印,请添加墨水并刷卡.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3443"/>
+        <location filename="InkJetPrinter.cpp" line="3421"/>
+        <source>墨水告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3480"/>
         <source>请及时使用溶剂盒附带的IC卡激活溶剂盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3509"/>
-        <source>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <source>溶剂液位报警超过%1小时,机器无法正常打印,请添加溶剂并刷卡.</source>
+        <oldsource>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3576"/>
+        <location filename="InkJetPrinter.cpp" line="3558"/>
+        <source>溶剂告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3632"/>
         <source>File not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3099"/>
+        <location filename="InkJetPrinter.cpp" line="3090"/>
         <source>刷卡倒计时起始时间文件不存在</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2898,7 +2976,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="266"/>
-        <location filename="MainInstruction.cpp" line="187"/>
+        <location filename="MainInstruction.cpp" line="188"/>
         <source>额外设置</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +2997,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="205"/>
-        <location filename="MainInstruction.cpp" line="200"/>
+        <location filename="MainInstruction.cpp" line="201"/>
         <source>系统授权</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2934,7 +3012,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.ui" line="325"/>
+        <location filename="MainInstruction.ui" line="317"/>
+        <source>粘度设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="MainInstruction.ui" line="338"/>
         <source>✕</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2944,28 +3027,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>RFID卡清零!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="188"/>
-        <location filename="MainInstruction.cpp" line="199"/>
+        <location filename="MainInstruction.cpp" line="189"/>
+        <location filename="MainInstruction.cpp" line="200"/>
         <source>取消授权</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="190"/>
+        <location filename="MainInstruction.cpp" line="191"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="191"/>
+        <location filename="MainInstruction.cpp" line="192"/>
         <source>密码错误:%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,8 +3202,8 @@
     <message>
         <location filename="mainwidget.cpp" line="264"/>
         <location filename="mainwidget.cpp" line="283"/>
-        <location filename="mainwidget.cpp" line="1430"/>
-        <location filename="mainwidget.cpp" line="1448"/>
+        <location filename="mainwidget.cpp" line="1438"/>
+        <location filename="mainwidget.cpp" line="1456"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3152,36 +3235,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
-        <location filename="mainwidget.cpp" line="2478"/>
-        <location filename="mainwidget.cpp" line="2482"/>
-        <location filename="mainwidget.cpp" line="2491"/>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2474"/>
+        <location filename="mainwidget.cpp" line="2485"/>
+        <location filename="mainwidget.cpp" line="2489"/>
+        <location filename="mainwidget.cpp" line="2498"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
+        <location filename="mainwidget.cpp" line="2474"/>
         <source>喷印间隔过短,应高于%1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2478"/>
+        <location filename="mainwidget.cpp" line="2485"/>
         <source>喷头盖未关,请先关喷头盖!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2482"/>
+        <location filename="mainwidget.cpp" line="2489"/>
         <source>墨线未开，请先开墨线开关!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2491"/>
+        <location filename="mainwidget.cpp" line="2498"/>
         <source>当前总列数 %1 ,支持的总列数为 %2,请减少打印串的长度</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>打印耗时 %1ms ,触发间隔 :%2ms ,触发间隔至少应当大于打印耗时3ms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3218,72 +3301,72 @@
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1188"/>
-        <location filename="mainwidget.cpp" line="1416"/>
+        <location filename="mainwidget.cpp" line="1424"/>
         <source>正在排气...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1724"/>
-        <location filename="mainwidget.cpp" line="1761"/>
-        <source>高压故障</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1728"/>
-        <location filename="mainwidget.cpp" line="1765"/>
-        <source>相位故障</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwidget.cpp" line="1732"/>
         <location filename="mainwidget.cpp" line="1769"/>
-        <source>粘度故障</source>
+        <source>高压故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1736"/>
         <location filename="mainwidget.cpp" line="1773"/>
-        <source>回收故障</source>
+        <source>相位故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1740"/>
         <location filename="mainwidget.cpp" line="1777"/>
-        <source>溶液液位</source>
+        <source>粘度故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1744"/>
         <location filename="mainwidget.cpp" line="1781"/>
-        <source>墨水液位</source>
+        <source>回收故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1748"/>
         <location filename="mainwidget.cpp" line="1785"/>
-        <source>墨水缸满</source>
+        <source>溶液液位</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1752"/>
         <location filename="mainwidget.cpp" line="1789"/>
+        <source>墨水液位</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1756"/>
+        <location filename="mainwidget.cpp" line="1793"/>
+        <source>墨水缸满</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1760"/>
+        <location filename="mainwidget.cpp" line="1797"/>
         <source>墨线开关</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1808"/>
         <location filename="mainwidget.cpp" line="1816"/>
+        <location filename="mainwidget.cpp" line="1824"/>
         <source>正常</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2359"/>
         <source>相位故障, 关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2353"/>
-        <location filename="mainwidget.cpp" line="2354"/>
+        <location filename="mainwidget.cpp" line="2360"/>
+        <location filename="mainwidget.cpp" line="2361"/>
         <source>相位故障，关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3293,106 +3376,111 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1431"/>
-        <location filename="mainwidget.cpp" line="1449"/>
+        <location filename="mainwidget.cpp" line="1394"/>
+        <source>墨水或溶剂不足,请先添加</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1439"/>
+        <location filename="mainwidget.cpp" line="1457"/>
         <source>回收槽之前发生阻塞或回收槽时间设置错误，是否强制将当前位置设为到顶位置?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1571"/>
-        <location filename="mainwidget.cpp" line="1572"/>
+        <location filename="mainwidget.cpp" line="1579"/>
+        <location filename="mainwidget.cpp" line="1580"/>
         <source>%1.%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2145"/>
+        <location filename="mainwidget.cpp" line="2153"/>
         <source>墨水缸满报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2155"/>
+        <location filename="mainwidget.cpp" line="2163"/>
         <source>墨水液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2162"/>
+        <location filename="mainwidget.cpp" line="2170"/>
         <source>溶剂液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2189"/>
-        <location filename="mainwidget.cpp" line="2190"/>
+        <location filename="mainwidget.cpp" line="2196"/>
+        <location filename="mainwidget.cpp" line="2197"/>
         <source>高压故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2191"/>
+        <location filename="mainwidget.cpp" line="2198"/>
         <source>高压故障，暂停打印.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2203"/>
+        <location filename="mainwidget.cpp" line="2210"/>
         <source>高压故障，关回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2204"/>
+        <location filename="mainwidget.cpp" line="2211"/>
         <source>高压故障，关回收槽和墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2250"/>
-        <location filename="mainwidget.cpp" line="2251"/>
+        <location filename="mainwidget.cpp" line="2257"/>
+        <location filename="mainwidget.cpp" line="2258"/>
         <source>回收故障，关闭回收槽，关墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2255"/>
+        <location filename="mainwidget.cpp" line="2262"/>
         <source>回收故障.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2264"/>
+        <location filename="mainwidget.cpp" line="2271"/>
         <source>回收异常,墨线可能偏离.(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2272"/>
+        <location filename="mainwidget.cpp" line="2279"/>
         <source>正在喷印.......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2317"/>
+        <location filename="mainwidget.cpp" line="2324"/>
         <source>相位故障:飞行时间错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2321"/>
+        <location filename="mainwidget.cpp" line="2328"/>
         <source>相位故障:相位检测错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2329"/>
-        <location filename="mainwidget.cpp" line="2330"/>
-        <location filename="mainwidget.cpp" line="2331"/>
+        <location filename="mainwidget.cpp" line="2336"/>
+        <location filename="mainwidget.cpp" line="2337"/>
+        <location filename="mainwidget.cpp" line="2338"/>
         <source>相位故障，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2337"/>
-        <location filename="mainwidget.cpp" line="2338"/>
-        <location filename="mainwidget.cpp" line="2339"/>
+        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2345"/>
+        <location filename="mainwidget.cpp" line="2346"/>
         <source>相位故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2351"/>
         <source>相位故障，屏蔽DAC输出</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2345"/>
-        <location filename="mainwidget.cpp" line="2346"/>
+        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2353"/>
         <source>相位故障，屏蔽充电</source>
         <translation type="unfinished"></translation>
     </message>

vena.ts

@@ -194,15 +194,15 @@
         <location filename="countervarset.ui" line="84"/>
         <location filename="countervarset.ui" line="273"/>
         <location filename="CounterVarSet.cpp" line="168"/>
-        <location filename="CounterVarSet.cpp" line="183"/>
+        <location filename="CounterVarSet.cpp" line="187"/>
         <source>计数器1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="countervarset.ui" line="112"/>
         <location filename="countervarset.ui" line="655"/>
-        <location filename="CounterVarSet.cpp" line="176"/>
-        <location filename="CounterVarSet.cpp" line="185"/>
+        <location filename="CounterVarSet.cpp" line="178"/>
+        <location filename="CounterVarSet.cpp" line="189"/>
         <source>计数器2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1596,6 +1596,50 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DlgViscositySetting</name>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="14"/>
+        <source>告警浮动范围设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="26"/>
+        <source>✕</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="39"/>
+        <source>✓</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="52"/>
+        <source>告警阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="68"/>
+        <source>关喷嘴阈值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="167"/>
+        <source>设定值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="183"/>
+        <location filename="dlgviscositysetting.ui" line="196"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlgviscositysetting.ui" line="209"/>
+        <source>当前值:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FileLogger</name>
     <message>
@@ -1925,197 +1969,231 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="993"/>
+        <location filename="InkJetPrinter.cpp" line="988"/>
         <source>开始自检,请等待%1秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1830"/>
-        <location filename="InkJetPrinter.cpp" line="1831"/>
+        <location filename="InkJetPrinter.cpp" line="1816"/>
+        <location filename="InkJetPrinter.cpp" line="1817"/>
         <location filename="mainwidget.cpp" line="444"/>
         <source>自检完成!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3147"/>
+        <location filename="InkJetPrinter.cpp" line="3138"/>
+        <location filename="InkJetPrinter.cpp" line="3279"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="InkJetPrinter.cpp" line="101"/>
-        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <location filename="InkJetPrinter.cpp" line="1928"/>
+        <location filename="InkJetPrinter.cpp" line="3298"/>
+        <location filename="InkJetPrinter.cpp" line="3608"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="276"/>
+        <location filename="InkJetPrinter.cpp" line="274"/>
         <source>保养期还有%1小时到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="280"/>
+        <location filename="InkJetPrinter.cpp" line="278"/>
         <source>保养期已超过%1小时,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="976"/>
+        <location filename="InkJetPrinter.cpp" line="972"/>
         <source>开始自检,请等待60秒...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2792"/>
-        <location filename="InkJetPrinter.cpp" line="2825"/>
-        <location filename="InkJetPrinter.cpp" line="2851"/>
+        <location filename="InkJetPrinter.cpp" line="2783"/>
+        <location filename="InkJetPrinter.cpp" line="2816"/>
+        <location filename="InkJetPrinter.cpp" line="2842"/>
         <source>正在准备重启,请等待%1秒......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="769"/>
-        <location filename="InkJetPrinter.cpp" line="1227"/>
+        <location filename="InkJetPrinter.cpp" line="767"/>
+        <location filename="InkJetPrinter.cpp" line="1212"/>
         <source>压力泄漏或压力传感器故障!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="772"/>
+        <location filename="InkJetPrinter.cpp" line="770"/>
         <source>运行中压力泄漏，停齿轮泵!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="794"/>
-        <location filename="InkJetPrinter.cpp" line="878"/>
+        <location filename="InkJetPrinter.cpp" line="792"/>
+        <location filename="InkJetPrinter.cpp" line="876"/>
         <source>定时开机循环完成，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="871"/>
+        <location filename="InkJetPrinter.cpp" line="869"/>
         <source>waitPowerOffTime: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="879"/>
+        <location filename="InkJetPrinter.cpp" line="877"/>
         <source>准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1060"/>
-        <location filename="InkJetPrinter.cpp" line="1062"/>
+        <location filename="InkJetPrinter.cpp" line="1056"/>
+        <location filename="InkJetPrinter.cpp" line="1058"/>
         <source>缺少墨水,喷码机不能正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="1286"/>
+        <location filename="InkJetPrinter.cpp" line="1271"/>
         <location filename="mainwidget.cpp" line="445"/>
         <source>停止打印，自动关闭高压.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2087"/>
+        <location filename="InkJetPrinter.cpp" line="2078"/>
         <source>flagOfPowerOnMode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2677"/>
-        <location filename="InkJetPrinter.cpp" line="2678"/>
+        <location filename="InkJetPrinter.cpp" line="2668"/>
+        <location filename="InkJetPrinter.cpp" line="2669"/>
         <source>电机故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2695"/>
+        <location filename="InkJetPrinter.cpp" line="2686"/>
         <source>回收槽到头</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2744"/>
-        <location filename="InkJetPrinter.cpp" line="2745"/>
+        <location filename="InkJetPrinter.cpp" line="2735"/>
+        <location filename="InkJetPrinter.cpp" line="2736"/>
         <source>回收槽卡住或者回收槽开关时间设置错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="2963"/>
+        <location filename="InkJetPrinter.cpp" line="2954"/>
         <source>压力过高,请检查管路是否堵塞,然后点击故障恢复按钮</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3048"/>
-        <location filename="InkJetPrinter.cpp" line="3336"/>
-        <location filename="InkJetPrinter.cpp" line="3392"/>
+        <location filename="InkJetPrinter.cpp" line="3039"/>
+        <location filename="InkJetPrinter.cpp" line="3360"/>
+        <location filename="InkJetPrinter.cpp" line="3427"/>
         <source>请刷墨水卡,请使用原厂墨水耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3050"/>
+        <location filename="InkJetPrinter.cpp" line="3041"/>
         <source>墨水液位报警超过48小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3058"/>
-        <location filename="InkJetPrinter.cpp" line="3463"/>
-        <location filename="InkJetPrinter.cpp" line="3511"/>
+        <location filename="InkJetPrinter.cpp" line="3049"/>
+        <location filename="InkJetPrinter.cpp" line="3506"/>
+        <location filename="InkJetPrinter.cpp" line="3564"/>
         <source>请刷溶剂卡,请使用原厂溶剂耗材,否则机器将在%1小时后禁止使用!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3060"/>
+        <location filename="InkJetPrinter.cpp" line="3051"/>
         <source>溶剂液位报警超过48小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3068"/>
+        <location filename="InkJetPrinter.cpp" line="3059"/>
         <source>保养期还有%1天到期,请及时保养,否则喷码机容易损坏</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3070"/>
+        <location filename="InkJetPrinter.cpp" line="3061"/>
         <source>保养期已超过%1天,请进行保养以恢复喷码机的正常使用</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3226"/>
+        <location filename="InkJetPrinter.cpp" line="3211"/>
         <source>刷墨水卡成功, 请及时将该墨水卡对应的墨水添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3229"/>
+        <location filename="InkJetPrinter.cpp" line="3214"/>
         <source>刷墨水卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3238"/>
+        <location filename="InkJetPrinter.cpp" line="3223"/>
         <source>刷溶剂卡成功, 请及时将该溶剂卡对应的溶剂添加到机器中</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3241"/>
+        <location filename="InkJetPrinter.cpp" line="3226"/>
         <source>刷溶剂卡成功!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3316"/>
+        <location filename="InkJetPrinter.cpp" line="3274"/>
+        <source>粘度过高,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3276"/>
+        <source>粘度过低,即将关闭喷嘴</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3293"/>
+        <source>粘度较高,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3295"/>
+        <source>粘度较低,请注意调整粘度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3335"/>
         <source>请及时使用墨水盒附带的IC卡激活墨水盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3390"/>
-        <source>墨水液位报警超过%1小时,机器无法正常打印,请先添加原厂墨水再刷墨水卡,以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3414"/>
+        <source>墨水液位报警超过%1小时,机器无法正常打印,请添加墨水并刷卡.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3443"/>
+        <location filename="InkJetPrinter.cpp" line="3421"/>
+        <source>墨水告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3480"/>
         <source>请及时使用溶剂盒附带的IC卡激活溶剂盒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3509"/>
-        <source>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</source>
+        <location filename="InkJetPrinter.cpp" line="3552"/>
+        <source>溶剂液位报警超过%1小时,机器无法正常打印,请添加溶剂并刷卡.</source>
+        <oldsource>溶剂液位报警超过%1小时,机器无法正常打印,请先添加溶剂再刷溶剂卡以恢复喷码机的正常工作!</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3576"/>
+        <location filename="InkJetPrinter.cpp" line="3558"/>
+        <source>溶剂告警已累计3小时，自动关喷嘴。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="InkJetPrinter.cpp" line="3632"/>
         <source>File not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="InkJetPrinter.cpp" line="3099"/>
+        <location filename="InkJetPrinter.cpp" line="3090"/>
         <source>刷卡倒计时起始时间文件不存在</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2898,7 +2976,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="266"/>
-        <location filename="MainInstruction.cpp" line="187"/>
+        <location filename="MainInstruction.cpp" line="188"/>
         <source>额外设置</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +2997,7 @@
     </message>
     <message>
         <location filename="MainInstruction.ui" line="205"/>
-        <location filename="MainInstruction.cpp" line="200"/>
+        <location filename="MainInstruction.cpp" line="201"/>
         <source>系统授权</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2934,7 +3012,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.ui" line="325"/>
+        <location filename="MainInstruction.ui" line="317"/>
+        <source>粘度设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="MainInstruction.ui" line="338"/>
         <source>✕</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2944,28 +3027,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>提示</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="150"/>
+        <location filename="MainInstruction.cpp" line="151"/>
         <source>RFID卡清零!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="188"/>
-        <location filename="MainInstruction.cpp" line="199"/>
+        <location filename="MainInstruction.cpp" line="189"/>
+        <location filename="MainInstruction.cpp" line="200"/>
         <source>取消授权</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="190"/>
+        <location filename="MainInstruction.cpp" line="191"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="MainInstruction.cpp" line="191"/>
+        <location filename="MainInstruction.cpp" line="192"/>
         <source>密码错误:%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,8 +3202,8 @@
     <message>
         <location filename="mainwidget.cpp" line="264"/>
         <location filename="mainwidget.cpp" line="283"/>
-        <location filename="mainwidget.cpp" line="1430"/>
-        <location filename="mainwidget.cpp" line="1448"/>
+        <location filename="mainwidget.cpp" line="1438"/>
+        <location filename="mainwidget.cpp" line="1456"/>
         <source>警告</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3152,36 +3235,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
-        <location filename="mainwidget.cpp" line="2478"/>
-        <location filename="mainwidget.cpp" line="2482"/>
-        <location filename="mainwidget.cpp" line="2491"/>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2474"/>
+        <location filename="mainwidget.cpp" line="2485"/>
+        <location filename="mainwidget.cpp" line="2489"/>
+        <location filename="mainwidget.cpp" line="2498"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>错误</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2467"/>
+        <location filename="mainwidget.cpp" line="2474"/>
         <source>喷印间隔过短,应高于%1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2478"/>
+        <location filename="mainwidget.cpp" line="2485"/>
         <source>喷头盖未关,请先关喷头盖!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2482"/>
+        <location filename="mainwidget.cpp" line="2489"/>
         <source>墨线未开，请先开墨线开关!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2491"/>
+        <location filename="mainwidget.cpp" line="2498"/>
         <source>当前总列数 %1 ,支持的总列数为 %2,请减少打印串的长度</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2507"/>
+        <location filename="mainwidget.cpp" line="2514"/>
         <source>打印耗时 %1ms ,触发间隔 :%2ms ,触发间隔至少应当大于打印耗时3ms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3218,72 +3301,72 @@
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1188"/>
-        <location filename="mainwidget.cpp" line="1416"/>
+        <location filename="mainwidget.cpp" line="1424"/>
         <source>正在排气...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1724"/>
-        <location filename="mainwidget.cpp" line="1761"/>
-        <source>高压故障</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwidget.cpp" line="1728"/>
-        <location filename="mainwidget.cpp" line="1765"/>
-        <source>相位故障</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwidget.cpp" line="1732"/>
         <location filename="mainwidget.cpp" line="1769"/>
-        <source>粘度故障</source>
+        <source>高压故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1736"/>
         <location filename="mainwidget.cpp" line="1773"/>
-        <source>回收故障</source>
+        <source>相位故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1740"/>
         <location filename="mainwidget.cpp" line="1777"/>
-        <source>溶液液位</source>
+        <source>粘度故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1744"/>
         <location filename="mainwidget.cpp" line="1781"/>
-        <source>墨水液位</source>
+        <source>回收故障</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1748"/>
         <location filename="mainwidget.cpp" line="1785"/>
-        <source>墨水缸满</source>
+        <source>溶液液位</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwidget.cpp" line="1752"/>
         <location filename="mainwidget.cpp" line="1789"/>
+        <source>墨水液位</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1756"/>
+        <location filename="mainwidget.cpp" line="1793"/>
+        <source>墨水缸满</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1760"/>
+        <location filename="mainwidget.cpp" line="1797"/>
         <source>墨线开关</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1808"/>
         <location filename="mainwidget.cpp" line="1816"/>
+        <location filename="mainwidget.cpp" line="1824"/>
         <source>正常</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2359"/>
         <source>相位故障, 关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2353"/>
-        <location filename="mainwidget.cpp" line="2354"/>
+        <location filename="mainwidget.cpp" line="2360"/>
+        <location filename="mainwidget.cpp" line="2361"/>
         <source>相位故障，关闭回收槽</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3293,106 +3376,111 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1431"/>
-        <location filename="mainwidget.cpp" line="1449"/>
+        <location filename="mainwidget.cpp" line="1394"/>
+        <source>墨水或溶剂不足,请先添加</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwidget.cpp" line="1439"/>
+        <location filename="mainwidget.cpp" line="1457"/>
         <source>回收槽之前发生阻塞或回收槽时间设置错误，是否强制将当前位置设为到顶位置?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="1571"/>
-        <location filename="mainwidget.cpp" line="1572"/>
+        <location filename="mainwidget.cpp" line="1579"/>
+        <location filename="mainwidget.cpp" line="1580"/>
         <source>%1.%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2145"/>
+        <location filename="mainwidget.cpp" line="2153"/>
         <source>墨水缸满报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2155"/>
+        <location filename="mainwidget.cpp" line="2163"/>
         <source>墨水液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2162"/>
+        <location filename="mainwidget.cpp" line="2170"/>
         <source>溶剂液位报警</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2189"/>
-        <location filename="mainwidget.cpp" line="2190"/>
+        <location filename="mainwidget.cpp" line="2196"/>
+        <location filename="mainwidget.cpp" line="2197"/>
         <source>高压故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2191"/>
+        <location filename="mainwidget.cpp" line="2198"/>
         <source>高压故障，暂停打印.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2203"/>
+        <location filename="mainwidget.cpp" line="2210"/>
         <source>高压故障，关回收槽</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2204"/>
+        <location filename="mainwidget.cpp" line="2211"/>
         <source>高压故障，关回收槽和墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2250"/>
-        <location filename="mainwidget.cpp" line="2251"/>
+        <location filename="mainwidget.cpp" line="2257"/>
+        <location filename="mainwidget.cpp" line="2258"/>
         <source>回收故障，关闭回收槽，关墨线</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2255"/>
+        <location filename="mainwidget.cpp" line="2262"/>
         <source>回收故障.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2264"/>
+        <location filename="mainwidget.cpp" line="2271"/>
         <source>回收异常,墨线可能偏离.(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2272"/>
+        <location filename="mainwidget.cpp" line="2279"/>
         <source>正在喷印.......</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2317"/>
+        <location filename="mainwidget.cpp" line="2324"/>
         <source>相位故障:飞行时间错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2321"/>
+        <location filename="mainwidget.cpp" line="2328"/>
         <source>相位故障:相位检测错误!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2329"/>
-        <location filename="mainwidget.cpp" line="2330"/>
-        <location filename="mainwidget.cpp" line="2331"/>
+        <location filename="mainwidget.cpp" line="2336"/>
+        <location filename="mainwidget.cpp" line="2337"/>
+        <location filename="mainwidget.cpp" line="2338"/>
         <source>相位故障，准备关机</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2337"/>
-        <location filename="mainwidget.cpp" line="2338"/>
-        <location filename="mainwidget.cpp" line="2339"/>
+        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2345"/>
+        <location filename="mainwidget.cpp" line="2346"/>
         <source>相位故障，暂停打印</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2344"/>
+        <location filename="mainwidget.cpp" line="2351"/>
         <source>相位故障，屏蔽DAC输出</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwidget.cpp" line="2345"/>
-        <location filename="mainwidget.cpp" line="2346"/>
+        <location filename="mainwidget.cpp" line="2352"/>
+        <location filename="mainwidget.cpp" line="2353"/>
         <source>相位故障，屏蔽充电</source>
         <translation type="unfinished"></translation>
     </message>