From 4aa6ae21272b3013c5042c73cdc60efa787d57df Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 20:39:02 +0800
Subject: [PATCH] 2020-12-01-4
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 142 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 135 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 6f61531..4412688 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -21,11 +21,140 @@
/// <summary>
/// 浣忓畢ID
/// </summary>
- public static string homeId = "1333681497069043713";
+ public static string homeId = "1333723044544233473";
/// <summary>
/// 缃戝叧ID
/// </summary>
- public static string gatewayId = "1333682616549752834";
+ public static string gatewayId = "1333723647223775233";
+ ///// <summary>
+ ///// 鑾峰彇閫昏緫ID鍒楄〃
+ ///// </summary>
+ ///// <returns></returns>
+ //public const string getLogicId = "鑾峰彇閫昏緫ID";
+ ///// <summary>
+ ///// 鑾峰彇閫昏緫
+ ///// </summary>
+ ///// <returns></returns>
+ //public const string getLogic= "鑾峰彇閫昏緫璇︾粏";
+ ///// <summary>
+ ///// 娣诲姞鑷姩鍖栧懡浠�
+ ///// </summary>
+ ///// <returns></returns>
+ //public const string addLogic= "娣诲姞鏂伴�昏緫";
+ ///// <summary>
+ ///// 缂栬緫鏇存柊閫昏緫
+ ///// </summary>
+ ///// <returns></returns>
+ //public const string updateLogic = "缂栬緫閫昏緫";
+ ///// <summary>
+ ///// 鍒犻櫎閫昏緫
+ ///// </summary>
+ ///// <returns></returns>
+ //public const string delLogic = "鍒犻櫎閫昏緫";
+ ///// <summary>
+ ///// 閫昏緫寮�鍏�
+ ///// </summary>
+ ///// <returns></returns>
+ //public const string switchLogic = "閫昏緫寮�鍏�";
+ //public static ResponsePackNew Logic(string type,Logic logic) {
+ // string url = "";
+ // var jObject = new JObject { };
+ // switch (type) {
+ // case getLogicId: {
+ // jObject.Add("homeId",homeId);
+ // url = NewAPI.API_POST_Logic_List;
+ // }
+ // break;
+ // case getLogic: {
+ // var jArray = new JArray { };
+ // jArray.Add(logic.userLogicId);
+ // jObject.Add("userLogicIds", jArray);
+ // url = NewAPI.API_POST_Logic_Info;
+ // } break;
+ // case addLogic: {
+ // try
+ // {
+ // var cycleJObject = new JObject { };
+ // var cyclevaluejArray = new JArray { };
+ // cycleJObject.Add("type", logic.cycle.type);
+ // foreach (var dictionary in logic.cycle.value)
+ // {
+ // cyclevaluejArray.Add(dictionary);
+ // }
+ // cycleJObject.Add("value", cyclevaluejArray);
+
+ // var inputArray = new JArray { };
+ // foreach (var dictionary in logic.input)
+ // {
+ // var inputTypeJOb = new JObject { };
+ // inputTypeJOb.Add("sid", dictionary.sid);
+ // inputTypeJOb.Add("condition_type", dictionary.condition_type);
+
+ // var conditionArray = new JArray { };
+ // foreach (var dic in dictionary.condition)
+ // {
+ // var conditionJOb = new JObject { };
+ // conditionJOb.Add("key", dic["key"]);
+ // conditionJOb.Add("comparator", dic["comparator"]);
+ // conditionJOb.Add("data_type", dic["data_type"]);
+ // conditionJOb.Add("value", dic["value"]);
+ // conditionArray.Add(conditionJOb);
+ // }
+ // inputTypeJOb.Add("condition", conditionArray);
+ // inputArray.Add(inputTypeJOb);
+ // }
+
+ // var outputArray = new JArray { };
+ // foreach (var dictionary in logic.output)
+ // {
+ // var outputTypeJOb = new JObject { };
+ // outputTypeJOb.Add("sid", dictionary.sid);
+ // outputTypeJOb.Add("target_type", dictionary.target_type);
+ // var statusArray = new JArray { };
+ // foreach (var dic in dictionary.status)
+ // {
+ // var statusJOb = new JObject { };
+ // statusJOb.Add("key", dic["key"]);
+ // statusJOb.Add("value", dic["value"]);
+ // statusArray.Add(statusJOb);
+ // }
+ // outputTypeJOb.Add("status", statusArray);
+ // outputArray.Add(outputTypeJOb);
+ // }
+
+ // var logicjArray = new JArray { };
+ // var logicIfon = new JObject { };
+ // logicIfon.Add("sid", logic.sid);
+ // logicIfon.Add("gatewayId", gatewayId);
+ // logicIfon.Add("name", logic.name);
+ // logicIfon.Add("relation", logic.relation);
+ // logicIfon.Add("enable", logic.enable);
+ // logicIfon.Add("cycle", cycleJObject);
+ // logicIfon.Add("input", inputArray);
+ // logicIfon.Add("output", outputArray);
+ // logicjArray.Add(logicIfon);
+ // var jObject = new JObject { { "homeId", homeId }, { "logics", logicjArray } };
+ // responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add);
+
+ // }
+ // catch (Exception e)
+ // {
+ // var dd = e.Message;
+ // }
+ // } break;
+ // case updateLogic: {
+ // } break;
+ // case delLogic: { } break;
+ // case switchLogic: { } break;
+
+
+ // }
+
+ // return RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add);
+ //}
+
+
+
/// <summary>
/// 鑾峰彇閫昏緫ID鍒楄〃
/// </summary>
@@ -43,7 +172,7 @@
public static ResponsePackNew getLogic(Logic logic)
{
var jArray = new JArray { };
- jArray.Add(logic.sid);
+ jArray.Add(logic.userLogicId);
var jObject = new JObject { { "userLogicIds", jArray } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Info);
return responsePackNew;
@@ -129,7 +258,6 @@
return responsePackNew;
}
-
/// <summary>
/// 缂栬緫鏇存柊閫昏緫
/// </summary>
@@ -190,6 +318,7 @@
var logicjArray = new JArray { };
var logicIfon = new JObject { };
+ logicIfon.Add("userLogicId", logic.userLogicId);
logicIfon.Add("sid", logic.sid);
logicIfon.Add("gatewayId", gatewayId);
logicIfon.Add("name", logic.name);
@@ -218,7 +347,7 @@
public static ResponsePackNew delLogic(Logic logic)
{
var jArray = new JArray { };
- jArray.Add(logic.sid);
+ jArray.Add(logic.userLogicId);
var jObject = new JObject { { "userLogicIds", jArray } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Delete);
return responsePackNew;
@@ -229,9 +358,8 @@
/// <returns></returns>
public static ResponsePackNew switchLogic(Logic logic)
{
- logic.enable ="false";
var jArray = new JArray { };
- var job = new JObject { { "userLogicId", logic.sid } , { "enable", logic.enable } };
+ var job = new JObject { { "userLogicId", logic.userLogicId } , { "enable", logic.enable } };
jArray.Add(job);
var jObject = new JObject { { "logics", jArray } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Enable);
--
Gitblit v1.8.0