20201218-2

wei

2020-12-19 c5a873df96e4a797426e4dd5eafe5b43f7aea564

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs

old mode 100644
new mode 100755
@@ -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() { roomName = Language.StringByID(StringId.All)};
            //if (DB_ResidenceData.rooms.Count > 0)
            //{
            //    room = DB_ResidenceData.rooms[0];
            //}
            btnFoorDownIcon = new Button()
            {
                Width = Application.GetMinRealAverage(16),
@@ -307,7 +308,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextAlignment = TextAlignment.CenterLeft,
                Text = room.name,
                Text = room.roomName,
            };
            contentView.AddChidren(btnRoom);

@@ -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,17 +345,32 @@
            new TopViewDiv(bodyView, Language.StringByID(StringId.EnvironmentalScience)).LoadTopView();

        }

        /// <summary>
        /// 加载传感器列表
        /// </summary>
        void LoadSenesorList()
        {
            sensorListView.RemoveAll();
            int index = 0;
            foreach (var sensor in FunctionList.List.sensorsEnvironmentalScience)
            {
                LoadSensorDiv(sensor, index);
                index++;
            }
        }

        /// <summary>
        /// 加载传感器列表
        /// </summary>
        void LoadSensorDiv(Sensor sensor,int index)
        {
            if (sensor.roomIdList.Contains(room.sid))
            if (room.roomId == "" ||  sensor.roomIds.Contains(room.roomId))
            {
                var sensorTag = sensor.sid;
                if (sensor.bus_Data != null)
                if (sensor.bus != null)
                {
                    sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus_Data.SubnetID + "_" + sensor.bus_Data.DeviceID + "_" + sensor.bus_Data.LoopID;
                    sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus.SubnetID + "_" + sensor.bus.DeviceID + "_" + sensor.bus.LoopId;
                }
                FrameLayout sensorView = new FrameLayout()
                {
@@ -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",
@@ -644,15 +657,15 @@
                };
                dispalyView.AddChidren(contentView);

                if (DB_ResidenceData.rooms.Count < 2)
                if (SpatialInfo.CurrentSpatial.RoomList.Count < 2)
                {
                }
                else if (DB_ResidenceData.rooms.Count < 3)
                else if (SpatialInfo.CurrentSpatial.RoomList.Count < 3)
                {
                    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",
@@ -662,12 +675,12 @@
                    contentView.Height = Application.GetRealHeight(45 * 3);
                    dispalyView.AddChidren(contentView);
                }
                else if (DB_ResidenceData.rooms.Count < 4)
                else if (SpatialInfo.CurrentSpatial.RoomList.Count < 4)
                {
                    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,10 +708,13 @@
                }


                var showListRoom = new List<Room>();
                showListRoom.Add(new Room() { roomName = Language.StringByID(StringId.All) });
                showListRoom.AddRange(SpatialInfo.CurrentSpatial.RoomList);

                foreach (var roomTemp in DB_ResidenceData.rooms)
                foreach (var roomTemp in showListRoom) 
                {
                    string roomName = roomTemp.name;
                    string roomName = roomTemp.roomName;
                    var btnRoomName = new Button()
                    {
                        Gravity = Gravity.CenterHorizontal,
@@ -720,6 +736,7 @@
                        dialog.Close();
                        btnRoom.Text = roomName;
                        room = roomTemp;
                        LoadSenesorList();
                    };
                }