2020-09-01

wxr

2020-09-01 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5

 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,8 +414,6 @@
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };

                if ( sensor.functionType != FunctionType.WindPower)
                {
                    var btnInfoIcon = new Button()
                    {
                        X = Application.GetRealWidth(120),
@@ -432,7 +426,6 @@
                    {
                        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()