From 5851291c78b2cb5532e6938c77b5f51eb06a6ad2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 21 十二月 2020 19:41:07 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 0af4d57..d89fee9 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,27 +1,17 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.47f89eb181110cd1c1050db004cedf20a2ec9c7f" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs">
<Files>
- <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="262" Column="29" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="383" Column="25" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="107" Column="29" />
- <File FileName="HDL_ON/Entity/FunctionList.cs" Line="504" Column="47" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1957" Column="10" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="172" Column="1" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="372" Column="84" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="829" Column="45" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="376" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" Line="100" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="528" Column="27" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="909" Column="66" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" Line="170" Column="43" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="34" Column="30" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="259" Column="62" />
+ <File FileName="HDL_ON/Entity/FunctionList.cs" Line="416" Column="26" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="20" Column="29" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
<Node name="DriverLayer" expanded="True" />
<Node name="Server" expanded="True" />
@@ -30,31 +20,32 @@
<Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
+ <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
<Node name="1-HomePage" expanded="True" />
- <Node name="2-Classification" expanded="True">
- <Node name="ClassificationPage.cs" selected="True" />
- </Node>
+ <Node name="2-Classification" expanded="True" />
<Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True" />
<Node name="Scene" expanded="True" />
- </Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="RoomListManage" expanded="True">
- <Node name="AddRoom" expanded="True" />
- </Node>
</Node>
<Node name="FuntionControlView" expanded="True">
<Node name="AC" expanded="True" />
- <Node name="Electrical" expanded="True" />
- <Node name="FoolHeating" expanded="True" />
+ <Node name="EnvironmentalScience" expanded="True" />
+ <Node name="FoolHeating" expanded="True">
+ <Node name="FloorHeatingPage.cs" selected="True" />
+ </Node>
+ <Node name="Light" expanded="True" />
</Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True">
<Node name="Resources" expanded="True">
- <Node name="Phone" expanded="True" />
+ <Node name="Phone" expanded="True">
+ <Node name="FunctionIcon" expanded="True">
+ <Node name="Light" expanded="True" />
+ </Node>
+ </Node>
</Node>
</Node>
</Node>
@@ -69,10 +60,11 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="292" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="266" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" line="128" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs" relfile="HDL_ON/Entity/FunctionList.cs" line="383" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0