From 0bf9e65bc3ba98391e7835c922b15baab3c77876 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 01 六月 2020 14:59:39 +0800 Subject: [PATCH] 上传一个合并的版本 --- ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs | 110 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 74 insertions(+), 36 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs index 7790e40..f216dfe 100755 --- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs @@ -72,7 +72,7 @@ btnHumidityText.TextAlignment = TextAlignment.Center; frameHumidityPic.AddChidren(btnHumidityText); - //婀垮害鏁版嵁锛堢1涓紝listControl銆�0銆戯級 + //婀垮害鏁版嵁 var btnHumidityStatus = new NormalViewControl(193, 92, true); btnHumidityStatus.Y = Application.GetRealHeight(181); btnHumidityStatus.Text = "20"; @@ -80,12 +80,11 @@ btnHumidityStatus.TextColor = ZigbeeColor.Current.XMWhite; btnHumidityStatus.TextAlignment = TextAlignment.CenterRight; frameHumidityPic.AddChidren(btnHumidityStatus); - this.listControl.Add(btnHumidityStatus); //婀垮害鍗曚綅 - var btnHumidityUnit = new NormalViewControl(37 + 81, 40, true); + var btnHumidityUnit = new NormalViewControl(60, 40, true); btnHumidityUnit.Y = Application.GetRealHeight(181 + 46); - btnHumidityUnit.X = Application.GetRealWidth(180); + btnHumidityUnit.X = btnHumidityStatus.Right; btnHumidityUnit.Text = "%"; btnHumidityUnit.TextSize = 14; btnHumidityUnit.TextColor = ZigbeeColor.Current.XMWhite; @@ -109,7 +108,7 @@ btnTemperatureText.TextAlignment = TextAlignment.Center; frameTemperaturePic.AddChidren(btnTemperatureText); - //娓╁害鏁版嵁锛堢2涓紝listControl銆�1銆戯級 + //娓╁害鏁版嵁 var btnTemperatureStatus = new NormalViewControl(193, 92, true); btnTemperatureStatus.Y = Application.GetRealHeight(181); btnTemperatureStatus.Text = "20"; @@ -117,12 +116,11 @@ btnTemperatureStatus.TextColor = ZigbeeColor.Current.XMWhite; btnTemperatureStatus.TextAlignment = TextAlignment.CenterRight; frameTemperaturePic.AddChidren(btnTemperatureStatus); - this.listControl.Add(btnTemperatureStatus); //娓╁害鍗曚綅 - var btnTemperatureUnit = new NormalViewControl(40 + 81, 40, true); + var btnTemperatureUnit = new NormalViewControl(50, 40, true); btnTemperatureUnit.Y = Application.GetRealHeight(181 + 46); - btnTemperatureUnit.X = Application.GetRealWidth(180); + btnTemperatureUnit.X = btnTemperatureStatus.Right; btnTemperatureUnit.Text = "鈩�"; btnTemperatureUnit.TextSize = 14; btnTemperatureUnit.TextColor = ZigbeeColor.Current.XMWhite; @@ -146,7 +144,7 @@ btnPmText.TextAlignment = TextAlignment.Center; framePmPic.AddChidren(btnPmText); - //PM2.5鏁版嵁锛堢3涓紝listControl銆�2銆戯級 + //PM2.5鏁版嵁 var btnPmStatus = new NormalViewControl(162, 92, true); btnPmStatus.Y = Application.GetRealHeight(181); btnPmStatus.Text = "155"; @@ -154,18 +152,24 @@ btnPmStatus.TextColor = ZigbeeColor.Current.XMWhite; btnPmStatus.TextAlignment = TextAlignment.CenterRight; framePmPic.AddChidren(btnPmStatus); - this.listControl.Add(btnPmStatus); //PM2.5鍗曚綅 锛堢4涓紝listControl銆�3銆戯級 - var btnPmUnit = new NormalViewControl(120 + 26, 43, true); - btnPmUnit.Y = Application.GetRealHeight(181 + 46); - btnPmUnit.X = Application.GetRealWidth(153); + var btnPmUnit = new NormalViewControl(144, 48, true); + btnPmUnit.Y = Application.GetRealHeight(181 + 41); + btnPmUnit.X = btnPmStatus.Right; btnPmUnit.Text = "渭g/m鲁"; btnPmUnit.TextSize = 14; btnPmUnit.TextColor = ZigbeeColor.Current.XMWhite; btnPmUnit.TextAlignment = TextAlignment.CenterLeft; framePmPic.AddChidren(btnPmUnit); - this.listControl.Add(btnPmUnit); + + this.listControl.Add(btnHumidityStatus);//锛堢1涓紝listControl銆�0銆戯級 + this.listControl.Add(btnTemperatureStatus);//锛堢2涓紝listControl銆�1銆戯級 + this.listControl.Add(btnPmStatus);//锛堢3涓紝listControl銆�2銆戯級 + this.listControl.Add(btnPmUnit);//锛堢4涓紝listControl銆�3銆戯級 + this.listControl.Add(btnHumidityUnit);//锛堢5涓紝listControl銆�4銆戯級 + this.listControl.Add(btnTemperatureUnit);//锛堢6涓紝listControl銆�5銆戯級 + } #endregion @@ -244,12 +248,46 @@ private void UpdateStatus() { //璁剧疆鐘舵�佹枃瀛� - this.listControl[0].Text = pMSensor.currentTemperature.ToString(); - this.listControl[1].Text = pMSensor.currentHumidity.ToString(); + this.listControl[0].Text = pMSensor.currentHumidity.ToString(); + this.listControl[1].Text = pMSensor.currentTemperature.ToString(); this.listControl[2].Text = pMSensor.currentPmData.ToString(); //璁剧疆鐘舵�佹枃瀛� var curText = Language.StringByID(R.MyInternationalizationString.AirQuality) + QuailityType(); this.SetStatuText(curText); + + + if (pMSensor.currentHumidity <= 9 && pMSensor.currentHumidity >= 0) + { + this.listControl[0].Width = Application.GetRealWidth(168); + this.listControl[4].X = this.listControl[0].Right; + } + else if (pMSensor.currentHumidity < 100 && pMSensor.currentHumidity >= 10) + { + this.listControl[0].Width = Application.GetRealWidth(184); + this.listControl[4].X = this.listControl[0].Right; + } + else + { + this.listControl[0].Width = Application.GetRealWidth(188 + 30); + this.listControl[4].X = this.listControl[0].Right; + } + + if (pMSensor.currentTemperature <= 9 && pMSensor.currentTemperature >= 0) + { + this.listControl[1].Width = Application.GetRealWidth(168); + this.listControl[5].X = this.listControl[1].Right; + } + else if (pMSensor.currentTemperature < 100 && pMSensor.currentTemperature >= 10) + { + this.listControl[1].Width = Application.GetRealWidth(190); + this.listControl[5].X = this.listControl[1].Right; + } + else + { + this.listControl[1].Width = Application.GetRealWidth(188 + 30); + this.listControl[5].X = this.listControl[1].Right; + } + } /// <summary> @@ -265,60 +303,60 @@ if (pMSensor.currentPmData < 10) { - this.listControl[2].Width = Application.GetRealWidth(188 - 70); - this.listControl[3].X = Application.GetRealWidth(180 - 70); + this.listControl[2].Width = Application.GetRealWidth(125); + this.listControl[3].X = this.listControl[2].Right; } else { - this.listControl[2].Width = Application.GetRealWidth(193 - 40); - this.listControl[3].X = Application.GetRealWidth(137); + this.listControl[2].Width = Application.GetRealWidth(145); + this.listControl[3].X = this.listControl[2].Right; } } else if (pMSensor.currentPmData <= 75 && pMSensor.currentPmData > 35) { - curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality); - this.listControl[2].Width = Application.GetRealWidth(193 - 40); - this.listControl[3].X = Application.GetRealWidth(137); + curQuality = Language.StringByID(R.MyInternationalizationString.GoodAirQuality); + this.listControl[2].Width = Application.GetRealWidth(145); + this.listControl[3].X = this.listControl[2].Right; } else if (pMSensor.currentPmData <= 115 && pMSensor.currentPmData > 75) { - curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality); + curQuality = Language.StringByID(R.MyInternationalizationString.LightPollution); if (pMSensor.currentPmData < 100) { - this.listControl[2].Width = Application.GetRealWidth(193 - 40); - this.listControl[3].X = Application.GetRealWidth(137); + this.listControl[2].Width = Application.GetRealWidth(145); + this.listControl[3].X = this.listControl[2].Right; } else { this.listControl[2].Width = Application.GetRealWidth(162); - this.listControl[3].X = Application.GetRealWidth(153); + this.listControl[3].X = this.listControl[2].Right; } } else if (pMSensor.currentPmData <= 150 && pMSensor.currentPmData > 115) { - curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality); + curQuality = Language.StringByID(R.MyInternationalizationString.Moderatelyolluted); this.listControl[2].Width = Application.GetRealWidth(162); - this.listControl[3].X = Application.GetRealWidth(153); + this.listControl[3].X = this.listControl[2].Right; } else if (pMSensor.currentPmData <= 250 && pMSensor.currentPmData > 150) { - curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality); - this.listControl[2].Width = Application.GetRealWidth(162); - this.listControl[3].X = Application.GetRealWidth(153); + curQuality = Language.StringByID(R.MyInternationalizationString.HeavyPollution); + this.listControl[2].Width = Application.GetRealWidth(176); + this.listControl[3].X = this.listControl[2].Right; } else if (pMSensor.currentPmData > 250) { - curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality); - this.listControl[2].Width = Application.GetRealWidth(162); - this.listControl[3].X = Application.GetRealWidth(153); + curQuality = Language.StringByID(R.MyInternationalizationString.SeriousPollution); + this.listControl[2].Width = Application.GetRealWidth(176); + this.listControl[3].X = this.listControl[2].Right; } else { curQuality = ""; this.listControl[2].Width = Application.GetRealWidth(162); - this.listControl[3].X = Application.GetRealWidth(153); + this.listControl[3].X = this.listControl[2].Right; } //璁剧疆鐘舵�佹枃瀛� return curQuality; -- Gitblit v1.8.0