From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs
index 13e5034..fb835f5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs
@@ -83,6 +83,12 @@
FrameWhiteCentet1.AddChidren(btnSuctionView);
+ //int i = 0;
+ //btnIcon.MouseUpEventHandler = (sender, e) => {
+ // device.GetAttribute(FunctionAttributeKey.TargetStatus).state = i.ToString();
+ // i++;
+ // RefreshFormStatu();
+ //};
@@ -172,7 +178,7 @@
})
{ IsBackground = true }.Start();
};
-
+ //鍥炲埌缃《鍒锋柊
base.SettionFinishEvent += () => {
exitLabView.Visible = device.extSet.labModel;
};
@@ -286,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":
@@ -298,6 +304,14 @@
btnSuctionView.TextID = StringId.SomeoneRunning;
btnSuctionView.IsSelected = true;
}
+ else
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
+ btnIcon.IsSelected = true;
+ btnIcon.IsSelected = false;
+ btnSuctionView.TextID = StringId.Someone;
+ btnSuctionView.IsSelected = true;
+ }
break;
case "3":
if (device.extSet.labModel)
@@ -306,6 +320,14 @@
btnIcon.IsSelected = true;
btnIcon.IsSelected = false;
btnSuctionView.TextID = StringId.SomeoneSitting;
+ btnSuctionView.IsSelected = true;
+ }
+ else
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
+ btnIcon.IsSelected = true;
+ btnIcon.IsSelected = false;
+ btnSuctionView.TextID = StringId.Someone;
btnSuctionView.IsSelected = true;
}
break;
@@ -325,7 +347,14 @@
btnSuctionView.TextID = StringId.SomeoneStanding;
btnSuctionView.IsSelected = true;
}
- Console.WriteLine(btnSuctionView.Text);
+ else
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
+ btnIcon.IsSelected = true;
+ btnIcon.IsSelected = false;
+ btnSuctionView.TextID = StringId.Someone;
+ btnSuctionView.IsSelected = true;
+ }
break;
default:
--
Gitblit v1.8.0