From 1ecba3f7432912d4eb7637355f4dfae676059e00 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 17:23:58 +0800
Subject: [PATCH] 1
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index f44b93d..71bfe0f 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -491,31 +491,44 @@
};
UserInfo.Current.regionList.Add(home);
}
- //浣忓畢琚垹闄�
- 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];
- GetHomeGatewayList();
- DB_ResidenceData.Instance.SaveResidenceData();
- UserInfo.Current.SaveUserInfo();
- Action action = () =>
- {
- MainPage.GoUserPage();
- };
- new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
- });
- }
- else
+ //-------濡傛灉璐﹀彿鏄娆＄櫥褰�
+ if (DB_ResidenceData.Instance.CurrentRegion == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID))
{
//鍒锋柊褰撳墠浣忓畢
- DB_ResidenceData.Instance.CurrentRegion = findHome;
+ DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
DB_ResidenceData.Instance.SaveResidenceData();
UserInfo.Current.SaveUserInfo();
//鍒锋柊涓�娆′綇瀹呯綉鍏�
GetHomeGatewayList();
+ }
+ else
+ {
+ //浣忓畢琚垹闄�
+ 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];
+ GetHomeGatewayList();
+ DB_ResidenceData.Instance.SaveResidenceData();
+ UserInfo.Current.SaveUserInfo();
+ Action action = () =>
+ {
+ MainPage.GoUserPage();
+ };
+ new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
+ });
+ }
+ else
+ {
+ //鍒锋柊褰撳墠浣忓畢
+ DB_ResidenceData.Instance.CurrentRegion = findHome;
+ DB_ResidenceData.Instance.SaveResidenceData();
+ UserInfo.Current.SaveUserInfo();
+ //鍒锋柊涓�娆′綇瀹呯綉鍏�
+ GetHomeGatewayList();
+ }
}
}
}
@@ -572,8 +585,12 @@
DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
{
- DriverLayer.Control.Ins.IsRemote = true;
+ //DriverLayer.Control.Ins.IsRemote = true;
DriverLayer.Control.Ins.GatewayOnline = true;
+ }
+ else
+ {
+ DriverLayer.Control.Ins.GatewayOnline = false;
}
DB_ResidenceData.Instance.SaveResidenceData();
return;
@@ -1900,7 +1917,7 @@
d.Add("userSceneIds",new List<string>() { seceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneList, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
}
/// <summary>
/// 娣诲姞鍦烘櫙
--
Gitblit v1.8.0