Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs

@@ -462,7 +462,10 @@
            {

                if (Config.Instance.HomeFilePathList.Contains($"House_{keys}.json") == false)

                {

                    //保存顺序

                    listResidenceSort.Remove(keys);

                    Room.CurrentRoom.SaveFloorSort(listResidenceSort);



                    this.listView.RemoveAll();

                    //数据已经变更

                    HdlThreadLogic.Current.RunThread(() =>