From f8bafd162ad7adf2f21986389568d650b71f976b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 三月 2022 17:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index d38ec13..8b19f2a 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -206,18 +206,13 @@
{
bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
bodyView.btnLinkStateTip.TextID = StringId.NetworkAnomaly;
+ bodyView.environmentalView.Y = Application.GetRealHeight(8) + btnResidenceName.Bottom;
}
else
{
- if (Control.Ins.GatewayOnline_Local)
- {
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipLocal;
- }
- else
- {
- bodyView.btnLinkStateTip.BackgroundColor = 0x00000000;
- bodyView.btnLinkStateTip.Text = "";
- }
+ bodyView.btnLinkStateTip.BackgroundColor = 0x00000000;
+ bodyView.btnLinkStateTip.Text = "";
+ bodyView.environmentalView.Y = Application.GetRealHeight(1) + btnResidenceName.Bottom;
}
}
@@ -347,6 +342,11 @@
{
if (view.Tag.ToString() == function.sid)
{
+ //if (!function.online)
+ //{
+ // view.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ //}
+
var state = false;
if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades || function.spk == SPK.CurtainTrietex ||
function.spk == SPK.CurtainSwitch)//绐楀笜璁惧鏍规嵁鐧惧垎姣斿垽鏂紑鍏崇姸鎬�
--
Gitblit v1.8.0