From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01

---
 HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs |  108 +++++++++++++++++++++++++++--------------------------
 1 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index aed9839..345f80f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -66,7 +66,8 @@
         #endregion
 
         #region 鍖哄煙鍙橀噺
-        AC aC;
+        AC acTemp = new AC();
+        Function function;
         Button btnCollection_Out;
         Button btnFunctionName_Out;
         Button btnFromFloor_Out;
@@ -75,10 +76,10 @@
         /// </summary>
         Action actionRefresh;
         #endregion
-        public ACPage(AC func)
+        public ACPage(Function func)
         {
             bodyView = this;
-            aC = func;
+            function = func;
         }
 
         public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -107,7 +108,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
-                Text = aC.name,
+                Text = function.name,
             };
             controlView.AddChidren(btnFunctionName);
 
@@ -120,7 +121,7 @@
                 TextColor = CSS_Color.PromptingColor1,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = aC.GetRoomListName()
+                Text = function.GetRoomListName()
             };
             controlView.AddChidren(btnFromFoorAndRoom);
 
@@ -132,43 +133,41 @@
                 Height = Application.GetMinRealAverage(40),
                 SelectedImagePath = "Collection/CollectionIcon.png",
                 UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
-                IsSelected = aC.collection
+                IsSelected = function.collect
             };
             controlView.AddChidren(btnCollection);
+            //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+            //{
+            //    controlView.AddChidren(btnCollection);
+            //}
 
             arcBar = new DiyArcSeekBar()
             {
-#if __IOS__
                 Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(120+25),
-                Width = Application.GetRealWidth(260-40),
-                Height = Application.GetRealWidth(260-40),
                 OpenAngle = 160,
-                ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
+                ThumbImagePath = function.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                 ThumbImageHeight = Application.GetRealWidth(50),
-                ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
-                MinValue = 16,
-                MaxValue = 38,
-                Progress = aC.curTemp,
-                IsClickable =  aC.on_off == "on" ,
+                ProgressBarColor = CSS_Color.MainColor,
+                OfflineProgressBarColor = CSS_Color.PromptingColor2,
+                IsOffline = function.trait_on_off.curValue.ToString() == "off",
+                MinValue = function.GetAttribute(FunctionAttributeKey.SetTemp).min,
+                MaxValue = function.GetAttribute(FunctionAttributeKey.SetTemp).max,
+                //IsClickable = function.trait_on_off.curValue.ToString() == "on",
                 ArcColor = CSS_Color.BackgroundColor,
+                Progress = (int)Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp)),
+#if __IOS__
+                Y = Application.GetRealHeight(120 + 25),
+                Width = Application.GetRealWidth(260 - 40),
+                Height = Application.GetRealWidth(260 - 40),
                 SeekBarPadding = Application.GetRealWidth(8),
 #else
-                Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(120 + 40),
                 Width = Application.GetRealWidth(260 - 40),
                 Height = Application.GetRealWidth(260 - 40),
-                OpenAngle = 160,
-                ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
-                ThumbImageHeight = Application.GetRealWidth(50),
-                ProgressBarColor = aC.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
-                MinValue = 16,
-                MaxValue = 38,
-                Progress = aC.curTemp,
-                IsClickable = aC.on_off == "on",
-                ArcColor = CSS_Color.BackgroundColor,
                 SeekBarPadding = Application.GetRealWidth(7),
 #endif
+
             };
             controlView.AddChidren(arcBar);
 
@@ -181,7 +180,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 50,
                 IsBold = true,
-                Text = aC.curTemp.ToString(),
+                Text = Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp)).ToString(),
                 TextAlignment = TextAlignment.Center,
             };
             controlView.AddChidren(btnTemp);
@@ -204,7 +203,7 @@
             {
                 Gravity = Gravity.CenterHorizontal,
                 Y = btnTemp.Bottom,
-                Width = Application.GetRealWidth(100),
+                Width = Application.GetRealWidth(120),
                 Height = Application.GetRealHeight(20),
                 Text = Language.StringByID(StringId.IndoorTemp) + "20掳C",
                 TextColor = CSS_Color.PromptingColor1,
@@ -238,7 +237,7 @@
                 Y = Application.GetRealHeight(334),
                 Width = Application.GetRealWidth(30),
                 Height = Application.GetRealWidth(30),
-                UnSelectedImagePath = aC.curModeImage,
+                UnSelectedImagePath = acTemp.GetModeIconPath(function.GetAttrState(FunctionAttributeKey.Mode)),
             };
             controlView.AddChidren(btnMode);
 
@@ -248,24 +247,29 @@
                 Y = Application.GetRealHeight(337),
                 Width = Application.GetRealWidth(30),
                 Height = Application.GetRealWidth(30),
-                UnSelectedImagePath = aC.curFanImage,
+                UnSelectedImagePath = acTemp.GetFanIconPath(function.GetAttrState(FunctionAttributeKey.FanSpeed)),
             };
             controlView.AddChidren(btnWindSpeed);
 
             btnSwitch = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(462),
-                Width = Application.GetRealWidth(40),
-                Height = Application.GetRealWidth(40),
+                Y = Application.GetRealHeight(466),
+                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(32),
                 UnSelectedImagePath = "Public/PowerClose.png",
                 SelectedImagePath = "Public/PowerOpen.png",
