From 6d82738bd42265dda21be8c2f35c371c0d5163e8 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sun, 28 Apr 2024 20:50:33 +0800
Subject: [PATCH] update

---
 libzqt/zui/zqui.cpp | 4 ++--
 libzqt/zui/zqui.hpp | 6 +++---
 src/mainwindow.cpp  | 7 +++----
 src/mainwindow.h    | 2 +-
 src/mainwindow.ui   | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/libzqt/zui/zqui.cpp b/libzqt/zui/zqui.cpp
index 6934c11..8adb66a 100644
--- a/libzqt/zui/zqui.cpp
+++ b/libzqt/zui/zqui.cpp
@@ -35,14 +35,14 @@ void ZQUI::rshow(const char *fmt, ...) {
   if (m_reportPreviewShow) m_reportPreviewShow(text);
 }
 
-void ZQUI::blockDataUploadPreviewShow(const char *fmt, ...) {
+void ZQUI::eshow(const char *fmt, ...) {
   va_list args;
   va_start(args, fmt);
   char buf[1024] = {0};
   vsnprintf(buf, sizeof(buf), fmt, args);
   va_end(args);
   QString text(buf);
-  if (m_blockDataUploadPreviewShow) m_blockDataUploadPreviewShow(text);
+  if (m_exceptionUploadPreviewShow) m_exceptionUploadPreviewShow(text);
 }
 void ZQUI::rawDataPreviewShow(const char *fmt, ...) {
   va_list args;
diff --git a/libzqt/zui/zqui.hpp b/libzqt/zui/zqui.hpp
index d8ed620..e666eef 100644
--- a/libzqt/zui/zqui.hpp
+++ b/libzqt/zui/zqui.hpp
@@ -43,7 +43,7 @@ class ZQUI : public QObject {
 
   std::function<void(QString)> m_ishow;
   std::function<void(QString)> m_reportPreviewShow;
-  std::function<void(QString)> m_blockDataUploadPreviewShow;
+  std::function<void(QString)> m_exceptionUploadPreviewShow;
   std::function<void(QString)> m_rawDataPreviewShow;
   std::function<void()>        m_instructionPreviewClear;
 
@@ -55,13 +55,13 @@ class ZQUI : public QObject {
 
   void ishow(const char *fmt, ...);
   void rshow(const char *fmt, ...);
-  void blockDataUploadPreviewShow(const char *fmt, ...);
+  void eshow(const char *fmt, ...);
   void rawDataPreviewShow(const char *fmt, ...);
   void instructionPreviewClear();
 
   void setishow(std::function<void(QString)> func) { m_ishow = func; }
   void setReportPreviewShow(std::function<void(QString)> func) { m_reportPreviewShow = func; }
-  void setBlockDataUploadPreviewShow(std::function<void(QString)> func) { m_blockDataUploadPreviewShow = func; }
+  void setexceptionUploadPreviewShow(std::function<void(QString)> func) { m_exceptionUploadPreviewShow = func; }
   void setRawDataPreviewShow(std::function<void(QString)> func) { m_rawDataPreviewShow = func; }
   void setInstructionPreviewClear(std::function<void()> func) { m_instructionPreviewClear = func; }
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 54fcf3c..98f7152 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -70,7 +70,7 @@ void MainWindow::reportPreviewShow(QString text) {
     ui->reportPreview->append(info);
   }));
 }
-void MainWindow::blockDataUploadPreviewShow(QString text) {
+void MainWindow::exceptionUploadPreviewShow(QString text) {
   QString info;
 
   info.append(QDateTime::currentDateTime().toString("hh:mm:ss.zzz "));
@@ -196,7 +196,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
   qRegisterMetaType<QFunction>("QFunction");
   connect(this, SIGNAL(doinui_signal(QFunction)), this, SLOT(doinui_slot(QFunction)));
   ZQUI::ins()->initialize();
-  ZQUI::ins()->setBlockDataUploadPreviewShow([this](QString text) { blockDataUploadPreviewShow(text); });
+  ZQUI::ins()->setexceptionUploadPreviewShow([this](QString text) { exceptionUploadPreviewShow(text); });
   ZQUI::ins()->setishow([this](QString text) { ishow(text); });
   ZQUI::ins()->setReportPreviewShow([this](QString text) { reportPreviewShow(text); });
   ZQUI::ins()->setRawDataPreviewShow([this](QString text) { rawDataPreviewShow(text); });
@@ -207,7 +207,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
    */
   constructBaseUI();
   constructAppUI();
-  ui->uploadDataPreview->hide();
 
   /**
    * @brief 业务逻辑构造
@@ -365,7 +364,7 @@ void MainWindow::processReportPacket(packet_type_t type, uint8_t from, uint8_t t
 
   } else if (frame->function_id == kreport_exception_error) {
     report_exeception_data_t *ack = (report_exeception_data_t *)frame->params;
-    ZQUI::ins()->rshow("[Exception][FROM:%03d] subid:%x ecode:%s",  //
+    ZQUI::ins()->eshow("[Exception][FROM:%03d] subid:%x ecode:%s",  //
                        from, ack->subid, ErrorCodeToString(ack->ecode));
   } else if (frame->function_id == kreport_pressure_data) {
     report_pressure_data_t *ack = (report_pressure_data_t *)frame->params;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index eaf93d3..91849df 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -105,7 +105,7 @@ class MainWindow : public QMainWindow {
   void instructionPreviewClear();
   void ishow(QString info);
   void reportPreviewShow(QString info);
-  void blockDataUploadPreviewShow(QString info);
+  void exceptionUploadPreviewShow(QString info);
   void rawDataPreviewShow(QString info);
 
   void displayInfo(bool suc, QString info);
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 4bdd784..6ec0632 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1055,7 +1055,7 @@ p, li { white-space: pre-wrap; }
              <item>
               <widget class="QGroupBox" name="uploadDataPreviewBox">
                <property name="title">
-                <string>上传数据显示</string>
+                <string>异常上报显示</string>
                </property>
                <layout class="QVBoxLayout" name="verticalLayout_5">
                 <item>