change-登录修改为单例模式

Aucma.Core.BoxFoam/Business/InStoreBusiness.cs

@@ -21,6 +21,8 @@ using Microsoft.IdentityModel.Logging;
 using Admin.Core.Socket;
 using Admin.Core.Service;
 using TouchSocket.Core;
+using NPOI.SS.Formula.Functions;
+using Aucma.Core.BoxFoam.Config;
 
 namespace Aucma.Core.BoxFoam.Business
 {
@@ -42,7 +44,7 @@ namespace Aucma.Core.BoxFoam.Business
         /// </summary>
         private List<RealTaskInfo> TaskInfos = new List<RealTaskInfo>();
         private Dictionary<string, int> KeyValuePairs = new Dictionary<string, int>();
-
+        private AppConfig appConfig = AppConfig.Instance;
         #region 事件
         /// <summary>
         /// 扫码信息刷新
@@ -130,6 +132,14 @@ namespace Aucma.Core.BoxFoam.Business
         /// <returns></returns>
         public async void NewTask(string IP,string materialBarCode)
         {
+            #region 未登录禁止入库
+            if (string.IsNullOrEmpty(appConfig.TeamName))
+            {
+                logHelper.Error($"条码{materialBarCode}未登录不做处理");
+               
+                return;
+            }
+            #endregion
             if (string.IsNullOrEmpty(materialBarCode))
             {
                 LogDelegateEvent?.Invoke("未扫到二维码信息！","Red");

Aucma.Core.BoxFoam/ViewModels/LoginPageViewModel.cs

@@ -67,10 +67,10 @@ namespace Aucma.Core.BoxFoam.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow indexPage = new MainWindow();
+                    MainWindow indexPage = MainWindow.Instance;
                     indexPage.Show();
                     
-                    window.Close();
+                  //  window.Close();
                 }
                 else
                 {

Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs

@@ -245,9 +245,9 @@ namespace Aucma.Core.BoxFoam.ViewModels
 
                 window.Hide();
                 //跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login =  LoginPageView.Instance;
                 login.Show();
-                window.Close();
+               // window.Close();
             }
         }
 

Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml

@@ -54,13 +54,13 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="0.5*"/>
                         <ColumnDefinition Width="0.5*"/>
-                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="1.5*"/>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
                         <ColumnDefinition Width="0.5*"/>
                         <ColumnDefinition Width="0.5*"/>
                         <ColumnDefinition Width="0.5*"/>
-                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="1.5*"/>
                         <ColumnDefinition/>
                         <!--<ColumnDefinition/>
                         <ColumnDefinition Width="0.5*"/>-->

Aucma.Core.BoxFoam/Views/LoginPageView.xaml.cs

@@ -22,15 +22,28 @@ namespace Aucma.Core.BoxFoam.Views
     /// </summary>
     public partial class LoginPageView : Window
     {
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
+        }
+
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
         }
 
