From 761fc6621ed9d54b520dcf0f0ce6158e050e2214 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 03 三月 2021 20:16:03 +0800
Subject: [PATCH] 2021-3-3-3
---
/dev/null | 0
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 12 +++++++-----
Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide | 0
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 16 +++++++++++++---
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index ea91fe6..fb53936 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,10 +1,12 @@
锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c4650918" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs">
<Files>
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="32" Column="62" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="222" Column="49" />
- <File FileName="../../HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="90" Column="39" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="22" Column="10" />
+ <File FileName="../../HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="712" Column="1" />
+ <File FileName="../../HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="308" Column="14" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -20,7 +22,7 @@
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
<Node name="Schedule" expanded="True">
- <Node name="UserSchedule.cs" selected="True" />
+ <Node name="AddSchedule.cs" selected="True" />
</Node>
</Node>
</Node>
diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
index a2ad602..b5ec049 100644
--- a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
+++ b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
Binary files differ
diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm
deleted file mode 100644
index 150a9f1..0000000
--- a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm
+++ /dev/null
Binary files differ
diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal
deleted file mode 100644
index 92632d1..0000000
--- a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal
+++ /dev/null
Binary files differ
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
index 6c0c602..e96a79f 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
using Shared.SimpleControl.Phone.Music;
namespace Shared.SimpleControl.Phone
@@ -666,9 +667,9 @@
timerTemp.whichDay.Add (5);
}
}
- if (string.IsNullOrEmpty (timerTemp.id)) {
- timerTemp.id = Guid.NewGuid ().ToString ();
- }
+ //if (string.IsNullOrEmpty (timerTemp.id)) {
+ // timerTemp.id = Guid.NewGuid ().ToString ();
+ //}
DeviceDate deviceDate = new DeviceDate ();
deviceDate.gatewayId = SmartHome.Send.GatewayId;
@@ -698,8 +699,17 @@
if (revertObj == null) {
new Alert ("", "Unable to save data, please check the network.", "Close").Show ();
} else if (revertObj.Code == StateCode.SUCCESS) {
+ string id = "";
+ if (!isEdit) {
+ var jObject = JObject.Parse (revertObj.Data.ToString ());
+ id = jObject ["id"].ToString ();
+ timerTemp.id = id;
+ }
this.RemoveFromParent ();
action (timerTemp);
+
+
+
} else {
//鎻愮ず閿欒
SmartHome.Method method = new SmartHome.Method ();
--
Gitblit v1.8.0