From a154c3ce81601e3c202d3c5f4d0a8cefc5a7e8ae Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 02 三月 2022 11:49:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 80793fd..43a2944 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -199,24 +199,20 @@
//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;
+ 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 = CSS.CSS_Color.MainColor;
- }
+ bodyView.btnLinkStateTip.BackgroundColor = 0x00000000;
+ bodyView.btnLinkStateTip.Text = "";
+ bodyView.environmentalView.Y = Application.GetRealHeight(1) + btnResidenceName.Bottom;
}
}
@@ -244,11 +240,11 @@
function.collect = false;
if (SPK.MusicSpkList().Contains(function.spk))//澶勭悊闊充箰涓讳粠鍏崇郴
{
- if ((function as Music.A31MusicModel).ServerClientType == 1)
- {
- (function as Music.A31MusicModel).MainPlayCollection = false;
- Music.A31MusicModel.Save();
- }
+ //if ((function as Music.A31MusicModel).ServerClientType == 1)
+ //{
+ // (function as Music.A31MusicModel).MainPlayCollection = false;
+ // Music.A31MusicModel.Save();
+ //}
}
string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
LoadDeviceFunctionControlZone();
@@ -374,7 +370,7 @@
{
if (SPK.MusicSpkList().Contains(function.spk))
{
- btn.Text = (function as Music.A31MusicModel).A31PlayStatus.Title;
+ btn.Text =function.GetAttrState("song_name");
}
else
{
--
Gitblit v1.8.0