wxr
2022-09-22 f12a70ac4639f6ea5de0b136d86cafd90af06eec
光伏卡片数据显示
3个文件已修改
79 ■■■■ 已修改文件
HDL_ON/Common/ApiUtlis.cs 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/FunctionList.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/ApiUtlis.cs
@@ -437,30 +437,30 @@
            //下载光伏数据
            new System.Threading.Thread(() => {
                try
                {//00
                    HttpServerRequest http = new HttpServerRequest();
                    var packData = http.GetInverterList();
                    if (packData != null)
                    {
                        if (packData.Code == StateCode.SUCCESS)
                        {
                            var inverterList = JsonConvert.DeserializeObject<List<InverterInfo>>(packData.Data.ToString());
                            if (inverterList!= null)
                            {
                                FunctionList.List.InverterList = inverterList;
                            }
                        }
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"读取光伏数据异常:{ex.Message}");
                }
            ////下载光伏数据
            //new System.Threading.Thread(() => {
            //    try
            //    {//00
            //        HttpServerRequest http = new HttpServerRequest();
            //        var packData = http.GetInverterList();
            //        if (packData != null)
            //        {
            //            if (packData.Code == StateCode.SUCCESS)
            //            {
            //                var inverterList = JsonConvert.DeserializeObject<List<InverterInfo>>(packData.Data.ToString());
            //                if (inverterList!= null)
            //                {
            //                    FunctionList.List.InverterList = inverterList;
            //                }
            //            }
            //        }
            //    }
            //    catch (Exception ex)
            //    {
            //        MainPage.Log($"读取光伏数据异常:{ex.Message}");
            //    }
            }) { IsBackground = true }.Start();
            //}) { IsBackground = true }.Start();
HDL_ON/Entity/FunctionList.cs
@@ -126,16 +126,17 @@
        /// <summary>
        /// 光伏列表
        /// </summary>
        public List<InverterInfo> InverterList
        public List<Function> InverterList()
        {
            get
            {
                return _inverterList;
            }
            set
            {
                _inverterList = value;
            }
            //get
            //{
            //    return _inverterList;
            //}
            //set
            //{
            //    _inverterList = value;
            //}
            return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
        }
        #region 家电列表 electricals
        /// <summary>
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1122,7 +1122,7 @@
            //光伏数据
            if (FunctionList.List.InverterList.Count > 0 )
            if (FunctionList.List.InverterList().Count > 0 )
            {
                FrameLayout inverterListView = new FrameLayout()
                {
@@ -1170,26 +1170,26 @@
                Button btnFunctionCount = new Button()
                {
                    X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * FunctionList.List.InverterList.Count.ToString().Length),
                    X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * FunctionList.List.InverterList().Count.ToString().Length),
                    Y = btnName.Bottom,
                    Width = Application.GetRealWidth(120),
                    Height = Application.GetRealHeight(24),
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = "/" + FunctionList.List.InverterList.Count,
                    Text = "/" + FunctionList.List.InverterList().Count,
                };
                inverterListView.AddChidren(btnFunctionCount);
                Button btnOpenCount = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnName.Bottom,
                    Width = Application.GetRealWidth(14 * FunctionList.List.InverterList.Count.ToString().Length),
                    Width = Application.GetRealWidth(14 * FunctionList.List.InverterList().Count.ToString().Length),
                    Height = Application.GetRealHeight(24),
                    TextColor = CSS_Color.MainColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = FunctionList.List.InverterList.Count.ToString(),
                    Text = FunctionList.List.InverterList().Count.ToString(),
                    Tag = "inverter_onCount",
                    BorderWidth = 0,
                };
@@ -1314,7 +1314,7 @@
                            }
                            var function = new Function();
                            function.sid = data["sid"].ToString();
                            var inObj = FunctionList.List.InverterList.Find((obj) => obj.sid == function.sid);
                            var inObj = FunctionList.List.InverterList().Find((obj) => obj.sid == function.sid);
                            if (inObj == null)
                            {
                                return;
@@ -1346,7 +1346,7 @@
                            Application.RunOnMainThread(() =>
                            {
                                btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
                                btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", info.systemStatus);
                                btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", info.workMode);
                                btnCurrentPowerGeneration.Text = Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
                                btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
                            });