From 2bc230cf2e7a7329c2329b07307a47b059835bbc Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 10:20:52 +0800
Subject: [PATCH] 2019-10-18-1
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 7f6e7af..e634aee 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -561,7 +561,7 @@
/// <param name="selectedBtn">閫変腑閭ｄ釜鐣岄潰 0--鍔熻兘 1--鍦烘櫙 2--鑷姩鍖� </param>
public void Show(int selectedBtn = 1)
{
- InitFloor();
+
ZbGateway.StatusList.Add(this);
RemoveAll();
@@ -657,7 +657,7 @@
if (Config.Instance.Home.FloorDics.Count > 0)
{
- floorBtn.Text = Config.Instance.Home.GetCurrentFloorName();
+ floorBtn.Text = Config.Instance.Home.GetCurrentFloorName;
functionSceneAutoBG.AddChidren(floorBtn);
functionSceneAutoBG.AddChidren(selectFloorBtn);
}
@@ -704,6 +704,9 @@
BorderWidth=1
};
row.AddChidren(roomBtn);
+ if (Shared.Common.Room.CurrentRoom==null) {
+ continue;
+ }
if(Shared.Common.Room.CurrentRoom.FileName==roomFilePath)
{
roomBtn.IsSelected = true;
--
Gitblit v1.8.0