Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

BPASmartClient.ScreenALL/App.config

@@ -2,7 +2,7 @@
 <configuration>
 	<appSettings>
 		<!--MQTT配置-->
-		<add key="MQTTConnection" value="171.221.208.23,11883,admin,public"/>
+		<add key="MQTTConnection" value="171.221.208.23,11883,admin,public1"/>
 		<!--订阅主题设置：大炒,小炒,分餐机,煮面机-->
 		<add key="DeviceMC" value="大炒,小炒,分餐机,煮面机"/>
 		<add key="GgAdder" value="https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4"/>

BPASmartClient.ScreenLib/AppMain.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
 
+
 namespace BPASmartClient.ScreenLib
 {
     public partial class AppMain
@@ -44,17 +45,15 @@ namespace BPASmartClient.ScreenLib
                     windowLarge2.Init("二号" + TitleName, new ScreenSplitMealsControl2());
                     WindowLargeScreen windowLarge3 = new WindowLargeScreen();
                     windowLarge3.Init("三号" + TitleName, new ScreenSplitMealsControl3());
-
-                    int i = 0;
-                    foreach (System.Windows.Forms.Screen scr in System.Windows.Forms.Screen.AllScreens)
+                    for (int i = 0; i < 3; i++)
                     {
-                        if (i.ToString() == System.Configuration.ConfigurationManager.AppSettings["一号屏"].ToString())
+                        if (i==0)
                         {
                             windowLarge.WindowStartupLocation = WindowStartupLocation.Manual;
-                            windowLarge.Left = scr.WorkingArea.Left;
-                            windowLarge.Top = scr.WorkingArea.Top;
-                            windowLarge.Width = scr.Bounds.Width;
-                            windowLarge.Height = scr.Bounds.Height;
+                            windowLarge.Left = i * 1920;
+                            windowLarge.Top = 0;
+                            windowLarge.Height = 1080;
+                            windowLarge.Width = 1920;
                             windowLarge.WindowState = WindowState.Maximized;
                             windowLarge.ResizeMode = ResizeMode.NoResize;
                             windowLarge.WindowStyle = WindowStyle.None;
@@ -62,13 +61,13 @@ namespace BPASmartClient.ScreenLib
                             windowLarge.ShowInTaskbar = false;
                             windowLarge.Topmost = true;
                         }
-                        else if (i.ToString() == System.Configuration.ConfigurationManager.AppSettings["二号屏"].ToString())
+                        else if (i==1)
                         {
                             windowLarge2.WindowStartupLocation = WindowStartupLocation.Manual;
-                            windowLarge2.Left = scr.WorkingArea.Left;
-                            windowLarge2.Top = scr.WorkingArea.Top;
-                            windowLarge2.Width = scr.Bounds.Width;
-                            windowLarge2.Height = scr.Bounds.Height;
+                            windowLarge2.Left = i * 1920;
+                            windowLarge2.Top = 0;
+                            windowLarge2.Height = 1080;
+                            windowLarge2.Width = 1920;
                             windowLarge2.WindowState = WindowState.Maximized;
                             windowLarge2.ResizeMode = ResizeMode.NoResize;
                             windowLarge2.WindowStyle = WindowStyle.None;
@@ -76,13 +75,13 @@ namespace BPASmartClient.ScreenLib
                             windowLarge2.ShowInTaskbar = false;
                             windowLarge2.Topmost = true;
                         }
-                        else if (i.ToString() == System.Configuration.ConfigurationManager.AppSettings["三号屏"].ToString())
+                        else if (i==2)
                         {
                             windowLarge3.WindowStartupLocation = WindowStartupLocation.Manual;
-                            windowLarge3.Left = scr.WorkingArea.Left;
-                            windowLarge3.Top = scr.WorkingArea.Top;
-                            windowLarge3.Width = scr.Bounds.Width;
-                            windowLarge3.Height = scr.Bounds.Height;
+                            windowLarge3.Left = i * 1920;
+                            windowLarge3.Top = 0;
+                            windowLarge3.Height = 1080;
+                            windowLarge3.Width = 1920;
                             windowLarge3.WindowState = WindowState.Maximized;
                             windowLarge3.ResizeMode = ResizeMode.NoResize;
                             windowLarge3.WindowStyle = WindowStyle.None;
@@ -91,8 +90,56 @@ namespace BPASmartClient.ScreenLib
                             windowLarge3.Topmost = true;
 
                         }
-                        i++;
                     }
+                    #region 不需要代码
+                    //foreach (System.Windows.Forms.Screen scr in System.Windows.Forms.Screen.AllScreens)
+                    //{
+                    //    if (i.ToString() == System.Configuration.ConfigurationManager.AppSettings["一号屏"].ToString())
+                    //    {
+                    //        windowLarge.WindowStartupLocation = WindowStartupLocation.Manual;
+                    //        windowLarge.Left = scr.WorkingArea.Left;
+                    //        windowLarge.Top = scr.WorkingArea.Top;
+                    //        windowLarge.Width = scr.Bounds.Width;
+                    //        windowLarge.Height = scr.Bounds.Height;
+                    //        windowLarge.WindowState = WindowState.Maximized;
+                    //        windowLarge.ResizeMode = ResizeMode.NoResize;
+                    //        windowLarge.WindowStyle = WindowStyle.None;
+                    //        windowLarge.WindowState = WindowState.Normal;
+                    //        windowLarge.ShowInTaskbar = false;
+                    //        windowLarge.Topmost = true;
+                    //    }
+                    //    else if (i.ToString() == System.Configuration.ConfigurationManager.AppSettings["二号屏"].ToString())
+                    //    {
+                    //        windowLarge2.WindowStartupLocation = WindowStartupLocation.Manual;
+                    //        windowLarge2.Left = scr.WorkingArea.Left;
+                    //        windowLarge2.Top = scr.WorkingArea.Top;
+                    //        windowLarge2.Width = scr.Bounds.Width;
+                    //        windowLarge2.Height = scr.Bounds.Height;
+                    //        windowLarge2.WindowState = WindowState.Maximized;
+                    //        windowLarge2.ResizeMode = ResizeMode.NoResize;
+                    //        windowLarge2.WindowStyle = WindowStyle.None;
+                    //        windowLarge2.WindowState = WindowState.Normal;
+                    //        windowLarge2.ShowInTaskbar = false;
+                    //        windowLarge2.Topmost = true;
+                    //    }
+                    //    else if (i.ToString() == System.Configuration.ConfigurationManager.AppSettings["三号屏"].ToString())
+                    //    {
+                    //        windowLarge3.WindowStartupLocation = WindowStartupLocation.Manual;
+                    //        windowLarge3.Left = scr.WorkingArea.Left;
+                    //        windowLarge3.Top = scr.WorkingArea.Top;
+                    //        windowLarge3.Width = scr.Bounds.Width;
+                    //        windowLarge3.Height = scr.Bounds.Height;
+                    //        windowLarge3.WindowState = WindowState.Maximized;
+                    //        windowLarge3.ResizeMode = ResizeMode.NoResize;
+                    //        windowLarge3.WindowStyle = WindowStyle.None;
+                    //        windowLarge3.WindowState = WindowState.Normal;
+                    //        windowLarge3.ShowInTaskbar = false;
+                    //        windowLarge3.Topmost = true;
+
+                    //    }
+                    //    i++;
+                    //}
+                    #endregion
                     windowLarge.Show(); windowLarge2.Show(); windowLarge3.Show();
                     break;
             }

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml

