From 7232642ff48a7fbde2018cde652f3e771fa58025 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 27 一月 2021 14:32:55 +0800
Subject: [PATCH] 20200127-英文版处理
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 84 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 490f401..c27acef 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,17 +571,16 @@
if (mHomeGatewayRes.Count > 0)
{
DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
- if(mHomeGatewayRes[0].gatewayStatus)
- {
- //DriverLayer.Control.Ins.IsRemote = true;
- DriverLayer.Control.Ins.GatewayOnline = true;
- }
- else
- {
- DriverLayer.Control.Ins.GatewayOnline = false;
- }
+ //if (mHomeGatewayRes[0].gatewayStatus)
+ //{
+ // DriverLayer.Control.Ins.GatewayOnline = true;
+ //}
+ //else
+ //{
+ // DriverLayer.Control.Ins.GatewayOnline = false;
+ //}
DB_ResidenceData.Instance.SaveResidenceData();
- return;
+ return revertObj.Code;
}
}
//鍏朵綑鎯呭喌娓呯┖缃戝叧淇℃伅
@@ -593,11 +592,35 @@
{
//鎻愮ず閿欒
}
+ 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);
+ var jsonString = HttpUtil.GetSignRequestJson(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)
+ {
+ if(mHomeGatewayRes.gatewayStatus)
+ {
+ DriverLayer.Control.Ins.GatewayOnline = true;
+ }
+ }
+ }
+ return revertObj.Code;
}
/// <summary>
@@ -1802,7 +1825,7 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
- d.Add("deviceId", function.deviceId);//DriverLayer.Control.Ins.GatewayId);
+ d.Add("deviceId", function.deviceId);
d.Add("name", function.name);
d.Add("collect", function.collect);
d.Add("roomIds", function.roomIds);
@@ -1810,6 +1833,22 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDevice, requestJson);
}
+ /// <summary>
+ /// 鏇存柊璁惧缁戝畾鎴块棿淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew UpdataDevcieBindRoomInfo(Function function)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("deviceId", function.deviceId);
+ d.Add("roomIds", function.roomIds);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDevice, requestJson);
+ }
+
+
/// <summary>
/// 璁惧缁戝畾鎴块棿
/// </summary>
@@ -1908,6 +1947,21 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
}
+
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙璇︽儏鍒楄〃
+ /// </summary>
+ /// <param name="seceneId">鍦烘櫙ID</param>
+ /// <returns></returns>
+ public ResponsePackNew GetSceneListInfo(List<string> seceneIds)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("userSceneIds", seceneIds);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
+ }
+
/// <summary>
/// 娣诲姞鍦烘櫙
/// </summary>
--
Gitblit v1.8.0