2019-10-18-1

WJC

2019-10-18 2bc230cf2e7a7329c2329b07307a47b059835bbc

 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;