From 55bd5c4ccb56cbd3c10e6b170aaab20d7023c139 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 14 十二月 2020 10:44:41 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 2a667fb..45bed8c 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -492,11 +492,12 @@
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(() =>
{
- DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
+ DB_ResidenceData.Instance.SetCurrentRegion(0);
GetHomeGatewayList();
DB_ResidenceData.Instance.SaveResidenceData();
UserInfo.Current.SaveUserInfo();
@@ -509,6 +510,9 @@
}
else
{
+ //鍒锋柊褰撳墠浣忓畢
+ DB_ResidenceData.Instance.CurrentRegion = findHome;
+ DB_ResidenceData.Instance.SaveResidenceData();
UserInfo.Current.SaveUserInfo();
//鍒锋柊涓�娆′綇瀹呯綉鍏�
GetHomeGatewayList();
--
Gitblit v1.8.0