新二维码/条形码编辑逻辑

LogInfo.h

@@ -6,7 +6,9 @@
 #include "MyFileDialog.h"
 #include <QDate>
 #include <QTimer>
+#include "SysPara.h"
 #include "myinclude.h"
+#include "loginfoctrl.h"
 namespace Ui {
 class LogInfo;
 }
@@ -34,23 +36,6 @@ typedef struct{
     QString dataSize;
 }AlarmStatus;
 
-//typedef struct {
-//  unsigned char inkSwith;
-//  unsigned char NozzleCover;
-//  unsigned char InkTankFull;
-//  unsigned char InkLevel;
-//  unsigned char SolventLevel;
-//  unsigned char RecyclyFault;
-//  unsigned char ViscosityFault;
-//  unsigned char PhaseFault;
-//  unsigned char HighVoltageFault;
-//  QString pressValue;
-//  QString visoValue;
-//  QString gearPumpRunSpeed;
-//  QString highVol;
-//  QString dataSize;
-//}AlarmStatus;
-
 class LogInfo : public QWidget
 {
     Q_OBJECT
@@ -75,6 +60,10 @@ public:
    void applyStyleSheet(); // 应用样式表
 
    void updateSysStatusToUI(const AlarmStatus& alarmStatus);
+
+   void bindSysPara(SysPara *sysPara);
+
+   void checkState();
 protected slots:
    void deleteOldLog(const QString folderPath, int days);
    void deleteOldLog();
@@ -90,10 +79,12 @@ private slots:
    void buttonClickedSlot();
 
 
+   void on_btn_clean_clicked();
+
+   void slt_cleanOver(bool flag);
 signals:
    void sendButtonClickedSignal(int);
    void faultTesumePress();
-   void sig_updateGeneralState(DevStatusLightType type, QString stateStr);
 
 private:
     Ui::LogInfo *ui;
@@ -107,16 +98,14 @@ private:
     static QString r_CurrentDate;
     QTimer *timerLogdel;
 
+    LogInfoCtrl *ctrl_loginfo = nullptr;
+    // 锁定全局控件，放出逆清洗
+    void lockUI();
+    void unlockUI();
+protected:
+    SysPara *sysPara;
 
-    DevStatusLightType m_stateColor = DEV_STATUS_GREEN;
-    //DEV_STATUS_GREEN:正常
-    QString m_stateStr = "正常";
-    //Mainwindow获取机器总状态
-    void getGeneralState(AlarmStatus status);
-    bool checkRed(AlarmStatus &status);
-    bool checkYellow(AlarmStatus &status);
-
-
+     void showEvent(QShowEvent *event) override;
 };
 
 #endif // LOGINFO_H