Teams/shgxtzcjhoudaosaomadayinwpf
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mqtt修改

Browse Source
This commit is contained in:
小魔仙
2025-05-23 08:45:58 +08:00
parent 9d66ffc55b
commit 6646e6b5e5
5 changed files with 119 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/RIZO_Application.Modules.ModuleName.csproj
View File

@@ -5,6 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Prism.Wpf" Version="8.1.97" />
<PackageReference Include="System.Management" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\RIZO_Application.Models\RIZO_Application.Models.csproj" />

15
RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/MqttControlViewModel.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text.Json;
using System.Threading.Tasks;
using System.Windows;
using MQTTnet.Client;
using Prism.Events;
using Prism.Regions;
@@ -17,7 +18,7 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels
private readonly IEventAggregator _eventAggregator;
private MqttHelper? _mqttHelper;
private SubscriptionToken _token;
public MqttControlViewModel(
IRegionManager regionManager,
IEventAggregator eventAggregator)
@@ -40,7 +41,7 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels
_mqttHelper = new MqttHelper(serverUrl, 1883, clientId);
_mqttHelper.MessageReceived += HandleMqttMessage;
_mqttHelper.ConnectionFailed += HandleMqttConnectionFailed;
_mqttHelper.Disconnected += Publish;
if (await ConnectMqttAsync())
{
await SubscribeToTopicsAsync();
@@ -81,6 +82,7 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels
{
_eventAggregator.GetEvent<SystemLogEvent>().Publish($"订阅:{printTopic}");
}
}
private async Task PublishInitialMessageAsync()
@@ -165,7 +167,14 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels
_eventAggregator.GetEvent<SystemLogEvent>().Publish($"发布扫描消息时出错: {ex.Message}");
}
}
public void Publish(string message, int retries, int maxRetries)
{
_eventAggregator.GetEvent<SystemLogEvent>().Publish(message);
if (retries>=maxRetries)
{
MessageBox.Show("MQTT已掉线，请停止扫码");
}
}
public async void Destroy()
{
_token?.Dispose();

7
RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/PrintControlViewModel.cs
View File

@@ -5,11 +5,9 @@ using Prism.Events;
using Prism.Regions;
using RIZO_Application.Core;
using RIZO_Application.Core.Mvvm;
using RIZO_Helper.Tools;
using RIZO_Application.Infrastructure.Model;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.Primitives;
namespace RIZO_Application.Modules.ModuleName.ViewModels
{
@@ -19,7 +17,6 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels
private readonly BartenderPrintHelper _printHelper;
private SubscriptionToken _printEventToken;
private bool _isDisposed;
public PrintControlViewModel(
IRegionManager regionManager,
IEventAggregator eventAggregator,
@@ -120,6 +117,10 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels
subStringValues: Intersect,
copies: 1);
//bool printSuccess = barTenderPrinter.PrintLabel(templatePath: printDto.Path,
// subStringValues: Intersect,
// copies: 1);
if (printSuccess)
{
_eventAggregator.GetEvent<SystemLogEvent>().Publish($"打印成功: {printDto.Name}");

51
RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/ScanControlViewModel.cs
View File

@@ -10,6 +10,7 @@ using RIZO_Helper.Tools;
using System.Windows;
using System.IO.Ports;
using System.Windows.Documents;
using System.Management;
namespace RIZO_Application.Modules.ModuleName.ViewModels
{
@@ -21,6 +22,8 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels
private bool _isConnected;
private string _lastLabel;
private DateTime _lastScanTime;
private ManagementEventWatcher watcher= new ManagementEventWatcher(new WqlEventQuery(
"SELECT * FROM Win32_DeviceChangeEvent WHERE EventType = 2 OR EventType = 3"));
// 串口连接状态属性
public bool IsConnected
{
@@ -52,11 +55,44 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels
: base(regionManager)
{
watcher.EventArrived += new EventArrivedEventHandler(DeviceChanged);
watcher.Start();
_eventAggregator = eventAggregator;
IsConnected = false; // 初始状态为未连接
InitializeScanHelperAsync().ConfigureAwait(false);
}
private void DeviceChanged(object sender, EventArrivedEventArgs e)
{
// 1. 获取设备变化前的端口列表
string[] portsBefore = SerialPort.GetPortNames();
// 2. 等待系统完成端口更新（重要！）
System.Threading.Thread.Sleep(500);
// 3. 获取设备变化后的端口列表
string[] portsAfter = SerialPort.GetPortNames();
// 4. 检测新增的端口
foreach (string port in portsAfter)
{
if (Array.IndexOf(portsBefore, port) == -1)
{
}
}
// 5. 检测移除的端口
foreach (string port in portsBefore)
{
if (Array.IndexOf(portsAfter, port) == -1)
{
}
}
}
private async Task InitializeScanHelperAsync()
{
try
@@ -69,18 +105,17 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels
}
}
public async Task StartComScan()
public async Task StartComScan(string comName = "COM1",int baudRate = 9600)
{
if (_isDisposed)
throw new ObjectDisposedException(nameof(ScanControlViewModel));
string comName = "COM1";
int baudRate = 9600;
if (SerialConfigs.Current != null)
{
comName = SerialConfigs.Current.ComName ?? string.Empty;
baudRate = SerialConfigs.Current.BaudRate ?? 9600;
}
//if (SerialConfigs.Current != null)
//{
// comName = SerialConfigs.Current.ComName ?? string.Empty;
// baudRate = SerialConfigs.Current.BaudRate ?? 9600;
//}
_eventAggregator.GetEvent<SystemLogEvent>().Publish($"串口扫码枪初始化……串口：{comName} 波特率：{baudRate}");