diff --git a/Class/TcpServer.cs b/Class/TcpServer.cs index a8e7d96..86a34b3 100644 --- a/Class/TcpServer.cs +++ b/Class/TcpServer.cs @@ -123,8 +123,8 @@ namespace SunlightAggregationTerminal.Class if (data.TryGetValue("Info", out val) && val != null)//机台信息接受 { DataModel.Info_data = JsonSerializer.Deserialize>>(val.ToString()!)!; - //发送消息 - WeakReferenceMessenger.Default.Send(new object()); + //发送消息 + WeakReferenceMessenger.Default.Send(new object()); } if (data.TryGetValue("Query", out val) && val != null)//查询接受 { diff --git a/InfoPage.xaml b/InfoPage.xaml index 6f42dab..97745b4 100644 --- a/InfoPage.xaml +++ b/InfoPage.xaml @@ -10,9 +10,8 @@ - - - + @@ -83,6 +82,5 @@ - - + \ No newline at end of file diff --git a/InfoPage.xaml.cs b/InfoPage.xaml.cs index fe98a93..d0ad450 100644 --- a/InfoPage.xaml.cs +++ b/InfoPage.xaml.cs @@ -1,5 +1,6 @@ using CommunityToolkit.Mvvm.Messaging; using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using SunlightAggregationTerminal.Class; using SunlightAggregationTerminal.Models; using System.Collections.ObjectModel; @@ -12,10 +13,11 @@ public partial class InfoPage : ContentPage public static string? _Name, _State, _MachineName, _Machine, _Information, _Model, _Type, _ModelA, _ModelB, _ModelC, _ModelD, _ModelE, _ModelF; + public InfoPage() { InitializeComponent(); - + CardCollectionView.ItemsSource = InfoItems; // 注册订阅一个不携带数据的消息(使用 object 作为泛型) WeakReferenceMessenger.Default.Register(this, (r, m) => @@ -23,6 +25,10 @@ public partial class InfoPage : ContentPage // 收到信号,直接触发函数 HandleUITrigger(); }); + //注册当前页面的下滑刷新 + myRefreshView_.Refreshing += (sender, e) => { + TcpServer.TcpTransmit("{\"Command\":\"Info\"}"); + myRefreshView_.IsRefreshing = false; }; } private void HandleUITrigger() { @@ -61,24 +67,8 @@ public partial class InfoPage : ContentPage }); } - - InfoItems.Add(new InfoItem - { - Name = _Name, - State = _State, - MachineName = _MachineName, - Machine = _Machine, - Information = _Information, - Type = _Type, - Model = _Model, - ModelA = _ModelA, - ModelB = _ModelB, - ModelC = _ModelC, - ModelD = _ModelD, - ModelE = _ModelE, - ModelF = _ModelF - }); - + CardCollectionView.ItemsSource = InfoItems; + myRefreshView_.IsRefreshing = false; } ~InfoPage()//关闭时注销消息