@@ -23,7 +23,7 @@
         </Grid.ColumnDefinitions>
 
         <StackPanel Margin="0,10,0,0">
-            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="2 号档口" Style="{DynamicResource  from}" Tag="Start">
+            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="1 号档口" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
                     <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
                     <Grid Height="160" >
@@ -33,7 +33,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -48,7 +48,7 @@
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -60,11 +60,11 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -72,7 +72,7 @@
 
             </GroupBox>
             <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
@@ -122,7 +122,7 @@
         </StackPanel>
 
         <StackPanel Grid.Column="2"  Margin="0,10,0,0">
-            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="1 号档口" Style="{DynamicResource  from}" Tag="Start">
+            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="2 号档口" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
                     <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
                     <Grid Height="160" >
@@ -132,7 +132,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -147,7 +147,7 @@
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -159,11 +159,11 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -171,7 +171,7 @@
 
             </GroupBox>
             <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml

@@ -23,7 +23,7 @@
         </Grid.ColumnDefinitions>
 
         <StackPanel Margin="0,10,0,0">
-            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="4 号档口" Style="{DynamicResource  from}" Tag="Start">
+            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="3 号档口" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
                     <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
                     <Grid Height="160" >
@@ -33,7 +33,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -48,7 +48,7 @@
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -60,11 +60,11 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -72,7 +72,7 @@
 
             </GroupBox>
             <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
@@ -122,7 +122,7 @@
         </StackPanel>
 
         <StackPanel Grid.Column="2"  Margin="0,10,0,0">
-            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="3 号档口" Style="{DynamicResource  from}" Tag="Start">
+            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="4 号档口" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
                     <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
                     <Grid Height="160" >
@@ -132,7 +132,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -147,7 +147,7 @@
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -159,11 +159,11 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -171,7 +171,7 @@
 
             </GroupBox>
             <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml

@@ -23,7 +23,7 @@
         </Grid.ColumnDefinitions>
 
         <StackPanel Margin="0,10,0,0">
-            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="2 号档口" Style="{DynamicResource  from}" Tag="Start">
+            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="5 号档口" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
                     <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
                     <Grid Height="160" >
@@ -33,7 +33,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -48,7 +48,7 @@
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -60,11 +60,11 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -72,7 +72,7 @@
 
             </GroupBox>
             <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
@@ -122,7 +122,7 @@
         </StackPanel>
 
         <StackPanel Grid.Column="2"  Margin="0,10,0,0">
-            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="5 号档口" Style="{DynamicResource  from}" Tag="Start">
+            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="6 号档口" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
                     <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
                     <Grid Height="160" >
