From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs |   99 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 370fbbc..5f1adf2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -53,7 +53,8 @@
         #endregion
 
         #region 鍖哄煙鍙橀噺
-        Curtain curtain;
+        Curtain curtainTemp = new Curtain();
+        Function function;
         Button btnCollection_Out;
         Button btnFunctionName_Out;
         Button btnFromFloor_Out;
@@ -62,10 +63,14 @@
         /// </summary>
         Action actionRefresh;
         #endregion
-        public RollingShutterPage(Curtain func)
+        /// <summary>
+        /// 姝e湪鎺у埗
+        /// </summary>
+        bool onControl = false;
+        public RollingShutterPage(Function func)
         {
             bodyView = this;
-            curtain = func;
+            function = func;
         }
 
         public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -95,7 +100,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
-                Text = curtain.name,
+                Text = function.name,
             };
             controlView.AddChidren(btnFunctionName);
 
@@ -108,7 +113,7 @@
                 TextColor = CSS_Color.PromptingColor1,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = curtain.GetRoomListName()
+                Text = function.GetRoomListName()
             };
             controlView.AddChidren(btnFromFoorAndRoom);
 
@@ -120,9 +125,14 @@
                 Height = Application.GetMinRealAverage(40),
                 SelectedImagePath = "Collection/CollectionIcon.png",
                 UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
-                IsSelected = curtain.collection
+                IsSelected = function.collect
             };
             controlView.AddChidren(btnCollection);
+            //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+            //{
+            //    controlView.AddChidren(btnCollection);
+            //}
 
             curtainSeekBar = new CurtainRollSeekBarOn()
             {
@@ -130,17 +140,23 @@
                 Y = Application.GetRealHeight(130),
                 Width = Application.GetRealWidth(170),
                 Height = Application.GetRealWidth(210),
-                Progress = curtain.percent
+                Progress = curtainTemp.GetPercent(function),
+                //IsInvertedProgress = true,
+                ProgressTextColor = 0x00000000,
             };
             controlView.AddChidren(curtainSeekBar);
 
             btnMinusSignIcon = new Button()
             {
-                X = Application.GetRealWidth(42),
                 Y = Application.GetRealHeight(406),
-                Width = Application.GetMinRealAverage(24),
+                Width = Application.GetRealWidth(52),
                 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);
 
@@ -148,47 +164,55 @@
             {
                 X = btnMinusSignIcon.Right,
                 Y = Application.GetRealHeight(391),//414,璁捐鏁版嵁
-                Width = Application.GetRealWidth(190),
+                Width = Application.GetRealWidth(220),
                 Height = Application.GetRealHeight(54),
                 SeekBarViewHeight = Application.GetRealHeight(8),
                 ThumbImagePath = "Public/ThumbImage.png",
                 ThumbImageHeight = Application.GetRealHeight(54),
                 ProgressBarColor = CSS_Color.MainColor,
                 ProgressTextColor = CSS_Color.FirstLevelTitleColor,
-                ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                ProgressTextSize = 0x00000000,
                 MaxValue = 100,
                 SeekBarPadding = Application.GetRealWidth(20),
-                Progress = curtain.percent
+                Progress = curtainTemp.GetPercent(function),
+                Visible = false,
+                Enable = false,
             };
             controlView.AddChidren(controlBar);
 
             btnPlusSgnIcon = new Button()
             {
-                X = controlBar.Right + Application.GetRealWidth(10),
+                X = Application.GetRealWidth(286),
                 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);
 
             btnCurtainClose = new Button()
             {
-                X = Application.GetRealWidth(64),
-                Y = Application.GetRealHeight(462),
-                Width = Application.GetMinRealAverage(40),
-                Height = Application.GetMinRealAverage(40),
-                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
-                SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
+                X = Application.GetRealWidth(84),
+                Y = Application.GetRealHeight(466),
+                Width = Application.GetMinRealAverage(32),
+                Height = Application.GetMinRealAverage(32),
+                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainDownIcon.png",
+                SelectedImagePath = "FunctionIcon/Curtain/CurtainDownIconOn.png",
+                IsSelected = function.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",
             };
@@ -196,18 +220,23 @@
 
             btnCurtainOpen = new Button()
             {
-                X = Application.GetRealWidth(224),
-                Y = Application.GetRealHeight(462),
-                Width = Application.GetMinRealAverage(40),
-                Height = Application.GetMinRealAverage(40),
-                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
-                SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
+                X = Application.GetRealWidth(212),
+                Y = Application.GetRealHeight(466),
+                Width = Application.GetMinRealAverage(32),
+                Height = Application.GetMinRealAverage(32),
+                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png",
+                SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png",
+                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0",
             };
             controlView.AddChidren(btnCurtainOpen);
 
             LoadEventList();
-            new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(curtain, actionRefresh);
+            new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(function, actionRefresh);
+            new System.Threading.Thread(() =>
+            {
+                DriverLayer.Control.Ins.SendReadCommand(function);
+            })
+            { IsBackground = true }.Start();
         }
-
     }
 }

--
Gitblit v1.8.0