From 3cebdfad56d78ba04a214fccd1b942a010aeba77 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期五, 26 三月 2021 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 72 ++++++++++++-----------------------
1 files changed, 25 insertions(+), 47 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 9c8b4a1..02ec9ba 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,47 +1,38 @@
-锘�<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/UI/UI2/1-HomePage/HomePage.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/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs" Line="237" Column="44" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="786" Column="38" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="133" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" Line="427" Column="1" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/BrandListView.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" />
+ <File FileName="HDL_ON/Entity/Function/Scene.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs" Line="136" Column="83" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="DAL" expanded="True">
- <Node name="Net" 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>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True">
- <Node name="HomePage.cs" selected="True" />
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True" />
</Node>
- <Node name="2-Classification" expanded="True" />
- <Node name="3-Intelligence" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="1ContorlPage" expanded="True">
+ <Node name="AcControlPage_AddIrButton.cs" selected="True" />
+ </Node>
+ </Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True">
- <Node name="Echarts" expanded="True" />
- <Node name="Phone" expanded="True">
- <Node name="Public" expanded="True" />
- </Node>
- </Node>
- </Node>
+ <Node name="ys" expanded="True" />
</Node>
</State>
</Pad>
@@ -53,23 +44,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/Control_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Bus.cs" line="521" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/CommonPage.cs" relfile="HDL_ON/DriverLayer/CommonPage.cs" line="397" 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="416" 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="78" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs" relfile="HDL_ON/Entity/FunctionList.cs" line="49" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs" relfile="HDL_ON/Entity/FunctionList.cs" line="45" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs" relfile="HDL_ON/Entity/FunctionList.cs" line="41" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/Entity/DB_ResidenceData.cs" relfile="HDL_ON/Entity/DB_ResidenceData.cs" line="484" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/Entity/DB_ResidenceData.cs" relfile="HDL_ON/Entity/DB_ResidenceData.cs" line="485" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0