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/.vs/SmartHome/xs/UserPrefs.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index ddaa76b..218f043 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,13 +1,16 @@
锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs">
+ <Files>
+ <File FileName="SmartHome/HDL/Common/Constant.cs" Line="60" Column="31" />
+ <File FileName="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" Line="716" Column="10" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/SceneMethod.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="344" Column="33" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Droid" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
<Node name="Shared" expanded="True">
<Node name="DLL" expanded="True" />
<Node name="HDL" expanded="True">
@@ -23,12 +26,23 @@
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
+ <Node name="FoolHeat" expanded="True" />
+ <Node name="FresAir" expanded="True" />
+ <Node name="Guide" expanded="True" />
+ <Node name="Light" expanded="True" />
<Node name="Register" expanded="True" />
+ <Node name="Room" expanded="True" />
<Node name="Scene" expanded="True" />
<Node name="Schedule" expanded="True">
- <Node name="Method.cs" selected="True" />
+ <Node name="UserSchedule.cs" selected="True" />
</Node>
+ <Node name="Security" expanded="True" />
+ <Node name="Sensor" expanded="True" />
+ <Node name="System" expanded="True" />
+ <Node name="TV" expanded="True" />
+ <Node name="UniversalDevice" expanded="True" />
<Node name="User" expanded="True" />
+ <Node name="Warning" expanded="True" />
</Node>
</Node>
</Node>
--
Gitblit v1.8.0