From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 1e3b358..434c27e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -62,6 +62,10 @@
/// </summary>
Action actionRefresh;
#endregion
+ /// <summary>
+ /// 姝ｅ湪鎺у埗
+ /// </summary>
+ bool onControl = false;
public RollingShutterPage(Curtain func)
{
bodyView = this;
@@ -136,7 +140,8 @@
Width = Application.GetRealWidth(170),
Height = Application.GetRealWidth(210),
Progress = curtain.percent,
- ProgressTextColor = 0x00000000
+ //IsInvertedProgress = true,
+ ProgressTextColor = 0x00000000,
};
controlView.AddChidren(curtainSeekBar);
@@ -191,21 +196,22 @@
btnCurtainClose = new Button()
{
- X = Application.GetRealWidth(64),
- Y = Application.GetRealHeight(462),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ X = Application.GetRealWidth(84),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
+ IsSelected = curtain.GetAttrState(FunctionAttributeKey.Percent) == "0",
};
controlView.AddChidren(btnCurtainClose);
btnCurtainStop = new Button()
{
- X = Application.GetRealWidth(144),
- Y = Application.GetRealHeight(462),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ X = Application.GetRealWidth(148),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png",
};
@@ -213,12 +219,13 @@
btnCurtainOpen = new Button()
{
- X = Application.GetRealWidth(224),
- Y = Application.GetRealHeight(462),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ X = Application.GetRealWidth(212),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
+ IsSelected = curtain.GetAttrState(FunctionAttributeKey.Percent) != "0",
};
controlView.AddChidren(btnCurtainOpen);
--
Gitblit v1.8.0