From dd3f6db0cb3c242758ab0000a0513e093f02531c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 18 十一月 2021 13:11:32 +0800
Subject: [PATCH] 合并成功
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index d9dbcea..a817328 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -463,7 +463,7 @@
<Folder Include="Resources\Phone\FunctionIcon\Light\LightScene\" />
<Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" />
- <Folder Include="Other\Data\" />
+ <Folder Include="Other\Siri\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -473,6 +473,7 @@
<InterfaceDefinition Include="Resources\EZ\Base.lproj\EZSupportViewController.xib" />
<InterfaceDefinition Include="Resources\EZ\Base.lproj\EZMain.storyboard" />
<InterfaceDefinition Include="Resources\EZ\Base.lproj\AddDevice.storyboard" />
+ <InterfaceDefinition Include="Other\Siri\SiriBaseView.xib" />
</ItemGroup>
<ItemGroup>
<None Include="Info.plist" />
@@ -491,9 +492,13 @@
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="Other\JLCountrycode.cs" />
<Compile Include="BlueWifi.cs" />
- <Compile Include="Other\PrimaryClass.cs" />
- <Compile Include="Other\Data\VoiceShortcutDataManager.cs" />
- <Compile Include="Other\Data\SiriScene.cs" />
+ <Compile Include="Other\SkipControl.cs" />
+ <Compile Include="Other\Siri\SiriBaseView.cs" />
+ <Compile Include="Other\Siri\SiriBaseView.designer.cs">
+ <DependentUpon>SiriBaseView.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Other\Siri\VoiceShortcutDataManager.cs" />
+ <Compile Include="Other\Siri\SiriScene.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -1405,10 +1410,19 @@
<Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
<Name>Blufi</Name>
</ProjectReference>
- <ProjectReference Include="..\SiriIntentUI\SiriIntentUI.csproj">
+ <ProjectReference Include="..\SiriBinding\SiriBinding.csproj">
+ <Project>{77FFAB61-395D-4AD3-863E-C4E32B5038E7}</Project>
+ <Name>SiriBinding</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\SiriIntents\SiriIntents.csproj">
<IsAppExtension>true</IsAppExtension>
- <Project>{B594D3F5-4B93-4988-B45E-150BBFDC8A43}</Project>
- <Name>SiriIntentUI</Name>
+ <Project>{760980F5-1CD3-4F4F-9134-34D87BECD790}</Project>
+ <Name>SiriIntents</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\SiriIntentsUI\SiriIntentsUI.csproj">
+ <IsAppExtension>true</IsAppExtension>
+ <Project>{ACC48A7F-250B-4915-A250-9BC399DBD6B3}</Project>
+ <Name>SiriIntentsUI</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
--
Gitblit v1.8.0