From 9bc0ea236cad9e5c86d0d6fe03eabb327b693096 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 18:03:16 +0800
Subject: [PATCH] Update SplashActivity.cs
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 7693cb4..dbe2dc1 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)
@@ -1596,16 +1596,6 @@
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
}
- else if (function.spk == SPK.VideoDoorLock)
- {
- btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
- //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
- }
- else if (function.spk == SPK.AvZkAiks)
- {
- //涓轰簡鍘绘帀寮�鍏虫寜閽�
- btnIcon.UnSelectedImagePath = "AksIcon/yingyinzhongkong1.png";
- }
else if (function.spk == SPK.GroupControl)
{
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
@@ -1710,8 +1700,7 @@
};
- var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect, () =>
- {
+ var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, Comerom.collect,()=> {
this.LoadDeviceFunctionControlZone();//鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
});
view.MouseUpEventHandler = skipControlPageEvent;
@@ -1765,7 +1754,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 +1775,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 +1811,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