From 0f17fd41975f2b0e05905a8b7752bac5804ac37d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 26 三月 2021 17:41:14 +0800
Subject: [PATCH] Merge branch 'wjc'
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs
index 806656b..616273c 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs
@@ -70,6 +70,7 @@
jObject.Add ("gatewayId", GatewayId);
jObject.Add ("homeId", HomeId);
jObject.Add ("timerName", timer.timerName);
+ jObject.Add ("room", timer.RoomName);
jObject.Add ("isEnable", timer.isEnable);
jObject.Add ("executeUtcTime", Method.GetUtcTime (timer.executeUtcTime));
jObject.Add ("controlData", deviceDateJObject);
@@ -129,6 +130,7 @@
jObject.Add ("homeId", HomeId);
jObject.Add ("id", timer.id);
jObject.Add ("timerName", timer.timerName);
+ jObject.Add ("room", timer.RoomName);
jObject.Add ("isEnable", timer.isEnable);
jObject.Add ("executeUtcTime", Method.GetUtcTime (timer.executeUtcTime));
jObject.Add ("controlData", deviceDateJObject);
--
Gitblit v1.8.0