From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index a829dc1..75b7d48 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,14 +1,17 @@
锘�<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/Control_Udp.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/UdpSocket.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="139" Column="67" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control_TcpServer.cs" Line="201" Column="45" />
- <File FileName="HDL_ON/UI/UI0-Public/UpdataTcpResidenceDataDialog.cs" Line="35" Column="32" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="115" Column="10" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="142" Column="59" />
- <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="575" Column="70" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="17" Column="15" />
+ <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" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -18,26 +21,19 @@
<Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
<Node name="DriverLayer" expanded="True">
- <Node name="Control_Udp.cs" selected="True" />
+ <Node name="UdpSocket.cs" selected="True" />
</Node>
<Node name="Mqtt" expanded="True" />
<Node name="Server" expanded="True" />
</Node>
<Node name="Entity" expanded="True">
- <Node name="Device" expanded="True" />
- <Node name="Enumerative" expanded="True" />
<Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
<Node name="CSS" 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="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True" />
- <Node name="Scene" expanded="True" />
- </Node>
<Node name="4-PersonalCenter" expanded="True">
<Node name="AccountBindInfo" expanded="True" />
<Node name="MemberManagement" expanded="True" />
@@ -76,12 +72,13 @@
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" />
<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_TcpServer.cs" relfile="HDL_ON/DAL/DriverLayer/Control_TcpServer.cs" line="222" column="1" />
+ <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" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0