Zhou/20230201_145_upperpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改一键还原功能，去掉非强制关闭功能

Browse Source
This commit is contained in:
MoYue 2024-11-20 08:47:08 +08:00
parent a989a1648e
commit 0b1292e6df
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
InSituLaboratory/ViewModels/Pages/RelayViewModel.cs
View File

@ -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
{

12
InSituLaboratory/Views/MainView.xaml
View File

@ -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>