From 6c5398cef0d718eec08a1f56b1a9f00e79a85d67 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 十一月 2021 14:48:54 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 62 ++++---------------------------
1 files changed, 8 insertions(+), 54 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 8832c5c..2ac4a02 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,20 +1,8 @@
锘�<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/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="306" Column="55" />
- <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="368" Column="1" />
- <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="2030" Column="27" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="251" Column="53" />
- <File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" Line="166" Column="45" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="53" Column="25" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="525" Column="55" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs" Line="47" Column="30" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" Line="166" Column="37" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="161" Column="47" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs" Line="94" Column="22" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs" Line="92" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="85" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -22,44 +10,11 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True" />
- </Node>
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- </Node>
- <Node name="UI" expanded="True">
- <Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="RoomListManage" expanded="True">
- <Node name="AddRoom" expanded="True" />
- <Node name="FloorsManagementPage.cs" selected="True" />
- </Node>
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Curtain" expanded="True" />
- </Node>
- </Node>
+ <Node name="Server" expanded="True" />
</Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="zh-Hans.lproj" expanded="True" />
- </Node>
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" selected="True" />
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>row.Tag</Value>
- <Value>btn.Tag</Value>
- <Value>light.BlueColor</Value>
- <Value>e2[0]</Value>
- <Value>e2[1]</Value>
- <Value>e2[2]</Value>
- <Value>deviceList</Value>
- <Value>b1</Value>
</State>
</Pad>
</Pads>
@@ -70,13 +25,12 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|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/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/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="90" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="331" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1415" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="333" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0