From a4f57bf9dda3d52e04f537a2ca24db95761eb888 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 11:34:14 +0800
Subject: [PATCH] Revert "Merge branch 'CJL-NEW' into NewFilePath"
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 278c08d..ad9473e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -7,25 +7,25 @@
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
- public class Send
+ public class Send
{
- ///// <summary>
- ///// 浣忓畢ID
- ///// </summary>
- //public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
- ///// <summary>
- ///// 缃戝叧ID
- ///// </summary>
- //public static string gatewayId = DriverLayer.Control.Ins.GatewayId;
-
/// <summary>
/// 浣忓畢ID
/// </summary>
- public static string homeId = "1333723044544233473";
+ public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
/// <summary>
/// 缃戝叧ID
/// </summary>
- public static string gatewayId = "1333723647223775233";
+ public static string gatewayId = DriverLayer.Control.Ins.GatewayId;
+
+ ///// <summary>
+ ///// 缃戝叧ID
+ ///// </summary>
+ //public static string gatewayId =Entity.DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+ ///// <summary>
+ ///// 浣忓畢ID
+ ///// </summary>
+ //public static string homeId = Entity.DB_ResidenceData.residenceData.HomeGateway.homeId;
/// <summary>
/// 鑾峰彇閫昏緫ID鍒楄〃
@@ -40,7 +40,7 @@
/// <summary>
/// 鑾峰彇閫昏緫
/// </summary>
- /// <param name="userLogicId">閫昏緫ID</param>
+ /// <param name="listIdList">閫昏緫ID鍒楄〃</param>
/// <returns></returns>
public static ResponsePackNew getLogic(List<string> listIdList)
{
@@ -251,7 +251,6 @@
return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
}
-
/// <summary>
/// 璇锋眰鏈嶅姟鍣�
/// </summary>
--
Gitblit v1.8.0