From ba30f4585670341ef85d38fa6545d8e037c6abcd Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 17:08:48 +0800
Subject: [PATCH] 2021-3-26-3
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs | 1 +
Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal | 0
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 26 +++++++++++++++-----------
Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide | 0
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 2 +-
Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm | 0
Crabtree/.DS_Store | 0
7 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/Crabtree/.DS_Store b/Crabtree/.DS_Store
new file mode 100644
index 0000000..668853a
--- /dev/null
+++ b/Crabtree/.DS_Store
Binary files differ
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 7018c9f..2cab15d 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,14 +1,15 @@
锘�<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/Send.cs">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/HDL/Common/HttpUtil/HttpUtil.cs">
<Files>
<File FileName="SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs" Line="22" Column="19" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="552" Column="1" />
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/Timer.cs" Line="66" Column="31" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/SceneMethod.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs" Line="130" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="350" Column="59" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="16" Column="39" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" />
+ <File FileName="SmartHome/HDL/Operation/ResponseEntity/Timer.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/SceneMethod.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" />
+ <File FileName="SmartHome/HDL/Common/HttpUtil/HttpUtil.cs" Line="50" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -16,6 +17,11 @@
<Node name="SmartHome" expanded="True">
<Node name="Shared" expanded="True">
<Node name="HDL" expanded="True">
+ <Node name="Common" expanded="True">
+ <Node name="HttpUtil" expanded="True">
+ <Node name="HttpUtil.cs" selected="True" />
+ </Node>
+ </Node>
<Node name="Operation" expanded="True">
<Node name="ResponseEntity" expanded="True" />
</Node>
@@ -25,9 +31,7 @@
<Node name="Phone" expanded="True">
<Node name="Light" expanded="True" />
<Node name="Scene" expanded="True" />
- <Node name="Schedule" expanded="True">
- <Node name="Send.cs" selected="True" />
- </Node>
+ <Node name="Schedule" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
index 3e6691d..c9b4817 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
new file mode 100644
index 0000000..2b4293d
--- /dev/null
+++ b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm
Binary files differ
diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal
new file mode 100644
index 0000000..5319658
--- /dev/null
+++ b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal
Binary files differ
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
index 0aaa983..fd52b68 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
@@ -451,7 +451,7 @@
Height = Application.GetRealHeight (60),
TextAlignment = TextAlignment.CenterLeft,
TextColor = SkinStyle.Current.TextColor1,
- Text = "ALL",
+ Text = timerTemp.RoomName,
};
roomContenView.AddChidren (btnRoomChoose);
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs
index 89026c9..616273c 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs
@@ -130,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