From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 27 九月 2022 14:04:21 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr --- HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 91 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 87 insertions(+), 4 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs index 2cb9b13..04c68ec 100644 --- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs +++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs @@ -17,14 +17,14 @@ /// <param name="updataFunction"></param> public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView, Room room = null) { + if (view == null || scrolView == null || updataFunction == null) + { + return; + } Application.RunOnMainThread((() => { try { - if (view == null || scrolView == null || updataFunction == null) - { - return; - } if (!scrolView.ScrollEnabled) { return; @@ -171,6 +171,89 @@ } #endregion } + //鏇存柊姣背娉紶鎰熷櫒鐘舵�� + else if(SPK.SenesorMegahealth == updataFunction.spk) + { + if (cTag == updataFunction.sid + "_SenesorMegahealth_Status") + { + try + { + Button btnStatus = (fcView.GetChildren(j) as Button); + + var tempStatus = updataFunction.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus); + if (tempStatus != null) + { + + switch (tempStatus.state) + {//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔� + case "0": + btnStatus.TextID = StringId.SensorNormalState; + btnStatus.TextColor = CSS_Color.MainColor; + break; + case "1": + btnStatus.TextID = StringId.SomeoneIn; + break; + case "2": + if (updataFunction.extSet.labModel) + { + btnStatus.TextID = StringId.SomeoneRunning; + } + else + { + btnStatus.TextID = StringId.Someone; + } + btnStatus.TextColor = CSS_Color.WarningColor; + break; + case "3": + if (updataFunction.extSet.labModel) + { + btnStatus.TextID = StringId.SomeoneSitting; + } + else + { + btnStatus.TextID = StringId.Someone; + } + btnStatus.TextColor = CSS_Color.WarningColor; + break; + case "4": + btnStatus.TextID = StringId.SomeoneFell; + btnStatus.TextColor = CSS_Color.WarningColor; + break; + case "5": + if (updataFunction.extSet.labModel) + { + btnStatus.TextID = StringId.SomeoneStanding; + } + else + { + btnStatus.TextID = StringId.Someone; + } + btnStatus.TextColor = CSS_Color.WarningColor; + break; + } + + } + + + } + catch (Exception ex) + { + MainPage.Log($"{this.GetType()} error 3 : {ex.Message}"); + } + } + } + //鏇存柊娓╂帶鍣ㄧ姸鎬� + else if(SPK.HvacCac == updataFunction.spk) + { + if (cTag == updataFunction.sid + "_Humidity") + { + (fcView.GetChildren(j) as Button).Text = updataFunction.GetAttrState(FunctionAttributeKey.RoomHumidity) + "%"; + } + else if (cTag == updataFunction.sid + "_Temp") + { + (fcView.GetChildren(j) as Button).Text = updataFunction.GetAttrState(FunctionAttributeKey.RoomTemp) + "掳C"; + } + } } } } -- Gitblit v1.8.0