From 3fcb73db484d2bed5ee993702913a7eaea68068c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 八月 2023 18:01:23 +0800
Subject: [PATCH] 2.1.2
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 47d6c7c..67e453b 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -915,7 +915,6 @@
sceneFunctionView = new VerticalScrolViewLayout();
contentView.AddChidren(sceneFunctionView);
LoadSceneFunctionControlZone();
- contentView.PageIndex = CurShowTypeContent;
if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
gcFunctionView = new VerticalScrolViewLayout();
@@ -929,6 +928,7 @@
GetUnreadPushMessages();
RegisterGetPushMessageAction();
+ contentView.PageIndex = CurShowTypeContent;
if (waitPage != null)
{
waitPage.RemoveFromParent();
@@ -989,11 +989,11 @@
foreach (var function in list)
{
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
- if (SPK.MusicSpkList().Contains( function.spk))
- {
- continue;
- }
- else
+ //if (SPK.MusicSpkList().Contains( function.spk))
+ //{
+ // continue;
+ //}
+ //else
{
if (!function.collect)
continue;
@@ -1087,9 +1087,9 @@
/// </summary>
void LoadGroupControlFunctionControlZone()
{
+
#region ContextView
gcFunctionView.RemoveAll();
- functionViews.Clear();
var rowView = new FrameLayout();
try
{
@@ -1454,7 +1454,7 @@
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
- btnCollection.Visible = false;
+ //btnCollection.Visible = false;
Button btnPower;
btnPower = new Button()
{
@@ -1560,6 +1560,10 @@
// btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
// btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
//}
+ else if (function.spk == SPK.ElectricEnergy || function.spk == SPK.AirSwitch || function.spk == SPK.AirSwitchP3)
+ {
+
+ }
else
{
Button btnSwitch;
@@ -1601,7 +1605,7 @@
btnName.MouseUpEventHandler = skipControlPageEvent;
btnIcon.MouseUpEventHandler = skipControlPageEvent;
btnState.MouseUpEventHandler = skipControlPageEvent;
- //涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔ㄨ兘鍒楄〃
+ //涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔熻兘鍒楄〃
if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
{
UpdataFunctionStates(function);
@@ -1617,7 +1621,7 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
Tag = "OnlineTag",
- Visible = !function.online
+ Visible = !function.isOnline()
};
view.AddChidren(btnOffline);
--
Gitblit v1.8.0