From 59908be1533b6e85643a98a814143e691a5fc130 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期五, 05 二月 2021 17:01:41 +0800 Subject: [PATCH] 2021-2-5-3 --- Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal | 0 Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 13 ++++++++----- Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide | 0 Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 17 +++++++++++------ Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm | 0 Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs | 14 ++++++++------ 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml index 513bd47..dd7b2d2 100644 --- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml +++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml @@ -1,10 +1,10 @@ 锘�<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.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs"> <Files> - <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="29" Column="29" /> - <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="233" Column="62" /> - <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="147" Column="43" /> + <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="1" Column="1" /> + <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs" Line="218" Column="38" /> + <File FileName="SmartHome/HDL/Common/HDLLinkUtlis.cs" Line="2000" Column="18" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -12,11 +12,14 @@ <Node name="SmartHome" expanded="True"> <Node name="ON.Droid" expanded="True" /> <Node name="Shared" expanded="True"> + <Node name="HDL" expanded="True"> + <Node name="Common" expanded="True" /> + </Node> <Node name="UI" expanded="True"> <Node name="SimpleControl" expanded="True"> <Node name="Phone" expanded="True"> <Node name="Schedule" expanded="True"> - <Node name="Send.cs" selected="True" /> + <Node name="Method.cs" selected="True" /> </Node> <Node name="User" expanded="True" /> </Node> diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide index 7e6a72b..507aa23 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 index de5038b..d652aee 100644 --- a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm +++ 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 index 2acc4bc..35ec880 100644 --- a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal +++ 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 cbafc6e..9bbfeea 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs @@ -773,7 +773,8 @@ deviceRowView.AddChidren (tempSwitch); switch (device.spk) { - case "light.dimming": { + //DeviceType.LightDALI + case SPK.LightDimming: { #region 璋冨厜鍣ˋ tempSwitch.RemoveFromParent (); @@ -845,7 +846,10 @@ #endregion } break; - case "light.switch": { + //DeviceType.LightEnergySwitch + //DeviceType.LightEnergySocket + //DeviceType.LightSwitchSocket + case SPK.LightSwitch: { #region 缁х數鍣� tempSwitch.MouseUpEventHandler += (sender3, e3) => { tempSwitch.IsSelected = !tempSwitch.IsSelected; @@ -894,9 +898,10 @@ #endregion } break; - case "curtain.roller": - case "curtain.trietex": - case "curtain.switch": { + case SPK.CurtainRoller: + case SPK.CurtainTrietex: + case SPK.CurtainSwitch: + { #region 绐楀笜 tempSwitch.RemoveFromParent (); var tempSwitch1 = new Button () { @@ -971,7 +976,7 @@ } break; - case "fan": { + case SPK.ElectricFan: { #region 椋庢墖 tempSwitch.RemoveFromParent (); deviceRowView.Height = Application.GetRealHeight (130); diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs index 19e74f1..57e6773 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs @@ -209,12 +209,14 @@ for (int i = 0; i < list.Count; i++) { var device = list [i]; switch (device.spk) { - case "light.dimming": - case "light.switch": - case "curtain.roller": - case "curtain.trietex": - case "curtain.switch": - case "electrical.socket": { + case SPK.LightDimming: + case SPK.LightSwitch: + case SPK.CurtainRoller: + case SPK.CurtainTrietex: + case SPK.CurtainSwitch: + case SPK.ElectricSocket: + case SPK.ElectricFan: + { //鐩墠鏀寔鐨勮澶� DeviceList.Add (device); } -- Gitblit v1.8.0