From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期一, 28 十月 2024 11:58:31 +0800 Subject: [PATCH] 谷歌版本问题修复 --- HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 145 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 110 insertions(+), 35 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index b7d21a7..60d7722 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs @@ -1,5 +1,6 @@ 锘縰sing System; using HDL_ON.Entity; +using HDL_ON.Stan; using HDL_ON.UI.CSS; using Shared; @@ -93,27 +94,38 @@ } else if (SPK.EvironmentSensorList().Contains(function.spk) || SPK.ArmSensorSpkList().Contains(function.spk)) //浼犳劅鍣ㄦ病鏈夊紑鍏虫寜閽�) { + //if(function.spk == SPK.SensorPir || function.spk == SPK.SensorWater) { } var powerLowTipAttr = function.attributes.Find((obj) => obj.key == FunctionAttributeKey.BatteryState); - if (powerLowTipAttr != null) + if (powerLowTipAttr != null && !string.IsNullOrEmpty( powerLowTipAttr.state.ToString())) { - if (powerLowTipAttr.state.ToLower() == "low") + //鐢垫睜鎺т欢銆� + Button btnTipPowerLow = new Button() { - Button btnTipPowerLow = new Button() - { - X = Application.GetRealWidth(307), - Y = Application.GetRealHeight(25), - Width = Application.GetRealWidth(24), - Height = Application.GetRealWidth(24), - UnSelectedImagePath = "FunctionIcon/ArmSensor/PowerLowIcon.png", - SelectedImagePath = "FunctionIcon/ArmSensor/PowerLowIcon.png", - }; - this.AddChidren(btnTipPowerLow); - } + X = Application.GetRealWidth(307), + Y = Application.GetRealHeight(45), + Width = Application.GetRealWidth(24), + Height = Application.GetRealWidth(24), + UnSelectedImagePath = "FunctionIcon/ArmSensor/Power80pIcon.png", + SelectedImagePath = "FunctionIcon/ArmSensor/PowerLowIcon.png", + IsSelected = powerLowTipAttr.state.ToLower() == "low" + }; + this.AddChidren(btnTipPowerLow); + + //var batteryControl = new BatteryPersentControl(); + //batteryControl.X = Application.GetRealWidth(107); + //batteryControl.Y = Application.GetRealHeight(45); + //batteryControl.InitControl(); + //this.AddChidren(batteryControl); + //batteryControl.SetValue(80); + //if (powerLowTipAttr.state.ToLower() == "low") + //{ + // batteryControl.SetValue(20); + //} + //batteryControl.btnIcon.Visible = true; + //batteryControl.btnIcon.BackgroundColor = 0x88008800; } - - - else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose ) + else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose) { var btnStatus = new Button() { @@ -128,8 +140,6 @@ }; bodyDiv.AddChidren(btnStatus); - - var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus); if (tempStatus != null) { @@ -137,7 +147,7 @@ switch (tempStatus.state) {//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔� case "0": - btnStatus.TextID = StringId.SensorNormalState; + btnStatus.TextID = StringId.wuren; btnStatus.TextColor = CSS_Color.MainColor; break; case "1": @@ -191,19 +201,83 @@ } + else if (SPK.ArmSensorSpkList().Contains(function.spk)) + { + var btnStatus = new Button() + { + X = Application.GetRealWidth(51), + Y = Application.GetRealHeight(64), + Height = Application.GetRealHeight(18), + TextColor = CSS_Color.MainColor, + TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, + Text = "", + TextAlignment = TextAlignment.CenterLeft, + Tag = function.sid + "_Sensor_Status" + }; + bodyDiv.AddChidren(btnStatus); + + var alarm_status = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.AlarmStatus); + if (alarm_status != null) + { + if (alarm_status.curValue.ToString() == "normal") + { + btnStatus.TextID = StringId.SensorNormalState; + btnStatus.TextColor = CSS_Color.MainColor; + } + else + { + btnStatus.TextID = StringId.InAlarm; + btnStatus.TextColor = CSS_Color.WarningColor; + } + } + else + { + alarm_status = function.attributes.Find((sta) => sta.key == "contact_status"); + if (alarm_status != null) + { + if (alarm_status.curValue.ToString() == "close") + { + btnStatus.TextID = StringId.Shut; + btnStatus.TextColor = CSS_Color.MainColor; + } + else + { + if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2) + { + btnStatus.TextID = StringId.DryBreak; + } + else + { + btnStatus.TextID = StringId.Open; + } + btnStatus.TextColor = CSS_Color.WarningColor; + } + } + else + { + alarm_status = function.attributes.Find((sta) => sta.key == "people_status"); + if (alarm_status != null) + { + if (alarm_status.curValue.ToString() == "false") + { + btnStatus.TextID = StringId.wuren; + btnStatus.TextColor = CSS_Color.MainColor; + } + else + { + btnStatus.TextID = StringId.youren; + btnStatus.TextColor = CSS_Color.WarningColor; + } + } + } + } + + } + } else if (function.spk == SPK.DoorLock) { btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png"; - } - else if (function.spk == SPK.VideoDoorLock) - { - btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function); - } - else if (function.spk == SPK.AvZkAiks) - { - //闅愯棌寮�鍏虫寜閽� - btnIcon.UnSelectedImagePath = "AksIcon/aks.png"; } else if(function.spk == SPK.GroupControl) { } else if (function.spk == SPK.HvacCac) @@ -276,7 +350,7 @@ { ClothesHangerFragment(); } - else if(function.spk == SPK.IpCam_Imou) + else if(function.spk == SPK.IpCam_Imou || function.spk == SPK.ElectricEnergy || function.spk ==SPK.AirSwitch || function.spk == SPK.AirSwitchP3) { } @@ -288,7 +362,7 @@ /// 寮�鍏虫寜閽� /// </summary> Button btnSwitch; - if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming) + if (function.spk == SPK.LightRGBW || function.spk == SPK.LightCCT || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming) { btnSwitch = new Button() { @@ -449,20 +523,20 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; - if ( !SPK.ArmSensorSpkList().Contains(function.spk) - && function.spk != SPK.DoorLock + if ( !SPK.ArmSensorSpkList().Contains(function.spk)&& + function.spk != SPK.DoorLock && function.spk != SPK.GroupControl - && !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && + && !SPK.EnvironDeviceSpkList().Contains( function.spk)) { bodyDiv.AddChidren(btnCollectionIcon); } - if(function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose) + if(function.spk == SPK.SensorPir || function.spk == SPK.SensorPirHold || function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose) { bodyDiv.AddChidren(btnCollectionIcon); } - if (!function.online) + if (!function.isOnline()) { bodyDiv.BackgroundColor = CSS_Color.PromptingColor2; btnOffline = new Button() @@ -502,6 +576,7 @@ case SPK.LightDimming: case SPK.LightRGBW: case SPK.LightRGB: + case SPK.LightCCT: #region Dimmer var btnDimmerMinValues = new Button() { -- Gitblit v1.8.0