20201104

wxr

2020-11-04 e6a26ee148587327478d9a82624a820c907b6e16

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

@@ -835,6 +835,63 @@
                        curMonth = DateTime.Now.Month;
                    }
                    int i = 0;

//#if DEBUG
//                    var sItem = new EchartSeriesItem
//                    {
//                        name = sensor.GetRoomListName(),
//                        data = new List<int>(),
//                        lineStyle = new EchartLineStyle()
//                        {
//                            color = tipColorStringList[i],
//#if __IOS__
//                            width = 5,
//#elif __ANDROID__
//                                        width = 2,
//#endif
//                        },
//                    };
//                    Random random = new Random();
//                    double level = 0.0;
//                    int countddd = 24;
//                    for (int j = 0; j < countddd; j++)
//                    {
//                        switch (sensor.functionType)
//                        {
//                            case FunctionType.PM25:
//                                level = Math.Round(random.NextDouble() * 130, 0);
//                                break;
//                            case FunctionType.CO2:
//                                level = Math.Round(random.NextDouble() * 6000, 0);
//                                break;
//                            case FunctionType.Temp:
//                                level = Math.Round(random.NextDouble() * 40, 0);
//                                break;
//                            case FunctionType.TVOC:
//                                level = Math.Round(random.NextDouble() * 10, 1);
//                                break;
//                            case FunctionType.Humidity:
//                                level = Math.Round(random.NextDouble() * 100, 0);
//                                break;
//                        }
//                        sItem.data.Add((int)level);
//                    }
//                        seriesList.Add(sItem);
//                    echartRootJson.series = seriesList;
//#if __IOS__
//                    echartRootJson.xAxis.axisLabel.fontSize = 22;
//                    echartRootJson.yAxis.axisLabel.fontSize = 22;
//#else
//                    echartRootJson.xAxis.axisLabel.fontSize = 8;
//                    echartRootJson.yAxis.axisLabel.fontSize = 8;
//#endif
//                    echartRootJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(echartRootJson);
//                    Application.RunOnMainThread(() =>
//                    {
//                        myEchartsView.ShowWithOptionJsonString(echartRootJsonString);
//                    });
//#endif

                    foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
                    {
                        if (sr.functionType != sensor.functionType)
@@ -874,7 +931,7 @@
                                int ass = 0;
                                for (int j = 0; j < revertData.Count; j++)
                                {
                                    if (curQueryType == QueryType.NowMonth && revertData[j].CreatedOnUtc.Day > DateTime.Now.Day )
                                    if (curQueryType == QueryType.NowMonth && revertData[j].CreatedOnUtc.Day > DateTime.Now.Day)
                                    {
                                        continue;
                                    }
@@ -913,8 +970,6 @@
                        i++;
                    }

                    //echartRootJson.title.text = "温度(℃)";lineStyle
                    //echartRootJson.color = new List<string> { "#80AEFF" };//, "FFD154", "FF9D54", "FE6A6A", "B183C3", "ADE764" 
                    echartRootJson.series = seriesList;