From 46fef61e8de822dc4a9eebca530ce37f2ed014f7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 11:06:27 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr6
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 48 ++++++++++++++----------------------------------
1 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index baafcb8..4b8ad64 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,21 +1,6 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/DB_ResidenceData.cs">
- <Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs" Line="8" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs" Line="94" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs" Line="39" Column="36" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs" Line="260" Column="23" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs" Line="99" Column="50" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs" Line="219" Column="62" />
- <File FileName="HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs" Line="9" Column="18" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="405" Column="22" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs" Line="292" Column="1" />
- <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="6" Column="23" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="148" Column="29" />
- <File FileName="HDL_ON/DriverLayer/Control.cs" Line="84" Column="38" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="1" Column="1" />
- </Files>
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -24,36 +9,31 @@
<Node name="DAL" expanded="True">
<Node name="Server" expanded="True" />
</Node>
- <Node name="DriverLayer" expanded="True" />
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- <Node name="ResponseEntity" expanded="True" />
- <Node name="DB_ResidenceData.cs" selected="True" />
- </Node>
<Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
<Node name="4-PersonalCenter" expanded="True">
- <Node name="MemberManagement" expanded="True" />
+ <Node name="PirDevice" expanded="True">
+ <Node name="View" expanded="True">
+ <Node name="TopView.cs" selected="True" />
+ </Node>
+ </Node>
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="Phone" expanded="True" />
- </Node>
- </Node>
- <Node name="Shared.IOS" expanded="True" />
</Node>
</State>
</Pad>
</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 AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.SelectDevice" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0