From b88f0d4dd35615302186c0c238d1b61825a74892 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 二月 2022 11:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 9bec14b..d38ec13 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -199,13 +199,13 @@
//Dome妯″紡
if (MainPage.NoLoginMode)
{
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
return;
}
if (!Control.Ins.GatewayOnline_Local && !Control.Ins.GatewayOnline_Cloud)
{
bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
+ bodyView.btnLinkStateTip.TextID = StringId.NetworkAnomaly;
}
else
{
@@ -215,7 +215,8 @@
}
else
{
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+ bodyView.btnLinkStateTip.BackgroundColor = 0x00000000;
+ bodyView.btnLinkStateTip.Text = "";
}
}
}
@@ -493,6 +494,14 @@
d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
Control.Ins.SendWriteCommand(function, d);
}
+ else if (function.spk == SPK.PanelSocket)
+ {
+ if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
+ {
+ d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
+ }
+ Control.Ins.SendWriteCommand(function, d);
+ }
else
{
d.Add("on_off", function.trait_on_off.curValue.ToString());
--
Gitblit v1.8.0