From f2614723e2c5ea597169dd8240644f5f3f827102 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 10 Dec 2024 09:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E9=97=B4=E4=B8=BA5s=E4=B8=80=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CheckOrderNewWindowViewModel.cs           |  2 +-
 DM_Weight/ViewModels/HomeWindowViewModel.cs   | 47 ++++++++++---------
 .../ViewModels/OpenBoxNewWindowViewModel.cs   |  2 +-
 .../ViewModels/SettingBoxWindowViewModel.cs   |  2 +-
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index 8021723..9c59277 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -860,7 +860,7 @@ namespace DM_Weight.ViewModels
                     bool loop = true;
                     while (loop)
                     {
-                        await Task.Delay(3000);
+                        await Task.Delay(5000);
                         bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState();
                         bool state = Array.TrueForAll(boolsl, b => b == false);
                         if (state)
diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs
index 0fd076e..ac2407a 100644
--- a/DM_Weight/ViewModels/HomeWindowViewModel.cs
+++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs
@@ -285,32 +285,37 @@ namespace DM_Weight.ViewModels
             //        _regionManager.RequestNavigate("ContentRegion", SelectedMenu.Children[0].PremissionPath);
             //    }
             //}
-            if (SelectedMenu != null && SelectedMenu.PremissionName == "退出")
+
+            if (!ModbusHelper.BoxOperate)
             {
-                //bool[] boolArrs = ModbusHelper.GetInstance().GetAllBoxState();
-                //bool allTrue = Array.TrueForAll(boolArrs, b => b);
-                //false是关着,true是开着
-                if (!ModbusHelper.BoxOperate)
+                if (SelectedMenu != null && SelectedMenu.PremissionName == "退出")
                 {
-                    logger.Info($"用户【{Operator?.Nickname}】退出登录");
-                    Operator = null;
-                    Reviewer = null;
-                    _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+                    //bool[] boolArrs = ModbusHelper.GetInstance().GetAllBoxState();
+                    //bool allTrue = Array.TrueForAll(boolArrs, b => b);
+                    //false是关着,true是开着
+                    //if (!ModbusHelper.BoxOperate)
+                    //{
+                        logger.Info($"用户【{Operator?.Nickname}】退出登录");
+                        Operator = null;
+                        Reviewer = null;
+                        _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+                    //}
+                    //else
+                    //{
+                    //    //还有药箱开着不能退出
+                    //    _portUtil.SpeakAsync("请关闭药箱后再退出");
+                    //    SelectedMenu = _premissionDmList[0];
+                    //}
                 }
+
                 else
                 {
-                    //还有药箱开着不能退出
-                    _portUtil.SpeakAsync("请关闭药箱后再退出");
-                    SelectedMenu = _premissionDmList[0];
-                }
-            }
-            else
-            {
-                //SelectedMenu.Children = SelectedMenu.Children;
-                //SelectedChildMenu = SelectedMenu.Children[0];
-                if (!_portUtil.Operate)
-                {
-                    _regionManager.RequestNavigate("ContentRegion", SelectedMenu.Children[0].PremissionPath);
+                    //SelectedMenu.Children = SelectedMenu.Children;
+                    //SelectedChildMenu = SelectedMenu.Children[0];
+                    if (!_portUtil.Operate)
+                    {
+                        _regionManager.RequestNavigate("ContentRegion", SelectedMenu.Children[0].PremissionPath);
+                    }
                 }
             }
         }
diff --git a/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs b/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs
index 4bf9b99..524c3ab 100644
--- a/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs
@@ -674,7 +674,7 @@ namespace DM_Weight.ViewModels
                     bool loop = true;
                     while (loop)
                     {
-                        await Task.Delay(3000);
+                        await Task.Delay(5000);
                         bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState();
                         bool state = Array.TrueForAll(boolsl, b => b == false);
                         if(state)
diff --git a/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs b/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
index 37c4353..b7d7283 100644
--- a/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
+++ b/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
@@ -232,7 +232,7 @@ namespace DM_Weight.ViewModels
                         bool loop = true;
                         while (loop)
                         {
-                            await Task.Delay(3000);
+                            await Task.Delay(5000);
                             bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState();
                             bool state = Array.TrueForAll(boolsl, b => b == false);
                             if (state)