From 35c4bc03ee8da50317cd3f33e9f52f0a4259affd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:53:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 490f401..19c8c8a 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -503,7 +503,7 @@
UserInfo.Current.SaveUserInfo();
Action action = () =>
{
- MainPage.GoUserPage();
+ MainPage.GoUserPage(true);
};
new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
});
@@ -553,11 +553,11 @@
/// <summary>
/// 鑾峰彇鍒锋柊褰撳墠浣忓畢鐨勭綉鍏冲垪琛�
/// </summary>
- public void GetHomeGatewayList()
+ public string GetHomeGatewayList()
{
try
{
- if (string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID)) return;
+ if (string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID)) return "";
var nowhomeId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = nowhomeId });
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
@@ -571,7 +571,7 @@
if (mHomeGatewayRes.Count > 0)
{
DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
- if(mHomeGatewayRes[0].gatewayStatus)
+ if (mHomeGatewayRes[0].gatewayStatus)
{
//DriverLayer.Control.Ins.IsRemote = true;
DriverLayer.Control.Ins.GatewayOnline = true;
@@ -581,7 +581,7 @@
DriverLayer.Control.Ins.GatewayOnline = false;
}
DB_ResidenceData.Instance.SaveResidenceData();
- return;
+ return revertObj.Code;
}
}
//鍏朵綑鎯呭喌娓呯┖缃戝叧淇℃伅
@@ -593,12 +593,34 @@
{
//鎻愮ず閿欒
}
+ return revertObj.Code;
}
catch
{
-
+ return "";
}
}
+ /// <summary>
+ /// 鑾峰彇缃戝叧淇℃伅
+ /// </summary>
+ public string GetGatewayInfo()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGatewayInfo, jsonString);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<HomeGatewayInfo>(revertObj.Data.ToString());
+ if (mHomeGatewayRes != null)
+ {
+ DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes;
+ DB_ResidenceData.Instance.SaveResidenceData();
+ }
+ }
+ return revertObj.Code;
+ }
/// <summary>
/// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
--
Gitblit v1.8.0