From b271bcceb1c4e718377ca86b6213816abcf7482a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 13:57:18 +0800
Subject: [PATCH] 20210111-删除功能类别，统一使用spk去设备功能
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
old mode 100755
new mode 100644
index 4829203..64b726e
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -132,9 +132,9 @@
btnSwitchIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(102),
+ Y = Application.GetRealHeight((int)((float)102 / Application.HeightScale)),
Width = Application.GetRealWidth(168),
- Height = Application.GetRealHeight(288),
+ Height = Application.GetRealWidth(288),
UnSelectedImagePath = "FunctionIcon/Light/RelayBg.png",
SelectedImagePath = "FunctionIcon/Light/RelayOnBg.png",
IsSelected = light.trait_on_off.curValue.ToString() == "on"
@@ -144,9 +144,9 @@
btnSwitch = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(462),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Y = Application.GetRealHeight(466),// + btnSwitchIcon.Bottom,
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
IsSelected = light.trait_on_off.curValue.ToString() == "on"
--
Gitblit v1.8.0