From 0c0536e9b5db204fd3bd3c2443ef500b66bf7423 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 24 十一月 2020 17:48:40 +0800
Subject: [PATCH] 2020-11-24-1
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index e3faad6..069664f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -3,6 +3,7 @@
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using System.Collections.Generic;
+using HDL_ON.DriverLayer;
namespace HDL_ON.UI
{
@@ -283,11 +284,11 @@
bodyView.AddChidren(contentView);
#region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙
- room = new Room();
- if (DB_ResidenceData.rooms.Count > 0)
- {
- room = DB_ResidenceData.rooms[0];
- }
+ room = new Room() { name = Language.StringByID(StringId.All), sid = ""};
+ //if (DB_ResidenceData.rooms.Count > 0)
+ //{
+ // room = DB_ResidenceData.rooms[0];
+ //}
btnFoorDownIcon = new Button()
{
Width = Application.GetMinRealAverage(16),
@@ -331,12 +332,10 @@
};
contentView.AddChidren(sensorListView);
- int index = 0;
- foreach(var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
- {
- LoadSensorDiv(sensor, index);
- index++;
- }
+ LoadSenesorList();
+
+ LoadEventList();
+
#endregion
@@ -346,12 +345,27 @@
new TopViewDiv(bodyView, Language.StringByID(StringId.EnvironmentalScience)).LoadTopView();
}
+
+ /// <summary>
+ /// 鍔犺浇浼犳劅鍣ㄥ垪琛�
+ /// </summary>
+ void LoadSenesorList()
+ {
+ sensorListView.RemoveAll();
+ int index = 0;
+ foreach (var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+ {
+ LoadSensorDiv(sensor, index);
+ index++;
+ }
+ }
+
/// <summary>
/// 鍔犺浇浼犳劅鍣ㄥ垪琛�
/// </summary>
void LoadSensorDiv(Sensor sensor,int index)
{
- if (sensor.roomIdList.Contains(room.sid))
+ if (room.sid == "" || sensor.roomIdList.Contains(room.sid))
{
var sensorTag = sensor.sid;
if (sensor.bus_Data != null)
@@ -456,8 +470,7 @@
};
sensorView.AddChidren(btnLevel);
- //Control.Send(CommandType_A.read, sensor);
- Control.SendReadCommand(sensor);
+ Control.ins.SendReadCommand(sensor);
}
}
@@ -627,7 +640,7 @@
var dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(100),
+ Y = Application.GetRealHeight(266),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(110),
BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
@@ -652,7 +665,7 @@
dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(100),
+ Y = Application.GetRealHeight(266),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(155),
BackgroundImagePath = "PersonalCenter/HomeList2bg.png",
@@ -667,7 +680,7 @@
dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(100),
+ Y = Application.GetRealHeight(266),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(200),
BackgroundImagePath = "PersonalCenter/HomeList3bg.png",
@@ -682,7 +695,7 @@
dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(100),
+ Y = Application.GetRealHeight(266),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(245),
BackgroundImagePath = "PersonalCenter/HomeList4bg.png",
@@ -695,8 +708,11 @@
}
+ var showListRoom = new List<Room>();
+ showListRoom.Add(new Room() { name = Language.StringByID(StringId.All),sid = "" });
+ showListRoom.AddRange(DB_ResidenceData.rooms);
- foreach (var roomTemp in DB_ResidenceData.rooms)
+ foreach (var roomTemp in showListRoom)
{
string roomName = roomTemp.name;
var btnRoomName = new Button()
@@ -720,6 +736,7 @@
dialog.Close();
btnRoom.Text = roomName;
room = roomTemp;
+ LoadSenesorList();
};
}
--
Gitblit v1.8.0