From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28

---
 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 517fe26..f0cae0b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -189,7 +189,7 @@
                 //娌℃湁璁剧疆杩囨ā寮�
                 if (AppResidenceMode == 0)
                 {
-                    var frame = new TopRightMenuControl(2);
+                    var frame = new TopRightMenuControl(2, 2);
                     //鍒涘缓妤煎眰
                     frame.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uCreatFloor), "Item/CreatFloor.png", "Item/CreatFloorSelected.png", () =>
                     {
@@ -353,6 +353,18 @@
                     {
                         //绉婚櫎妤煎眰
                         Common.Config.Instance.Home.FloorDics.Remove(keys);
+                        if (Common.Config.Instance.Home.CurrentFloorId == keys)
+                        {
+                            //濡傛灉鍒犻櫎鐨勬槸褰撳墠妤煎眰鐨勮瘽
+                            Common.Config.Instance.Home.CurrentFloorId = string.Empty;
+                            foreach (string floorId in Common.Config.Instance.Home.FloorDics.Keys)
+                            {
+                                //鎶婄涓�涓ゼ灞侷D缁欏畠
+                                Common.Config.Instance.Home.CurrentFloorId = floorId;
+                                break;
+                            }
+                        }
+                        
                         if (Common.Room.CurrentRoom == null)
                         {
                             Common.Room.CurrentRoom = Common.Room.Lists[0];

--
Gitblit v1.8.0