From 4796f4a91d85dedb5a30d2f5d3844c5720f5919a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 13 五月 2022 17:36:46 +0800
Subject: [PATCH] 2022年05月13日17:36:43

---
 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs |   47 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 9a7fe8d..aa40d9a 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -1,7 +1,6 @@
 锘縰sing System;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
-using HDL_ON.UI.Music;
 using Shared;
 
 namespace HDL_ON.UI
@@ -9,7 +8,7 @@
     public partial class FunctionControlZone : FrameLayout
     {
         #region 鍖哄煙鎺т欢
-        static FrameLayout bodyDiv;
+        FunctionControlZone bodyDiv;
         /// <summary>
         /// 鍔熻兘/鍦烘櫙icon
         /// </summary>
@@ -26,6 +25,11 @@
         /// 鏀惰棌鎸夐挳
         /// </summary>
         Button btnCollectionIcon;
+        /// <summary>
+        /// 绂荤嚎鏂囨湰
+        /// </summary>
+        Button btnOffline;
+
         #endregion
 
         #region 鍖哄煙鍙橀噺
@@ -61,8 +65,9 @@
             }
             LoadDiv();
 
-            btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
 
+            btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
+            
             if (SPK.CurtainSpkList().Contains(function.spk))
             {//绐楀笜娌℃湁寮�鍏虫寜閽�
                 CurtainFragment();
@@ -71,7 +76,8 @@
             {//闊充箰娌℃湁寮�鍏虫寜閽�
                 MusicFragment();
             }
-            else if (SPK.EvironmentSensorList().Contains(function.spk) || SPK.ArmSensorSpkList().Contains(function.spk)) //浼犳劅鍣ㄦ病鏈夊紑鍏虫寜閽�)
+            else if (SPK.EvironmentSensorList().Contains(function.spk) || SPK.ArmSensorSpkList().Contains(function.spk)
+                || SPK.PanelSpkList().Contains(function.spk)) //浼犳劅鍣ㄦ病鏈夊紑鍏虫寜閽�)
             {
                 var powerLowTipAttr = function.attributes.Find((obj) => obj.key == FunctionAttributeKey.BatteryState);
                 if (powerLowTipAttr != null)
@@ -90,6 +96,10 @@
                         this.AddChidren(btnTipPowerLow);
                     }
                 }
+            }
+            else if (function.spk == SPK.DoorLock)
+            {
+                btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
             }
             else
             {
@@ -160,6 +170,8 @@
 
             LoadEvent_DivSkipEvent();
             LoadEvent_FunctionCollection();
+
+   
         }
 
         /// <summary>
@@ -212,10 +224,28 @@
                 UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                 IsSelected = function.collect
             };
-            if ( !SPK.ArmSensorSpkList().Contains(function.spk) && !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare &&
+            if ( !SPK.ArmSensorSpkList().Contains(function.spk)
+                && function.spk != SPK.DoorLock
+                && !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare &&
             {
                 bodyDiv.AddChidren(btnCollectionIcon);
             }
+
+            //if (!function.online)
+            //{
+            //    bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
+            //    btnOffline = new Button()
+            //    {
+            //        X = Application.GetRealWidth(8 + 10 + 32),
+            //        Y = Application.GetRealHeight(28 + 24),
+            //        Height = Application.GetRealHeight(30),
+            //        TextID = StringId.DeviceOffline,
+            //        TextColor = CSS_Color.WarningColor,
+            //        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+            //        TextAlignment = TextAlignment.CenterLeft
+            //    };
+            //    bodyDiv.AddChidren(btnOffline);
+            //}
         }
 
         /// <summary>
@@ -332,7 +362,7 @@
                 btnCurtainOpen.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png";
                 btnCurtainOpen.SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png";
             }
-            LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function);
+            LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose);
             #endregion
         }
         /// <summary>
@@ -408,7 +438,7 @@
                 SelectedImagePath = "MusicIcon/nextSelected.png",
             };
             bodyDiv.AddChidren(btnNext);
-            LoadEvent_ControlMusic(btnPlay, btnNext, btnPrev, function as A31MusicModel);
+            LoadEvent_ControlMusic(btnPlay, btnNext, btnPrev, function);
             #endregion
         }
 
@@ -437,5 +467,8 @@
             };
             bodyDiv.AddChidren(btnLastStates);
         }
+
+
+
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0