From 32cd05a17e2b7ae8a1d3687996278dc25dd58cc5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 21 十二月 2020 09:58:05 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index ff9cc1b..c0d3b3b 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,11 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/AppDelegate.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs">
<Files>
- <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="319" Column="52" />
- <File FileName="HDL-ON_iOS/ViewController.cs" Line="1" Column="1" />
- <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="204" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs" Line="98" Column="54" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" Line="244" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs" Line="51" Column="29" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -20,43 +19,36 @@
<Node name="DriverLayer" expanded="True" />
<Node name="Mqtt" expanded="True" />
</Node>
- <Node name="Entity" 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="2-Classification" expanded="True" />
<Node name="3-Intelligence" expanded="True">
<Node name="Scene" expanded="True" />
</Node>
- <Node name="4-PersonalCenter" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="RoomListManage" expanded="True" />
+ </Node>
<Node name="FuntionControlView" expanded="True">
- <Node name="AC" expanded="True" />
- <Node name="FoolHeating" expanded="True" />
+ <Node name="Curtain" expanded="True" />
+ <Node name="Light" expanded="True">
+ <Node name="RGBPageBLL.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Assets" expanded="True">
+ <Node name="Phone" expanded="True" />
+ </Node>
+ </Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="Other" expanded="True" />
- <Node name="Resources" expanded="True" />
- <Node name="AppDelegate.cs" selected="True" />
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True" />
+ </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>
@@ -67,7 +59,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
--
Gitblit v1.8.0