From 48c07e0a371f67b97abc7c2e61d7f23d060324fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 28 一月 2021 18:24:53 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
index 4829203..78ede19 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -134,7 +134,7 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(102),
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