From e75ccccb370b47305c6eadb321efb27c86cdd28b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 十一月 2021 09:57:24 +0800
Subject: [PATCH] 合并
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 3847b41..78e92ec 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -2,24 +2,29 @@
<MonoDevelop.Ide.ItemProperties.SiriIntentUI>
<MonoDevelop.MacDev.AppleDevelopmentTeam />
</MonoDevelop.Ide.ItemProperties.SiriIntentUI>
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="SiriIntentsUI/IntentViewController.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs" Line="203" Column="17" IsPinned="True" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="79" />
+ <File FileName="HDL-ON_iOS/Other/SkipControl.cs" Line="68" Column="45" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="SiriIntentsUI/IntentViewController.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL-ON_iOS" expanded="True" selected="True" />
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Other" expanded="True" />
+ </Node>
+ <Node name="SiriIntents" expanded="True" />
+ <Node name="SiriIntentsUI" expanded="True">
+ <Node name="IntentViewController.cs" selected="True" />
+ </Node>
+ <Node name="SiriKit" expanded="True">
+ <Node name="References" expanded="True" />
+ <Node name="Base.lproj" expanded="True" />
+ </Node>
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>tempFunction.deviceId</Value>
- <Value>updata2.ToString()</Value>
</State>
</Pad>
</Pads>
@@ -31,14 +36,21 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
<String>SiriIntent/SiriIntent.csproj</String>
<String>SceneKit/SceneKit.csproj</String>
+ <String>HdlOnProSiriIntents/HdlOnProSiriIntents.csproj</String>
+ <String>HdlOnProSiriIntentsUI/HdlOnProSiriIntentsUI.csproj</String>
+ <String>HdlOnProSiriKit/HdlOnProSiriKit.csproj</String>
+ <String>HDLSiriIntents/HDLSiriIntents.csproj</String>
+ <String>HDLSiriIntentsUI/HDLSiriIntentsUI.csproj</String>
+ <String>HDLSiriKit/HDLSiriKit.csproj</String>
+ <String>SiriBinding/SiriBinding.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="28" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/SkipControl.cs" relfile="HDL-ON_iOS/Other/SkipControl.cs" line="25" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="14" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs" line="366" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0