From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 108 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 73 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index b991266..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()
{
@@ -463,7 +456,8 @@
};
sensorView.AddChidren(btnLevel);
- Control.Send(CommandType_A.read, sensor);
+ //Control.Send(CommandType_A.read, sensor);
+ Control.SendReadCommand(sensor);
}
}
@@ -507,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;
@@ -641,10 +627,10 @@
var dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(266),
+ Y = Application.GetRealHeight(100),
Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(203),
- BackgroundImagePath = "PersonalCenter/HomeListbg.png",
+ Height = Application.GetRealHeight(110),
+ BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
};
dialogBody.AddChidren(dispalyView);
@@ -653,12 +639,64 @@
X = Application.GetRealWidth(8),
Y = Application.GetRealHeight(15),
Width = Application.GetRealWidth(150),
- Height = Application.GetRealHeight(45 * 4),
+ Height = Application.GetRealHeight(45 * 2),
+ ScrollEnabled = false
};
dispalyView.AddChidren(contentView);
+ if (DB_ResidenceData.rooms.Count < 2)
+ {
+ }
+ else if (DB_ResidenceData.rooms.Count < 3)
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(155),
+ BackgroundImagePath = "PersonalCenter/HomeList2bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
- foreach (var roomTemp in DB_ResidenceData.residenceData.rooms)
+ contentView.Height = Application.GetRealHeight(45 * 3);
+ dispalyView.AddChidren(contentView);
+ }
+ else if (DB_ResidenceData.rooms.Count < 4)
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(200),
+ BackgroundImagePath = "PersonalCenter/HomeList3bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 4);
+ dispalyView.AddChidren(contentView);
+ }
+ else
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(245),
+ BackgroundImagePath = "PersonalCenter/HomeList4bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 5);
+ contentView.ScrollEnabled = true;
+ dispalyView.AddChidren(contentView);
+ }
+
+
+
+ foreach (var roomTemp in DB_ResidenceData.rooms)
{
string roomName = roomTemp.name;
var btnRoomName = new Button()
--
Gitblit v1.8.0