diff --git a/Views/ShowData.xaml b/Views/ShowData.xaml
index f30bcc5..04df0cb 100644
--- a/Views/ShowData.xaml
+++ b/Views/ShowData.xaml
@@ -75,7 +75,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
@@ -151,7 +151,7 @@
-
+
diff --git a/Views/ShowData.xaml.cs b/Views/ShowData.xaml.cs
index 16b2fcd..8a563e8 100644
--- a/Views/ShowData.xaml.cs
+++ b/Views/ShowData.xaml.cs
@@ -75,10 +75,23 @@ namespace 片剂四用仪.Views
}
}
}
+ // 正常循环的Delay,同样处理取消异常
+ try
+ {
+ await Task.Delay(1000, token);
+ }
+ catch (OperationCanceledException)
+ {
+ break;
+ }
+ }
+ catch (OperationCanceledException)
+ {
+ // 窗口关闭时的取消异常,正常退出循环
+ break;
}
- catch { }
- await Task.Delay(1000, token);
+ //await Task.Delay(1000, token);
}
}
@@ -123,7 +136,7 @@ namespace 片剂四用仪.Views
new PlcParamMapping("txt_HardnessDisplacement", 310, PlcParamType.Float),
new PlcParamMapping("txt_HardnessMotorLimit", 298, PlcParamType.Float),
new PlcParamMapping("txt_HardnessDamageThreshold", 400, PlcParamType.Float),
- new PlcParamMapping("txt_MaxForceCollect", 72, PlcParamType.Float),
+
new PlcParamMapping("txt_BrittlenessTestTime", 410, PlcParamType.Int),
new PlcParamMapping("txt_PreBrittlenessMass", 412, PlcParamType.Int),
@@ -136,11 +149,15 @@ namespace 片剂四用仪.Views
new PlcParamMapping("txt_DissolutionTime", 430, PlcParamType.Int),
new PlcParamMapping("txt_DissolutionSamplingInterval", 432, PlcParamType.Int),
- new PlcParamMapping("txt_ForceDisplay", 1314, PlcParamType.Float),
+
new PlcParamMapping("txt_ForceCoefficient", 1320, PlcParamType.Float),
new PlcParamMapping("txt_ForceProtection", 1322, PlcParamType.Float),
- new PlcParamMapping("txt_TemperatureCoefficient", 1428, PlcParamType.Float),
+
new PlcParamMapping("txt_TemperatureDisplay", 1430, PlcParamType.Float),
+
+ new PlcParamMapping("txt_MaxForceCollect", 72, PlcParamType.Float),//读取
+ new PlcParamMapping("txt_ForceDisplay", 1314, PlcParamType.Float),//读取
+ new PlcParamMapping("txt_TemperatureCoefficient", 1428, PlcParamType.Float),//读取
};
}