diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs
index adc293e7..337066cd 100644
--- a/BPASmartClient.Device/BaseDevice.cs
+++ b/BPASmartClient.Device/BaseDevice.cs
@@ -153,36 +153,37 @@ namespace BPASmartClient.Device
Status.Update($"{TypeName}.{key}", peripheral.GetAllStatus()[key]);
}
}
-
-
}
- foreach (var item in Status.GetStatusT())
+ if (AddErrorAction != null && DeleteErrorAction != null)
{
- if (item.Name == "Warning" || item.Name == "Fault")
+ foreach (var item in Status.GetStatusT())
{
- if (item.Status != "无故障" && item.Status != "无警告" && item.Status != "未发生故障")
+ if (item.Name == "Warning" || item.Name == "Fault")
{
- var res = Error?.FirstOrDefault(p => p.GetType().GetProperty("Text").GetValue(p).ToString() == item.Ms);
- if (res == null)
+ if (item.Status != "无故障" && item.Status != "无警告" && item.Status != "未发生故障")
{
- object obj = new
+ var res = Error?.FirstOrDefault(p => p.GetType().GetProperty("Text").GetValue(p).ToString() == item.Ms);
+ if (res == null)
{
- Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Type = item.Name == "Warning" ? "警告" : "故障",
- Text = item.Ms
- };
- Error.Add(obj);
- AddErrorAction?.Invoke(obj);
+ object obj = new
+ {
+ Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Type = item.Name == "Warning" ? "警告" : "故障",
+ Text = item.Ms
+ };
+ Error.Add(obj);
+ AddErrorAction?.Invoke(obj);
+ }
}
- }
- else
- {
- var res = Error?.FirstOrDefault(p => p.GetType().GetProperty("Text").GetValue(p).ToString().Contains(item.id));
- if (res != null)
+ else
{
- Error.Remove(res);
- DeleteErrorAction?.Invoke(res);
+ var res = Error?.FirstOrDefault(p => p.GetType().GetProperty("Text").GetValue(p).ToString().Contains(item.id));
+ if (res != null)
+ {
+ Error.Remove(res);
+ DeleteErrorAction?.Invoke(res);
+ }
}
}
}
diff --git a/BPASmartClient.IoT/DataVClient.cs b/BPASmartClient.IoT/DataVClient.cs
index a18c0412..5fa65c91 100644
--- a/BPASmartClient.IoT/DataVClient.cs
+++ b/BPASmartClient.IoT/DataVClient.cs
@@ -49,7 +49,9 @@ namespace BPASmartClient.IoT
///
/// 广播
///
- public string PubTopic = "/broadcast/" + "grgpECHSL7q" + "/" + "Transit_SetDevice";
+ //public string PubTopic = "/broadcast/" + "grgpECHSL7q" + "/" + "Transit_SetDevice";
+ public string PubTopic = "/broadcast/" + "grgpECHSL7q" + "/" + "Transit_Test_SetDevice";
+
///
/// key值
///
diff --git a/BPASmartClient/MainWindow.xaml.cs b/BPASmartClient/MainWindow.xaml.cs
index 8d503cbe..639c95a0 100644
--- a/BPASmartClient/MainWindow.xaml.cs
+++ b/BPASmartClient/MainWindow.xaml.cs
@@ -62,8 +62,9 @@ namespace BPASmartClient
ThreadManage.GetInstance().Start(new Action(() =>
{
new MainConsole().Start();
+
+ DataVClient.GetInstance().Start();
}), "启动主控制台", false);
- DataVClient.GetInstance().Start();
}
#endregion