From baf36afaef0fabfe6377aba123980d54be77560e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 09:29:48 +0800
Subject: [PATCH] 2020-12-23 1.更新
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index f333a9b..27685d0 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -373,7 +373,14 @@
roomView.RemoveFromParent();
};
- var view = new RoomPage(room, ReloadRoomName, deleteAction);
+ //鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�
+ Action modifyImageAction = () =>
+ {
+ //roomViewbg.ImagePath = room.backgroundImage;
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
+ };
+
+ var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
MainPage.BasePageView.AddChidren(view);
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -589,7 +596,7 @@
btnLightPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnLightPower, item);
+ LoadEvent_SwitchFunction(btnLightPower, item, functionView);
};
functionPageTitleId = StringId.Lights;
@@ -614,7 +621,7 @@
functionView.AddChidren(btnAcPower);
btnAcPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnAcPower, item);
+ LoadEvent_SwitchFunction(btnAcPower, item, functionView);
};
functionPageTitleId = StringId.AC;
#endregion
@@ -633,7 +640,6 @@
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
- //Tag = item + "_AllControl",
IsSelected = !DB_ResidenceData.Instance.GlobalCurtainStatus,
};
functionView.AddChidren(btnClose);
@@ -650,7 +656,7 @@
IsSelected = DB_ResidenceData.Instance.GlobalCurtainStatus,
};
functionView.AddChidren(btnOpen);
- LoadEvent_CurtainSwitch(btnClose, btnOpen);
+ LoadEvent_CurtainSwitch(btnClose, btnOpen, functionView);
functionPageTitleId = StringId.Curtain;
#endregion
@@ -674,7 +680,7 @@
functionView.AddChidren(btnFhPower);
btnFhPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnFhPower, item);
+ LoadEvent_SwitchFunction(btnFhPower, item, functionView);
};
functionPageTitleId = StringId.FloorHeating;
#endregion
@@ -701,7 +707,7 @@
functionView.AddChidren(btnElectricPower);
btnElectricPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnElectricPower, item);
+ LoadEvent_SwitchFunction(btnElectricPower, item, functionView);
};
functionPageTitleId = StringId.Electric;
#endregion
@@ -921,7 +927,7 @@
Text = floor.roomName,
TextSize = CSS_FontSize.SubheadingFontSize,
IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
- IsMoreLines = true,
+ //IsMoreLines = true,
};
contentView.AddChidren(btnHomeName);
--
Gitblit v1.8.0