+
         private void loginBtn_Click(object sender, RoutedEventArgs e)
         {
+           
             string userName = txtUserName.Text;
             string passWord = txtPassword.Password;
             BaseTeamMembers teamMembers = (BaseTeamMembers)this.selectTeamComboBox.SelectedItem;

Aucma.Core.BoxFoam/Views/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Aucma.Core.BoxFoam.ViewModels;
+using System;
 using System.Windows;
 
 namespace Aucma.Core.BoxFoam.Views
@@ -8,6 +9,10 @@ namespace Aucma.Core.BoxFoam.Views
     /// </summary>
     public partial class MainWindow : Window
     {
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
+
+        public static MainWindow Instance => _instance.Value;
+
         public MainWindow()
         {
             InitializeComponent();

Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs

@@ -40,6 +40,7 @@ using Aucma.Core.Scanner;
 using LiveCharts.Defaults;
 using Admin.Core.Socket;
 using System.Runtime.ConstrainedExecution;
+using Aucma.Core.BoxFoam.Config;
 /*
 * 首页信息
 */
@@ -51,7 +52,7 @@ namespace Aucma.Core.CodeBinding.ViewModels
         private readonly ICodeBindingRecordServices? _codeBindingRecordServices;
         private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices;
         private readonly IBaseBomInfoServices? _baseBomInfoServices;
-         
+        private AppConfig appConfig = AppConfig.Instance;
         private readonly IPrintBarCodeServices? _printBarCodeServices;
         // 过点数据表，物料完成记录MaterialCompletion
         private readonly IMaterialCompletionServices? _iMaterialCompletionServices;
@@ -618,6 +619,15 @@ namespace Aucma.Core.CodeBinding.ViewModels
         /// <param name="flag">1为自动扫描，2为手动扫描</param>
         public void BindingCode(string code1, string code2,int flag =1)
         {
+            #region 未登录禁止入库
+            if (string.IsNullOrEmpty(appConfig.TeamName))
+            {
+                log.Error($"条码{code1}未登录不做处理,禁止放行");
+                speechStr.SpeakAsync("请登录以后在使用,请登录");
+                return;
+            }
+            #endregion
+
             try
             {
                 if (code1.Substring(0, 1) != "B")

Aucma.Core.CodeBinding/ViewModels/LoginPageViewModel.cs

@@ -67,10 +67,10 @@ namespace Aucma.Core.CodeBinding.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow indexPage = new MainWindow();
+                    MainWindow indexPage = MainWindow.Instance;
                     indexPage.Show();
                     
-                    window.Close();
+                   // window.Close();
                 }
                 else
                 {

Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs

@@ -281,9 +281,9 @@ namespace Aucma.Core.CodeBinding.ViewModels
 
                 window.Hide();
                 //跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login = LoginPageView.Instance;
                 login.Show();
-                window.Close();
+              //  window.Close();
             }
         }
 

Aucma.Core.CodeBinding/Views/LoginPageView.xaml.cs

@@ -23,13 +23,25 @@ namespace Aucma.Core.CodeBinding.Views
     /// </summary>
     public partial class LoginPageView : Window
     {
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
         }
 
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
+        }
+
+
         private void loginBtn_Click(object sender, RoutedEventArgs e)
         {
             string userName = txtUserName.Text;

Aucma.Core.CodeBinding/Views/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Aucma.Core.CodeBinding.ViewModels;
+using System;
 using System.Windows;
 
 namespace Aucma.Core.CodeBinding.Views
@@ -8,13 +9,14 @@ namespace Aucma.Core.CodeBinding.Views
     /// </summary>
     public partial class MainWindow : Window
     {
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
+
+        public static MainWindow Instance => _instance.Value;
+
         public MainWindow()
         {
-          
             InitializeComponent();
             this.DataContext = new MainWindowViewModel();
-         
-           
         }
     }
 }

Aucma.Core.DoorFoam/ViewModels/LoginPageViewModel.cs

@@ -67,10 +67,10 @@ namespace Aucma.Core.DoorFoam.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow indexPage = new MainWindow();
+                    MainWindow indexPage = MainWindow.Instance;
                     indexPage.Show();
                     
-                    window.Close();
+                  //  window.Close();
                 }
                 else
                 {

Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs

@@ -233,9 +233,9 @@ namespace Aucma.Core.DoorFoam.ViewModels
 
                 window.Hide();
                 //跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login = LoginPageView.Instance;
                 login.Show();
-                window.Close();
+            //    window.Close();
             }
         }
 

Aucma.Core.DoorFoam/Views/LoginPageView.xaml.cs

