maqiao
/
HKC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去掉登录页面调连接"冰箱串口失败"的提示

This commit is contained in:
maqiao 2024-10-22 16:35:35 +08:00
parent b7a395871d
commit 97287feb39
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.xaml.cs
View File

@ -234,7 +234,7 @@ namespace DM_Weight
// 调试页面 // 调试页面
containerRegistry.RegisterForNavigation<DebugWindow, DebugWindowViewModel>(); containerRegistry.RegisterForNavigation<DebugWindow, DebugWindowViewModel>();
//主设置页面 //主设置页面
//containerRegistry.RegisterForNavigation<SettingMainWindow, SettingMainWindowViewModel>(); containerRegistry.RegisterForNavigation<SettingMainWindow, SettingMainWindowViewModel>();
////冰箱抽屉设置页面 ////冰箱抽屉设置页面
//containerRegistry.RegisterForNavigation<FridgeWindow, FridgeWindowViewModel>(); //containerRegistry.RegisterForNavigation<FridgeWindow, FridgeWindowViewModel>();

26
DM_Weight/Port/PortUtil.cs
View File

@ -624,18 +624,20 @@ namespace DM_Weight.Port
{ {
logger.Error("条码枪串口打开错误" + e.Message); logger.Error("条码枪串口打开错误" + e.Message);
} }
try #region 湘潭毒麻柜无冰箱
{ //try
string FridgePortPath = ConfigurationManager.AppSettings["FridgePortPath"]; //{
logger.Info($"打开冰箱串口【{FridgePortPath}】"); // string FridgePortPath = ConfigurationManager.AppSettings["FridgePortPath"];
fridgeSerial = new SerialPort(FridgePortPath, 9600, Parity.None, 8); // logger.Info($"打开冰箱串口【{FridgePortPath}】");
fridgeSerial.Open(); // fridgeSerial = new SerialPort(FridgePortPath, 9600, Parity.None, 8);
logger.Info($"冰箱串口打开结果【{fridgeSerial.IsOpen}】"); // fridgeSerial.Open();
} // logger.Info($"冰箱串口打开结果【{fridgeSerial.IsOpen}】");
catch (Exception e) //}
{ //catch (Exception e)
logger.Error("冰箱串口打开错误" + e.Message); //{
} // logger.Error("冰箱串口打开错误" + e.Message);
//}
#endregion
if (_canBusExsit) if (_canBusExsit)
{ {
try try

8
DM_Weight/ViewModels/LoginWindowViewModel.cs
View File

@ -91,10 +91,10 @@ namespace DM_Weight.ViewModels
get => _fingerMsg; get => _fingerMsg;
set => SetProperty(ref _fingerMsg, value); set => SetProperty(ref _fingerMsg, value);
} }
public bool FridgePortMsg //public bool FridgePortMsg
{ //{
get => !_portUtil.fridgeSerial.IsOpen; // get => !_portUtil.fridgeSerial.IsOpen;
} //}
//录像机登录状态 //录像机登录状态
private bool _hikMsg; private bool _hikMsg;
public bool HIKMsg public bool HIKMsg

2
DM_Weight/Views/LoginWindow.xaml
View File

@ -199,7 +199,7 @@
<TextBlock Visibility="{Binding CanBusPortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="can总线串口连接失败" /> <TextBlock Visibility="{Binding CanBusPortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="can总线串口连接失败" />
<TextBlock Visibility="{Binding FingerMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="指纹机连接失败" /> <TextBlock Visibility="{Binding FingerMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="指纹机连接失败" />
<TextBlock Visibility="{Binding HIKMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="录像机登录失败" /> <TextBlock Visibility="{Binding HIKMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="录像机登录失败" />
<TextBlock Visibility="{Binding FridgePortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="冰箱串口连接失败" /> <!--<TextBlock Visibility="{Binding FridgePortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="冰箱串口连接失败" />-->
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>