From 0f7f4d950441da043dc5c93950ea63457fb1b358 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 三月 2023 12:01:26 +0800
Subject: [PATCH] 合并备份
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 3b85c15..04c6273 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -546,7 +546,6 @@
{
if (DB_ResidenceData.Instance.CurrentRegion.id != "")
{
- DB_ResidenceData.Instance.CurrentRegion = null;
Shared.Application.RunOnMainThread(() =>
{
MainPage.GoUserPage(false);
@@ -3195,11 +3194,12 @@
/// </summary>
/// <param name="spk"></param>
/// <returns></returns>
- public ResponsePackNew AddGroupControl()
+ public ResponsePackNew AddGroupControl(List<GroupControl> groupControls)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+ d.Add("infos", groupControls);
var requestJson = HttpUtil.GetSignRequestJson(d);
var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGroupControlListByHome, requestJson);
return pack;
--
Gitblit v1.8.0