From f0f63edda354eaf18895f0b92ff6d308bd778176 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 07 十二月 2020 11:01:12 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/DAL/DriverLayer/Control.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 22e42b4..aeb874a 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -228,13 +228,14 @@
function.refreshTime = DateTime.Now;
DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
//杩滅▼閫氳
- if (Ins.IsRemote)
+ if (!Ins.IsRemote)
{
//ALink鎺у埗銆丅us鎺у埗浣跨敤鍚屼竴涓帴鍙ｆ帶鍒讹紝鐢变簯绔礋璐ｈВ鏋�
var apiControlData = function.GetApiControlData(commandDictionary);
var actionObjs = new List<ApiAlinkControlActionObj>();
actionObjs.Add(apiControlData);
- httpServer.ControlDevice(actionObjs);
+ var pack = httpServer.ControlDevice(actionObjs);
+ MainPage.Log($"{pack.Code}:{pack.Data}");
}
//鏈湴閫氳
else
--
Gitblit v1.8.0