From 1b42f39e34492ba8d4ce6336cc913877b9e064cb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:30:05 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 71 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 43 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 6d7c744..1815d1a 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,14 +1,20 @@
锘�<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/DriverLayer/Control_Udp_Bus.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
<Files>
- <File FileName="HDL_ON/DriverLayer/Control.cs" Line="177" Column="1" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="253" Column="54" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="140" Column="72" />
- <File FileName="HDL_ON/DriverLayer/UdpSocket.cs" Line="177" Column="20" />
- <File FileName="HDL_ON/DriverLayer/Control_TcpClient.cs" Line="50" Column="14" />
- <File FileName="HDL_ON/DriverLayer/Packet.cs" Line="631" Column="67" />
- <File FileName="HDL_ON/DriverLayer/Control_Udp_Bus.cs" Line="71" Column="36" />
+ <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/SceneEditPage.cs" Line="375" Column="31" />
+ <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/DAL/Server/HttpServerRequest.cs" Line="1838" Column="52" />
+ <File FileName="HDL_ON/Entity/Function/TV.cs" Line="27" Column="30" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="469" Column="78" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" Line="260" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -16,40 +22,25 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="DAL" expanded="True">
- <Node name="Net" expanded="True" />
- </Node>
- <Node name="DriverLayer" expanded="True">
- <Node name="Control_Udp_Bus.cs" selected="True" />
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Server" expanded="True">
+ <Node name="HttpServerRequest.cs" selected="True" />
+ </Node>
</Node>
<Node name="Entity" expanded="True">
<Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" 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>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="MemberManagement" expanded="True" />
- <Node name="RoomListManage" expanded="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="AC" expanded="True" />
- <Node name="Curtain" expanded="True" />
- <Node name="Electrical" expanded="True" />
- <Node name="EnvironmentalScience" expanded="True" />
- <Node name="FoolHeating" expanded="True" />
- <Node name="Light" expanded="True" />
- </Node>
- </Node>
+ <Node name="BindingResidence" expanded="True" />
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True" />
<Node name="HDL-ON_iOS" expanded="True" />
</Node>
+ </State>
+ </Pad>
+ <Pad Id="MonoDevelop.Debugger.WatchPad">
+ <State>
+ <Value>updataObj.attributes</Value>
</State>
</Pad>
</Pads>
@@ -61,17 +52,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/nigel/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/nigel/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/nigel/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/nigel/Desktop/HDL_APP_Project/HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" relfile="HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" line="104" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" relfile="HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" line="163" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_TcpClient.cs" relfile="HDL_ON/DriverLayer/Control_TcpClient.cs" line="45" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="695" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="913" 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