Merge branch 'CJL' into NewFilePath

wxr

2020-12-14 55bd5c4ccb56cbd3c10e6b170aaab20d7023c139

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -492,7 +492,8 @@
                        UserInfo.Current.regionList.Add(home);
                    }
                    //住宅被删除
                    if (UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID) == null)
                    var findHome = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID);
                    if (findHome == null)
                    {
                        Shared.Application.RunOnMainThread(() =>
                        {
@@ -509,6 +510,9 @@
                    }
                    else
                    {
                        //刷新当前住宅
                        DB_ResidenceData.Instance.CurrentRegion = findHome;
                        DB_ResidenceData.Instance.SaveResidenceData();
                        UserInfo.Current.SaveUserInfo();
                        //刷新一次住宅网关
                        GetHomeGatewayList();