V2.6.0金茂热水器，金茂光伏测试通过的版本

wxr

2024-09-11 dd922032a3301ae960f4968eaf33ca14768c0ed1

 HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs

@@ -143,9 +143,6 @@
        /// </summary>
        Button btnPowerControl;




        public WaterHeaterJinmaoPage(Function deviceFunction)
        {
            bodyView = this;
@@ -507,6 +504,7 @@
            #endregion


            #region flow 热水流量
            if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.flow.ToString()) != null)
            {
                contentView.AddChidren(new Button()
@@ -686,8 +684,13 @@
            {
                Height = Application.GetRealWidth(8)
            });
            #endregion

            #region 社会贡献 Social contribution
            if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.energy_electricity.ToString()) != null
                && function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.co2.ToString()) != null
                && function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.trees.ToString()) != null)
            {
            contentView.AddChidren(new Button()
            {
                Height = Application.GetRealWidth(46),
@@ -708,7 +711,8 @@
                ScrollEnabled = false,
            };
            contentView.AddChidren(socialContributionView);

                if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.energy_electricity.ToString()) != null)
                {
            #region 热回收节电量
            var socialContribution_InfoView_1 = new FrameLayout()
            {
@@ -774,7 +778,9 @@
            {
                Width = Application.GetRealWidth(8),
            });

                }
                if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.co2.ToString()) != null)
                {
            #region CO2减排量
            var socialContribution_InfoView_2 = new FrameLayout()
            {
@@ -844,7 +850,9 @@
            {
                Width = Application.GetRealWidth(8),
            });

                }
                if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.trees.ToString()) != null)
                {
            #region 等效植树量
            var socialContribution_InfoView_3 = new FrameLayout()
            {
@@ -908,7 +916,8 @@
            };
            socialContribution_InfoView_3.AddChidren(socialContribution_Info3_TipButton);
            #endregion

                }
            }


            #endregion
@@ -926,8 +935,8 @@
                Height = Application.GetRealWidth(50),
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealWidth(16),
                SelectedImagePath = "FunctionIcon/Acst/orange/PowerIcon.png",
                UnSelectedImagePath = "FunctionIcon/Acst/grey/PowerOffIcon.png",
                SelectedImagePath = "FunctionIcon/Acst/blue/PowerIcon.png",
                IsSelected = function.trait_on_off.curValue.ToString() == "on"
            };
            bottomView.AddChidren(btnPowerControl);
@@ -955,7 +964,6 @@
            //节能模式控制
            btnControlModeEconomic.MouseUpEventHandler = (sender, e) =>
            {
                {
                    new System.Threading.Thread(() =>
                    {
                        var dic = new Dictionary<string, string>();
@@ -968,11 +976,9 @@
                        });
                    })
                    { IsBackground = true }.Start();
                }
            };
            //速热模式控制
            btnControlModeQuickHeat.MouseUpEventHandler = (sender, e) =>
            {
                {
                    new System.Threading.Thread(() =>
                    {
@@ -986,7 +992,6 @@
                        });
                    })
                    { IsBackground = true }.Start();
                }
            };
            setTemp_Bar.OnStartTrackingTouchEvent = (sender, e) =>
            {
@@ -1054,16 +1059,80 @@
                try
                {
                    bodyView.updateFreeMode();
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
                try
                {
                    bodyView.updateTemp();
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
                try
                {
                    bodyView.updateModeUI();
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
                try
                {
                    bodyView.updateSetTemp();
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
                try
                {
                    bodyView.updateFlow();
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
                try
                {
                    bodyView.updateVolume();
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
                try
                {
                    bodyView.updateSocialContribution1();
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
                try
                {
                    bodyView.updateSocialContribution2();
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
                try
                {
                    bodyView.updateSocialContribution3();
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
                try
                {
                    bodyView.updatePowerButton();
                }catch  (Exception ex)
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水控件更新异常：{ex.Message}");
                }
@@ -1221,6 +1290,11 @@
        /// </summary>
        private void updateSocialContribution1()
        {

            if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.energy_electricity.ToString()) != null)
            {
                try
                {
            socialContribution_Info1_ValuesButton.Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.energy_electricity.ToString());
            socialContribution_Info1_ValuesButton.Width = socialContribution_Info1_ValuesButton.GetTextWidth();
            if (socialContribution_Info1_ValuesButton.Width > Application.GetRealWidth(61))
@@ -1236,10 +1310,18 @@
            socialContribution_Info1_UintButton.X = socialContribution_Info1_ValuesButton.Right +Application.GetRealWidth(2);
#endif
        }
                catch { }
            }
        }
        /// <summary>
        /// 更新社会贡2献数据UI
        /// </summary>
        private void updateSocialContribution2()
        {

            if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.co2.ToString()) != null)
            {
                try
        {
            socialContribution_Info2_ValuesButton.Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.co2.ToString());
            socialContribution_Info2_ValuesButton.Width = socialContribution_Info2_ValuesButton.GetTextWidth();
@@ -1254,12 +1336,18 @@
#else
            socialContribution_Info2_UintButton.X = socialContribution_Info2_ValuesButton.Right +Application.GetRealWidth(2);
#endif

                }
                catch { }
            }
        }
        /// <summary>
        /// 更新社会贡3献数据UI
        /// </summary>
        private void updateSocialContribution3()
        {
            if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.trees.ToString()) != null)
            {
                try
        {
            socialContribution_Info3_ValuesButton.Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.trees.ToString());
            socialContribution_Info3_ValuesButton.Width = socialContribution_Info3_ValuesButton.GetTextWidth();
@@ -1276,6 +1364,9 @@
            socialContribution_Info3_UintButton.X = socialContribution_Info3_ValuesButton.Right +Application.GetRealWidth(2);
#endif
        }
                catch { }
            }
        }

        /// <summary>
        /// 更新开关按钮状态