From 4564687f2ada89760eda21568baa9cfdc3ff3fa4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 11 三月 2022 15:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index bed8a4e..2d42531 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -193,6 +193,19 @@
#if DEBUG
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
+
+ if (UserInfo.Current.VerOpenDoorPw || string.IsNullOrEmpty(UserInfo.Current.doorPasswordString))
+ {
+ var page = new DoorLockUnlockPage(new Function());
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadView();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else
+ {
+ Control.Ins.OneKeyUnlocking(new Function(), UserInfo.Current.doorPasswordString);
+ }
+
};
#endif
@@ -856,6 +869,7 @@
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
if (SPK.MusicSpkList().Contains( function.spk))
{
+ continue;
//var music = function as Music.A31MusicModel;
//var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
//if (music == null)
@@ -924,6 +938,12 @@
functionViews.Add(functionView);
LoadDeviceFunctionDiv(functionView, function);
index++;
+
+
+ if (!function.online)
+ {
+ btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ }
}
if (index == 0)
@@ -1306,6 +1326,23 @@
{
UpdataFunctionStates(function);
}
+
+
+ if (!function.online)
+ {
+ var btnOffline = new Button()
+ {
+ X = btnIcon.Right,
+ Y = Application.GetRealWidth(16),
+ Height = Application.GetMinRealAverage(32),
+ TextID = StringId.DeviceOffline,
+ TextColor = CSS_Color.WarningColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft
+ };
+ view.AddChidren(btnOffline);
+
+ }
}
catch (Exception ex)
{
--
Gitblit v1.8.0