From 2b380862ab304f049ae7181a058b0791671d1bb4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 23 二月 2021 09:39:54 +0800
Subject: [PATCH] 2021-02-23 1.增加场景数据转换和上传测试方法。2.增加风扇和通用开关设备spk
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 1e6e503..f3d6d44 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,25 +1,33 @@
-锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
+锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/HDL/Operation/Global.cs">
<Files>
- <File FileName="../../../../Downloads/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="868" Column="60" IsPinned="True" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="87" Column="64" />
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/Timer.cs" Line="71" Column="42" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="481" Column="55" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="344" Column="33" />
+ <File FileName="SmartHome/HDL/Operation/MyEnum.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/HDL/Operation/Global.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Droid" expanded="True" />
+ <Node name="ON.Droid" expanded="True">
+ <Node name="Properties" expanded="True" />
+ </Node>
<Node name="Shared" expanded="True">
+ <Node name="HDL" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="Operation" expanded="True">
+ <Node name="Device" expanded="True" />
+ <Node name="Global.cs" selected="True" />
+ </Node>
+ </Node>
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Schedule" expanded="True">
- <Node name="AddSchedule.cs" selected="True" />
- </Node>
+ <Node name="Light" expanded="True" />
+ <Node name="Room" expanded="True" />
+ <Node name="Scene" expanded="True" />
+ <Node name="Schedule" expanded="True" />
+ <Node name="User" expanded="True" />
</Node>
</Node>
</Node>
@@ -29,9 +37,7 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.DebuggingService.PinnedWatches>
- <Watch file="../../../SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" line="297" offsetX="-1" offsetY="-1" expression="timeStamp" liveUpdate="False" />
- </MonoDevelop.Ide.DebuggingService.PinnedWatches>
+ <MonoDevelop.Ide.DebuggingService.PinnedWatches />
<DisabledProjects>
<String>Shared.Droid/Shared.Droid.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
@@ -40,11 +46,9 @@
<String>DroidService/DroidService.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/hdl/Desktop/wjc/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" relfile="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" line="970" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0