兆观传感器

wei

2021-06-06 e63d7efbe2a41783989bdaea94d37bb6f16deb22

 HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs

@@ -218,7 +218,7 @@
            {
                EnergyRow(energy, energyListView, index);
                index++;
                DriverLayer.Control.Ins.SendReadCommand(energy);
                Control.Ins.SendReadCommand(energy);
            }


@@ -386,13 +386,15 @@
                brokenLine.YvalueText = "";
                foreach (var ene in queryList)
                {
                    brokenLine.YvalueText += ene.GetAttrState("ydata") + ",";
                    brokenLine.YvalueText += ene.GetAttrState("ydata");
                }
                var opString = brokenLine.InitOption();

                Application.RunOnMainThread(() =>
                {
                    myEchartsView.ShowWithOption(brokenLine.InitOption());
                    myEchartsView.ShowWithOption(opString);
                });

                return;
            }

@@ -427,21 +429,17 @@
                                    vs.Add(data.fieldName);
                                }
                                brokenLine.InitXdataText(vs);

                                if (sr.GetAttribute("ydata") == null)
                                {
                                    sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
                                }
                                sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color")) + ",");
                            }
                            else
                            if (sr.GetAttribute("ydata") == null)
                            {
                                if (sr.GetAttribute("ydata") == null)
                                {
                                    sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
                                }
                                sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color"))+",");
                                sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
                            }
                            sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color")) + ",");
                            //if (sr.GetAttribute("ydata") == null)
                            //{
                            //    sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
                            //}
                            //sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color")) + ",");
                        }
                    }
                    brokenLine.yTitle = Language.StringByID(StringId.EnergyConsumption) + "(kW)";
@@ -690,6 +688,7 @@
                Action backAction = () =>
                {
                    btnName.Text = energy.name;
                    btnFromFloor.Text = energy.GetRoomListName();
                };
                var infoView = new FunctionBaseInfoSetPage(energy, backAction);
                MainPage.BasePageView.AddChidren(infoView);