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

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", "")}";
@@ -60,9 +60,8 @@ namespace BPASmartClient.ScreenLib
                             windowLarge.WindowStyle = WindowStyle.None;
                             windowLarge.WindowState = WindowState.Normal;
                             windowLarge.ShowInTaskbar = false;
-                            windowLarge.Topmost = true;
                         }
-                        else if (i==1)
+                        else if (i == 1)
                         {
                             windowLarge2.WindowStartupLocation = WindowStartupLocation.Manual;
                             windowLarge2.Left = i * 1920;
@@ -74,9 +73,8 @@ namespace BPASmartClient.ScreenLib
                             windowLarge2.WindowStyle = WindowStyle.None;
                             windowLarge2.WindowState = WindowState.Normal;
                             windowLarge2.ShowInTaskbar = false;
-                            windowLarge2.Topmost = true;
                         }
-                        else if (i==2)
+                        else if (i == 2)
                         {
                             windowLarge3.WindowStartupLocation = WindowStartupLocation.Manual;
                             windowLarge3.Left = i * 1920;
@@ -88,7 +86,6 @@ namespace BPASmartClient.ScreenLib
                             windowLarge3.WindowStyle = WindowStyle.None;
                             windowLarge3.WindowState = WindowState.Normal;
                             windowLarge3.ShowInTaskbar = false;
-                            windowLarge3.Topmost = true;
 
                         }
                     }
@@ -141,7 +138,7 @@ namespace BPASmartClient.ScreenLib
                     //    i++;
                     //}
                     #endregion
-                    windowLarge.Show(); windowLarge2.Show(); windowLarge3.Show();
+                    windowLarge.Show();windowLarge2.Show(); windowLarge3.Show();
                     break;
             }
             #endregion

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs

@@ -69,7 +69,7 @@ namespace BPASmartClient.ScreenLib
                         OrderCount = modelMaxWok.SplitMeals_CreditCardCount_1 + modelMaxWok.SplitMeals_CreditCardCount_2;
                     }
                 }));
-                Thread.Sleep(1000);
+                Thread.Sleep(100);
             }), $"{DateTime.Now}_1,线程服务");
         }
     }

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2ViewModel.cs

@@ -69,7 +69,7 @@ namespace BPASmartClient.ScreenLib
 
                     }
                 }));
-                Thread.Sleep(1000);
+                Thread.Sleep(100);
             }), $"{DateTime.Now}_2,线程服务");
         }
     }

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3ViewModel.cs

@@ -68,7 +68,7 @@ namespace BPASmartClient.ScreenLib
                         OrderCount = modelMaxWok.SplitMeals_CreditCardCount_5 + modelMaxWok.SplitMeals_CreditCardCount_6;
                     }
                 }));
-                Thread.Sleep(1000);
+                Thread.Sleep(100);
             }), $"{DateTime.Now}_3,线程服务");
         }
     }

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"

BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs

@@ -237,7 +237,7 @@ namespace BPASmartClient.ScreenLib
                         StatsCountAll= JsonConvert.DeserializeObject<ObservableCollection<StatsAllModel>>(str);
                     }
                 }));
-                Thread.Sleep(2000);
+                Thread.Sleep(1000);
             }), $"{DateTime.Now},线程服务");
         }
     }

BPASmartClient.ScreenLib/煮面机/ScreenMorksControlViewModel.cs

@@ -85,7 +85,7 @@ namespace BPASmartClient.ScreenLib
                         OrderMakeListOver = JsonConvert.DeserializeObject<ObservableCollection<OrderMakeFormModel>>(JsonConvert.SerializeObject(ViewData.MakeOrderOver));
                     }
                 }));
-                Thread.Sleep(1000);
+                Thread.Sleep(100);
             }), $"{DateTime.Now},线程服务");
         }
     }

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)