From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
index f0200e7..fb9e247 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
@@ -29,6 +29,10 @@
/// </summary>
private Button floorBtn;
/// <summary>
+ /// 褰撳墠妤煎眰id
+ /// </summary>
+ private string curFloorId;
+ /// <summary>
/// 閫夋嫨妤煎眰
/// </summary>
private Button selectFloorBtn;
@@ -128,9 +132,12 @@
{
var floors = new SelectFloor();
AddChidren(floors);
+ floors.changeFloor = false;
+ floors.CurFloorId = curFloorId;
floors.Init(580, 184, Direction.Right);
floors.FloorAction += (floorId) =>
{
+ curFloorId = floorId;
floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
RefreshBodyView(floorId);
};
--
Gitblit v1.8.0