diff --git a/HKCardOUT/Converter/TextForegroundConvert.cs b/HKCardOUT/Converter/TextForegroundConvert.cs
index 5b046a1..6efe477 100644
--- a/HKCardOUT/Converter/TextForegroundConvert.cs
+++ b/HKCardOUT/Converter/TextForegroundConvert.cs
@@ -13,11 +13,11 @@ namespace Converter
{
if (value != null)
{
- if (value.ToString() == "正常")
+ if (value.ToString().Contains("正常"))
return Brushes.White;
- else if (value.ToString() == "异常")
+ else if (value.ToString().Contains("异常"))
return Brushes.Yellow;
- else if (value.ToString() == "未连接")
+ else if (value.ToString().Contains("未连接"))
return Brushes.Yellow;
}
return default;
diff --git a/HKCardOUT/HKCardOUT.csproj b/HKCardOUT/HKCardOUT.csproj
index 25728b2..b7d8a94 100644
--- a/HKCardOUT/HKCardOUT.csproj
+++ b/HKCardOUT/HKCardOUT.csproj
@@ -14,9 +14,9 @@
1.0.0.0
AnyCPU;x86
-
+
TRACE;Core
diff --git a/HKCardOUT/ViewModels/AdWindowViewModel.cs b/HKCardOUT/ViewModels/AdWindowViewModel.cs
index dee34fd..1f03e9f 100644
--- a/HKCardOUT/ViewModels/AdWindowViewModel.cs
+++ b/HKCardOUT/ViewModels/AdWindowViewModel.cs
@@ -71,14 +71,14 @@ namespace HKCardOUT.ViewModels
LAdInfo.Count = model.Where(t => t.Key == "4" || t.Key == "5" || t.Key == "6").Sum(t => t.Value);
RAdinfo.Count = model.Where(t => t.Key == "1" || t.Key == "2" || t.Key == "3").Sum(t => t.Value);
StringBuilder sb1 = new StringBuilder();
- sb1.Append(!Main.GetInstance.GetIsConnect(4) ? "4号未连接" : (Main.GetInstance.GetIsSwipe(4) ? "4号正常" : "4号异常"));
- sb1.Append(!Main.GetInstance.GetIsConnect(5) ? "5号未连接" : (Main.GetInstance.GetIsSwipe(5) ? "5号正常" : "5号异常"));
- sb1.Append(!Main.GetInstance.GetIsConnect(6) ? "6号未连接" : (Main.GetInstance.GetIsSwipe(6) ? "6号正常" : "6号异常"));
+ sb1.Append((!Main.GetInstance.GetIsConnect(4) ? "4号未连接" : (Main.GetInstance.GetIsSwipe(4) ? "4号正常" : "4号异常")+"\r"));
+ sb1.Append((!Main.GetInstance.GetIsConnect(5) ? "5号未连接" : (Main.GetInstance.GetIsSwipe(5) ? "5号正常" : "5号异常")+"\r"));
+ sb1.Append((!Main.GetInstance.GetIsConnect(6) ? "6号未连接" : (Main.GetInstance.GetIsSwipe(6) ? "6号正常" : "6号异常")+"\r"));
LAdInfo.Msg = sb1.ToString();
StringBuilder sb2 = new StringBuilder();
- sb2.Append(!Main.GetInstance.GetIsConnect(1) ? "1号未连接" : (Main.GetInstance.GetIsSwipe(1) ? "1号正常" : "1号异常"));
- sb2.Append(!Main.GetInstance.GetIsConnect(2) ? "2号未连接" : (Main.GetInstance.GetIsSwipe(2) ? "2号正常" : "2号异常"));
- sb2.Append(!Main.GetInstance.GetIsConnect(3) ? "3号未连接" : (Main.GetInstance.GetIsSwipe(3) ? "3号正常" : "3号异常"));
+ sb2.Append((!Main.GetInstance.GetIsConnect(1) ? "1号未连接" : (Main.GetInstance.GetIsSwipe(1) ? "1号正常" : "1号异常")+"\r"));
+ sb2.Append((!Main.GetInstance.GetIsConnect(2) ? "2号未连接" : (Main.GetInstance.GetIsSwipe(2) ? "2号正常" : "2号异常")+"\r"));
+ sb2.Append((!Main.GetInstance.GetIsConnect(3) ? "3号未连接" : (Main.GetInstance.GetIsSwipe(3) ? "3号正常" : "3号异常")+"\r"));
RAdinfo.Msg = sb2.ToString();
if (DataBus.saleLogDtos.Count > 0)