From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..998734e 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>
@@ -291,8 +294,11 @@
///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛�
/// </summary>
/// <returns></returns>
- public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 10)
+ 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