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 | 60 +++++++++++++++++++++++------------------------------------- 1 files changed, 23 insertions(+), 37 deletions(-) diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml index 75b7d48..d89fee9 100644 --- a/.vs/HDL_APP_Project/xs/UserPrefs.xml +++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml @@ -1,17 +1,10 @@ 锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> - <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> - <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/UdpSocket.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/DAL/Mqtt/MqttClient.cs" Line="289" Column="1" /> - <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1" Column="1" /> - <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1453" Column="23" /> - <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs" Line="63" Column="18" /> - <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" /> - <File FileName="HDL_ON/DAL/Mqtt/MqttInfoConfig.cs" /> - <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="138" Column="41" /> - <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="20" Column="31" /> - <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="779" Column="116" /> - <File FileName="HDL_ON/DAL/DriverLayer/UdpSocket.cs" Line="106" Column="15" /> + <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"> @@ -20,45 +13,43 @@ <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> - <Node name="DriverLayer" expanded="True"> - <Node name="UdpSocket.cs" selected="True" /> - </Node> - <Node name="Mqtt" expanded="True" /> + <Node name="DriverLayer" expanded="True" /> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> - <Node name="CSS" expanded="True" /> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="1-HomePage" expanded="True" /> - <Node name="4-PersonalCenter" expanded="True"> - <Node name="AccountBindInfo" expanded="True" /> - <Node name="MemberManagement" expanded="True" /> - <Node name="ResetAccountPassword" expanded="True" /> - <Node name="RoomListManage" expanded="True" /> - <Node name="SearchDevice" expanded="True" /> - <Node name="UnlockSetting" expanded="True" /> + <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="FuntionControlView" expanded="True"> + <Node name="AC" 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="References" expanded="True" /> <Node name="Resources" expanded="True"> - <Node name="js" expanded="True" /> + <Node name="Phone" expanded="True"> + <Node name="FunctionIcon" expanded="True"> + <Node name="Light" expanded="True" /> + </Node> + </Node> </Node> </Node> </Node> </State> - </Pad> - <Pad Id="MonoDevelop.Debugger.WatchPad"> - <State /> </Pad> </Pads> </MonoDevelop.Ide.Workbench> @@ -69,16 +60,11 @@ <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> - <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" /> + <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/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/nigemacpc/Desktop/On+/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/nigemacpc/Desktop/On+/HDL_ON/UI/UI0-Public/AppUnlockPage.cs" relfile="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" line="18" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="694" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/DriverLayer/Control_TcpServer.cs" relfile="HDL_ON/DriverLayer/Control_TcpServer.cs" line="197" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" relfile="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" line="49" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/DAL/DriverLayer/Control_Udp.cs" relfile="HDL_ON/DAL/DriverLayer/Control_Udp.cs" line="749" 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