diff --git a/DM_Weight/ViewModels/FridgeOnlyWindowViewModel.cs b/DM_Weight/ViewModels/FridgeOnlyWindowViewModel.cs index b37df28..e3c080a 100644 --- a/DM_Weight/ViewModels/FridgeOnlyWindowViewModel.cs +++ b/DM_Weight/ViewModels/FridgeOnlyWindowViewModel.cs @@ -2,6 +2,8 @@ using DM_Weight.msg; using DM_Weight.Port; using DM_Weight.util; +using log4net; +using log4net.Repository.Hierarchy; using Prism.Commands; using Prism.Events; using Prism.Mvvm; @@ -19,6 +21,7 @@ namespace DM_Weight.ViewModels { public class FridgeOnlyWindowViewModel : BindableBase, IRegionMemberLifetime, INavigationAware { + private readonly ILog logger = LogManager.GetLogger(typeof(FridgeOnlyWindowViewModel)); //温度区间 private string _temperatureRange = CommonClass.ReadAppSetting("temperatureRange").ToString(); public string TemperatureRange @@ -200,6 +203,7 @@ namespace DM_Weight.ViewModels string exeFileName = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name; doc.Load(exeFileName + ".dll.config"); XmlNode node = doc.SelectSingleNode(xPath); + logger.Info($"xPath:{xPath} exeFileName:{exeFileName} ReadAppSetting key:{key} value:{node.Attributes["value"].Value}"); return Convert.ToInt32(node.Attributes["value"].Value); } diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs index 0874467..6f759d9 100644 --- a/DM_Weight/ViewModels/HomeWindowViewModel.cs +++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs @@ -453,7 +453,7 @@ namespace DM_Weight.ViewModels private async void GetWD() { - if (!_portUtil.FridgeOperate) + if (!_portUtil.FridgeOperate && FridgeState.Equals("0")) { string retStr = string.Empty; byte[] data = null; @@ -468,6 +468,15 @@ namespace DM_Weight.ViewModels // WD += $"{retTemp}℃"; //} } + else + { + AlertMsg alertMsg = new AlertMsg + { + Message = $"正在获取冰箱温度或已关闭冰箱制冷功能!!!", + Type = MsgType.ERROR + }; + _eventAggregator.GetEvent().Publish(alertMsg); + } } /// /// 将收到的返回转换成具体温度数值 @@ -690,6 +699,7 @@ namespace DM_Weight.ViewModels float retT = await _portUtil.GetFridgeTemperature(1); Thread.Sleep(80); WD = $"恒温冷藏抽屉当前温度:{Math.Round((retT), 2)}℃;"; + AlertColor = Brushes.White; logger.Info(WD); if (tempRange != null && tempRange.Count() >= 2) { diff --git a/DM_Weight/Views/FridgeOnlyWindow.xaml b/DM_Weight/Views/FridgeOnlyWindow.xaml index 0c6657a..323ae58 100644 --- a/DM_Weight/Views/FridgeOnlyWindow.xaml +++ b/DM_Weight/Views/FridgeOnlyWindow.xaml @@ -20,16 +20,16 @@ - - - + + + - -