From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整,新风,音乐

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 7693cb4..4284a3e 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -997,7 +997,7 @@
                     //}
                     //else
                     {
-                        if (!function.collect)
+                        if (!function.collect&& function.spk != SPK.InverterJinmao)
                             continue;
                     }
                     if (index % 2 == 0)
@@ -1765,7 +1765,8 @@
             {
                 X = Application.GetRealWidth(11),
                 Y = Application.GetRealWidth(10),
-                TextID = StringId.Acst,
+                Text = function.name,
+                //TextID = StringId.Acst,
                 IsBold = true,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
@@ -1785,12 +1786,28 @@
             };
             view.AddChidren(btnLogo);
 
+            try
+            {
+                if (function.extend.Contains("jinmao") && function.extend.Contains("true"))
+                {
+                    btnLogo.Visible = true;
+                }
+                else
+                {
+                    btnLogo.Visible = false;
+                }
+            }
+            catch (Exception ex)
+            {
+                MainPage.Log("Error", $"閲戣寕logo鏄剧ず澶勭悊寮傚父锛歿ex.Message}");
+            }
+
             Button btnFunctionViewBg;
             btnFunctionViewBg = new Button()
             {
                 Height = Application.GetRealWidth(100),
                 Width = Application.GetRealWidth(102),
-                UnSelectedImagePath = "FunctionIcon/FunctionBg/AcstFunctionBg.png",
+                UnSelectedImagePath = function.spk == SPK.AcstParent ? "FunctionIcon/FunctionBg/AcstFunctionBg.png" : "FunctionIcon/FunctionBg/InverterJinmaoFunctionBg.png",
             };
             view.AddChidren(btnFunctionViewBg);
             if (function.spk == SPK.AcstParent)
@@ -1805,7 +1822,7 @@
             }
             else if (function.spk == SPK.InverterJinmao)
             {
-                btnName.TextID = StringId.NewEnergy;
+                //btnName.TextID = StringId.NewEnergy;
                 btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                 {
                     var page = new InverterJinmaoPage();

--
Gitblit v1.8.0