diff --git a/ConvertMoels/StateToColorConvert.cs b/ConvertMoels/StateToColorConvert.cs
index 08683c8..0fdad06 100644
--- a/ConvertMoels/StateToColorConvert.cs
+++ b/ConvertMoels/StateToColorConvert.cs
@@ -24,6 +24,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ConvertMoels
if (i == "201") return "green";
else if (i == "202") return "yellow";
else if (i == "309") return "Red";
+ else if (i == "800") return "Red";
else return "block";
}
}
diff --git a/ConvertMoels/StatenClassConvert.cs b/ConvertMoels/StatenClassConvert.cs
index 9460b1a..53fa01b 100644
--- a/ConvertMoels/StatenClassConvert.cs
+++ b/ConvertMoels/StatenClassConvert.cs
@@ -35,7 +35,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ConvertMoels
else if (i == "309") Staten = Properties.Resources.Abnormal;//错误
else if (i == "800") Staten = Properties.Resources.Notimplementation;//未连接
else if (i == "801") Staten = Properties.Resources.Implementation;//连接成功
- else if (i == "801") Staten = Properties.Resources.Online;//在线
+ else if (i == "802") Staten = Properties.Resources.Online;//在线
else if (i == "899") Staten = Properties.Resources.CloseTheConnection;//关闭连接
else Staten = "null";
diff --git a/EX/DispenseState.xaml b/EX/DispenseState.xaml
new file mode 100644
index 0000000..45dc445
--- /dev/null
+++ b/EX/DispenseState.xaml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EX/DispenseState.xaml.cs b/EX/DispenseState.xaml.cs
new file mode 100644
index 0000000..299ba5b
--- /dev/null
+++ b/EX/DispenseState.xaml.cs
@@ -0,0 +1,69 @@
+using SunlightCentralizedControlManagement_SCCM_.UserClass;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SunlightCentralizedControlManagement_SCCM_.EX
+{
+ ///
+ /// DispenseState.xaml 的交互逻辑
+ ///
+ public partial class DispenseState : UserControl
+ {
+ public DispenseState()
+ {
+ InitializeComponent();
+ }
+ public async void State(object dat,string mac)
+ {
+ string Connstr_SC;
+ string WaitChemical_WaitDispenseDyestuff;
+ string DAT = mac.Substring(0,3);
+ if (DAT == "252")
+ {
+ WaitChemical_WaitDispenseDyestuff = "SELECT * FROM [dbo].[WaitDispenseDyestuff] WHERE DispenseMachine = '" + dat + "'";
+ }
+ else
+ {
+ WaitChemical_WaitDispenseDyestuff = "SELECT * FROM [dbo].[WaitChemical] WHERE DispenseMachine = '" + dat + "'";
+ }
+ try
+ {
+ if (MainWindowViewModel.SQMOD == "Windows Authentication")
+ {
+ Connstr_SC = "server=" + MainWindowViewModel.SQLIP + ";database=" + MainWindowViewModel.SQLNAME + ";Trusted_Connection=SSPI";
+ }
+ else
+ {
+ Connstr_SC = "server=" + MainWindowViewModel.SQLIP + ";database=" + MainWindowViewModel.SQLNAME + ";User ID=" + MainWindowViewModel.SQLUSER + ";Password=" + MainWindowViewModel.SQLPASWORD;
+ }
+ SqlConnection conn_SC = new SqlConnection(Connstr_SC);
+ await conn_SC.OpenAsync(); //连接数据库
+ SqlDataAdapter WaitChemical_data = new SqlDataAdapter(WaitChemical_WaitDispenseDyestuff, Connstr_SC); //查询
+ conn_SC.Close();
+
+ DataTable ds = new DataTable();//载入信息
+ WaitChemical_data.Fill(ds);
+ Grid_data.ItemsSource = ds.DefaultView;
+ }
+ catch (Exception ex)
+ {
+ LogGing.ERRDATA(ex);
+ }
+ }
+ }
+}
diff --git a/EX/ManualDyelot.xaml b/EX/ManualDyelot.xaml
new file mode 100644
index 0000000..5df430a
--- /dev/null
+++ b/EX/ManualDyelot.xaml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EX/ManualDyelot.xaml.cs b/EX/ManualDyelot.xaml.cs
new file mode 100644
index 0000000..8a43979
--- /dev/null
+++ b/EX/ManualDyelot.xaml.cs
@@ -0,0 +1,66 @@
+using SunlightCentralizedControlManagement_SCCM_.UserClass;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace SunlightCentralizedControlManagement_SCCM_.EX
+{
+ ///
+ /// ManualDyelot.xaml 的交互逻辑
+ ///
+ public partial class ManualDyelot : Window
+ {
+ public ManualDyelot()
+ {
+ InitializeComponent();
+ }
+ public async void MAC(object Machines)
+ {
+ string Connstr_SC;
+ string sql = "SELECT * FROM [dbo].[Pipes] WHERE Dispenser = '" + Machines + "'";
+
+ try
+ {
+ if (MainWindowViewModel.SQMOD == "Windows Authentication")
+ {
+ Connstr_SC = "server=" + MainWindowViewModel.SQLIP + ";database=" + MainWindowViewModel.SQLNAME + ";Trusted_Connection=SSPI";
+ }
+ else
+ {
+ Connstr_SC = "server=" + MainWindowViewModel.SQLIP + ";database=" + MainWindowViewModel.SQLNAME + ";User ID=" + MainWindowViewModel.SQLUSER + ";Password=" + MainWindowViewModel.SQLPASWORD;
+ }
+ SqlConnection conn_SC = new SqlConnection(Connstr_SC);
+ await conn_SC.OpenAsync(); //连接数据库
+ SqlDataAdapter _data = new SqlDataAdapter(sql, Connstr_SC); //查询
+ conn_SC.Close();
+
+ DataTable ds = new DataTable();//载入信息
+ _data.Fill(ds);
+ Grid_data.ItemsSource = ds.DefaultView;
+ }
+ catch (Exception ex)
+ {
+ LogGing.ERRDATA(ex);
+ }
+ }
+
+ private void State_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+ }
+}
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 62395fd..ddb9e6f 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -116,7 +116,7 @@ namespace SunlightCentralizedControlManagement_SCCM_
}
private void ListViewItem_ConveyorCenters(object sender, MouseButtonEventArgs e)
{
-
+ Picture.Content = new View.DispenseView();
}
private void Buttonhelp_Click(object sender, RoutedEventArgs e)
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 012e3d5..d2bb98a 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -699,6 +699,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 DispenseModule 的本地化字符串。
+ ///
+ public static string DispenseModule {
+ get {
+ return ResourceManager.GetString("DispenseModule", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Details were not sent 的本地化字符串。
///
@@ -1113,6 +1122,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Information 的本地化字符串。
+ ///
+ public static string Information {
+ get {
+ return ResourceManager.GetString("Information", resourceCulture);
+ }
+ }
+
///
/// 查找类似 I/O 的本地化字符串。
///
@@ -1248,6 +1266,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Manual 的本地化字符串。
+ ///
+ public static string Manual {
+ get {
+ return ResourceManager.GetString("Manual", resourceCulture);
+ }
+ }
+
///
/// 查找类似 MasterCylinder 的本地化字符串。
///
@@ -1464,6 +1491,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 NOT AVAILABLE 的本地化字符串。
+ ///
+ public static string Not_a {
+ get {
+ return ResourceManager.GetString("Not_a", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Notimplementation 的本地化字符串。
///
@@ -2220,6 +2256,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 screen 的本地化字符串。
+ ///
+ public static string Screen {
+ get {
+ return ResourceManager.GetString("Screen", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Search 的本地化字符串。
///
@@ -2616,6 +2661,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Volume 的本地化字符串。
+ ///
+ public static string Volume {
+ get {
+ return ResourceManager.GetString("Volume", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Washing 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 4f988a6..f837a91 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -1014,4 +1014,22 @@
Cancel
+
+ Manual
+
+
+ NOT AVAILABLE
+
+
+ Screen
+
+
+ Volume
+
+
+ DispenseModule
+
+
+ Information
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 221bd27..bdeba84 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -1014,4 +1014,22 @@
Cancel
+
+ Manual
+
+
+ NOT AVAILABLE
+
+
+ screen
+
+
+ Volume
+
+
+ DispenseModule
+
+
+ Information
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 9aaf8ae..ca79cbc 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -1014,4 +1014,22 @@
取消
+
+ 手动
+
+
+ 当前功能不可用
+
+
+ 远程画面
+
+
+ 容量
+
+
+ 运行模组
+
+
+ 信息
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 47c7e8b..068ab79 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -1014,4 +1014,22 @@
取消
+
+ 手動
+
+
+ 目前功能不可用
+
+
+ 遠端畫面
+
+
+ 容量
+
+
+ 運行模組
+
+
+
+
\ No newline at end of file
diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj
index d1e4194..30a9766 100644
--- a/SunlightCentralizedControlManagement_SCCM_.csproj
+++ b/SunlightCentralizedControlManagement_SCCM_.csproj
@@ -101,6 +101,12 @@
+
+ DispenseState.xaml
+
+
+ ManualDyelot.xaml
+
Login.xaml
@@ -124,6 +130,9 @@
+
+ DispenseMacInfo.xaml
+
@@ -212,6 +221,14 @@
ViewStep.xaml
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
@@ -234,6 +251,10 @@
MainWindow.xaml
Code
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
diff --git a/UserControls/DispenseMacInfo.xaml b/UserControls/DispenseMacInfo.xaml
new file mode 100644
index 0000000..ade1182
--- /dev/null
+++ b/UserControls/DispenseMacInfo.xaml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/UserControls/DispenseMacInfo.xaml.cs b/UserControls/DispenseMacInfo.xaml.cs
new file mode 100644
index 0000000..e7f0ca0
--- /dev/null
+++ b/UserControls/DispenseMacInfo.xaml.cs
@@ -0,0 +1,70 @@
+using ScottPlot.Plottables;
+using SunlightCentralizedControlManagement_SCCM_.EX;
+using SunlightCentralizedControlManagement_SCCM_.WindowsView;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace SunlightCentralizedControlManagement_SCCM_.UserControls
+{
+ ///
+ /// info.xaml 的交互逻辑
+ ///
+ public partial class DispenseMacInfo : UserControl
+ {
+ public DispenseMacInfo()
+ {
+ InitializeComponent();
+ }
+
+ private void State_Click(object sender, RoutedEventArgs e)
+ {
+ if (mlock.Visibility == Visibility.Visible)
+ {
+ MessageBox.Show(Properties.Resources.Not_a,"Dispense",MessageBoxButton.OK);
+ return;
+ }
+ UserMessage userMessage = new UserMessage();
+ userMessage.DispenseMacInfo(mac.Text, macg.Text);
+ userMessage.Show();
+ }
+
+ private void Manual_Click(object sender, RoutedEventArgs e)
+ {
+ if (mlock.Visibility == Visibility.Visible)
+ {
+ MessageBox.Show(Properties.Resources.Not_a, "Dispense", MessageBoxButton.OK);
+ return;
+ }
+ ManualDyelot manualDyelot = new ManualDyelot();
+ manualDyelot.MAC(mac.Text);
+ manualDyelot.Show();
+ }
+
+ private void Screen_Click(object sender, RoutedEventArgs e)
+ {
+ if (mlock.Visibility == Visibility.Visible)
+ {
+ MessageBox.Show(Properties.Resources.Not_a, "Dispense", MessageBoxButton.OK);
+ return;
+ }
+
+ }
+ }
+
+}
diff --git a/UserControls/info.xaml.cs b/UserControls/info.xaml.cs
index 87be57e..9095011 100644
--- a/UserControls/info.xaml.cs
+++ b/UserControls/info.xaml.cs
@@ -28,22 +28,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserControls
public info()
{
InitializeComponent();
- CountDown();
+
}
- private void CountDown()
- {
- DispatcherTimer timer1s = new DispatcherTimer//初始化循环，每1秒调用一次Tick
- {
- Interval = TimeSpan.FromSeconds(10)//秒
- };
- timer1s.Tick += Tick_Event_1S;
- timer1s.Start();
- }//时间周期初始化
- void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
- {
-
- }
+
}
}
diff --git a/View/DispenseMachinesSet.xaml b/View/DispenseMachinesSet.xaml
index 49bb0c4..4664467 100644
--- a/View/DispenseMachinesSet.xaml
+++ b/View/DispenseMachinesSet.xaml
@@ -62,12 +62,20 @@
+
+
+
-
+
+
+
+
+
+
@@ -75,10 +83,10 @@
-
-
-
-
+
+
+
+
diff --git a/View/DispenseMachinesSet.xaml.cs b/View/DispenseMachinesSet.xaml.cs
index afbddb8..ac436eb 100644
--- a/View/DispenseMachinesSet.xaml.cs
+++ b/View/DispenseMachinesSet.xaml.cs
@@ -48,8 +48,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
{
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
SQLiteHelpers.Open(); //打开数据库
- Griddata.ItemsSource = SQLiteHelpers.ExecuteDataSet("select Name,Groups,IP,PORT,DATA from MachinesDispense Order by id", null).Tables[0].DefaultView;
+ DataTable dataTable = SQLiteHelpers.ExecuteDataSet("select * from MachinesDispense Order by id", null).Tables[0];
SQLiteHelpers.Close();
+ Griddata.ItemsSource = dataTable.DefaultView;
}
private void Griddata_MouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -61,6 +62,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
TextMachineGroup.Text = (Griddata.Columns[2].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
IP.Text = (Griddata.Columns[3].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
PORT.Text = (Griddata.Columns[4].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
+ User.Text = (Griddata.Columns[5].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
+ Password.Text = (Griddata.Columns[6].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
+ string TYR= (Griddata.Columns[7].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;
+ dLICK.IsChecked = Convert.ToBoolean((Griddata.Columns[7].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text);//定位第列，
}
}
@@ -77,6 +82,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
dr_new.Add("Groups", TextMachineGroup.Text);
dr_new.Add("IP", IP.Text);
dr_new.Add("PORT", PORT.Text);
+ dr_new.Add("State", "899");
+ dr_new.Add("User", User.Text);
+ dr_new.Add("Passsword", Password.Text);
+ dr_new.Add("LOCK", dLICK.IsChecked.ToString());
dr_new.Add("DATA",imageData);
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
diff --git a/View/DispenseView.xaml b/View/DispenseView.xaml
index 5c82b4b..b583e6d 100644
--- a/View/DispenseView.xaml
+++ b/View/DispenseView.xaml
@@ -16,14 +16,14 @@
-
-
-
+
+
+
+
+
-
-
-
+
diff --git a/View/DispenseView.xaml.cs b/View/DispenseView.xaml.cs
index 41dc95c..689751f 100644
--- a/View/DispenseView.xaml.cs
+++ b/View/DispenseView.xaml.cs
@@ -1,14 +1,19 @@
-using SkiaSharp;
+using LiveChartsCore.Geo;
+using SkiaSharp;
using SunlightCentralizedControlManagement_SCCM_.UserClass;
+using SunlightCentralizedControlManagement_SCCM_.UserControls;
using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using SunlightCentralizedControlManagement_SCCM_.ConvertMoels;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Linq;
using System.Net;
using System.Net.NetworkInformation;
using System.Net.Sockets;
+using System.Numerics;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -37,10 +42,60 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
private SQLiteHelper SQLiteHelpers = null; //定义数据库
private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db"; //数据库路径
private readonly UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
+ DataTable DispenseMac = new DataTable();
+ UserControls.DispenseMacInfo[] dispenseMacInfo = new UserControls.DispenseMacInfo[99]; //定义总览信息卡
//private string SYS_machines = null;
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
-
+ SQLiteHelpers = new SQLiteHelper(DBAddress);
+ SQLiteHelpers.Open(); //打开数据库
+ DispenseMac = SQLiteHelpers.ExecuteDataSet("select * from MachinesDispense ", null).Tables[0];//缓存
+ SQLiteHelpers.Close();
+ ///
+ /// 生成总览信息卡
+ ///
+ for (int i = 0; i < DispenseMac.Rows.Count; i++)
+ {
+ string x = DispenseMac.AsEnumerable().Select(row => row.Field("State")).ElementAt(i);
+ bool y = DispenseMac.AsEnumerable().Select(row => row.Field("LOCK")).ElementAt(i);
+
+ dispenseMacInfo[i] = new UserControls.DispenseMacInfo();
+ dispenseMacInfo[i].Margin = new Thickness(5, 5, 0, 5);
+ dispenseMacInfo[i].Width = 400;
+ dispenseMacInfo[i].Height = 600;
+ dispenseMacInfo[i].mac.Text = DispenseMac.AsEnumerable().Select(row => row.Field("name")).ElementAt(i);
+ dispenseMacInfo[i].macg.Text = DispenseMac.AsEnumerable().Select(row => row.Field("Groups")).ElementAt(i);
+ dispenseMacInfo[i].state.Text = StatenClassConvert.Convert(x);
+ if (x == "899")
+ {
+ dispenseMacInfo[i].state.Background = new SolidColorBrush(Color.FromRgb(255, 0, 0));
+ }
+ else
+ {
+ dispenseMacInfo[i].state.Background = new SolidColorBrush(Color.FromRgb(255, 255, 255));
+ }
+ dispenseMacInfo[i].WorkingStatus.Text = DispenseMac.AsEnumerable().Select(row => row.Field("WorkingStatus")).ElementAt(i);
+ if (y)
+ {
+ dispenseMacInfo[i].mlock.Visibility = Visibility.Visible;
+ }
+ else
+ {
+ dispenseMacInfo[i].mlock.Visibility = Visibility.Collapsed;
+ }
+
+ //dispenseMacInfo[i].name.Text = Selet_Machines(MainWindowViewModel.Machines, "name", i).ToString();
+ // dispenseMacInfo[i].IMAGE = ;
+
+ MemoryStream memoryStream = new MemoryStream(DispenseMac.AsEnumerable().Select(row => row.Field("DATA")).ElementAt(i));
+ //数据流生成图片显示
+ BitmapImage bitmapImage = new BitmapImage();
+ bitmapImage.BeginInit();
+ bitmapImage.StreamSource = memoryStream;
+ bitmapImage.EndInit();
+ dispenseMacInfo[i].IMAGE.Source = bitmapImage;
+ DispenseMacView.Children.Add(dispenseMacInfo[i]);
+ }
}
diff --git a/WindowsView/UserMessage.xaml.cs b/WindowsView/UserMessage.xaml.cs
index 3dd8795..e2b2399 100644
--- a/WindowsView/UserMessage.xaml.cs
+++ b/WindowsView/UserMessage.xaml.cs
@@ -1,4 +1,5 @@
using SunlightCentralizedControlManagement_SCCM_.View;
+using SunlightCentralizedControlManagement_SCCM_.EX;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -24,7 +25,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
{
InitializeComponent();
}
-
+ public void DispenseMacInfo(object dat, string mac)
+ {
+ DispenseState dispenseState = new DispenseState();
+ dispenseState.State(dat,mac);
+ Picture.Content = dispenseState;
+ }
public void Dyelots(object dat)
{
DyelotView dyelotView = new DyelotView();