-                IsSelected = aC.on_off == "on"
+                IsSelected = function.trait_on_off.curValue.ToString() == "on"
             };
             controlView.AddChidren(btnSwitch);
 
             LoadEventList();
-            new TopViewDiv(bodyView,aC.name).LoadTopView(aC, actionRefresh);
+            new TopViewDiv(bodyView,Language.StringByID(StringId.AC)).LoadTopView_FunctionTop(function, actionRefresh);
+            new System.Threading.Thread(() =>
+            {
+                DriverLayer.Control.Ins.SendReadCommand(function);
+            })
+            { IsBackground = true }.Start();
         }
         /// <summary>
         /// 鍔犺浇淇敼妯″紡鍖哄煙
@@ -288,8 +292,6 @@
                 Width = Application.GetRealWidth(160),
                 Height = Application.GetRealHeight(287),
                 BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
-                Animate = Animate.DownToUp,
-                AnimateSpeed = 0.3f
             };
             dialogView.AddChidren(modeChangeView);
 
@@ -317,28 +319,29 @@
             };
             modeChangeView.AddChidren(btnLine);
 
-            foreach(var m in aC.modeList)
+            var modeList = function.GetAttribute(FunctionAttributeKey.Mode).value;
+            foreach (var m in modeList)
             {
                 Button btnModeIcon = new Button()
                 {
                     X = btnTitle.X,
-                    Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 10 + 8),
+                    Y = Application.GetRealHeight(44 * (modeList.IndexOf(m) + 1) + 10 + 8),
                     Width = Application.GetRealWidth(24),
                     Height = Application.GetRealWidth(24),
-                    IsSelected = aC.trait_mode.curValues == m,
+                    IsSelected = function.GetAttrState(FunctionAttributeKey.Mode) == m,
                 };
                 modeChangeView.AddChidren(btnModeIcon);
 
                 Button btnModeText = new Button()
                 {
                     X = Application.GetRealWidth(12) + btnModeIcon.Right,
-                    Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 8),
+                    Y = Application.GetRealHeight(44 * (modeList.IndexOf(m) + 1) + 8),
                     Height = Application.GetRealHeight(44),
-                    Width = Application.GetRealWidth(70),
+                    Width = Application.GetRealWidth(90),
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     SelectedTextColor = CSS_Color.MainColor,
-                    IsSelected = aC.trait_mode.curValues == m,
+                    IsSelected = function.GetAttrState(FunctionAttributeKey.Mode) == m,
                     TextSize = CSS_FontSize.TextFontSize,
                 };
                 modeChangeView.AddChidren(btnModeText);
@@ -372,12 +375,12 @@
                         break;
                 }
 
-                if(aC.modeList.IndexOf(m) < aC.modeList.Count-1)
+                if (modeList.IndexOf(m) < modeList.Count - 1)
                 {
                     modeChangeView.AddChidren(new Button()
                     {
                         X = btnTitle.X,
-                        Y = btnModeText.Bottom ,
+                        Y = btnModeText.Bottom,
                         Width = Application.GetRealWidth(112),
                         Height = Application.GetRealHeight(1),
                         BackgroundColor = CSS_Color.BackgroundColor,
@@ -411,9 +414,7 @@
                 Y = Application.GetRealHeight(172),
                 Width = Application.GetRealWidth(160),
                 Height = Application.GetRealHeight(243),
-                AnimateSpeed = 0.3f,
                 BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
-                Animate = Animate.DownToUp,
             };
             dialogView.AddChidren(modeChangeView);
 
@@ -441,28 +442,29 @@
             };
             modeChangeView.AddChidren(btnLine);
 
-            foreach (var m in aC.fan_List)
+            var modeList = function.GetAttribute(FunctionAttributeKey.FanSpeed).value;
+            foreach (var m in modeList)
             {
                 Button btnFanIcon = new Button()
                 {
                     X = btnTitle.X,
-                    Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 10 + 8),
+                    Y = Application.GetRealHeight(44 * (modeList.IndexOf(m) + 1) + 10 + 8),
                     Width = Application.GetRealWidth(24),
                     Height = Application.GetRealWidth(24),
-                    IsSelected = aC.trait_fan.curValues.ToString() == m,
+                    IsSelected = function.GetAttrState(FunctionAttributeKey.FanSpeed) == m,
                 };
                 modeChangeView.AddChidren(btnFanIcon);
 
                 Button btnFanText = new Button()
                 {
                     X = Application.GetRealWidth(12) + btnFanIcon.Right,
-                    Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 8),
+                    Y = Application.GetRealHeight(44 * (modeList.IndexOf(m) + 1) + 8),
                     Height = Application.GetRealHeight(44),
                     Width = Application.GetRealWidth(70),
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     SelectedTextColor = CSS_Color.MainColor,
-                    IsSelected = aC.trait_fan.curValues.ToString() == m,
+                    IsSelected = function.GetAttrState(FunctionAttributeKey.FanSpeed) == m,
                     TextSize = CSS_FontSize.TextFontSize,
                 };
                 modeChangeView.AddChidren(btnFanText);
@@ -491,7 +493,7 @@
                         break;
                 }
 
-                if (aC.fan_List.IndexOf(m) < aC.fan_List.Count - 1)
+                if (modeList.IndexOf(m) < modeList.Count - 1)
                 {
                     modeChangeView.AddChidren(new Button()
                     {

--
Gitblit v1.8.0