From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
index dca2d52..7a41534 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -129,18 +129,22 @@
                 Y = Application.GetRealHeight(130),
                 Width = Application.GetRealWidth(250),
                 Height = Application.GetRealWidth(177),
-                Progress = curtain.percent
+                Progress = curtain.percent,
+                ProgressTextColor =0x00000000,
             };
             controlView.AddChidren(curtainSeekBar);
 
-
             btnMinusSignIcon = new Button()
             {
-                X = Application.GetRealWidth(42),
                 Y = Application.GetRealHeight(406),
-                Width = Application.GetMinRealAverage(24),
+                Width = Application.GetRealWidth(62),
                 Height = Application.GetMinRealAverage(24),
-                UnSelectedImagePath = "Public/MinusSignIcon.png",
+                TextAlignment = TextAlignment.CenterRight,
+                TextID = StringId.PullOpen,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                TextColor = CSS_Color.PromptingColor1,
+                Visible = false,
+                Enable = false,
             };
             controlView.AddChidren(btnMinusSignIcon);
 
@@ -155,20 +159,27 @@
                 ThumbImageHeight = Application.GetRealHeight(54),
                 ProgressBarColor = CSS_Color.MainColor,
                 ProgressTextColor = CSS_Color.FirstLevelTitleColor,
-                ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                ProgressTextSize = 0x00000000,
                 MaxValue = 100,
                 Progress = 30,
                 SeekBarPadding = Application.GetRealWidth(20),
+                Visible = false,
+                Enable = false,
             };
             controlView.AddChidren(controlBar);
 
             btnPlusSgnIcon = new Button()
             {
-                X = controlBar.Right,
+                X = Application.GetRealWidth(266),
                 Y = Application.GetRealHeight(406),
-                Width = Application.GetMinRealAverage(24),
-                Height = Application.GetMinRealAverage(24),
-                UnSelectedImagePath = "Public/PlusSignIcon.png",
+                Width = Application.GetRealWidth(62),
+                Height = Application.GetRealWidth(24),
+                TextID = StringId.Shut,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                TextColor = CSS_Color.PromptingColor1,
+                Visible = false,
+                Enable = false,
             };
             controlView.AddChidren(btnPlusSgnIcon);
 
@@ -206,7 +217,7 @@
             controlView.AddChidren(btnCurtainOpen);
 
             LoadEventList();
-            new TopViewDiv(bodyView, curtain.name).LoadTopView(curtain,actionRefresh);
+            new TopViewDiv(bodyView, curtain.name).LoadTopView_FunctionTop(curtain,actionRefresh);
         }
 
     }

--
Gitblit v1.8.0