From 4a83749337096aae6dd5ec4f44f16653fbc7268a Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 10 三月 2021 16:19:52 +0800 Subject: [PATCH] 2021-03-10 1.合并 --- HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs index 5ca34c0..b830595 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs @@ -50,6 +50,7 @@ #region 鍖哄煙鍙橀噺 Room room; + Sensor sensorTemp = new Sensor(); #endregion @@ -285,10 +286,6 @@ #region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙 room = new Room() { roomName = Language.StringByID(StringId.All)}; - //if (DB_ResidenceData.rooms.Count > 0) - //{ - // room = DB_ResidenceData.rooms[0]; - //} btnFoorDownIcon = new Button() { Width = Application.GetMinRealAverage(16), @@ -353,7 +350,7 @@ { sensorListView.RemoveAll(); int index = 0; - foreach (var sensor in FunctionList.List.sensorsEnvironmentalScience) + foreach (var sensor in FunctionList.List.GetEnvirSensorsList()) { LoadSensorDiv(sensor, index); index++; @@ -363,8 +360,11 @@ /// <summary> /// 鍔犺浇浼犳劅鍣ㄥ垪琛� /// </summary> - void LoadSensorDiv(Sensor sensor,int index) + void LoadSensorDiv(Function sensor,int index) { + var levelColorList = sensorTemp.GetLevelColorList(sensor.spk); + var levelTextList = sensorTemp.GetLevelTextList(sensor.spk); + if (room.roomId == "" || sensor.roomIds.Contains(room.roomId)) { var sensorTag = sensor.sid; @@ -392,10 +392,10 @@ Width = Application.GetRealWidth(48), Height = Application.GetRealWidth(48), OpenAngle = 10, - ProgressBarColor = sensor.levelColorList[sensor.curLevel - 1], + ProgressBarColor = sensorTemp.GetLevelColorList(sensor.spk)[sensorTemp.GetCurLevel(sensor) - 1], MinValue = 0, MaxValue = 96, - Progress = (96 / sensor.levelColorList.Count) * sensor.curLevel, + Progress = (96 / sensorTemp.GetLevelColorList(sensor.spk).Count * sensorTemp.GetCurLevel(sensor)), IsClickable = false, ArcColor = CSS_Color.BackgroundColor, ArcWidth = Application.GetRealWidth(4), @@ -413,17 +413,16 @@ TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, TextColor = CSS_Color.FirstLevelTitleColor, - TextID = sensor.functionTypeNameId, + TextID = sensorTemp.GetFunctionTypeNameId(sensor.spk), Tag = "SensorTitle" }; sensorView.AddChidren(btnSensorTitle); btnSensorTitle.MouseUpEventHandler = (sender, e) => { - return; - #region F3闃舵 - //var esp = new EnvironmentalSensorPage(sensor); - //MainPage.BasePageView.AddChidren(esp); - //esp.LoadPage(); - //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + #region + var esp = new EnvironmentalSensorPage(sensor); + MainPage.BasePageView.AddChidren(esp); + esp.LoadPage(); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; #endregion }; @@ -450,7 +449,7 @@ TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.EmphasisFontSize_Secondary, IsBold = true, - Text = sensor.values.ToString(), + Text = sensor.GetAttrState(FunctionAttributeKey.Value), Tag = "SensorValues" }; sensorView.AddChidren(btnSensorValues); @@ -462,9 +461,9 @@ Width = Application.GetRealWidth(50), Height = Application.GetRealWidth(18), TextAlignment = TextAlignment.CenterLeft, - TextColor = sensor.levelColorList[sensor.curLevel - 1], + TextColor = levelColorList[sensorTemp.GetCurLevel( sensor) - 1], TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, - TextID = sensor.levelTextList[sensor.curLevel - 1], + TextID = levelTextList[sensorTemp.GetCurLevel(sensor) - 1], Tag = "SensorLevel" }; sensorView.AddChidren(btnLevel); @@ -476,8 +475,10 @@ /// <summary> /// 鍔犺浇浼犳劅鍣ㄧ瓑绾х浉鍏充俊鎭� /// </summary> - void LoadInfo(Sensor sensor) + void LoadInfo(Function sensor) { + var levelColorList = sensorTemp.GetLevelColorList(sensor.spk); + var levelTextList = sensorTemp.GetLevelTextList(sensor.spk); Dialog dialog = new Dialog(); FrameLayout dialogBodyView = new FrameLayout(); @@ -486,13 +487,12 @@ { dialog.Close(); }; - VerticalScrolViewLayout infoView = new VerticalScrolViewLayout() { Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(667 - 94 - (sensor.levelColorList.Count * 44) - 20), + Y = Application.GetRealHeight(667 - 94 - (levelColorList.Count * 44) - 20), Width = Application.GetRealWidth(343), - Height = Application.GetRealHeight(94 + (sensor.levelColorList.Count * 44) + sensor.levelColorList.Count), + Height = Application.GetRealHeight(94 + (levelColorList.Count * 44) + levelColorList.Count), Radius = (uint)Application.GetRealWidth(12), BackgroundColor = CSS_Color.MainBackgroundColor, Animate = Animate.DownToUp, @@ -568,7 +568,7 @@ IsBold = true, TextID = StringId.ColorValue, }); - for (int index = 0; index < sensor.levelTextList.Count; index++) + for (int index = 0; index < levelTextList.Count; index++) { infoView.AddChidren(new Button() { @@ -592,7 +592,7 @@ TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.TextFontSize, IsBold = true, - Text = sensor.intervalValue[index] + Text = sensorTemp.GetIntervalValue(sensor.spk)[index] }); subInfoView.AddChidren(new Button() @@ -603,7 +603,7 @@ TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.TextFontSize, IsBold = true, - TextID = sensor.levelTextList[index] + TextID = levelTextList[index] }); subInfoView.AddChidren(new Button() @@ -613,7 +613,7 @@ Width = Application.GetRealWidth(38), Height = Application.GetRealHeight(18), Radius = (uint)Application.GetRealWidth(4), - BackgroundColor = sensor.levelColorList[index] + BackgroundColor = levelColorList[index] }); } -- Gitblit v1.8.0