diff --git a/InfoDetail.xaml b/InfoDetail.xaml
index e058f8d..cc7d3cd 100644
--- a/InfoDetail.xaml
+++ b/InfoDetail.xaml
@@ -9,141 +9,144 @@
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
+
+
\ No newline at end of file
diff --git a/InfoDetail.xaml.cs b/InfoDetail.xaml.cs
index f3cfc95..5b3c8f6 100644
--- a/InfoDetail.xaml.cs
+++ b/InfoDetail.xaml.cs
@@ -1,17 +1,90 @@
using CommunityToolkit.Mvvm.ComponentModel;
using SunlightAggregationTerminal.Models;
+using System.Collections.ObjectModel;
using System.Reflection.PortableExecutable;
namespace SunlightAggregationTerminal;
public partial class InfoDetail : ContentPage
{
- public InfoDetail(InfoItem item)
+ public static ObservableCollection InfoProbuctItems { get; set; } = new();
+ public static ObservableCollection InfoDyelotItems { get; set; } = new();
+ public InfoDetail(InfoItem item)
{
InitializeComponent();
this.BindingContext = item;
+ InfoProbuctItems.Add(new ProbuctItem { ProductName="cs", ProductCode="cs", ProductState="", ProductInf="" });
+ InfoProbuctItems.Add(new ProbuctItem { ProductName = "c23s", ProductCode = "cweds", ProductState = "", ProductInf = "" });
+ InfoProbuctItems.Add(new ProbuctItem { ProductName = "arf", ProductCode = "af", ProductState = "", ProductInf = "" });
+ InfoProbuctItems.Add(new ProbuctItem { ProductName = "afars", ProductCode = "cs", ProductState = "", ProductInf = "" });
+
+ InfoDyelotItems.Add(new DyelotItem { Dyelot = "2134566", Machine = "g01", CreationTime = "", CallTime = "" ,
+ FabricName = "21345122343566",
+ ColorName = "g01",
+ CustomerName = "",
+ EndTime = "",
+ StartTime = "",
+ Information = "yyjjy\nfxfxdsdg\n",
+ });
+ InfoDyelotItems.Add(new DyelotItem
+ {
+ Dyelot = "231423134566",
+ Machine = "g01",
+ CreationTime = "",
+ CallTime = "",
+ FabricName = "2134566",
+ ColorName = "g01",
+ CustomerName = "",
+ EndTime = "",
+ StartTime = "",
+ Information = "yyjjy\nfxfxdsdg\n",
+ });
+
+ InfoDyelotItems.Add(new DyelotItem
+ {
+ Dyelot = "2131324354566",
+ Machine = "g01",
+ CreationTime = "",
+ CallTime = "",
+ FabricName = "2134566",
+ ColorName = "g01",
+ CustomerName = "",
+ EndTime = "",
+ StartTime = "",
+ Information = "yyjjy\nfxfxdsdg\n",
+ });
+ InfoDyelotItems.Add(new DyelotItem
+ {
+ Dyelot = "2134123243566",
+ Machine = "g01",
+ CreationTime = "",
+ CallTime = "",
+ FabricName = "2134566",
+ ColorName = "g01",
+ CustomerName = "",
+ EndTime = "",
+ StartTime = "",
+ Information = "yyjjy\nfxfxdsdg\n",
+ });
+ InfoDyelotItems.Add(new DyelotItem
+ {
+ Dyelot = "2134566",
+ Machine = "g01",
+ CreationTime = "",
+ CallTime = "",
+ FabricName = "2134566",
+ ColorName = "g01",
+ CustomerName = "",
+ EndTime = "",
+ StartTime = "",
+ Information = "yyjjy\nfxfxdsdg\n",
+ });
+
+
+ CardCollectionView_machine.ItemsSource = InfoProbuctItems;
+ CardCollectionView_history.ItemsSource = InfoDyelotItems;
}
private void Button_real(object sender, EventArgs e)
diff --git a/Models/DataSource.cs b/Models/DataSource.cs
index 186c3ae..06801a4 100644
--- a/Models/DataSource.cs
+++ b/Models/DataSource.cs
@@ -41,15 +41,26 @@ namespace SunlightAggregationTerminal.Models
public string? ModelE { get; set; }
public string? ModelF { get; set; }
}
-
+ public partial class ProbuctItem
+ {
+ public string? ProductName { get; set; }
+ public string? ProductCode { get; set; }
+ public string? ProductState { get; set; }
+ public string? ProductInf { get; set; }
+ }
+
public class DyelotItem
{
public string? Dyelot { get; set; }
public string? Machine { get; set; }
public string? CreationTime { get; set; }
+ public string? CallTime { get; set; }
public string? FabricName { get; set; }
public string? ColorName { get; set; }
public string? CustomerName { get; set; }
+ public string? EndTime { get; set; }
+ public string? StartTime { get; set; }
+ public string? Information { get; set; }
}
public static class DataService
diff --git a/NotificationView/MessagePage.xaml b/NotificationView/MessagePage.xaml
index 012eb39..37e8e2f 100644
--- a/NotificationView/MessagePage.xaml
+++ b/NotificationView/MessagePage.xaml
@@ -5,8 +5,7 @@
Title="信息">
+ RemainingItemsThreshold="5">
diff --git a/NotificationView/MessagePage.xaml.cs b/NotificationView/MessagePage.xaml.cs
index e45c76e..117fc6c 100644
--- a/NotificationView/MessagePage.xaml.cs
+++ b/NotificationView/MessagePage.xaml.cs
@@ -34,8 +34,5 @@ public partial class MessagePage : ContentPage
}
}
- private void CardCollectionView_RemainingItemsThresholdReached(object sender, EventArgs e)
- {
-
- }
+
}
\ No newline at end of file