wxr
2022-10-13 b3c9ada9a3e758c9f67abb9fc0a6a2764c7ea03d
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1227,12 +1227,23 @@
                //};
                //inverterListView.AddChidren(btnWorkStatus);
                Button btnWorkingMode = new Button()
                Button btnWorkingModeIcon = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnOpenCount.Bottom + Application.GetRealHeight(5),
                    Width = Application.GetRealWidth(14),
                    Height = Application.GetRealWidth(14),
                    UnSelectedImagePath = "FunctionIcon/Inverter/Icon1.png"
                };
                inverterListView.AddChidren(btnWorkingModeIcon);
                Button btnWorkingMode = new Button()
                {
                    X = Application.GetRealWidth(37),
                    Y = btnOpenCount.Bottom + Application.GetRealHeight(5),// + Application.GetRealHeight(16),
                    Width = Application.GetRealWidth(148),
                    Height = Application.GetRealHeight(18),
                    Height = Application.GetRealHeight(14),
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextID = StringId.WorkingMode,
@@ -1240,12 +1251,23 @@
                };
                inverterListView.AddChidren(btnWorkingMode);
                Button btnPowerTenerationToday = new Button()
                Button btnPowerTenerationTodayIcon = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnWorkingMode.Bottom + Application.GetRealHeight(5),
                    Y = btnWorkingMode.Bottom + Application.GetRealHeight(10),
                    Width = Application.GetRealWidth(14),
                    Height = Application.GetRealWidth(14),
                    UnSelectedImagePath = "FunctionIcon/Inverter/Icon2.png"
                };
                inverterListView.AddChidren(btnPowerTenerationTodayIcon);
                Button btnPowerTenerationToday = new Button()
                {
                    X = Application.GetRealWidth(37),
                    Y = btnWorkingMode.Bottom + Application.GetRealHeight(10),
                    Width = Application.GetRealWidth(148),
                    Height = Application.GetRealHeight(21),
                    Height = Application.GetRealHeight(14),
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextID = StringId.PowerTenerationToday,
@@ -1253,13 +1275,22 @@
                };
                inverterListView.AddChidren(btnPowerTenerationToday);
                Button btnCurrentPowerGenerationIcon = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(10),
                    Width = Application.GetRealWidth(14),
                    Height = Application.GetRealWidth(14),
                    UnSelectedImagePath = "FunctionIcon/Inverter/Icon3.png"
                };
                inverterListView.AddChidren(btnCurrentPowerGenerationIcon);
                Button btnCurrentPowerGeneration = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(5),
                    X = Application.GetRealWidth(37),
                    Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(10),
                    Width = Application.GetRealWidth(148),
                    Height = Application.GetRealHeight(21),
                    Height = Application.GetRealHeight(14),
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextID = StringId.CurrentPowerGeneration,
@@ -1267,17 +1298,17 @@
                };
                inverterListView.AddChidren(btnCurrentPowerGeneration);
                Button btnBatterySOC = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnCurrentPowerGeneration.Bottom,
                    Width = Application.GetRealWidth(148),
                    Height = Application.GetRealHeight(18),
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextID = StringId.BatterySOC,
                    TextAlignment = TextAlignment.CenterLeft,
                };
                //Button btnBatterySOC = new Button()
                //{
                //    X = Application.GetRealWidth(37),
                //    Y = btnCurrentPowerGeneration.Bottom,
                //    Width = Application.GetRealWidth(148),
                //    Height = Application.GetRealHeight(18),
                //    TextColor = CSS_Color.FirstLevelTitleColor,
                //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                //    TextID = StringId.BatterySOC,
                //    TextAlignment = TextAlignment.CenterLeft,
                //};
                //inverterListView.AddChidren(btnBatterySOC);
                //Button btnOperationDataTotalData = new Button()
@@ -1354,7 +1385,7 @@
                            {
                                h5BasePage.RemoveFromParent();
                            });
                            refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
                            refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration);
                        }
                        else if (jObj["method"].ToString() == "setPageIndex")
                        {
@@ -1367,7 +1398,7 @@
                };
                refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
                refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration);
                index++;
            }
@@ -1377,7 +1408,7 @@
            #endregion
        }
        void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration, Button btnBatterySOC)
        void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration)
        {
            new System.Threading.Thread(() =>
            {
@@ -1398,7 +1429,7 @@
                    {
                        Application.RunOnMainThread(() =>
                        {
                            btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
                            btnPowerTenerationToday.Text = info.totalElectricityPvToday + "kW·h";// Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
                            string workModeString = "";
                            if (Language.CurrentLanguage == "Chinese") {
                                switch (info.workMode)
@@ -1429,9 +1460,9 @@
                                        break;
                                }
                            }
                            btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", workModeString);
                            btnCurrentPowerGeneration.Text = Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
                            btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
                            btnWorkingMode.Text = workModeString;// Language.StringByID(StringId.WorkingMode).Replace("----", workModeString);
                            btnCurrentPowerGeneration.Text = info.powerPvNow + "w";// Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
                            //btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
                        });
                    }
                    catch (Exception ex)