From 1ee407dd57a7273ef6b686ac25a40d4199f5bce9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 10:14:41 +0800
Subject: [PATCH] Merge branch 'wxr6' into wxr4
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index cb622ac..39fadc2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,15 +1,15 @@
-锘�<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">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.Workbench>
<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" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="15" Column="35" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" />
+ <File FileName="HDL-ON_Android/Application.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="359" Column="40" />
+ <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -17,22 +17,20 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True" />
+ <Node name="Mqtt" expanded="True" />
</Node>
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- </Node>
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True" />
+ <Node name="BindingResidence" expanded="True" />
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True">
- <Node name="SceneEditPage.cs" selected="True" />
- </Node>
+ <Node name="Scene" expanded="True" />
</Node>
+ <Node name="4-PersonalCenter" expanded="True" />
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True" selected="True" />
<Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
@@ -45,17 +43,10 @@
<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/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" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0