From bac00b1bc932d3a85f90986466757b24d9407d61 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 14:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 3896be0..4e0ee18 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,20 +1,16 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Function.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.47f89eb181110cd1c1050db004cedf20a2ec9c7f" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="164" Column="80" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="252" Column="21" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="154" Column="21" />
- <File FileName="HDL_ON/Common/FileUtlis.cs" Line="54" Column="10" />
- <File FileName="HDL_ON/DAL/FileUtils.cs" Line="214" Column="109" />
- <File FileName="HDL_ON/Entity/UserInfo.cs" Line="8" Column="1" />
- <File FileName="HDL_ON/Entity/OnAppConfig.cs" Line="15" Column="54" />
- <File FileName="HDL_ON/Entity/Room.cs" Line="83" Column="1" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2113" Column="17" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs" Line="156" Column="1" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" Line="88" Column="48" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="280" Column="60" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="285" Column="23" />
+ <File FileName="HDL_ON/Entity/Function/AC.cs" Line="343" Column="14" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="425" Column="124" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs" Line="90" Column="64" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="633" Column="44" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs" Line="140" Column="36" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="419" Column="30" />
+ <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="416" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" Line="145" Column="18" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="148" Column="62" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -23,24 +19,40 @@
<Node name="HDL_ON" expanded="True">
<Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Mqtt" expanded="True" />
<Node name="Server" expanded="True" />
</Node>
<Node name="Entity" expanded="True">
- <Node name="Function" expanded="True">
- <Node name="Function.cs" selected="True" />
- </Node>
+ <Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
+ <Node name="BindingResidence" expanded="True" />
+ <Node name="CSS" expanded="True" />
<Node name="UI2" expanded="True">
<Node name="2-Classification" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="RoomListManage" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="FoolHeating" expanded="True">
+ <Node name="FloorHeatingPage.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Other" expanded="True">
+ <Node name="JPush" expanded="True" />
+ </Node>
+ </Node>
<Node name="HDL-ON_iOS" expanded="True" />
</Node>
+ </State>
+ </Pad>
+ <Pad Id="MonoDevelop.Debugger.WatchPad">
+ <State>
+ <Value>commandDictionary</Value>
+ <Value>scenefunction.localFunction</Value>
</State>
</Pad>
</Pads>
@@ -54,11 +66,7 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="529" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewController.cs" relfile="HDL-ON_iOS/ViewController.cs" line="87" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewController.cs" relfile="HDL-ON_iOS/ViewController.cs" line="75" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="267" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Function.cs" relfile="HDL_ON/Entity/Function/Function.cs" line="297" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmebly.cs" relfile="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" line="726" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0