From 8df24b0a3dfd5b6f39c5393ef24eab25b70ab858 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 13:18:33 +0800
Subject: [PATCH] 202009111
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 51 ++++++++++++++++++---------------------------------
1 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index a390242..e3faad6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -284,9 +284,9 @@
#region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙
room = new Room();
- if (DB_ResidenceData.residenceData.rooms.Count > 0)
+ if (DB_ResidenceData.rooms.Count > 0)
{
- room = DB_ResidenceData.residenceData.rooms[0];
+ room = DB_ResidenceData.rooms[0];
}
btnFoorDownIcon = new Button()
{
@@ -332,12 +332,8 @@
contentView.AddChidren(sensorListView);
int index = 0;
- foreach(var sensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
+ foreach(var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
{
- if ( sensor.functionType == FunctionType.WindPower)
- {
- continue;
- }
LoadSensorDiv(sensor, index);
index++;
}
@@ -418,21 +414,18 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- if ( sensor.functionType != FunctionType.WindPower)
+ var btnInfoIcon = new Button()
{
- var btnInfoIcon = new Button()
- {
- X = Application.GetRealWidth(120),
- Width = Application.GetRealWidth(28),
- Height = Application.GetRealWidth(28),
- UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/TipInfoIcon.png",
- };
- sensorView.AddChidren(btnInfoIcon);
- btnInfoIcon.MouseUpEventHandler = (sender, e) =>
- {
- LoadInfo(sensor);
- };
- }
+ X = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
+ UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/TipInfoIcon.png",
+ };
+ sensorView.AddChidren(btnInfoIcon);
+ btnInfoIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ LoadInfo(sensor);
+ };
var btnSensorValues = new Button()
{
@@ -508,17 +501,9 @@
switch (sensor.functionType)
{
- case FunctionType.PM10:
- btnTitle.Text = "PM1.0(ug/m虏)";
- break;
case FunctionType.PM25:
btnTitle.Text = "PM2.5(ug/m虏)";
break;
- case FunctionType.WindPower:
-
- break;
- //case FunctionType.Noise:
- // break;
case FunctionType.Temp:
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
break;
@@ -659,10 +644,10 @@
};
dispalyView.AddChidren(contentView);
- if (DB_ResidenceData.residenceData.rooms.Count < 2)
+ if (DB_ResidenceData.rooms.Count < 2)
{
}
- else if (DB_ResidenceData.residenceData.rooms.Count < 3)
+ else if (DB_ResidenceData.rooms.Count < 3)
{
dispalyView = new FrameLayout()
{
@@ -677,7 +662,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (DB_ResidenceData.residenceData.rooms.Count < 4)
+ else if (DB_ResidenceData.rooms.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -711,7 +696,7 @@
- foreach (var roomTemp in DB_ResidenceData.residenceData.rooms)
+ foreach (var roomTemp in DB_ResidenceData.rooms)
{
string roomName = roomTemp.name;
var btnRoomName = new Button()
--
Gitblit v1.8.0