Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/Shared/Common/House.cs

@@ -174,6 +174,8 @@
            }
            home.Name = houseName;
            home.Save();
            //住宅修改名称的话,主页需要重新刷新

            Phone.UserView.UserPage.Instance.RefreshForm = true;
        }

        #endregion
@@ -399,6 +401,7 @@
        /// GetCurrentFloorName
        /// </summary>
        /// <returns></returns>
        [Newtonsoft.Json.JsonIgnore]
        public string GetCurrentFloorName
        {
            get