From 1b42f39e34492ba8d4ce6336cc913877b9e064cb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:30:05 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 76 +++++++++++++++++---------------------
1 files changed, 34 insertions(+), 42 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 2d0b468..1815d1a 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,20 +1,20 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs">
+锘�<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/DAL/Server/HttpServerRequest.cs">
<Files>
- <File FileName="HDL_ON/DriverLayer/Control_Bus.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DriverLayer/CommonPage.cs" />
- <File FileName="HDL_ON/DriverLayer/Control.cs" Line="251" Column="34" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" />
- <File FileName="HDL_ON/Entity/FunctionList.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs" Line="36" Column="33" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" Line="68" Column="1" />
- <File FileName="HDL_ON/Entity/Function/Light.cs" Line="15" Column="35" />
- <File FileName="HDL-ON_Android/Application.cs" Line="79" Column="55" />
- <File FileName="HDL-ON_iOS/ViewController.cs" Line="83" Column="16" />
- <File FileName="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" Line="182" Column="77" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs" Line="365" Column="64" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" Line="40" Column="21" />
+ <File FileName="../../Downloads/PanelColorSelectForm.cs" Line="117" Column="1" IsPinned="True" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs" Line="153" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="375" Column="31" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="899" Column="38" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" Line="16" Column="20" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" Line="6" Column="20" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="264" Column="62" />
+ <File FileName="HDL_ON/Entity/FunctionList.cs" Line="384" Column="22" />
+ <File FileName="HDL_ON/Entity/Room.cs" Line="546" Column="14" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1838" Column="52" />
+ <File FileName="HDL_ON/Entity/Function/TV.cs" Line="27" Column="30" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="469" Column="78" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" Line="260" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -22,29 +22,25 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True" />
- </Node>
- <Node name="Entity" expanded="True" />
- <Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
- <Node name="3-Intelligence" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="UnlockSetting" expanded="True">
- <Node name="AppUnlockSettingsPageBLL.cs" selected="True" />
- </Node>
- </Node>
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Server" expanded="True">
+ <Node name="HttpServerRequest.cs" selected="True" />
</Node>
</Node>
+ <Node name="Entity" expanded="True">
+ <Node name="Function" expanded="True" />
+ </Node>
+ <Node name="UI" expanded="True">
+ <Node name="BindingResidence" expanded="True" />
+ </Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
+ </State>
+ </Pad>
+ <Pad Id="MonoDevelop.Debugger.WatchPad">
+ <State>
+ <Value>updataObj.attributes</Value>
</State>
</Pad>
</Pads>
@@ -56,15 +52,11 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" />
+ <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/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/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_Android/Application.cs" relfile="HDL-ON_Android/Application.cs" line="82" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" relfile="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" line="86" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1837" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0