From c4f0723cc7053933a6e598eb0c58cfdf4e9d7459 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 04 一月 2021 14:13:01 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/DAL/DriverLayer/Control.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 861a54d..c7e2314 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -342,14 +342,14 @@
public void SwtichFunctions(bool open,List<Function> functions)
{
var count = 0;
- var logString = open ? "鎵撳紑" : "鍏抽棴";
+ var logString = open ? "鎵撳紑\r\n" : "鍏抽棴\r\n";
List<ApiAlinkControlActionObj> actionObjs = new List<ApiAlinkControlActionObj>();
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, open ? "on" : "off");
var pm = new DAL.Server.HttpServerRequest();
foreach (var temp in functions)
{
- logString += temp.spk + ":" + temp.sid;
+ logString += temp.spk + ":" + temp.sid + "\r\n";
var apiControlData = temp.GetApiControlData(d);
actionObjs.Add(apiControlData);
count++;
@@ -442,8 +442,16 @@
{
if (Ins.IsRemote)
{
- var pm = new DAL.Server.HttpServerRequest();
- var result = pm.ExecuteScene(scene.userSceneId);
+ //浜戠鍋氬鐞嗗彂閫佷竴绔彛鍦烘櫙
+ //if (DB_ResidenceData.Instance.GatewayType == 0)
+ //{
+ // new Control_Udp().ControlBusScenes(scene);
+ //}
+ //else
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ var result = pm.ExecuteScene(scene.userSceneId);
+ }
}
else
{
--
Gitblit v1.8.0