@@ -22,13 +22,25 @@ namespace Aucma.Core.DoorFoam.Views
     /// </summary>
     public partial class LoginPageView : Window
     {
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
         }
 
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
+        }
+
+
         private void loginBtn_Click(object sender, RoutedEventArgs e)
         {
             string userName = txtUserName.Text;

Aucma.Core.DoorFoam/Views/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Aucma.Core.DoorFoam.ViewModels;
+using System;
 using System.Windows;
 
 namespace Aucma.Core.DoorFoam.Views
@@ -8,6 +9,10 @@ namespace Aucma.Core.DoorFoam.Views
     /// </summary>
     public partial class MainWindow : Window
     {
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
+
+        public static MainWindow Instance => _instance.Value;
+
         public MainWindow()
         {
             InitializeComponent();

Aucma.Core.OldBoxFoam/ViewModels/LoginPageViewModel.cs

@@ -67,10 +67,10 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow indexPage = new MainWindow();
+                    MainWindow indexPage = MainWindow.Instance;
                     indexPage.Show();
                     
-                    window.Close();
+                 //   window.Close();
                 }
                 else
                 {

Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs

@@ -289,9 +289,9 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
 
                 window.Hide();
                 //跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login = LoginPageView.Instance;
                 login.Show();
-                window.Close();
+              //  window.Close();
             }
         }
 

Aucma.Core.OldBoxFoam/Views/LoginPageView.xaml.cs

@@ -22,11 +22,22 @@ namespace Aucma.Core.OldBoxFoam.Views
     /// </summary>
     public partial class LoginPageView : Window
     {
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
+        }
+
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
         }
 
         private void loginBtn_Click(object sender, RoutedEventArgs e)

Aucma.Core.OldBoxFoam/Views/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Aucma.Core.OldBoxFoam.ViewModels;
+using System;
 using System.Windows;
 
 namespace Aucma.Core.OldBoxFoam.Views
