From 20e0fb92d25047fabd2dc418597c0ff9b595b07c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 21 十二月 2020 19:35:33 +0800
Subject: [PATCH] 2020-12-21 1.解决房间修改图片后，分类页面对应房间图标没及时刷新问题。
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 855b89c..dd81a73 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;
@@ -494,6 +501,25 @@
}
functionCategoryCount++;
+ //FunctionType ft = FunctionType.A31Music
+ //switch (item)
+ //{
+ // case FunctionType.FloorHeating:
+ // break;
+ // case FunctionType.AC:
+ // break;
+ // case FunctionType.MotorCurtain:
+ // case FunctionType.Curtain:
+ // case FunctionType.RollingShutter:
+ // break;
+ // case FunctionType.Relay:
+ // case FunctionType.Dimmer:
+ // case FunctionType.RGB:
+ // case FunctionType.ColorTemperature:
+ // break;
+ // case FunctionType.Socket:
+ // break;
+ //}
FrameLayout functionView = new FrameLayout()
{
Height = Application.GetRealWidth(161),
@@ -502,6 +528,7 @@
Tag = item + "_View",
Y = index % 2 == 1 ? lastY2 : lastY1
};
+ MainPage.Log($"Load FunctionView Tag = {item}");
//楂樺害绋嶉珮鐨剉iew
if (specialList.Contains(index))
{
@@ -570,7 +597,7 @@
btnLightPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnLightPower, item);
+ LoadEvent_SwitchFunction(btnLightPower, item, functionView);
};
functionPageTitleId = StringId.Lights;
@@ -595,7 +622,7 @@
functionView.AddChidren(btnAcPower);
btnAcPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnAcPower, item);
+ LoadEvent_SwitchFunction(btnAcPower, item, functionView);
};
functionPageTitleId = StringId.AC;
#endregion
@@ -614,7 +641,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);
@@ -631,7 +657,7 @@
IsSelected = DB_ResidenceData.Instance.GlobalCurtainStatus,
};
functionView.AddChidren(btnOpen);
- LoadEvent_CurtainSwitch(btnClose, btnOpen);
+ LoadEvent_CurtainSwitch(btnClose, btnOpen, functionView);
functionPageTitleId = StringId.Curtain;
#endregion
@@ -655,7 +681,7 @@
functionView.AddChidren(btnFhPower);
btnFhPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnFhPower, item);
+ LoadEvent_SwitchFunction(btnFhPower, item, functionView);
};
functionPageTitleId = StringId.FloorHeating;
#endregion
@@ -682,7 +708,7 @@
functionView.AddChidren(btnElectricPower);
btnElectricPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnElectricPower, item);
+ LoadEvent_SwitchFunction(btnElectricPower, item, functionView);
};
functionPageTitleId = StringId.Electric;
#endregion
@@ -920,7 +946,7 @@
{
foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
{
- if (room.parentId == floor.roomId)
+ if (room.parentId == floor.uid)
{
roomsShowed.Add(room);
}
--
Gitblit v1.8.0