From ac3c6b64df51443519d3a27fa8cf0d25dd6ff6d7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 三月 2021 09:37:54 +0800
Subject: [PATCH] Merge branch 'wjc'
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs
index 52da91d..806656b 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs
@@ -16,8 +16,11 @@
public static ResponsePackNew GetTimerList ()
{
var jObject = new JObject { };
- jObject.Add ("gatewayId", Int64.Parse (GatewayId));
- jObject.Add ("homeId", Int64.Parse (HomeId));
+ jObject.Add ("gatewayId", GatewayId);
+ jObject.Add ("homeId", HomeId);
+ jObject.Add ("pageSize", 1000);
+ jObject.Add ("pageNo", 1);
+
var responsePackNew = RequestServerhomeId (jObject, API.GetTimerList);
return responsePackNew;
}
@@ -36,8 +39,8 @@
}
var deviceDateJObject = new JObject { };
- deviceDateJObject.Add ("gatewayId", Int64.Parse (GatewayId));
- deviceDateJObject.Add ("homeId", Int64.Parse (HomeId));
+ deviceDateJObject.Add ("gatewayId", GatewayId);
+ deviceDateJObject.Add ("homeId", HomeId);
var funjArray = new JArray { };
for (int i = 0; i < timer.controlData.actions.Count; i++) {
var fun = timer.controlData.actions [i];
@@ -64,8 +67,8 @@
deviceDateJObject.Add ("actions", funjArray);
var jObject = new JObject { };
- jObject.Add ("gatewayId", Int64.Parse (GatewayId));
- jObject.Add ("homeId", Int64.Parse (HomeId));
+ jObject.Add ("gatewayId", GatewayId);
+ jObject.Add ("homeId", HomeId);
jObject.Add ("timerName", timer.timerName);
jObject.Add ("isEnable", timer.isEnable);
jObject.Add ("executeUtcTime", Method.GetUtcTime (timer.executeUtcTime));
@@ -94,8 +97,8 @@
}
var deviceDateJObject = new JObject { };
- deviceDateJObject.Add ("gatewayId", Int64.Parse (GatewayId));
- deviceDateJObject.Add ("homeId", Int64.Parse (HomeId));
+ deviceDateJObject.Add ("gatewayId", GatewayId);
+ deviceDateJObject.Add ("homeId", HomeId);
var funjArray = new JArray { };
for (int i = 0; i < timer.controlData.actions.Count; i++) {
var fun = timer.controlData.actions [i];
@@ -122,8 +125,8 @@
deviceDateJObject.Add ("actions", funjArray);
var jObject = new JObject { };
- jObject.Add ("gatewayId", Int64.Parse (GatewayId));
- jObject.Add ("homeId", Int64.Parse (HomeId));
+ jObject.Add ("gatewayId", GatewayId);
+ jObject.Add ("homeId", HomeId);
jObject.Add ("id", timer.id);
jObject.Add ("timerName", timer.timerName);
jObject.Add ("isEnable", timer.isEnable);
@@ -146,8 +149,8 @@
{
var jObject = new JObject { };
jObject.Add ("id", Int64.Parse (id));
- jObject.Add ("gatewayId", Int64.Parse (GatewayId));
- jObject.Add ("homeId", Int64.Parse (HomeId));
+ jObject.Add ("gatewayId", GatewayId);
+ jObject.Add ("homeId", HomeId);
var responsePackNew = RequestServerhomeId (jObject, API.DeleteTimer);
return responsePackNew;
}
@@ -160,8 +163,8 @@
var jObject = new JObject { };
jObject.Add ("id", timer.id);
- jObject.Add ("gatewayId", Int64.Parse (GatewayId));
- jObject.Add ("homeId", Int64.Parse (HomeId));
+ jObject.Add ("gatewayId", GatewayId);
+ jObject.Add ("homeId", HomeId);
var responsePackNew = RequestServerhomeId (jObject, API.IsEnableTimer);
return responsePackNew;
}
--
Gitblit v1.8.0