@@ -8,6 +9,10 @@ namespace Aucma.Core.OldBoxFoam.Views
     /// </summary>
     public partial class MainWindow : Window
     {
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
+
+        public static MainWindow Instance => _instance.Value;
+
         public MainWindow()
         {
             InitializeComponent();

Aucma.Core.Palletiz/Business/InstoreBusiness.cs

@@ -129,6 +129,14 @@ namespace Aucma.Core.Palletiz.Business
         /// <param name="asciiStr">20位是正常扫码传输的条码,手动入库传的是人工选择的成品型号</param>      
         private void InStore(string spaceArea, string asciiStr)
         {
+            #region 未登录禁止入库
+            if (string.IsNullOrEmpty(appConfig.TeamName))
+            {
+                log.Error($"条码{asciiStr}未登录不做处理");
+                return;
+            }
+            #endregion
+
             Task.Run(() =>
             {
                 RecordInStore recordInstore = new RecordInStore();

Aucma.Core.Palletiz/ViewModels/LoginPageViewModel.cs

@@ -67,10 +67,10 @@ namespace Aucma.Core.Palletiz.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow indexPage = new MainWindow();
+                    MainWindow indexPage = MainWindow.Instance;
                     indexPage.Show();
                     
-                    window.Close();
+                  //  window.Close();
                 }
                 else
                 {

Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs

@@ -217,9 +217,9 @@ namespace Aucma.Core.Palletiz.ViewModels
 
                 window.Hide();
                 //跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login = LoginPageView.Instance;
                 login.Show();
-                window.Close();
+             //   window.Close();
             }
         }
 

Aucma.Core.Palletiz/Views/LoginPageView.xaml.cs

@@ -22,13 +22,25 @@ namespace Aucma.Core.Palletiz.Views
     /// </summary>
     public partial class LoginPageView : Window
     {
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
         }
 
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
+        }
+
+
         private void loginBtn_Click(object sender, RoutedEventArgs e)
         {
             string userName = txtUserName.Text;

Aucma.Core.Palletiz/Views/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Aucma.Core.Palletiz.ViewModels;
+using System;
 using System.Windows;
 
 namespace Aucma.Core.Palletiz.Views
@@ -8,6 +9,10 @@ namespace Aucma.Core.Palletiz.Views
     /// </summary>
     public partial class MainWindow : Window
     {
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
+
+        public static MainWindow Instance => _instance.Value;
+
         public MainWindow()
         {
             InitializeComponent();

Aucma.Core.PalletizCX1/Business/InstoreBusiness.cs

@@ -11,6 +11,7 @@ using Aucma.Core.PalletizCX1.Models;
 using Aucma.Core.PalletizCX1.ViewModels;
 using log4net;
 using Microsoft.Extensions.DependencyInjection;
+using NPOI.SS.Formula.Functions;
 using NPOI.SS.Formula.UDF;
 using NPOI.SS.Util;
 using System;
@@ -21,6 +22,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Interop;
 using TouchSocket.Sockets;
+using Match = System.Text.RegularExpressions.Match;
 
 namespace Aucma.Core.PalletizCX1.Business
 {
@@ -144,6 +146,14 @@ namespace Aucma.Core.PalletizCX1.Business
         /// <param name="asciiStr">20位是正常扫码传输的条码,手动入库传的是人工选择的成品型号</param>      
         private void InStore(string spaceArea, string asciiStr)
         {
+            #region 未登录禁止入库
+            if (string.IsNullOrEmpty(appConfig.TeamName))
+            {
+                log.Error($"条码{asciiStr}未登录不做处理");
+                return;
+            }
+            #endregion
+
             Task.Run(() =>
             {
                 if (asciiStr.Length == 20)

Aucma.Core.PalletizCX1/ViewModels/LoginPageViewModel.cs

@@ -68,10 +68,10 @@ namespace Aucma.Core.PrintTo.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow indexPage = new MainWindow();
+                    MainWindow indexPage = MainWindow.Instance;
                     indexPage.Show();
                     
-                    window.Close();
+                //    window.Close();
                 }
                 else
                 {

Aucma.Core.PalletizCX1/ViewModels/MainWindowViewModel.cs

@@ -218,9 +218,9 @@ namespace Aucma.Core.PalletizCX1.ViewModels
 
                 window.Hide();
                 //跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login = LoginPageView.Instance;
                 login.Show();
-                window.Close();
+              //  window.Close();
             }
         }
 

Aucma.Core.PalletizCX1/Views/LoginPageView.xaml.cs

@@ -22,13 +22,25 @@ namespace Aucma.Core.PalletizCX1.Views
     /// </summary>
     public partial class LoginPageView : Window
     {
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
         }
 
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
+        }
+
+
         private void loginBtn_Click(object sender, RoutedEventArgs e)
         {
             string userName = txtUserName.Text;

Aucma.Core.PalletizCX1/Views/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Aucma.Core.PalletizCX1.ViewModels;
+using System;
 using System.Windows;
 
 namespace Aucma.Core.PalletizCX1.Views
@@ -8,6 +9,10 @@ namespace Aucma.Core.PalletizCX1.Views
     /// </summary>
     public partial class MainWindow : Window
     {
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
+
+        public static MainWindow Instance => _instance.Value;
+
         public MainWindow()
         {
             InitializeComponent();

Aucma.Core.PrintTo/ViewModels/LoginPageViewModel.cs

@@ -68,10 +68,10 @@ namespace Aucma.Core.PrintTo.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow indexPage = new MainWindow();
+                    MainWindow indexPage = MainWindow.Instance;
                     indexPage.Show();
                     
-                    window.Close();
+                 //   window.Close();
                 }
                 else
                 {

Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs

@@ -31,8 +31,7 @@ namespace Aucma.Core.PrintTo.ViewModels
 
         private async void InitializeAsync()
         {
-            await Task.Run(() =>
+           
-            {
                 UserContent = firstPage;
 
                 _sysUserInfoServices = App.ServiceProvider.GetService<ISysUserInfoServices>();
@@ -45,7 +44,7 @@ namespace Aucma.Core.PrintTo.ViewModels
                 timer.Interval = new TimeSpan(0, 0, 1);   //间隔1秒
                 timer.Tick += new EventHandler(timer_Tick);
                 timer.Start();
-            });
+           
         }
 
         #region 更换界面
@@ -196,12 +195,15 @@ namespace Aucma.Core.PrintTo.ViewModels
 
                 window.Hide();
                 // 跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login = LoginPageView.Instance;
                 login.Show();
-                window.Close();
+              //  window.Close();
+              //  TerminateApplication();
             }
         }
 
+      
+
         #endregion
 
 

Aucma.Core.PrintTo/Views/LoginPageView.xaml.cs

@@ -22,11 +22,22 @@ namespace Aucma.Core.PrintTo.Views
     /// </summary>
     public partial class LoginPageView : Window
     {
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
+        }
+
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
         }
 
         private void loginBtn_Click(object sender, RoutedEventArgs e)

Aucma.Core.PrintTo/Views/MainWindow.xaml.cs

@@ -11,65 +11,17 @@ namespace Aucma.Core.PrintTo.Views
     public partial class MainWindow : Window
     {
         private AppConfig appConfig = AppConfig.Instance;
-        public MainWindow()
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
-        {
-
-            try
-            {
-                bool loginResult = LoginInit();
-                if (loginResult)
-                {
-                    MainWindow_Loaded();
-
-                }
-                else
-                {
-                    this.Hide(); // 登录校验失败，关闭主窗体
-                    LoginPageView indexPage = new LoginPageView();
-                    indexPage.ShowDialog();
-                    this.Close();
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
 
-        }
+        public static MainWindow Instance => _instance.Value;
 
-        private void MainWindow_Loaded()
+        public MainWindow()
-        {
-            try
         {
-                // 主窗体加载完成后执行其他逻辑
             InitializeComponent();
             this.DataContext = new MainWindowViewModel();
         }
-            catch (System.Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
-        }
 
-        #region 登录验证
-        public bool LoginInit()
-        {
-            //账号名称不存在，跳转
-            if (string.IsNullOrWhiteSpace(appConfig.Account))
-            {
-              //  this.Hide();
 
-                //this.Close();
-                return false;
-            }
-            else
-            {
-               // this.Account.Text = appConfig.Account;
-                //this.Team.Text = appConfig.TeamName;
-                return true;
-            }
-        }
-        #endregion
 
 
     }

Aucma.Core.ProductOffLine/Business/offLineBusiness.cs

@@ -223,6 +223,15 @@ namespace Aucma.Core.ProductOffLine.Business
         {
             try
             {
+                #region 未登录禁止下线
+                if (string.IsNullOrEmpty(appConfig.TeamName))
+                {
+                    log.Error($"条码{code}未登录不做处理");
+                    speechStr.SpeakAsync("请先登录再下线;请登录");
+                    return;
+                }
+                #endregion
+
                 //  ScannerModel model = allScanners.FirstOrDefault(x => x.Ip == scannerIp);
                 //   int ScannerNo = model.Id;  // 确定是哪个扫码器
                 //  log.Info("扫码器ip:" + scannerIp + "编号:[" + ScannerNo + "]扫描到条码:" + code);

Aucma.Core.ProductOffLine/ViewModels/LoginPageViewModel.cs

@@ -71,10 +71,10 @@ namespace Aucma.Core.ProductOffLine.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow mainPage = new MainWindow();
+                    MainWindow mainPage =  MainWindow.Instance;
                     mainPage.Show();
                     
-                    window.Close();
+                  //  window.Close();
                 }
                 else
                 {

Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs

@@ -328,9 +328,9 @@ namespace Aucma.Core.ProductOffLine.ViewModels
 
                 window.Hide();
                 //跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login = LoginPageView.Instance;
                 login.Show();
-                window.Close();
+               // window.Close();
             }
         }
 

Aucma.Core.ProductOffLine/Views/LoginPageView.xaml.cs

@@ -25,14 +25,28 @@ namespace Aucma.Core.ProductOffLine.Views
     public partial class LoginPageView : Window
     {
         private AppConfig appConfig = AppConfig.Instance;
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             txtBarCode.Text = appConfig.BarCodeAccount;
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
         }
 
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
+        }
+
+      
+     
+
         private void loginBtn_Click(object sender, RoutedEventArgs e)
         {
             string barCode = txtBarCode.Text;

Aucma.Core.ProductOffLine/Views/MainWindow.xaml.cs

@@ -12,71 +12,16 @@ namespace Aucma.Core.ProductOffLine.Views
     {
         private AppConfig appConfig = AppConfig.Instance;
 
-        public MainWindow()
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
-        {
-            try
-            {
-                bool loginResult = LoginInit();
-                if (loginResult)
-                {
-                    MainWindow_Loaded();
-
-                }
-                else
-                {
-                    this.Hide(); // 登录校验失败，关闭主窗体
-                    LoginPageView indexPage = new LoginPageView();
-                    indexPage.ShowDialog();
-                    this.Close();
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
-        }
-
-      
-
-        private void Minimized_Click(object sender, RoutedEventArgs e)
-        {
-
-        }
 
+        public static MainWindow Instance => _instance.Value;
 
-        private void MainWindow_Loaded()
+        public MainWindow()
-        {
-            try
         {
-                // 主窗体加载完成后执行其他逻辑
             InitializeComponent();
             this.DataContext = new MainWindowViewModel();
         }
-            catch (System.Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
-        }
 
-        #region 登录验证
-        public bool LoginInit()
-        {
-            //账号名称不存在，跳转
-            if (string.IsNullOrWhiteSpace(appConfig.Account))
-            {
-                //  this.Hide();
-
-                //this.Close();
-                return false;
-            }
-            else
-            {
-                // this.Account.Text = appConfig.Account;
-                //this.Team.Text = appConfig.TeamName;
-                return true;
-            }
-        }
-        #endregion
      
     }
 }

Aucma.Core.ProductOffLineCX1/Business/offLineBusiness.cs

@@ -14,6 +14,7 @@ using Aucma.Core.ProductOffLineCX1.Views;
 using Aucma.Core.Scanner;
 using Castle.Core.Internal;
 using log4net;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Logging;
@@ -225,8 +226,18 @@ namespace Aucma.Core.ProductOffLineCX1.Business
         /// <param name="scannerIp"></param>
         public void MaterialBarScanHandle(string code, string code69, string scannerIp)
         {
+
             try
             {
+                #region 未登录禁止下线
+                if (string.IsNullOrEmpty(appConfig.TeamName))
+                {
+                    log.Error($"条码{code}未登录不做处理");
+                    speechStr.SpeakAsync("请先登录再下线;请登录");
+                    return;
+                }
+                #endregion
+
                 //  ScannerModel model = allScanners.FirstOrDefault(x => x.Ip == scannerIp);
                 //   int ScannerNo = model.Id;  // 确定是哪个扫码器
                 //  log.Info("扫码器ip:" + scannerIp + "编号:[" + ScannerNo + "]扫描到条码:" + code);

Aucma.Core.ProductOffLineCX1/ViewModels/LoginPageViewModel.cs

@@ -71,10 +71,10 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow mainPage = new MainWindow();
+                    MainWindow mainPage = MainWindow.Instance;
                     mainPage.Show();
                     
-                    window.Close();
+                 //   window.Close();
                 }
                 else
                 {

Aucma.Core.ProductOffLineCX1/ViewModels/MainWindowViewModel.cs

@@ -335,9 +335,9 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
 
                 window.Hide();
                 //跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login = LoginPageView.Instance;
                 login.Show();
-                window.Close();
+              //  window.Close();
             }
         }
 

Aucma.Core.ProductOffLineCX1/Views/LoginPageView.xaml.cs

@@ -24,14 +24,26 @@ namespace Aucma.Core.ProductOffLineCX1.Views
     public partial class LoginPageView : Window
     {
         private AppConfig appConfig = AppConfig.Instance;
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             txtBarCode.Text = appConfig.BarCodeAccount;
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
         }
 
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
+        }
+
+
         private void loginBtn_Click(object sender, RoutedEventArgs e)
         {
             string barCode = txtBarCode.Text;

Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Aucma.Core.ProductOffLineCX1.ViewModels;
+using System;
 using System.Windows;
 
 namespace Aucma.Core.ProductOffLineCX1.Views
@@ -8,6 +9,10 @@ namespace Aucma.Core.ProductOffLineCX1.Views
     /// </summary>
     public partial class MainWindow : Window
     {
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
+
+        public static MainWindow Instance => _instance.Value;
+
         public MainWindow()
         {
             InitializeComponent();