From 3246b9db47308cc809df595a5cb704fc82c96439 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 16:18:48 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index d3bb4f6..ed093d4 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,21 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="../../../../Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/msbuild/iOS/Xamarin.iOS.Common.targets">
+ <Files>
+ <File FileName="../../Downloads/PanelColorSelectForm.cs" Line="117" Column="1" IsPinned="True" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs" Line="153" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="899" Column="38" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" Line="16" Column="20" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" Line="6" Column="20" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="264" Column="62" />
+ <File FileName="HDL_ON/Entity/FunctionList.cs" Line="384" Column="22" />
+ <File FileName="HDL_ON/Entity/Room.cs" Line="546" Column="14" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs" Line="248" Column="99" />
+ <File FileName="HDL_ON/UI/UI0-Public/TopViewDiv.cs" Line="188" Column="59" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" Line="39" Column="16" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs" Line="32" Column="25" />
+ <File FileName="../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS/Xamarin.iOS.Common.targets" Line="486" Column="3" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -12,19 +27,18 @@
<Node name="Server" expanded="True" />
</Node>
<Node name="Entity" expanded="True">
- <Node name="Function" expanded="True">
- <Node name="Function.cs" selected="True" />
- </Node>
- <Node name="ResponseEntity" expanded="True" />
+ <Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
+ <Node name="BindingResidence" expanded="True" />
<Node name="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="MemberManagement" expanded="True" />
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Scene" expanded="True" />
</Node>
<Node name="FuntionControlView" expanded="True">
<Node name="Light" expanded="True" />
+ <Node name="FunctionBaseInfoSetPageBLL.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -33,10 +47,14 @@
<Node name="Assets" expanded="True" />
</Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="References" expanded="True" />
<Node name="Resources" expanded="True" />
</Node>
</Node>
+ </State>
+ </Pad>
+ <Pad Id="MonoDevelop.Debugger.WatchPad">
+ <State>
+ <Value>updataObj.attributes</Value>
</State>
</Pad>
</Pads>
@@ -48,10 +66,11 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" line="579" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" relfile="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" line="86" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1837" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0