From 160e6863bf3ecb420986f31abb1ab1372218d921 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 11 一月 2021 14:11:35 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f2c74c4..bc54b10 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,57 +1,46 @@
锘�<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>
+ <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="Enumerative" expanded="True" />
<Node name="Function" 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="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
+ <Node name="1-HomePage" expanded="True">
+ <Node name="MessageCenterPage.cs" selected="True" />
+ </Node>
<Node name="2-Classification" 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="RoomListManage" expanded="True" />
+ </Node>
<Node name="FuntionControlView" expanded="True">
- <Node name="FoolHeating" expanded="True">
- <Node name="FloorHeatingPageBLL.cs" selected="True" />
- </Node>
+ <Node name="EnvironmentalScience" expanded="True" />
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True">
+ <Node name="Public" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
</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>
@@ -66,8 +55,8 @@
<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/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" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" line="315" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" line="166" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0