三相测试打包

wxr

2023-07-31 2fd42f7ab6f1702dcc13d1aa6de5ad91a504fb4e

 HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs

@@ -319,7 +319,7 @@

            var btnTip = new Button()
            {
                Y = Application.GetRealHeight(289),
                Y = Application.GetRealWidth(289),
                Height = Application.GetRealHeight(41),
                Width = Application.GetRealWidth(300),
                TextAlignment = TextAlignment.Center,
@@ -493,6 +493,9 @@
            };
            totalElectricityView.AddChidren(btnTotalElectricity);


            double totalNumber = 0.00;
            double.TryParse(device.GetAttrState(FunctionAttributeKey.TotalElectricity), out totalNumber);
            var btnTotalNumber = new Button()
            {
                Y = Application.GetRealHeight(27),
@@ -501,43 +504,43 @@
                TextSize = 49,
                TextColor = 0xFF030D1C,
                TextAlignment = TextAlignment.Center,
                Text = device.GetAttrState(FunctionAttributeKey.TotalElectricity),
                Text = totalNumber.ToString("F2"),
            };
            totalElectricityView.AddChidren(btnTotalNumber);

            btnShowHistroyData_Day.MouseUpEventHandler += (sender, e) => {
                totalElectricityView.RemoveFromParent();
                historyDataView.AddChidren(myEchartsView_Line);
                viewa.Visible = true;
                viewb.Visible = true;
                viewc.Visible = true;
                //viewa.Visible = true;
                //viewb.Visible = true;
                //viewc.Visible = true;
                btnTip.TextID = StringId.AirSwitchP3HistroyTip1;
                historyDataView.Height = Application.GetRealHeight(330);
                historyDataView.Height = Application.GetRealWidth(330);
            };
            btnShowHistroyData_Month.MouseUpEventHandler += (sender, e) => {
                totalElectricityView.RemoveFromParent();
                historyDataView.AddChidren(myEchartsView_Line);
                viewa.Visible = true;
                viewb.Visible = true;
                viewc.Visible = true;
                //viewa.Visible = true;
                //viewb.Visible = true;
                //viewc.Visible = true;
                btnTip.TextID = StringId.AirSwitchP3HistroyTip2;
                historyDataView.Height = Application.GetRealHeight(330);
                historyDataView.Height = Application.GetRealWidth(330);
            };
            btnShowHistroyData_Year.MouseUpEventHandler += (sender, e) => {
                totalElectricityView.RemoveFromParent();
                historyDataView.AddChidren(myEchartsView_Line);
                viewa.Visible = false;
                viewb.Visible = false;
                viewc.Visible = false;
                //viewa.Visible = false;
                //viewb.Visible = false;
                //viewc.Visible = false;
                btnTip.TextID = StringId.AirSwitchP3HistroyTip3;
                historyDataView.Height = Application.GetRealHeight(330);
                historyDataView.Height = Application.GetRealWidth(330);
            };
            btnShowHistroyData_Total.MouseUpEventHandler += (sender, e) => {
                myEchartsView_Line.RemoveFromParent();
                historyDataView.AddChidren(totalElectricityView);
                viewa.Visible = false;
                viewb.Visible = false;
                viewc.Visible = false;
                //viewa.Visible = false;
                //viewb.Visible = false;
                //viewc.Visible = false;
                historyDataView.Height = Application.GetRealHeight(184);
            };

@@ -576,37 +579,25 @@
                    });

                    var sensorType = device.spk.Split(".")[1];
                    var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, device.deviceId, "power_a");
                    var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, device.deviceId, FunctionAttributeKey.TotalElectricity);
                    if (revertObj != null)
                    {
                        if (revertObj.Code == StateCode.SUCCESS)
                        {
                            var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<EnvironmentalSensorHistor>>(revertObj.Data.ToString());
                            if (revertData == null || revertData.Count == 0) {
#if DEBUG
                            if (revertData == null || revertData.Count == 0) {
                                List<string> vs = new List<string>() {
                                    "813","313","213","123",
                                    "113","213","183","133",
                                    "133","513","133","413",
                                    "813","313","213","123",
                                    "113","213","183","133",
                                    "133","513","133","413",
                                    "1","2","3","4",
                                    "5","6","7","8",
                                    "9","10","11","12",
                                    //"13","14","15","16",
                                    //"17","18","19","20",
                                    //"21","22","23","24",
                                };
                                    brokenLine.InitXdataText(vs);
                                revertData = new List<EnvironmentalSensorHistor>()
                                {
                                    new EnvironmentalSensorHistor{ fieldValue = "100"},
                                    new EnvironmentalSensorHistor{ fieldValue = "200"},
                                    new EnvironmentalSensorHistor{ fieldValue = "300"},
                                    new EnvironmentalSensorHistor{ fieldValue = "400"},
                                    new EnvironmentalSensorHistor{ fieldValue = "500"},
                                    new EnvironmentalSensorHistor{ fieldValue = "400"},
                                    new EnvironmentalSensorHistor{ fieldValue = "100"},
                                    new EnvironmentalSensorHistor{ fieldValue = "200"},
                                    new EnvironmentalSensorHistor{ fieldValue = "300"},
                                    new EnvironmentalSensorHistor{ fieldValue = "400"},
                                    new EnvironmentalSensorHistor{ fieldValue = "500"},
                                    new EnvironmentalSensorHistor{ fieldValue = "400"},
                                    new EnvironmentalSensorHistor{ fieldValue = "100"},
                                    new EnvironmentalSensorHistor{ fieldValue = "200"},
                                    new EnvironmentalSensorHistor{ fieldValue = "300"},
@@ -626,9 +617,9 @@
                                }
                                device.SetAttrState("ydata", brokenLine.InitYdataText2(device.name, revertData, "#5C62FE", curQueryType == "year_month") + ", ");

                        }
                        else
#endif
                            }
                            else
                            {
                                List<string> vs = new List<string>();
                                if (brokenLine.YvalueText == "")
@@ -654,7 +645,7 @@
                        brokenLine.xTitle = Language.StringByID(StringId.Date);
                    }

                    var opString = brokenLine.InitOption(50, curQueryType == "year_month");
                    var opString = brokenLine.InitOption(100, curQueryType == "year_month");
                    Application.RunOnMainThread(() =>
                    {
                        myEchartsView_Line.ShowWithOption(opString);