From 631f94758c3cb42abcdda8094e77895f376eff16 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:53:43 +0800
Subject: [PATCH] 2021-1-12-3
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index c6a88dc..3e62c97 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;
@@ -497,20 +504,20 @@
//FunctionType ft = FunctionType.A31Music
//switch (item)
//{
- // case FunctionType.FloorHeating:
+ // case SPK.FloorHeatStandard:
// break;
- // case FunctionType.AC:
+ // case SPK.AcStandard:
// break;
- // case FunctionType.MotorCurtain:
- // case FunctionType.Curtain:
- // case FunctionType.RollingShutter:
+ // case SPK.CurtainTrietex:
+ // case SPK.CurtainSwitch:
+ // case SPK.CurtainRoller:
// break;
- // case FunctionType.Relay:
- // case FunctionType.Dimmer:
- // case FunctionType.RGB:
- // case FunctionType.ColorTemperature:
+ // case SPK.LightSwitch:
+ // case SPK.LightDimming:
+ // case SPK.LightRGB:
+ // case SPK.LightCCT:
// break;
- // case FunctionType.Socket:
+ // case SPK.ElectricSocket:
// break;
//}
FrameLayout functionView = new FrameLayout()
--
Gitblit v1.8.0