From 80faceb86399017851f9f72feaaef868a37ff23f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 10:50:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lss' into temp-wxr
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 78 ++++++++++++++------------------------
1 files changed, 29 insertions(+), 49 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 61a32d2..bab12a2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,16 +1,19 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.61286FD1-B849-4457-AA51-F3CD79A395F6" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Function.cs">
+锘�<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/2-Classification/ClassificationPageBLL.cs">
<Files>
- <File FileName="HDL_ON/DriverLayer/Control.cs" Line="107" Column="61" />
- <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="1561" Column="21" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="160" Column="38" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="392" Column="2" />
- <File FileName="HDL_ON/Entity/AProtocolEntity.cs" Line="10" Column="30" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs" Line="91" Column="35" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/SceneEditPage.cs" Line="466" Column="60" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/SetSceneFunctionInfoPage.cs" Line="150" Column="45" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="157" Column="32" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="19" Column="44" />
+ <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="1864" Column="28" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="303" Column="15" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="195" Column="50" />
+ <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="95" Column="58" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="758" Column="53" />
+ <File FileName="../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS/Xamarin.iOS.Common.targets" Line="1912" Column="3" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs" Line="141" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" Line="152" Column="50" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="312" Column="14" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -18,42 +21,30 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="DAL" expanded="True">
- <Node name="Net" expanded="True" />
+ <Node name="DriverLayer" expanded="True" />
<Node name="Server" expanded="True" />
</Node>
- <Node name="DriverLayer" expanded="True" />
<Node name="Entity" expanded="True">
- <Node name="Enumerative" expanded="True" />
- <Node name="Function" expanded="True">
- <Node name="Function.cs" selected="True" />
- </Node>
+ <Node name="ResponseEntity" expanded="True" />
</Node>
<Node name="UI" 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="2-Classification" expanded="True" />
- <Node name="3-Intelligence" expanded="True" />
- <Node name="FuntionControlView" expanded="True">
- <Node name="AC" expanded="True" />
- <Node name="Curtain" expanded="True" />
- <Node name="Electrical" expanded="True" />
- <Node name="Light" expanded="True" />
- <Node name="Music" expanded="True">
+ <Node name="2-Classification" expanded="True">
+ <Node name="ClassificationPageBLL.cs" selected="True" />
+ </Node>
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True">
<Node name="View" expanded="True" />
</Node>
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True" />
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Properties" expanded="True" />
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>function.function</Value>
</State>
</Pad>
</Pads>
@@ -64,21 +55,10 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <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/FuntionControlView/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="115" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/CommonPage.cs" relfile="HDL_ON/DriverLayer/CommonPage.cs" line="395" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" line="351" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" line="311" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/CommonPage.cs" relfile="HDL_ON/DriverLayer/CommonPage.cs" line="414" column="1" />
- <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/3-Intelligence/SetSceneLocationPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/SetSceneLocationPage.cs" line="38" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" line="384" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/SetSceneFunctionInfoPage.cs" line="504" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/SetSceneFunctionInfoPage.cs" line="144" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0