From 160e6863bf3ecb420986f31abb1ab1372218d921 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 11 一月 2021 14:11:35 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index cb622ac..bc54b10 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,16 +1,6 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs">
- <Files>
- <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" Line="114" Column="19" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="54" Column="21" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs" Line="162" Column="20" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="684" Column="51" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" Line="164" Column="44" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs" Line="461" Column="1" />
- <File FileName="HDL_ON/Entity/Function/AC.cs" Line="185" Column="45" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="298" Column="14" />
- </Files>
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -20,20 +10,36 @@
<Node name="DriverLayer" expanded="True" />
</Node>
<Node name="Entity" expanded="True">
+ <Node name="Enumerative" expanded="True" />
<Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True" />
+ <Node name="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
+ <Node name="1-HomePage" expanded="True">
+ <Node name="MessageCenterPage.cs" selected="True" />
+ </Node>
+ <Node name="2-Classification" expanded="True" />
<Node name="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True">
- <Node name="SceneEditPage.cs" selected="True" />
- </Node>
+ <Node name="Automation" expanded="True" />
+ <Node name="Scene" expanded="True" />
+ </Node>
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="RoomListManage" expanded="True" />
+ </Node>
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="EnvironmentalScience" expanded="True" />
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True">
+ <Node name="Public" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
</Node>
</State>
</Pad>
@@ -49,12 +55,8 @@
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" line="76" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" line="56" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/AppUnlockPage.cs" relfile="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" line="18" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="694" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_TcpServer.cs" relfile="HDL_ON/DriverLayer/Control_TcpServer.cs" line="197" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs" relfile="HDL_ON/DAL/DriverLayer/Control_TcpClient.cs" line="69" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" line="315" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" line="166" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0