From bc176782bfc1a0d33fec953338ee24b0390fe48d Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Thu, 10 Nov 2022 13:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.ScreenLib.csproj           |  2 +-
 .../分餐机/ScreenSplitMealsControl1.xaml   |  8 +++++--
 .../分餐机/ScreenSplitMealsControl2.xaml   |  8 +++++--
 .../分餐机/ScreenSplitMealsControl3.xaml   |  8 +++++--
 .../炒锅/ScreenMaxWokControl.xaml           | 24 +++++--------------
 .../炒锅/ScreenMinWokControl.xaml           |  6 +++++
 .../煮面机/ScreenMorksControl.xaml         |  6 +++++
 BPASmartClient.ScreenSplitMeals/App.config    |  2 +-
 8 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj b/BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj
index d4b3414a..4c4964a1 100644
--- a/BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj
+++ b/BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj
@@ -19,7 +19,7 @@
 		</COMReference>
 	</ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BPA.CustomResource" Version="1.0.13" />
+    <PackageReference Include="BPA.CustomResource" Version="1.0.14" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1418.22" />
   </ItemGroup>
 
diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
index 585b9d31..12575faf 100644
--- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
+++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
@@ -76,7 +76,9 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
-                                <Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
+                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
+                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
+                                </Border>
                             </WrapPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
@@ -172,7 +174,9 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
-                                <Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
+                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
+                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
+                                </Border>
                             </WrapPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml
index 10552774..16ed5e3f 100644
--- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml
+++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml
@@ -76,7 +76,9 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
-                                <Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
+                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
+                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
+                                </Border>
                             </WrapPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
@@ -172,7 +174,9 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
-                                <Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
+                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
+                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
+                                </Border>
                             </WrapPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml
index 4cd079bd..81c0df1e 100644
--- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml
+++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml
@@ -76,7 +76,9 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
-                                <Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
+                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
+                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
+                                </Border>
                             </WrapPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
@@ -172,7 +174,9 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
-                                <Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
+                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
+                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
+                                </Border>
                             </WrapPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
diff --git a/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml b/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml
index 041c90d6..0c2ecf02 100644
--- a/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml
+++ b/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml
@@ -59,6 +59,9 @@
                                             <Trigger Property="Text" Value="故障">
                                                 <Setter Property="Foreground" Value="Red"/>
                                             </Trigger>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
                                         </Style.Triggers>
                                     </Style>
                                 </TextBlock.Style>
@@ -77,24 +80,6 @@
             </GroupBox>
             <GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程"  Style="{DynamicResource  from}"  Tag="Start">
                 <Grid>
-
-                    <!--<Grid Margin="0,10,0,0" Height="100" Width="130" VerticalAlignment="Top" HorizontalAlignment="Left">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="30"/>
-                        </Grid.ColumnDefinitions>
-                  
-                        <Border Background="{DynamicResource 椭圆}" >
-                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                <TextBlock x:Name="wb" FontSize="32"  Text="{Binding Name}"></TextBlock>
-                                <TextBlock x:Name="xs" Style="{DynamicResource 数码管Text}" FontSize="24" Margin="0,0,0,0" Text="{Binding Id}"></TextBlock>
-                            </StackPanel>
-                        </Border>
-                        <Border Background="Red" Margin="10">
-
-                        </Border>
-                        <Image x:Name="image" Grid.Column="1" Style="{DynamicResource image右1}" Cursor="Hand" ></Image>
-                    </Grid>-->
                     <ListBox x:Name="PageList"  BorderThickness="0" Margin="0,-20,0,0" Height="270" HorizontalAlignment="Stretch" VerticalAlignment="Top" 
                             ItemsSource="{Binding ProcessModel1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
                             Background="Transparent" ScrollViewer.VerticalScrollBarVisibility="Auto"  ScrollViewer.HorizontalScrollBarVisibility="Auto" >
@@ -281,6 +266,9 @@
                                             <Trigger Property="Text" Value="故障">
                                                 <Setter Property="Foreground" Value="Red"/>
                                             </Trigger>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
                                         </Style.Triggers>
                                     </Style>
                                 </TextBlock.Style>
diff --git a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
index 591790d0..a54a7acd 100644
--- a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
+++ b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
@@ -59,6 +59,9 @@
                                             <Trigger Property="Text" Value="故障">
                                                 <Setter Property="Foreground" Value="Red"/>
                                             </Trigger>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
                                         </Style.Triggers>
                                     </Style>
                                 </TextBlock.Style>
@@ -263,6 +266,9 @@
                                             <Trigger Property="Text" Value="故障">
                                                 <Setter Property="Foreground" Value="Red"/>
                                             </Trigger>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
                                         </Style.Triggers>
                                     </Style>
                                 </TextBlock.Style>
diff --git a/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml b/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
index 7c3f0e90..59fb2f97 100644
--- a/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
+++ b/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
@@ -57,6 +57,9 @@
                                         <Trigger Property="Text" Value="故障">
                                             <Setter Property="Foreground" Value="Red"/>
                                         </Trigger>
+                                        <Trigger Property="Text" Value="停止">
+                                            <Setter Property="Foreground" Value="Red"/>
+                                        </Trigger>
                                     </Style.Triggers>
                                 </Style>
                             </TextBlock.Style>
@@ -172,6 +175,9 @@
                                         <Trigger Property="Text" Value="故障">
                                             <Setter Property="Foreground" Value="Red"/>
                                         </Trigger>
+                                        <Trigger Property="Text" Value="停止">
+                                            <Setter Property="Foreground" Value="Red"/>
+                                        </Trigger>
                                     </Style.Triggers>
                                 </Style>
                             </TextBlock.Style>
diff --git a/BPASmartClient.ScreenSplitMeals/App.config b/BPASmartClient.ScreenSplitMeals/App.config
index 29e645ac..3e5d6a52 100644
--- a/BPASmartClient.ScreenSplitMeals/App.config
+++ b/BPASmartClient.ScreenSplitMeals/App.config
@@ -7,7 +7,7 @@
 		<add key="DeviceMC" value="大炒,小炒,分餐机,煮面机"/>
 		<add key="GgAdder" value="https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4"/>
 
-		<add key="一号屏" value="1"/>
+		<add key="一号屏" value="0"/>
 		<add key="二号屏" value="0"/>
 		<add key="三号屏" value="0"/>
 	</appSettings>