@@ -132,7 +132,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -147,7 +147,7 @@
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -159,11 +159,11 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
                         </StackPanel>
                     </Grid>
@@ -171,7 +171,7 @@
 
             </GroupBox>
             <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml.cs

@@ -23,6 +23,7 @@ namespace BPASmartClient.ScreenLib
         public ScreenSplitMealsControl3()
         {
             InitializeComponent();
+            this.DataContext = new ScreenSplitMealsControl3ViewModel();
 
             if (int.Parse(System.Configuration.ConfigurationManager.AppSettings["ShowForm"].ToString()) == 0)
             {

BPASmartClient.ScreenMaxWok/App.config

@@ -2,9 +2,9 @@
 <configuration>
 	<appSettings>
 		<!--MQTT配置-->
-		<add key="MQTTConnection" value="171.221.208.23,11883,admin,public"/>
+		<add key="MQTTConnection" value="171.221.208.23,11883,admin,public1"/>
 		<!--订阅主题设置：大炒,小炒,分餐机,煮面机-->
-		<add key="DeviceMC" value="大炒,小炒,分餐机,煮面机"/>
+		<add key="DeviceMC" value="大炒"/>
 		<add key="GgAdder" value="https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4"/>
 		<add key="SaasRoute" value="https://witt.black-pa.com/kitchen/api/StoreHelper/GeBasisGateList?StoreId=0c32b2e2-0dc9-4941-b73d-3dc91f7268ab"/>
 		<!--显示窗体：0 广告 1 地球-->

BPASmartClient.ScreenMinWok/App.config

@@ -3,9 +3,9 @@
 	<appSettings>
 		<!--MQTT配置-->
 		<!--<add key="MQTTConnection" value="10.2.1.254,1883,admin,public"/>-->
-		<add key="MQTTConnection" value="171.221.208.23,11883,emqx_u_block,emqx_p_admin3658765490789"/>
+		<add key="MQTTConnection" value="171.221.208.23,11883,admin,public1"/>
 		<!--订阅主题设置：大炒,小炒,分餐机,煮面机-->
-		<add key="DeviceMC" value="大炒,小炒,分餐机,煮面机"/>
+		<add key="DeviceMC" value="小炒"/>
 		<add key="GgAdder" value="https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4"/>
 		<add key="SaasRoute" value="https://witt.black-pa.com/kitchen/api/StoreHelper/GeBasisGateList?StoreId=0c32b2e2-0dc9-4941-b73d-3dc91f7268ab"/>
 		<!--显示窗体：0 广告 1 地球-->

BPASmartClient.ScreenMorks/App.config

@@ -2,9 +2,9 @@
 <configuration>
 	<appSettings>
 		<!--MQTT配置-->
-		<add key="MQTTConnection" value="171.221.208.23,11883,admin,public"/>
+		<add key="MQTTConnection" value="171.221.208.23,11883,admin,public1"/>
 		<!--订阅主题设置：大炒,小炒,分餐机,煮面机-->
-		<add key="DeviceMC" value="大炒,小炒,分餐机,煮面机"/>
+		<add key="DeviceMC" value="煮面机"/>
 		<add key="GgAdder" value="https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4"/>
 		<add key="SaasRoute" value="https://witt.black-pa.com/kitchen/api/StoreHelper/GeBasisGateList?StoreId=0c32b2e2-0dc9-4941-b73d-3dc91f7268ab"/>
 		<!--显示窗体：0 广告 1 地球-->

BPASmartClient.ScreenSplitMeals/App.config

@@ -2,15 +2,15 @@
 <configuration>
 	<appSettings>
 		<!--MQTT配置-->
-		<add key="MQTTConnection" value="171.221.208.23,11883,admin,public"/>
+		<add key="MQTTConnection" value="171.221.208.23,11883,admin,public1"/>
 		<!--订阅主题设置：大炒,小炒,分餐机,煮面机-->
-		<add key="DeviceMC" value="大炒,小炒,分餐机,煮面机"/>
+		<add key="DeviceMC" value="分餐机"/>
 		<add key="GgAdder" value="https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4"/>
 		<add key="SaasRoute" value="https://witt.black-pa.com/kitchen/api/StoreHelper/GeBasisGateList?StoreId=0c32b2e2-0dc9-4941-b73d-3dc91f7268ab"/>
 		<!--显示窗体：0 广告 1 地球-->
-		<add key="ShowForm" value="1"/>
-		<add key="一号屏" value="0"/>
+		<add key="ShowForm" value="0"/>
+		<!--<add key="一号屏" value="0"/>
 		<add key="二号屏" value="1"/>
-		<add key="三号屏" value="0"/>
+		<add key="三号屏" value="2"/>-->
 	</appSettings>
 </configuration>

WpfTest/MainWindow.xaml.cs

@@ -29,7 +29,7 @@ namespace WpfTest
         /// <summary>
         /// MQTT连接信息
         /// </summary>
-        public string MQTTConnection { get; set; } = "10.2.1.254,1883,admin,public";
+        public string MQTTConnection { get; set; } = "171.221.208.23,11883,admin,public1";
 
         /// <summary>
         /// Mqtt是否运行