From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs |   51 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
index b2a2baa..6e8c66f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
@@ -40,7 +40,8 @@
         #endregion
 
         #region 鍖哄煙鍙橀噺
-        Curtain curtain;
+        Curtain curtainTemp = new Curtain();
+        Function function;
         Button btnCollection_Out;
         Button btnFunctionName_Out;
         Button btnFromFloor_Out;
@@ -49,10 +50,10 @@
         /// </summary>
         Action actionRefresh;
         #endregion
-        public CurtainModulePage(Curtain func)
+        public CurtainModulePage(Function func)
         {
             bodyView = this;
-            curtain = func;
+            function = func;
         }
 
         public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -81,7 +82,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
-                Text = curtain.name,
+                Text = function.name,
             };
             controlView.AddChidren(btnFunctionName);
 
@@ -94,7 +95,7 @@
                 TextColor = CSS_Color.PromptingColor1,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = curtain.GetRoomListName()
+                Text = function.GetRoomListName()
             };
             controlView.AddChidren(btnFromFoorAndRoom);
 
@@ -106,9 +107,14 @@
                 Height = Application.GetMinRealAverage(40),
                 SelectedImagePath = "Collection/CollectionIcon.png",
                 UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
-                IsSelected = curtain.collect
+                IsSelected = function.collect
             };
-            controlView.AddChidren(btnCollection);
+            //controlView.AddChidren(btnCollection);
+            //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+            {
+                controlView.AddChidren(btnCollection);
+            }
 
             btnCurtainBgIcon = new Button()
             {
@@ -123,42 +129,45 @@
 
             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 = function.trait_on_off.curValue.ToString() == "off",
             };
             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",
+                IsSelected = function.trait_on_off.curValue.ToString() == "stop",
             };
             controlView.AddChidren(btnCurtainStop);
 
             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 = function.trait_on_off.curValue.ToString() == "on",
             };
             controlView.AddChidren(btnCurtainOpen);
 
             LoadEventList();
-            new TopViewDiv(bodyView,Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh);
+            new TopViewDiv(bodyView,Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(function, actionRefresh);
             new System.Threading.Thread(() =>
             {
-                DriverLayer.Control.Ins.SendReadCommand(curtain);
+                DriverLayer.Control.Ins.SendReadCommand(function);
             })
             { IsBackground = true }.Start();
         }

--
Gitblit v1.8.0