From f2c1e5bf3a67478076fb5bbcf546824b3127db15 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 19:11:40 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f6a2fb4..a6f8754 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,43 +1,61 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/Utlis.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs" Line="134" Column="16" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomsManagementPage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomsManagementPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/ResidentialManagePageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainFragment.cs" />
- <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="101" Column="58" />
- <File FileName="HDL_ON/UI/UI2/UserPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="442" Column="48" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs" Line="161" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1878" Column="32" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="163" Column="56" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" />
+ <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="342" Column="46" />
+ <File FileName="HDL_ON/Common/OnAppConfig.cs" Line="136" Column="22" />
+ <File FileName="HDL_ON/Common/FileUtlis.cs" Line="21" Column="10" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="149" Column="74" />
+ <File FileName="HDL_ON/Common/Utlis.cs" Line="1" 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="Utlis.cs" selected="True" />
+ </Node>
+ <Node name="DAL" expanded="True">
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Server" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True">
+ <Node name="Function" expanded="True" />
+ <Node name="ResponseEntity" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
<Node name="CSS" expanded="True" />
- <Node name="UI0-Public" expanded="True" />
+ <Node name="UI0-Public" expanded="True">
+ <Node name="Widget" expanded="True" />
+ </Node>
<Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
<Node name="1-HomePage" expanded="True" />
<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="ResidentialManage" expanded="True" />
- <Node name="PersonalCenterPage.cs" selected="True" />
+ <Node name="MemberManagement" expanded="True" />
+ <Node name="RoomListManage" expanded="True">
+ <Node name="AddRoom" expanded="True" />
+ </Node>
+ <Node name="SearchDevice" expanded="True" />
</Node>
<Node name="FuntionControlView" expanded="True">
- <Node name="Curtain" expanded="True" />
+ <Node name="EnvironmentalScience" expanded="True" />
</Node>
</Node>
</Node>
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
@@ -45,11 +63,19 @@
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
+ <DisabledProjects>
+ <String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String>
+ <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.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL-ON_iOS/obj/iPhone/Debug/device-builds/iphone11.8-13.3.1/actool/bundle/Assets.car" relfile="HDL-ON_iOS/obj/iPhone/Debug/device-builds/iphone11.8-13.3.1/actool/bundle/Assets.car" line="181" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL-ON_iOS/obj/iPhone/Debug/device-builds/iphone11.8-13.3.1/actool/bundle/Assets.car" relfile="HDL-ON_iOS/obj/iPhone/Debug/device-builds/iphone11.8-13.3.1/actool/bundle/Assets.car" line="179" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" line="136" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs" line="221" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Room.cs" relfile="HDL_ON/Entity/Room.cs" line="260" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePage.cs" relfile="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" line="163" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0