Browse Source

增加大屏下发消息

样式分支
fyf 2 years ago
parent
commit
a425052cf1
2 changed files with 46 additions and 8 deletions
  1. +0
    -5
      BPASmartClient.Device/BaseDevice.cs
  2. +46
    -3
      BPASmartClient/MainWindow.xaml.cs

+ 0
- 5
BPASmartClient.Device/BaseDevice.cs View File

@@ -132,9 +132,6 @@ namespace BPASmartClient.Device


public virtual void StartMain() public virtual void StartMain()
{ {
#region 测试添加几个日志与告警
#endregion

ThreadManage.GetInstance().StartLong(new Action(() => ThreadManage.GetInstance().StartLong(new Action(() =>
{ {
foreach (var peripheral in peripherals) foreach (var peripheral in peripherals)
@@ -254,8 +251,6 @@ namespace BPASmartClient.Device
}); });
} }




/// <summary> /// <summary>
/// 报警监控 /// 报警监控
/// </summary> /// </summary>


+ 46
- 3
BPASmartClient/MainWindow.xaml.cs View File

@@ -37,6 +37,7 @@ namespace BPASmartClient
/// </summary> /// </summary>
public partial class MainWindow : Window public partial class MainWindow : Window
{ {
public MainConsole mainConsole;
public MainWindow() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
@@ -67,7 +68,8 @@ namespace BPASmartClient


ThreadManage.GetInstance().Start(new Action(() => ThreadManage.GetInstance().Start(new Action(() =>
{ {
new MainConsole().Start();
mainConsole = new MainConsole();
mainConsole.Start();
GetDevices(); GetDevices();
}), "启动主控制台", false); }), "启动主控制台", false);


@@ -82,10 +84,51 @@ namespace BPASmartClient
{ {
MessageLog.GetInstance.ShowEx(ex.ToString()); MessageLog.GetInstance.ShowEx(ex.ToString());
} }

}), "启动主IoT", false); }), "启动主IoT", false);



ActionManage.GetInstance.Register(new Action<object>((o) =>
{
App.Current.Dispatcher.Invoke(new Action(() =>
{
if (o is IOTCommandModel iot)
{
switch (iot.CommandName)
{
case 0://控制类
if (iot.CommandValue != null && iot.CommandValue.Count>0)
{
switch (iot.CommandValue.Keys.ToList()[0])
{
case "程序启动":
//mainConsole.Start();
break;
//mainConsole.Stop();
case "程序停止":
break;
case "程序复位":
//mainConsole.Stop();
//mainConsole.Start();
break;
default:
break;
}
NoticeDemoViewModel.OpenMsg(EnumPromptType.Info, MainViewModel.GetInstance().window, "大屏控制", iot.CommandValue.Keys.ToList()[0]);
}
break;
case 1://设置类
break;
case 2://通知类
if (iot.CommandValue != null && iot.CommandValue.ContainsKey("text"))
{
NoticeDemoViewModel.OpenMsg(EnumPromptType.Info, MainViewModel.GetInstance().window, "大屏通知", iot.CommandValue["text"]);
}
break;
default:
break;
}
}
}));
}), "IotBroadcast");
} }
/// <summary> /// <summary>
/// 获取设备集合 /// 获取设备集合


Loading…
Cancel
Save