diff --git a/Class/DataReceived.cs b/Class/DataReceived.cs index aa932bf..fceb579 100644 --- a/Class/DataReceived.cs +++ b/Class/DataReceived.cs @@ -124,12 +124,16 @@ namespace SunlightAggregationTerminal.Class } if (data.TryGetValue("SysData", out var value_SysData)) { - + var tmp = JsonSerializer.Deserialize>>(value_SysData.ToString()!)!; } - if (data.TryGetValue("Info", out val) && val != null)//机台信息接受 { - DataModel.Info_data = JsonSerializer.Deserialize>>(val.ToString()!)!; + DataModel.Info_data = JsonSerializer.Deserialize>>(val.ToString()!)!; + InfoPage.DyeMeasurementNumber = data.GetValue("DyeMeasurementNumber").ToString(); + InfoPage.ChemicalNumber = data.GetValue("ChemicalNumber").ToString(); + InfoPage.PowderNumber = data.GetValue("PowderNumber").ToString(); + InfoPage.DyeDissolveNumber = data.GetValue("DyeDissolveNumber").ToString(); + //发送消息 WeakReferenceMessenger.Default.Send(new object()); } diff --git a/InfoPage.xaml b/InfoPage.xaml index 49752ae..e4403d4 100644 --- a/InfoPage.xaml +++ b/InfoPage.xaml @@ -2,7 +2,7 @@ @@ -12,73 +12,134 @@ - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/InfoPage.xaml.cs b/InfoPage.xaml.cs index 00bddf9..2c4e6cd 100644 --- a/InfoPage.xaml.cs +++ b/InfoPage.xaml.cs @@ -11,6 +11,7 @@ public partial class InfoPage : ContentPage { public static ObservableCollection InfoItems { get; set; } = new(); private DateTime _lastRefreshTime = DateTime.MinValue; + public static string? DyeMeasurementNumber, ChemicalNumber, PowderNumber, DyeDissolveNumber; public InfoPage() { @@ -44,8 +45,18 @@ public partial class InfoPage : ContentPage } }; } - private void HandleUITrigger() + + private void TapGestureRecognizer_ChemicalStatistics(object sender, TappedEventArgs e) { + + } + + private void HandleUITrigger() + { + _DyeMeasurementNumber.Text = DyeMeasurementNumber; + _ChemicalNumber.Text = ChemicalNumber; + _PowderNumber.Text = PowderNumber; + _DyeDissolveNumber.Text = DyeDissolveNumber; InfoItems.Clear(); foreach (Dictionary List in DataModel.Info_data) { diff --git a/Models/DataModel.cs b/Models/DataModel.cs index 78c3414..feaad51 100644 --- a/Models/DataModel.cs +++ b/Models/DataModel.cs @@ -38,6 +38,7 @@ namespace SunlightAggregationTerminal.Models [ObservableProperty] public partial bool MessageNotificationMode { get; set; } + public class RefreshUISignal { } public static List> Info_data = new List>(); } diff --git a/ProfilePage.xaml b/ProfilePage.xaml index baa54cf..6741915 100644 --- a/ProfilePage.xaml +++ b/ProfilePage.xaml @@ -23,8 +23,8 @@ FontAttributes="Bold" TextColor="Black" /> -