From 7c2541f609e8235c4c33b4fb2ee27125f73f8ee6 Mon Sep 17 00:00:00 2001 From: lss <lsc@hdlchina.com.cn> Date: 星期五, 24 六月 2022 13:28:36 +0800 Subject: [PATCH] 2022-06-24 --- HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index 098b041..8185dc9 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(); @@ -90,6 +95,10 @@ this.AddChidren(btnTipPowerLow); } } + } + else if (function.spk == SPK.DoorLock) + { + btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png"; } else { @@ -214,7 +223,9 @@ 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); } @@ -222,7 +233,7 @@ if (!function.online) { bodyDiv.BackgroundColor = CSS_Color.PromptingColor2; - var btnOffline = new Button() + btnOffline = new Button() { X = Application.GetRealWidth(8 + 10 + 32), Y = Application.GetRealHeight(28 + 24), @@ -350,7 +361,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> @@ -455,5 +466,8 @@ }; bodyDiv.AddChidren(btnLastStates); } + + + } } \ No newline at end of file -- Gitblit v1.8.0