From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs
index 13e5034..6f57788 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);
}
@@ -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;
};
@@ -238,7 +244,7 @@
else if (temp.state == "uninhabited")//鏃犱汉
{
btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/UnderProtectionBgIcon.png";
- btnSuctionView.TextID = StringId.SensorNormalState;
+ btnSuctionView.TextID = StringId.wuren;
btnSuctionView.IsSelected = false;
}
else//鏈変汉
@@ -265,7 +271,7 @@
else
{
btnIcon.IsSelected = false;
- btnSuctionView.TextID = StringId.SensorNormalState;
+ btnSuctionView.TextID = StringId.wuren;
btnSuctionView.IsSelected = false;
}
//澧炲姞瀹為獙瀹ゆā寮忓弽棣�
@@ -279,14 +285,14 @@
btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/UnderProtectionBgIcon.png";
btnIcon.IsSelected = true;
btnIcon.IsSelected = false;
- btnSuctionView.TextID = StringId.SensorNormalState;
+ btnSuctionView.TextID = StringId.wuren;
btnSuctionView.IsSelected = false;
break;
case "1":
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