From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f6a2fb4..68a7a40 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,55 +1,53 @@
-锘�<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">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Assets/Language.ini">
<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/Common/Constant.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="1" Column="1" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="484" 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="DAL" expanded="True">
+ <Node name="DriverLayer" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
- <Node name="CSS" expanded="True" />
<Node name="UI0-Public" expanded="True" />
<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="4-PersonalCenter" expanded="True">
- <Node name="ResidentialManage" expanded="True" />
- <Node name="PersonalCenterPage.cs" selected="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Curtain" expanded="True" />
- </Node>
- </Node>
+ <Node name="UI2" expanded="True" />
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Assets" expanded="True">
+ <Node name="Language.ini" selected="True" />
+ </Node>
+ <Node name="Other" expanded="True" />
+ <Node name="Resources" expanded="True" />
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <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" />
+ <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/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" line="76" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" line="56" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/AppUnlockPage.cs" relfile="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" line="18" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="694" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_TcpServer.cs" relfile="HDL_ON/DriverLayer/Control_TcpServer.cs" line="197" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0