From 06c2f8c0e649b65bbe57f6321f83a454af0b3dfc Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 19 Jul 2024 15:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=B1=89=E6=89=93=E5=BC=80=5FportUtil?=
 =?UTF-8?q?.Operate=E4=B8=BAtrue=E5=88=99=E4=B8=8D=E8=83=BD=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E8=8F=9C=E5=8D=95=E5=8F=8A=E9=80=80=E5=87=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                        |  2 +-
 DM_Weight/ViewModels/HomeWindowViewModel.cs | 36 ++++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index bdc87a9..6c3d8ff 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -37,7 +37,7 @@
 		<!-- 抽屉串口使用的协议232或者485 -->
 		<add key="DrawerProtocol" value="485" />
 		<!-- 抽屉串口的串口号 -->
-		<add key="DrawerPortPath" value="COM3" />
+		<add key="DrawerPortPath" value="COM1" />
 		<!-- can总线串口的串口号 -->
 		<add key="CanBusPortPath" value="COM9" />
 		<!-- 条码枪串口的串口号 -->
diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs
index 3ad20b3..72886ab 100644
--- a/DM_Weight/ViewModels/HomeWindowViewModel.cs
+++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs
@@ -57,10 +57,13 @@ namespace DM_Weight.ViewModels
             get { return _selectedChildMenu; }
             set
             {
+                logger.Info($"用户【{Operator?.Nickname}】进入菜单_portUtil.Operate:{_portUtil.Operate};value:{value}");
                 if (!_portUtil.Operate)
                 {
                     if (value != null)
                     {
+
+                        logger.Info($"用户【{Operator?.Nickname}】进入菜单value:{value.PremissionPath}");
                         if (value.PremissionPath.Equals("TakeRecordWindow"))
                         {
                             //定义传参变量
@@ -160,7 +163,14 @@ namespace DM_Weight.ViewModels
                 //        SelectedChildMenu = value.Children[0];
                 //    }
                 //}
-                SetProperty(ref _selectedMenu, value);
+                if (!_portUtil.Operate)
+                    SetProperty(ref _selectedMenu, value);
+                else
+                {
+                    logger.Info($"未关闭抽屉切换菜单");
+                    SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                    SnackbarMessageQueue.Enqueue("请关闭抽屉后再切换菜单");
+                }
             }
         }
 
@@ -171,7 +181,7 @@ namespace DM_Weight.ViewModels
         }
         private void SelectionMethod(ListBox viewName)
         {
-            logger.Info($"用户【{Operator?.Nickname}】进入菜单点击事件");
+            logger.Info($"用户【{Operator?.Nickname}】进入菜单点击事件;viewName.SelectedItem{viewName.SelectedItem}");
 
             //CheckTakeReturnTime();
             //PremissionDm premissionDm = viewName.SelectedItem as PremissionDm;
@@ -191,11 +201,21 @@ namespace DM_Weight.ViewModels
             SelectedMenu = viewName.SelectedItem as PremissionDm;
             if (SelectedMenu.PremissionName == "退出")
             {
-                //logger.Info($"用户【{Operator?.Nickname}】退出登录");
-                logger.Info($"用户【{Operator?.Nickname}】退出登录;SelectionMethod{SelectedMenu.PremissionName}");
-                Operator = null;
-                Reviewer = null;
-                _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+                if (!_portUtil.Operate)
+                {
+                    //logger.Info($"用户【{Operator?.Nickname}】退出登录");
+                    logger.Info($"用户【{Operator?.Nickname}】退出登录;SelectionMethod{SelectedMenu.PremissionName}");
+                    Operator = null;
+                    Reviewer = null;
+                    _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+                }
+                else
+                {
+                    logger.Info($"未关闭抽屉操作退出");
+                    SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                    SnackbarMessageQueue.Enqueue("请关闭抽屉后再退出");
+                    return;
+                }
             }
             else
             {
@@ -311,7 +331,7 @@ namespace DM_Weight.ViewModels
             get => _snackbarMessageQueue;
             set => SetProperty(ref _snackbarMessageQueue, value);
         }
-        private SolidColorBrush _colorBrush=new SolidColorBrush((Color) ColorConverter.ConvertFromString("#b71c1c"));
+        private SolidColorBrush _colorBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
 
         public SolidColorBrush SnackbarBackground
         {