From 680d96f157e4609af3e7af6f8d01ee0bf3f55063 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 21:11:04 +0800
Subject: [PATCH] 20201210
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 53 ++++++++++++++---------------------------------------
1 files changed, 14 insertions(+), 39 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f15acea..76b72bf 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,27 +1,11 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
-<<<<<<< Updated upstream
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.94B44E9C-E1BC-4BF7-812E-FC71E9B623B2" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs">
- <Files>
- <File FileName="HDL_ON/UI/MainPage.cs" Line="166" Column="36" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="148" Column="23" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="284" Column="7" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/Entity/UserInfo.cs" Line="97" Column="25" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" Line="1" Column="1" />
-=======
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/UserInfo.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Scene.cs">
<Files>
- <File FileName="HDL_ON/UI/MainPage.cs" Line="137" Column="10" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="148" Column="23" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="281" Column="7" />
- <File FileName="HDL_ON/Common/DB_AccountList.cs" Line="22" Column="44" />
- <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="104" Column="33" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/Entity/UserInfo.cs" Line="90" Column="19" />
->>>>>>> Stashed changes
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="470" Column="60" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs" Line="473" Column="56" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" Line="126" Column="88" />
+ <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="336" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -30,31 +14,22 @@
<Node name="HDL_ON" expanded="True">
<Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
-<<<<<<< Updated upstream
<Node name="DriverLayer" expanded="True" />
-=======
->>>>>>> Stashed changes
- <Node name="Server" expanded="True" />
</Node>
<Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- <Node name="UserInfo.cs" selected="True" />
+ <Node name="Function" expanded="True">
+ <Node name="Scene.cs" selected="True" />
+ </Node>
</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="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True">
- <Node name="NewSceneMenuListPage.cs" selected="True" />
- </Node>
+ <Node name="Scene" expanded="True" />
</Node>
<Node name="4-PersonalCenter" expanded="True">
- <Node name="RoomListManage" expanded="True">
- <Node name="AddRoom" expanded="True" />
- </Node>
- <Node name="UnlockSetting" expanded="True" />
+ <Node name="RoomListManage" expanded="True" />
</Node>
<Node name="FuntionControlView" expanded="True">
<Node name="EnvironmentalScience" expanded="True" />
@@ -62,7 +37,6 @@
</Node>
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True" />
<Node name="HDL-ON_iOS" expanded="True">
<Node name="Resources" expanded="True" />
</Node>
@@ -77,13 +51,14 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <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/Function.cs" relfile="HDL_ON/Entity/Function/Function.cs" line="292" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs" line="449" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs" line="526" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/DB_ResidenceData.cs" relfile="HDL_ON/Entity/DB_ResidenceData.cs" line="259" 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="136" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0