Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs

@@ -117,20 +117,11 @@
                frow.IsSelected = true;
            }

            frow.ButtonClickEvent += SelectFloor_MouseUpEvent;
        }

        /// <summary>
        /// SelectFloor_MouseUpEvent
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>
        private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
        {
            (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
            var home = UserCenter.HdlResidenceLogic.Current.GetHouseByFilePath((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
            RemoveView();
            HouseAction?.Invoke(home.Id);
            frow.ButtonClickEvent += (sender, e) =>
            {

                RemoveView();

                HouseAction?.Invoke(house.Id);

            };
        }

        /// <summary>