202009251

wxr

2020-09-25 6d3ba9484472d090532434e53667c096652149ce

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

@@ -283,11 +283,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 +331,10 @@
            };
            contentView.AddChidren(sensorListView);

            int index = 0;
            foreach(var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
            {
                LoadSensorDiv(sensor, index);
                index++;
            }
            LoadSenesorList();

            LoadEventList();


            #endregion

@@ -346,12 +344,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)
@@ -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();
                    };
                }