From 0b1292e6df65ac9ad04ce76f751b01e19278eda8 Mon Sep 17 00:00:00 2001
From: MoYue <MoYue@DESKTOP-V2TRTHU>
Date: Wed, 20 Nov 2024 08:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E9=94=AE=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=9D=9E?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E5=85=B3=E9=97=AD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Pages/RelayViewModel.cs        | 28 +++++++++----------
 InSituLaboratory/Views/MainView.xaml          | 12 +++++---
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/InSituLaboratory/ViewModels/Pages/RelayViewModel.cs b/InSituLaboratory/ViewModels/Pages/RelayViewModel.cs
index 9f625f6..5e46f03 100644
--- a/InSituLaboratory/ViewModels/Pages/RelayViewModel.cs
+++ b/InSituLaboratory/ViewModels/Pages/RelayViewModel.cs
@@ -956,22 +956,22 @@ namespace InSituLaboratory.ViewModels.Pages
                     this.Refresh();
 
                 }
-                else if (s1 == DialogResult.No)
-                {
-                    //非强制关闭
-                    byte[] byteaq = new byte[] { 0x93, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 };
+                //else if (s1 == DialogResult.No)
+                //{
+                //    //非强制关闭
+                //    byte[] byteaq = new byte[] { 0x93, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
-                    List<byte> buffer = Escape(byteaq);
-                    string list = tools.byteToHexStr(buffer.ToArray());
-                    byte[] bytea = tools.ConvertHexStringToBytes(list);
-                    clientModel.SendData(bytea);
+                //    List<byte> buffer = Escape(byteaq);
+                //    string list = tools.byteToHexStr(buffer.ToArray());
+                //    byte[] bytea = tools.ConvertHexStringToBytes(list);
+                //    clientModel.SendData(bytea);
 
-                    logModel = new LogModel();
-                    logModel.CreateTime = DateTime.Now;
-                    logModel.Remark = "一键还原指令已下发";
-                    _logService.Insert<LogModel>(logModel);
-                    this.Refresh();
-                }
+                //    logModel = new LogModel();
+                //    logModel.CreateTime = DateTime.Now;
+                //    logModel.Remark = "一键还原指令已下发";
+                //    _logService.Insert<LogModel>(logModel);
+                //    this.Refresh();
+                //}
             }
             else
             {
diff --git a/InSituLaboratory/Views/MainView.xaml b/InSituLaboratory/Views/MainView.xaml
index 52e146b..094bdd5 100644
--- a/InSituLaboratory/Views/MainView.xaml
+++ b/InSituLaboratory/Views/MainView.xaml
@@ -207,8 +207,10 @@
                                                     <Setter Property="Background" TargetName="Bd">
                                                         <Setter.Value>
                                                             <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-                                                                <GradientStop Color="#FE582D" Offset="0"/>
-                                                                <GradientStop Color="#F1961A" Offset="1"/>
+                                                                <!--<GradientStop Color="#FE582D" Offset="0"/>
+                                                                <GradientStop Color="#F1961A" Offset="1"/>-->
+                                                                <GradientStop Color="#3E7FFF" Offset="0"/>
+                                                                <GradientStop Color="#8BB2FF" Offset="1"/>
                                                             </LinearGradientBrush>
                                                         </Setter.Value>
                                                     </Setter>
@@ -549,8 +551,10 @@
                                 <Setter Property="Background">
                                     <Setter.Value>
                                         <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-                                            <GradientStop Color="#FE582D" Offset="0"/>
-                                            <GradientStop Color="#F1961A" Offset="1"/>
+                                            <!--<GradientStop Color="#FE582D" Offset="0"/>
+                                            <GradientStop Color="#F1961A" Offset="1"/>-->
+                                            <GradientStop Color="#3E7FFF" Offset="0"/>
+                                            <GradientStop Color="#8BB2FF" Offset="1"/>
                                         </LinearGradientBrush>
                                     </Setter.Value>
                                 </Setter>