diff --git a/Resources/Strings.en-US.xaml b/Resources/Strings.en-US.xaml
index fcdc8ab..eeb7d11 100644
--- a/Resources/Strings.en-US.xaml
+++ b/Resources/Strings.en-US.xaml
@@ -142,7 +142,7 @@
Manual interface
- Manual speed
+ Manual speed(mm/min)
Offline
settings
Tidal volume coefficient
diff --git a/Resources/Strings.zh-CN.xaml b/Resources/Strings.zh-CN.xaml
index 0923184..d093144 100644
--- a/Resources/Strings.zh-CN.xaml
+++ b/Resources/Strings.zh-CN.xaml
@@ -142,7 +142,7 @@
手动界面
- 手动速度
+ 手动速度(mm/min)
离线
设置
潮气量系数
diff --git a/Window6.xaml b/Window6.xaml
index 680ef82..562bb1b 100644
--- a/Window6.xaml
+++ b/Window6.xaml
@@ -18,7 +18,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -111,7 +111,7 @@
-
+
@@ -157,22 +157,22 @@
IsReadOnly="True"
/>
-
-
+
+
-
+
-
+
@@ -180,7 +180,7 @@ IsReadOnly="True"
-
+
@@ -189,7 +189,7 @@ IsReadOnly="True"
-
+
@@ -198,7 +198,7 @@ IsReadOnly="True"
-
+
diff --git a/Window6.xaml.cs b/Window6.xaml.cs
index 7a4adb5..4adb40a 100644
--- a/Window6.xaml.cs
+++ b/Window6.xaml.cs
@@ -22,7 +22,7 @@ using System.Windows.Threading;
using OxyPlot.Axes;
using OxyPlot.Legends;
using 口罩泄露定制款;
-
+using 睡眠呼吸暂停治疗面罩多功能测试仪.Data;
namespace ShanghaiEnvironmentalTechnology
{
///
@@ -90,7 +90,7 @@ namespace ShanghaiEnvironmentalTechnology
private TcpClient _tcpClient;
private IModbusMaster _modbusMaster;
private System.Timers.Timer resetTimer; // 启动状态实时定时器
-
+ string currentLang = LanguageManager.CurrentLanguage;
#region 统计相关
private PlotModel _plotModel;
@@ -137,7 +137,17 @@ namespace ShanghaiEnvironmentalTechnology
}
else
{
- ResetBtn.Content = "复位";
+ if (LanguageManager.IsEnglish)
+ {
+ // 英文逻辑
+ ResetBtn.Content = "Reset";
+ }
+ else if (LanguageManager.IsChinese)
+ {
+ // 中文逻辑
+ ResetBtn.Content = "复位";
+ }
+ //ResetBtn.Content = "复位";
ResetBtn.Foreground = Brushes.White;
}
});
@@ -226,7 +236,18 @@ namespace ShanghaiEnvironmentalTechnology
{
if (!IsModbusConnected())
{
- updateAction("离线");
+ //updateAction("离线");
+ //// 2. 直接判断是否是英文
+ if (LanguageManager.IsEnglish)
+ {
+ // 英文逻辑
+ updateAction("Offline");
+ }
+ else if (LanguageManager.IsChinese)
+ {
+ // 中文逻辑
+ updateAction("离线");
+ }
return;
}