From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs
index 607333f..1c21b73 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs
@@ -50,7 +50,7 @@
//璇诲彇鐘舵��
new System.Threading.Thread(() =>
{
- if (device.spk == SPK.SenesorMegahealth|| device.spk == SPK.SenesorMegahealth2)
+ if (device.spk == SPK.SenesorMegahealth || device.spk == SPK.SensorMmvPose || device.spk == SPK.SenesorMegahealth2)
{
DriverLayer.Control.Ins.SendReadCommand(device, true);
}
@@ -292,7 +292,7 @@
btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
btnIcon.IsSelected = true;
btnIcon.IsSelected = false;
- btnSuctionView.TextID = StringId.SomeoneIn;
+ btnSuctionView.TextID = StringId.Someone;
btnSuctionView.IsSelected = true;
break;
case "2":
@@ -309,7 +309,7 @@
btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
btnIcon.IsSelected = true;
btnIcon.IsSelected = false;
- btnSuctionView.TextID = StringId.SomeoneIn;
+ btnSuctionView.TextID = StringId.Someone;
btnSuctionView.IsSelected = true;
}
break;
@@ -327,7 +327,7 @@
btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
btnIcon.IsSelected = true;
btnIcon.IsSelected = false;
- btnSuctionView.TextID = StringId.SomeoneIn;
+ btnSuctionView.TextID = StringId.Someone;
btnSuctionView.IsSelected = true;
}
break;
@@ -352,7 +352,7 @@
btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
btnIcon.IsSelected = true;
btnIcon.IsSelected = false;
- btnSuctionView.TextID = StringId.SomeoneIn;
+ btnSuctionView.TextID = StringId.Someone;
btnSuctionView.IsSelected = true;
}
break;
--
Gitblit v1.8.0