From 46fef61e8de822dc4a9eebca530ce37f2ed014f7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 11:06:27 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr6
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 55 +++++++++++--------------------------------------------
1 files changed, 11 insertions(+), 44 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f2c74c4..4b8ad64 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,57 +1,27 @@
-锘�<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/FoolHeating/FloorHeatingPageBLL.cs">
- <Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="22" Column="17" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" Line="34" Column="34" />
- <File FileName="HDL_ON/UI/UI0-Public/Widget/DiySelectPopupDialog.cs" Line="631" Column="1" />
- <File FileName="HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs" Line="67" Column="44" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="186" Column="24" />
- <File FileName="HDL-ON_iOS/ViewController.cs" Line="1" Column="1" />
- <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="204" Column="1" />
- </Files>
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
+ <MonoDevelop.Ide.Workbench>
<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="Utlis" expanded="True" />
- </Node>
<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 name="Server" expanded="True" />
</Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True">
- <Node name="Widget" expanded="True" />
- </Node>
- <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
- <Node name="FuntionControlView" expanded="True">
- <Node name="FoolHeating" expanded="True">
- <Node name="FloorHeatingPageBLL.cs" selected="True" />
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True">
+ <Node name="View" expanded="True">
+ <Node name="TopView.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True" />
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>btnLightPower.Tag.ToString()</Value>
- <Value>response.StatusCode</Value>
- <Value>view3.Tag</Value>
- <Value>btn.Tag.ToString()</Value>
- <Value>item</Value>
- <Value>functionCategory</Value>
</State>
</Pad>
</Pads>
@@ -63,12 +33,9 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" line="171" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" line="32" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0