From a384a288316b3d852dec0ccb0058098689b6c886 Mon Sep 17 00:00:00 2001 From: fyf <11621@LAPTOP-04QQU0AO> Date: Tue, 6 Dec 2022 14:51:50 +0800 Subject: [PATCH] 1 --- BPASmartClient.ScreenLib/AppMain.cs | 11 ++++------- .../分餐机/ScreenSplitMealsControl1ViewModel.cs | 2 +- .../分餐机/ScreenSplitMealsControl2ViewModel.cs | 2 +- .../分餐机/ScreenSplitMealsControl3ViewModel.cs | 2 +- .../总监视大屏/ScreenALLControlViewModel.cs | 2 +- .../炒锅/ScreenMaxWokControlViewModel.cs | 2 +- .../炒锅/ScreenMinWokControlViewModel.cs | 2 +- .../煮面机/ScreenMorksControlViewModel.cs | 2 +- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/BPASmartClient.ScreenLib/AppMain.cs b/BPASmartClient.ScreenLib/AppMain.cs index 18bbd1d7..7359067f 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", "")}"; @@ -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 diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs index 4c24fc11..8566b80a 100644 --- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs +++ b/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,线程服务"); } } diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2ViewModel.cs b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2ViewModel.cs index 2cf8e38c..3737cc2e 100644 --- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2ViewModel.cs +++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2ViewModel.cs @@ -69,7 +69,7 @@ namespace BPASmartClient.ScreenLib } })); - Thread.Sleep(1000); + Thread.Sleep(100); }), $"{DateTime.Now}_2,线程服务"); } } diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3ViewModel.cs b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3ViewModel.cs index d935667d..8c57f70a 100644 --- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3ViewModel.cs +++ b/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,线程服务"); } } diff --git a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs index c18146fd..5ff8b5ad 100644 --- a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs +++ b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs @@ -237,7 +237,7 @@ namespace BPASmartClient.ScreenLib StatsCountAll= JsonConvert.DeserializeObject>(str); } })); - Thread.Sleep(2000); + Thread.Sleep(100); }), $"{DateTime.Now},线程服务"); } } diff --git a/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs b/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs index 9e0e3760..8ae4dd07 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(1000); + Thread.Sleep(100); }), $"{DateTime.Now},线程服务"); } } diff --git a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs index a4429133..a70977a6 100644 --- a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs +++ b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs @@ -102,7 +102,7 @@ namespace BPASmartClient.ScreenLib } })); - Thread.Sleep(1000); + Thread.Sleep(100); }), $"{DateTime.Now},线程服务"); } } diff --git a/BPASmartClient.ScreenLib/煮面机/ScreenMorksControlViewModel.cs b/BPASmartClient.ScreenLib/煮面机/ScreenMorksControlViewModel.cs index d007e44b..dd4c3d64 100644 --- a/BPASmartClient.ScreenLib/煮面机/ScreenMorksControlViewModel.cs +++ b/BPASmartClient.ScreenLib/煮面机/ScreenMorksControlViewModel.cs @@ -85,7 +85,7 @@ namespace BPASmartClient.ScreenLib OrderMakeListOver = JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(ViewData.MakeOrderOver)); } })); - Thread.Sleep(1000); + Thread.Sleep(100); }), $"{DateTime.Now},线程服务"); } }