Selaa lähdekoodia

V2.1
1、添加了刷新功能

Apple 3 viikkoa sitten
vanhempi
commit
8f28b59527

+ 2 - 0
TransmitterSwitch/CMakeLists.txt

@@ -21,6 +21,7 @@ file(GLOB LOCAL_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/ManagerPlan/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/CopyToOther/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/Network/*.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/Network/TcpListener/*.cpp
 
     ${CMAKE_CURRENT_SOURCE_DIR}/common/Thread/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/common/Shadow/*.cpp
@@ -65,6 +66,7 @@ target_include_directories(${lib_name} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/ManagerPlan
     ${CMAKE_CURRENT_SOURCE_DIR}/CopyToOther
     ${CMAKE_CURRENT_SOURCE_DIR}/Network
+    ${CMAKE_CURRENT_SOURCE_DIR}/Network/TcpListener
 
     ${CMAKE_CURRENT_SOURCE_DIR}/common
     ${CMAKE_CURRENT_SOURCE_DIR}/common/Thread

+ 1 - 1
TransmitterSwitch/Network/FromMQTT.h

@@ -40,7 +40,7 @@ private:
     int m_mqttPort = 1883;                  /* MQTT服务器端口 */
     int m_timeOut = 20000;                  /* 超时时间 */
     const QString m_topic_WebAPI = "LH_WEBINFO"; /* 订阅WebAPI信息的主题 */
-    const QString m_topic_UpdatePlan = "LH_EQM_ALARM_PERIOD"; /* 订阅更新计划的主题 */
+    const QString m_topic_UpdatePlan = "LH_EXECPLAN_CHANGED"; /* 订阅更新计划的主题 */
     const QString m_configName = "/Config.ini";
 
     std::atomic_bool m_isGetWebInfoSuccess{false}; /* 是否获取到WebAPI信息 */

+ 1 - 1
TransmitterSwitch/transmitterswitch.cpp

@@ -86,6 +86,7 @@ TransmitterSwitch::TransmitterSwitch(QWidget *parent) :
     connect(ui->pBtn_deletePlan, &QPushButton::clicked, this, &TransmitterSwitch::do_pBtnClearPlan);
     connect(ui->pBtn_cloneToOther, &QPushButton::clicked, this, &TransmitterSwitch::do_pBtnCopyToOther);
     connect(ui->pBtn_templateManager, &QPushButton::clicked, this, &TransmitterSwitch::do_pBtnManageTemplate);
+    connect(&m_fromMQTT, &FromMQTT::signal_updatePlan, this, &TransmitterSwitch::do_pBtnRefresh);
 
     /* 设置QSS */
     connect(&EPUIStyle, &UIStyleManager::signal_qssChanged, this, &TransmitterSwitch::do_setUIStyle);
@@ -121,7 +122,6 @@ TransmitterSwitch::~TransmitterSwitch()
 void TransmitterSwitch::initTS(const InitData& data)
 {
     m_fromMQTT.initMQTT();
-
     // setWebAPIInfo(data.url, data.serverID, data.serverKey);
     setWebAPIInfo(m_fromMQTT.m_webAPIUrl, m_fromMQTT.m_webAPIID, data.serverKey);
     /* 设置权限 */