From 330e3ae4cdd1e9facb14b6ea2b3e609166c04fd3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 12 一月 2021 16:00:27 +0800
Subject: [PATCH] 2021-1-12-1

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
index 203fa6d..4cc63e4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -61,6 +61,11 @@
         /// </summary>
         Action actionRefresh;
         #endregion
+        /// <summary>
+        /// 姝e湪鎺у埗
+        /// </summary>
+        bool onControl = false;
+
         public MotorCurtainPage(Curtain func)
         {
             bodyView = this;
@@ -136,6 +141,7 @@
                 Height = Application.GetRealWidth(177),
                 Progress = curtain.percent,
                 ProgressTextColor =0x00000000,
+                //IsInvertedProgress = true,
             };
             controlView.AddChidren(curtainSeekBar);
 
@@ -190,10 +196,10 @@
 
             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",
             };
@@ -201,10 +207,10 @@
 
             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",
             };
@@ -212,10 +218,10 @@
 
             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",
             };

--
Gitblit v1.8.0