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 | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 8ab081e..218f043 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,26 +1,16 @@
锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.822QECU5228FU" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs">
<Files>
- <File FileName="SmartHome/HDL/Operation/UserConfig.cs" Line="200" Column="39" IsPinned="True" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="453" Column="65" />
- <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="77" Column="10" />
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/API.cs" Line="60" Column="60" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/SubaccountListView.cs" Line="15" Column="35" />
- <File FileName="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" Line="568" Column="57" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="415" Column="32" />
- <File FileName="SmartHome/UI/SimpleControl/R.cs" Line="246" Column="55" />
- <File FileName="ON.Ios/Resources/Language.ini" Line="333" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs" Line="1" Column="1" />
+ <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.Ios" expanded="True">
- <Node name="Resources" expanded="True" />
- </Node>
<Node name="Shared" expanded="True">
<Node name="DLL" expanded="True" />
<Node name="HDL" expanded="True">
@@ -31,14 +21,28 @@
<Node name="ResponseEntity" expanded="True" />
</Node>
</Node>
+ <Node name="IO" expanded="True" />
<Node name="Net" expanded="True" />
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Register" expanded="True">
- <Node name="AccountView.cs" selected="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="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>
@@ -57,9 +61,11 @@
<String>DroidService/DroidService.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOnNew/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" relfile="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" line="153" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0