From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复,增加面容ID验证。2.错误码对接增加。

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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..19d5c5a 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>
@@ -25,17 +27,18 @@
         {
             get
             {
-                if (Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+                if (Entity.DB_ResidenceData.Instance.HomeGateway == null)
                 {
-                    return "";
+                    return DriverLayer.Control.Ins.GatewayId;
                 }
-                return Entity.DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+                return Entity.DB_ResidenceData.Instance.HomeGateway.gatewayId;
             }
         }
+        
         /// <summary>
         /// 浣忓畢ID
         /// </summary>
-        public static string homeId = Entity.DB_ResidenceData.residenceData.residecenInfo.RegionID;
+        public static string homeId = Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
 
 
         /// <summary>

--
Gitblit v1.8.0