From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 2f32631..241b0c6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -4,33 +4,11 @@
using HDL_ON.DAL.Server;
using Newtonsoft.Json.Linq;
using System.Collections.Generic;
-using HDL_ON.Entity;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
public class Send
{
-
- /// <summary>
- /// 璋冪敤鑾峰彇浣忓畢瀛愯处鍙峰垪琛�
- /// </summary>
- public static List<ResidenceMemberInfo> GetResidenceMemberAccount()
- {
-
- var responePack = new HttpServerRequest().GetResidenceMemberAccount();
- if (responePack.Code == StateCode.SUCCESS)
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.Data.ToString());
- }
- //澶辫触
- else
- {
- //鎻愮ず
- IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
- }
- return new List<ResidenceMemberInfo>();
- }
-
/// <summary>
/// 鑾峰彇閫昏緫ID鍒楄〃
/// </summary>
@@ -128,6 +106,7 @@
outputArray.Add(outputTypeJOb);
}
+<<<<<<< HEAD
var noticeConfigJObject = new JObject();
noticeConfigJObject.Add("enable", logic.noticeConfig.enable);
@@ -151,6 +130,8 @@
}
}
+=======
+>>>>>>> origin/CJL-LC
var logicjArray = new JArray { };
var logicIfon = new JObject { };
logicIfon.Add("sid", logic.sid);
@@ -161,8 +142,11 @@
logicIfon.Add("cycle", cycleJObject);
logicIfon.Add("input", inputArray);
logicIfon.Add("output", outputArray);
+<<<<<<< HEAD
logicIfon.Add("noticeConfig", noticeConfigJObject);
logicIfon.Add("pushConfigs", pushConfigsArray);
+=======
+>>>>>>> origin/CJL-LC
logicjArray.Add(logicIfon);
var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };
responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add,5);
@@ -241,6 +225,7 @@
outputArray.Add(outputTypeJOb);
}
+<<<<<<< HEAD
var noticeConfigJObject = new JObject();
noticeConfigJObject.Add("enable", logic.noticeConfig.enable);
noticeConfigJObject.Add("noticeContent", logic.noticeConfig.noticeContent);
@@ -264,6 +249,8 @@
}
}
+=======
+>>>>>>> origin/CJL-LC
var logicjArray = new JArray { };
var logicIfon = new JObject { };
logicIfon.Add("userLogicId", logic.userLogicId);
@@ -275,9 +262,12 @@
logicIfon.Add("cycle", cycleJObject);
logicIfon.Add("input", inputArray);
logicIfon.Add("output", outputArray);
+<<<<<<< HEAD
logicIfon.Add("noticeConfig", noticeConfigJObject);
logicIfon.Add("pushConfigs", pushConfigsArray);
+=======
+>>>>>>> origin/CJL-LC
logicjArray.Add(logicIfon);
var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };
responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update,5);
--
Gitblit v1.8.0