From 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 19:35:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 34747d8..7474bce 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+using System;
using System.IO;
using System.Net;
using HDL_ON.DAL.Server;
@@ -18,6 +18,8 @@
///// </summary>
//public static string gatewayId = DriverLayer.Control.Ins.GatewayId;
+ //public static string homeId = UserInfo.Current.CurReginID;
+
/// <summary>
/// 缃戝叧ID(鑾峰彇鍢変箰缃戝叧ID)
/// </summary>
@@ -27,11 +29,12 @@
{
if (Entity.DB_ResidenceData.residenceData.HomeGateway == null)
{
- return "";
+ return DriverLayer.Control.Ins.GatewayId;
}
return Entity.DB_ResidenceData.residenceData.HomeGateway.gatewayId;
}
}
+
/// <summary>
/// 浣忓畢ID
/// </summary>
--
Gitblit v1.8.0