From 1a13c963a5fb8cad92bf03667e411f46d6a6a843 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:10:33 +0800
Subject: [PATCH] Revert "Merge branch 'tzy' into NewFilePath"
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 998734e..580a8a6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -9,17 +9,6 @@
{
public class Send
{
- ///// <summary>
- ///// 浣忓畢ID
- ///// </summary>
- //public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
- ///// <summary>
- ///// 缃戝叧ID锛堢妗℃湁缃戝叧ID鍗磋繑鍥炴槸MAC锛�
- ///// </summary>
- //public static string gatewayId = DriverLayer.Control.Ins.GatewayId;
-
- //public static string homeId = UserInfo.Current.CurReginID;
-
/// <summary>
/// 缃戝叧ID(鑾峰彇鍢変箰缃戝叧ID)
/// </summary>
@@ -34,12 +23,17 @@
return Entity.DB_ResidenceData.Instance.HomeGateway.gatewayId;
}
}
-
+
/// <summary>
/// 浣忓畢ID
/// </summary>
- public static string homeId = Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
-
+ public static string homeId
+ {
+ get
+ {
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
+ }
+ }
/// <summary>
/// 鑾峰彇閫昏緫ID鍒楄〃
@@ -296,9 +290,6 @@
/// <returns></returns>
public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 3)
{
-
-
-
var requestJson = HttpUtil.GetSignRequestJson(o);
return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
--
Gitblit v1.8.0