2020-09-01

wxr

2020-09-01 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5

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

@@ -164,7 +164,6 @@

            switch (sensor.functionType)
            {
                case FunctionType.PM10:
                case FunctionType.PM25:
                    tipValuesView.AddChidren(new Button()
                    {
@@ -233,10 +232,6 @@
                //_levelTextList.Add(StringId.MildPollution);
                //_levelTextList.Add(StringId.HeavyPollution);
                //break;
                //case FunctionType.Noise:
                //    break;
                case FunctionType.WindPower:
                    break;
                case FunctionType.CO2:
                    tipValuesView.AddChidren(new Button()
                    {
@@ -646,7 +641,7 @@

            bool initTitleButton = true;

            foreach (var tempSensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
            foreach (var tempSensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
            {
                if (tempSensor.sid == sensor.sid)
                {
@@ -840,7 +835,7 @@
                        curMonth = DateTime.Now.Month;
                    }
                    int i = 0;
                    foreach (var sr in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
                    foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
                    {
                        if (sr.functionType != sensor.functionType)
                        {