From 1ee407dd57a7273ef6b686ac25a40d4199f5bce9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 10:14:41 +0800
Subject: [PATCH] Merge branch 'wxr6' into wxr4
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 53 ++++++++++++++++++++---------------------------------
1 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 3896be0..39fadc2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,44 +1,36 @@
-锘�<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.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Function.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="164" Column="80" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="252" Column="21" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="154" Column="21" />
- <File FileName="HDL_ON/Common/FileUtlis.cs" Line="54" Column="10" />
- <File FileName="HDL_ON/DAL/FileUtils.cs" Line="214" Column="109" />
- <File FileName="HDL_ON/Entity/UserInfo.cs" Line="8" Column="1" />
- <File FileName="HDL_ON/Entity/OnAppConfig.cs" Line="15" Column="54" />
- <File FileName="HDL_ON/Entity/Room.cs" Line="83" Column="1" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2113" Column="17" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs" Line="156" Column="1" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" Line="88" Column="48" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="280" Column="60" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="285" Column="23" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="15" Column="35" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" />
+ <File FileName="HDL-ON_Android/Application.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="359" Column="40" />
+ <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
</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="Server" expanded="True" />
+ <Node name="Mqtt" expanded="True" />
</Node>
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True">
- <Node name="Function.cs" selected="True" />
- </Node>
- </Node>
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
+ <Node name="BindingResidence" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="RoomListManage" expanded="True" />
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Scene" expanded="True" />
</Node>
+ <Node name="4-PersonalCenter" expanded="True" />
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True" selected="True" />
<Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
@@ -51,15 +43,10 @@
<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>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="529" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewController.cs" relfile="HDL-ON_iOS/ViewController.cs" line="87" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewController.cs" relfile="HDL-ON_iOS/ViewController.cs" line="75" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="267" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Function.cs" relfile="HDL_ON/Entity/Function/Function.cs" line="297" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0