From 7af19f5977cc72f0e8ad869fcea49c85c0467bfd Mon Sep 17 00:00:00 2001
From: fyf <11621@LAPTOP-04QQU0AO>
Date: Tue, 6 Dec 2022 17:26:22 +0800
Subject: [PATCH] 1

---
 BPASmartClient.ScreenLib/AppMain.cs                         | 2 +-
 .../总监视大屏/ScreenALLControl.xaml                   | 6 +++---
 .../总监视大屏/ScreenALLControlViewModel.cs            | 2 +-
 .../炒锅/ScreenMaxWokControlViewModel.cs                  | 2 +-
 .../炒锅/ScreenMinWokControlViewModel.cs                  | 2 +-
 WpfTest/MainWindow.xaml.cs                                  | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BPASmartClient.ScreenLib/AppMain.cs b/BPASmartClient.ScreenLib/AppMain.cs
index 7359067f..bec7679b 100644
--- a/BPASmartClient.ScreenLib/AppMain.cs
+++ b/BPASmartClient.ScreenLib/AppMain.cs
@@ -18,7 +18,7 @@ namespace BPASmartClient.ScreenLib
             Main.GetInstance.Start();
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             FSystemHelper.GetInstance.CreateDesktopShortcut();
-            FSystemHelper.GetInstance.AutoStart(true);
+           // FSystemHelper.GetInstance.AutoStart(true);
             WindowLargeScreen windowLarge = new WindowLargeScreen();
             #region 设置显示页面与标题
             string TitleName = $"{type.Assembly.ManifestModule.Name.Replace(".dll", "")}";
diff --git a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
index b4cc3565..1858f256 100644
--- a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
+++ b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
@@ -322,7 +322,7 @@
                     </Grid>
                 </StackPanel>
             </GroupBox>
-            <GroupBox Grid.Row="0" Margin="10,10,10,0"  Height="310" Width="450" Header="煮面设备 MorkS" Style="{DynamicResource  from}" Tag="Start">
+            <GroupBox Grid.Row="0" Margin="10,10,10,0"  Height="320" Width="450" Header="煮面设备 MorkS" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
                     <GroupBox Header="设备信息" Margin="20,0,0,0"/>
                     <Grid Height="80" >
@@ -389,7 +389,7 @@
         </StackPanel>
         
         <Grid Grid.Column="1" >
-            <Grid>
                <Grid VerticalAlignment="Top" Margin="0,-30,0,0">
                    <Image Style="{DynamicResource imagezhu}"></Image>
                    <Image Style="{DynamicResource image中1}" Margin="0,400,0,0"></Image>
                    <GroupBox Margin="600,100,0,500" Header="{Binding GZallCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="累计故障数" Content="次" Width="100"/>
                    <GroupBox Margin="600,400,0,0" Header="{Binding SplitMealsCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="食堂累计刷卡次数" Content="次" Width="160"/>
                    <GroupBox Margin="-500,100,0,0" Header="{Binding UserCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="日总接待人数" Content="人" Width="160"/>
                </Grid>
                <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" VerticalAlignment="Bottom" Style="{DynamicResource  from}">
+            <Grid>
                <Grid VerticalAlignment="Top" Margin="0,-30,0,0">
                    <Image Style="{DynamicResource imagezhu}"></Image>
                    <Image Style="{DynamicResource image中1}" Margin="0,400,0,0"></Image>
                    <GroupBox Margin="600,100,0,500" Header="{Binding GZallCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="累计故障数" Content="次" Width="100"/>
                    <GroupBox Margin="600,400,0,0" Header="{Binding SplitMealsCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="食堂累计刷卡次数" Content="次" Width="160"/>
                    <GroupBox Margin="-500,100,0,0" Header="{Binding UserCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="日总接待人数" Content="人" Width="160"/>
                </Grid>
                <GroupBox Margin="0,0,0,0" Height="320" Width="950" Header="信息通知区域" VerticalAlignment="Bottom" Style="{DynamicResource  from}">
                     <!--<ListBox Margin="10,-10,10,10" ScrollViewer.VerticalScrollBarVisibility="Disabled" ItemsSource="{Binding AlarmAll,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
@@ -502,7 +502,7 @@
                 </StackPanel>
             </GroupBox>
 
-            <GroupBox Margin="10,10,10,0" Height="640" Width="450" Header="今日商品热销统计" Style="{DynamicResource  from}">
+            <GroupBox Margin="10,10,10,0" Height="650" Width="450" Header="今日商品热销统计" Style="{DynamicResource  from}">
                 <ListBox
                         Background="Transparent"
                         BorderThickness="0"
diff --git a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs
index 5ff8b5ad..7af35177 100644
--- a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs
+++ b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs
@@ -237,7 +237,7 @@ namespace BPASmartClient.ScreenLib
                         StatsCountAll= JsonConvert.DeserializeObject<ObservableCollection<StatsAllModel>>(str);
                     }
                 }));
-                Thread.Sleep(100);
+                Thread.Sleep(1000);
             }), $"{DateTime.Now},线程服务");
         }
     }
diff --git a/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs b/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs
index 8ae4dd07..9e0e3760 100644
--- a/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs
+++ b/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs
@@ -103,7 +103,7 @@ namespace BPASmartClient.ScreenLib
                         OrderCount = modelMaxWok.MaxWok_OrderCount_1 + modelMaxWok.MaxWok_OrderCount_2;
                     }
                 }));
-                Thread.Sleep(100);
+                Thread.Sleep(1000);
             }), $"{DateTime.Now},线程服务");
         }
     }
diff --git a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs
index a70977a6..a4429133 100644
--- a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs
+++ b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs
@@ -102,7 +102,7 @@ namespace BPASmartClient.ScreenLib
 
                     }
                 }));
-                Thread.Sleep(100);
+                Thread.Sleep(1000);
             }), $"{DateTime.Now},线程服务");
         }
     }
diff --git a/WpfTest/MainWindow.xaml.cs b/WpfTest/MainWindow.xaml.cs
index f14383d8..230b2892 100644
--- a/WpfTest/MainWindow.xaml.cs
+++ b/WpfTest/MainWindow.xaml.cs
@@ -56,13 +56,13 @@ namespace WpfTest
                     if (IsRunningMqtt)
                     {
                         Send(ScreenDeviceType.大炒);
-                        Thread.Sleep(1000);
+                        
                         Send(ScreenDeviceType.小炒); Thread.Sleep(1000);
 
                         Send(ScreenDeviceType.煮面机); Thread.Sleep(1000);
 
                         Send(ScreenDeviceType.分餐机); Thread.Sleep(1000);
-
+                        Thread.Sleep(3000);
                     }
                 }
                 catch (Exception ex)