2020-09-01

wxr

2020-09-01 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5

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

@@ -22,7 +22,11 @@

        Sensor sensor;

        List<Sensor> showSensors; 
        List<Sensor> showSensors;
        /// <summary>
        /// 当前查询类型
        /// </summary>
        QueryType curQueryType = QueryType.NowDay;

        List<uint> tipColorList = new List<uint>()
        {
@@ -44,7 +48,6 @@

        public void LoadPage()
        {

            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
@@ -112,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
@@ -161,7 +164,6 @@

            switch (sensor.functionType)
            {
                case FunctionType.PM10:
                case FunctionType.PM25:
                    tipValuesView.AddChidren(new Button()
                    {
@@ -230,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()
                    {
@@ -606,7 +604,24 @@
                IsSelected = true,
            };
            selfInfoView.AddChidren(btnShowData);

            //btnShowData.MouseUpEventHandler = (sender, e) => {
            //    btnShowData.IsSelected = !btnShowData.IsSelected;
            //    if(btnShowData.IsSelected)
            //    {
            //        if (!showSensors.Contains(sensor))
            //        {
            //            showSensors.Add(sensor);
            //        }
            //    }
            //    else
            //    {
            //        if (showSensors.Contains(sensor))
            //        {
            //            showSensors.Remove(sensor);
            //        }
            //    }
            //    LoadMothed_GetSensorHistoryData();
            //};

            btnSetting.MouseUpEventHandler = (sender, e) =>
            {
@@ -626,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)
                {
@@ -636,7 +651,6 @@
                {
                    continue;
                }

                contentView.ScrollEnabled = true;

                if (initTitleButton)
@@ -694,7 +708,6 @@
                    IsBold = true,
                };
                otherInfoView.AddChidren(btnSensorName);


                Button btnFromFoorAndRoom1 = new Button()
                {
@@ -754,14 +767,31 @@
                    SelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIconOn.png",
                };
                otherInfoView.AddChidren(btnShowData1);

                btnShowData1.MouseUpEventHandler = (sender, e) => {
                    btnShowData1.IsSelected = !btnShowData1.IsSelected;
                    if (btnShowData1.IsSelected)
                    {
                        if (!showSensors.Contains(sensor))
                        {
                            showSensors.Add(sensor);
                        }
                    }
                    else
                    {
                        if (showSensors.Contains(sensor))
                        {
                            showSensors.Remove(sensor);
                        }
                    }
                    LoadMothed_GetSensorHistoryData();
                };
                #endregion

            }
            #endregion
            new TopViewDiv(bodyView, Language.StringByID(sensor.functionTypeNameId)).LoadTopView();

            LoadMothed_GetSensorHistoryData(QueryType.NowDay);
            LoadMothed_GetSensorHistoryData();
            LoadEvent_ChangeSensorHistoryShowType();
        }
    }
@@ -770,7 +800,7 @@
    //------------
    public partial class EnvironmentalSensorPage
    {
        enum QueryType
       public  enum QueryType
        {
            NowDay = 0,//当天
            NowMonth = 1,//指定月
@@ -781,7 +811,7 @@
        /// <summary>
        /// 读取传感器历史数据
        /// </summary>
        void LoadMothed_GetSensorHistoryData(QueryType queryType)
        void LoadMothed_GetSensorHistoryData()
        {
            string echartRootJsonString;
            EchartsOption echartRootJson = new EchartsOption();
@@ -800,15 +830,24 @@
                        loadPage.Start("Loading...");
                    });
                    var curMonth = 0;
                    if(queryType == QueryType.NowMonth)
                    if(curQueryType == QueryType.NowMonth)
                    {
                        curMonth = DateTime.Now.Month;
                    }
                    for (int i = 0; i < showSensors.Count; i++)
                    int i = 0;
                    foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
                    {
                        var sr = showSensors[i];
                        if (sr.functionType != sensor.functionType)
                        {
                            continue;
                        }
                        if (showSensors.Find((obj) => obj.sid == sr.sid) == null)
                        {
                            i++;
                            continue;
                        }
                        var revertObj = new DAL.Server.HttpServerRequest().GetSensorHistory(sr.bus_Data.SubnetID, sr.bus_Data.DeviceID,
                               5, (int)(sr.functionType) % 256, (int)queryType, sr.bus_Data.LoopID, curMonth,
                               5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus_Data.LoopID, curMonth,
                               DB_ResidenceData.residenceData.residenceGatewayMAC);

                        if (revertObj != null)
@@ -835,12 +874,20 @@
                                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 (queryType)
                                    switch (curQueryType)
                                    {
                                        case QueryType.NowDay:
                                            echartRootJson.xAxis.data.Add(revertData[j].CreatedOnUtc.Hour.ToString());
@@ -863,6 +910,7 @@
                                });
                            }
                        }
                        i++;
                    }

                    //echartRootJson.title.text = "温度(℃)";lineStyle
@@ -882,6 +930,7 @@
                    {
                        myEchartsView.ShowWithOptionJsonString(echartRootJsonString);
                    });

                }
                catch (Exception ex)
                {
@@ -905,7 +954,8 @@
                btnShowHistroyData_Day.IsSelected = true;
                btnShowHistroyData_Month.IsSelected = false;
                btnShowHistroyData_Week.IsSelected = false;
                LoadMothed_GetSensorHistoryData(QueryType.NowDay);
                curQueryType = QueryType.NowDay;
                LoadMothed_GetSensorHistoryData();
            };

            btnShowHistroyData_Month.MouseUpEventHandler = (sender, e) =>
@@ -914,7 +964,8 @@
                btnShowHistroyData_Day.IsSelected = false;
                btnShowHistroyData_Month.IsSelected = true;
                btnShowHistroyData_Week.IsSelected = false;
                LoadMothed_GetSensorHistoryData(QueryType.NowMonth);
                curQueryType = QueryType.NowMonth;
                LoadMothed_GetSensorHistoryData();
            };
            btnShowHistroyData_Week.MouseUpEventHandler = (sender, e) =>
            {
@@ -922,7 +973,8 @@
                btnShowHistroyData_Day.IsSelected = false;
                btnShowHistroyData_Month.IsSelected = false;
                btnShowHistroyData_Week.IsSelected = true;
                LoadMothed_GetSensorHistoryData(QueryType.LatelySevenDay);
                curQueryType = QueryType.LatelySevenDay;
                LoadMothed_GetSensorHistoryData();
            };

        }