From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
index 65094ac..7b3c175 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
@@ -66,7 +66,7 @@
AddBodyView();
- RefreshBodyView();
+ RefreshBodyView(Config.Instance.Home.CurrentFloorId);
}
@@ -124,10 +124,10 @@
var floors = new SelectFloor();
AddChidren(floors);
floors.Init(580, 184, Direction.Right);
- floors.FloorAction += (floorName) =>
+ floors.FloorAction += (floorId) =>
{
- floorBtn.Text = floorName;
- RefreshBodyView();
+ floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
+ RefreshBodyView(floorId);
};
}
/// <summary>
@@ -161,15 +161,15 @@
/// <summary>
/// RefreshBodyView
/// </summary>
- private void RefreshBodyView()
+ private void RefreshBodyView(string floorId)
{
- AddRoomView();
+ AddRoomView(floorId);
}
/// <summary>
/// AddRoomView
/// </summary>
- private void AddRoomView()
+ private void AddRoomView(string floorId)
{
var roomFL = new HorizontalScrolViewLayout()
{
@@ -190,7 +190,7 @@
bodyFrameLayout.AddChidren(functionSceneBodyView);
Button curBtn = new Button();
- foreach (var room in Common.Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
+ foreach (var room in Common.Room.CurrentRoom.GetRoomsByFloorIdAppendLoveRoom(floorId))
{
var row = new FrameLayout()
{
--
Gitblit v1.8.0