2020-09-01

wxr

2020-09-01 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5

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

@@ -115,7 +115,7 @@
                TextColor = CSS_Color.PromptingColor2,
                SelectedTextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = StringId.month,
                Text = DateTime.Now.Month.ToString() + Language.StringByID(StringId.month),
            };
            showDataTypeView.AddChidren(btnShowHistroyData_Month);
            #endregion
@@ -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,17 +835,12 @@
                        curMonth = DateTime.Now.Month;
                    }
                    int i = 0;
                    foreach (var tempSensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
                    foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
                    {
                        if (tempSensor.sid == sensor.sid)
                        if (sr.functionType != sensor.functionType)
                        {
                            continue;
                        }
                        if (tempSensor.functionType != sensor.functionType)
                        {
                            continue;
                        }
                        var sr = DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience[i];
                        if (showSensors.Find((obj) => obj.sid == sr.sid) == null)
                        {
                            i++;
@@ -884,10 +874,18 @@
                                int ass = 0;
                                for (int j = 0; j < revertData.Count; j++)
                                {
                                    if (curQueryType == QueryType.NowMonth && revertData[j].CreatedOnUtc.Day > DateTime.Now.Day )
                                    {
                                        continue;
                                    }
                                    if (revertData[j].TargetValue.ToString() != "NaN")
                                    {
                                        ass = Convert.ToInt32(revertData[j].TargetValue);
                                    }
                                    else
                                    {
                                        ass = 0;
                                    }
                                    sItem.data.Add(ass);
                                    switch (curQueryType)
                                    {