From 6c5398cef0d718eec08a1f56b1a9f00e79a85d67 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 十一月 2021 14:48:54 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 56 +++++++++++---------------------------------------------
1 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 9bb4beb..2ac4a02 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,56 +1,19 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="132" Column="58" IsPinned="True" />
- <File FileName="../../Application.cs" Line="16" Column="35" IsPinned="True" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="150" Column="18" IsPinned="True" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="133" Column="31" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="442" Column="22" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs" Line="895" Column="32" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs" Line="18" Column="132" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="40" Column="57" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs" Line="16" Column="40" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="338" Column="36" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="85" />
</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="Mqtt" expanded="True" />
<Node name="Server" expanded="True" />
</Node>
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- </Node>
- <Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True">
- <Node name="LogicView" expanded="True" />
- </Node>
- </Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True">
- <Node name="View" expanded="True" />
- <Node name="PirMain.cs" selected="True" />
- </Node>
- </Node>
- </Node>
- </Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" selected="True" />
</Node>
</State>
</Pad>
@@ -62,10 +25,13 @@
<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.4b65c4650918" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1415" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="333" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0