From 014abc547ffd1a9f23c58fd7a471dffc5933fdd3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:27:56 +0800
Subject: [PATCH] Merge branch 'master' into NewFilePath
---
HDL_ON/DAL/DriverLayer/Control.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 13996e8..dcd5410 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -235,10 +235,11 @@
{
function.usageCount++;
function.refreshTime = DateTime.Now;
- DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
+
//杩滅▼閫氳
if (Ins.IsRemote)
{
+ DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
//ALink鎺у埗銆丅us鎺у埗浣跨敤鍚屼竴涓帴鍙ｆ帶鍒讹紝鐢变簯绔礋璐ｈВ鏋�
var apiControlData = function.GetApiControlData(commandDictionary);
var actionObjs = new List<ApiAlinkControlActionObj>();
@@ -468,6 +469,11 @@
public void UpdataFunctionStatus(string revString,byte []usefulBytes)
{
MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
+ if(Control.Ins.myUdp!= null)
+ {
+ //閲嶇疆閲嶅惎udp鍒ゆ柇璋冩暣
+ Ins.myUdp.controlLostCount = 0;
+ }
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
if (temp != null)
{
--
Gitblit v1.8.0