From 981ccd4afab6271422d7f169b30a2efa55eafde1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 二月 2021 16:18:16 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 79 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 31f12fd..0667848 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,43 +1,72 @@
锘�<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/Common/ImageUtlis.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs" Line="83" Column="30" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" />
- <File FileName="HDL_ON/Common/R.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs" Line="102" Column="58" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="18" Column="33" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="263" Column="58" />
- <File FileName="HDL_ON/Common/ImageUtlis.cs" Line="373" Column="58" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" Line="80" Column="68" />
+ <File FileName="HDL_ON/Entity/Room.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="417" Column="60" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="186" Column="38" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="148" Column="70" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs" Line="388" Column="54" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="863" Column="51" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="369" Column="13" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="750" Column="1" />
+ <File FileName="HDL_ON/UI/UI0-Stan/Logic/HdlThreadLogic.cs" Line="97" Column="1" />
</Files>
<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="ImageUtlis.cs" selected="True" />
- </Node>
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True" />
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Mqtt" expanded="True" />
</Node>
<Node name="Entity" expanded="True">
- <Node name="Integratedbrand" expanded="True" />
+ <Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
+ <Node name="UI0-Public" expanded="True" />
+ <Node name="UI0-Stan" expanded="True">
+ <Node name="Logic" expanded="True" />
+ </Node>
<Node name="UI2" expanded="True">
<Node name="1-HomePage" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="AddFunction" expanded="True" />
- <Node name="RoomListManage" expanded="True">
- <Node name="AddRoom" expanded="True" />
+ <Node name="2-Classification" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="ArmSensor" expanded="True" />
+ <Node name="Electrical" expanded="True">
+ <Node name="ClothesHangerPage.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 name="FunctionIcon" expanded="True">
+ <Node name="Electrical" expanded="True">
+ <Node name="ClothesHanger" expanded="True" />
</Node>
</Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True">
+ <Node name="FunctionIcon" expanded="True">
+ <Node name="Electrical" expanded="True">
+ <Node name="ClothesHanger" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
</Node>
</Node>
</State>
@@ -51,17 +80,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.DebuggingService.Breakpoints>
- <BreakpointStore>
- <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" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs" line="167" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Function.cs" relfile="HDL_ON/Entity/Function/Function.cs" line="417" 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="170" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="124" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/BlueWifi.cs" relfile="HDL-ON_iOS/BlueWifi.cs" line="153" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/BlueWifi.cs" relfile="HDL-ON_iOS/BlueWifi.cs" line="158" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/ImageUtlis.cs" relfile="HDL_ON/Common/ImageUtlis.cs" line="371" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0