From 207b7261e989e4271578eddb933b33ba008379bb Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 22 十一月 2021 14:14:25 +0800 Subject: [PATCH] 1 --- HdlSiriKit/Siri/Support/NSUserDefaultsHelper.cs | 0 HDL_APP_Project.sln | 40 +++++-- HDL-ON_iOS/HDL-ON_iOS.csproj | 27 ---- HdlSiriKit/Siri/SiriBaseView.xib | 0 HdlSiriKit/Siri/UI/Cells.cs | 0 HdlSiriKit/HdlSiriKit.csproj | 79 +++++++++++++++ HdlSiriKit/Siri/VoiceShortcutDataManager.cs | 0 HDL-ON_iOS/Other/SkipControl.cs | 13 -- HdlSiriKit/SkipControl.cs | 28 +++++ HdlSiriKit/Siri/HDLRunSceneIntentHandlder.cs | 0 HdlSiriKit/Siri/SiriBaseView.designer.cs | 0 HdlSiriKit/Siri/Support/NSUserActivityHelper.cs | 0 HdlSiriKit/Siri/Data/DataManager.cs | 0 HdlSiriKit/Properties/AssemblyInfo.cs | 36 +++++++ HdlSiriKit/Siri/SiriScene.cs | 0 HdlSiriKit/Siri/Data/SceneDateManager.cs | 0 HdlSiriKit/Siri/SiriBaseView.cs | 3 .vs/HDL_APP_Project/xs/UserPrefs.xml | 72 ++++---------- HdlSiriKit/Base.lproj/Intents.intentdefinition | 0 19 files changed, 196 insertions(+), 102 deletions(-) diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml index 5785953..811249d 100644 --- a/.vs/HDL_APP_Project/xs/UserPrefs.xml +++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml @@ -2,77 +2,44 @@ <MonoDevelop.Ide.ItemProperties.SiriIntentUI> <MonoDevelop.MacDev.AppleDevelopmentTeam /> </MonoDevelop.Ide.ItemProperties.SiriIntentUI> + <MonoDevelop.Ide.ItemProperties.HdlSiriKit FirstBuild="True" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> - <MonoDevelop.Ide.ItemProperties.SiriIntents> - <MonoDevelop.MacDev.AppleDevelopmentTeam /> - </MonoDevelop.Ide.ItemProperties.SiriIntents> - <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Other/SkipControl.cs"> + <MonoDevelop.Ide.Workbench ActiveDocument="HdlSiriKit/Siri/Data/SceneDateManager.cs"> <Files> - <File FileName="HDL-ON_iOS/Other/Siri/Data/SceneDateManager.cs" Line="10" Column="102" /> - <File FileName="HDL-ON_iOS/Other/Siri/UI/Cells.cs" /> - <File FileName="HDL-ON_iOS/Other/Siri/HDLRunSceneIntentHandlder.cs" /> - <File FileName="SiriIntents/IntentHandler.cs" /> - <File FileName="HDL-ON_iOS/Other/Siri/Support/NSUserActivityHelper.cs" /> - <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" /> - <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" /> - <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" /> - <File FileName="HDL-ON_iOS/Other/Siri/Support/NSUserDefaultsHelper.cs" /> - <File FileName="HDL-ON_iOS/Other/Siri/SiriBaseView.cs" /> - <File FileName="HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" /> - <File FileName="HDL-ON_iOS/Other/Siri/Data/DataManager.cs" /> - <File FileName="HDL-ON_iOS/Other/SkipControl.cs" Line="30" Column="57" /> + <File FileName="HdlSiriKit/Siri/SiriBaseView.cs" Line="21" Column="43" /> + <File FileName="HdlSiriKit/Siri/Data/DataManager.cs" Line="1" Column="1" /> + <File FileName="HdlSiriKit/Siri/Data/SceneDateManager.cs" Line="1" 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="DAL" expanded="True"> - <Node name="Server" expanded="True" /> - </Node> - <Node name="UI" expanded="True"> - <Node name="CSS" expanded="True" /> - <Node name="UI1-Login" expanded="True" /> - <Node name="UI2" expanded="True"> - <Node name="4-PersonalCenter" expanded="True" /> - </Node> - </Node> - </Node> <Node name="HDL-ON_iOS" expanded="True"> - <Node name="Base.lproj" expanded="True" /> - <Node name="Other" expanded="True"> - <Node name="Siri" expanded="True"> - <Node name="Data" expanded="True" /> - <Node name="Support" expanded="True" /> + <Node name="Other" expanded="True" /> + </Node> + <Node name="HdlSiriKit" expanded="True"> + <Node name="Siri" expanded="True"> + <Node name="Data" expanded="True"> + <Node name="SceneDateManager.cs" selected="True" /> </Node> - <Node name="SkipControl.cs" selected="True" /> - </Node> - <Node name="Resources" expanded="True"> - <Node name="Phone" expanded="True" /> + <Node name="Support" expanded="True" /> + <Node name="UI" expanded="True" /> </Node> </Node> <Node name="SiriIntents" expanded="True" /> - <Node name="SiriIntentsUI" expanded="True" /> </Node> - </State> - </Pad> - <Pad Id="MonoDevelop.Debugger.WatchPad"> - <State> - <Value>GetType().Assembly</Value> </State> </Pad> </Pads> </MonoDevelop.Ide.Workbench> - <MonoDevelop.Ide.ItemProperties.SiriIntentsUI> - <MonoDevelop.MacDev.AppleDevelopmentTeam /> - </MonoDevelop.Ide.ItemProperties.SiriIntentsUI> <MonoDevelop.Ide.DebuggingService.PinnedWatches /> <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> <String>SiriIntent/SiriIntent.csproj</String> - <String>SiriBinding/SiriBinding.csproj</String> + <String>SiriLibrary/SiriLibrary.csproj</String> + <String>SceneKit/SceneKit.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> @@ -83,10 +50,11 @@ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" line="251" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" line="185" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" line="894" column="1" /> - <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" relfile="HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" line="62" column="1" /> - <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" relfile="HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" line="60" column="1" /> - <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" relfile="HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" line="64" column="1" /> - <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/Siri/SiriBaseView.cs" relfile="HDL-ON_iOS/Other/Siri/SiriBaseView.cs" line="60" column="1" /> + <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/SceneKit/Siri/VoiceShortcutDataManager.cs" relfile="SceneKit/Siri/VoiceShortcutDataManager.cs" line="62" column="1" /> + <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/SceneKit/Siri/VoiceShortcutDataManager.cs" relfile="SceneKit/Siri/VoiceShortcutDataManager.cs" line="60" column="1" /> + <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/SceneKit/Siri/VoiceShortcutDataManager.cs" relfile="SceneKit/Siri/VoiceShortcutDataManager.cs" line="64" column="1" /> + <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/SceneKit/Siri/SiriBaseView.cs" relfile="SceneKit/Siri/SiriBaseView.cs" line="60" column="1" /> + <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/Siri/HDLRunSceneIntentHandlder.cs" relfile="HdlSiriKit/Siri/HDLRunSceneIntentHandlder.cs" line="15" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index a33f04f..7a0c09c 100644 --- a/HDL-ON_iOS/HDL-ON_iOS.csproj +++ b/HDL-ON_iOS/HDL-ON_iOS.csproj @@ -108,9 +108,6 @@ <Reference Include="Shared.IOS.HDLLinphoneSDK"> <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath> </Reference> - <Reference Include="Shared.IOS.HDLSceneSiri"> - <HintPath>..\..\HDLXamarinSceneSiri\Shared.IOS.HDLSceneSiri\Shared.IOS.HDLSceneSiri\bin\Release\Shared.IOS.HDLSceneSiri.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <PackageReference Include="Newtonsoft.Json"> @@ -470,10 +467,6 @@ <Folder Include="Resources\Phone\FunctionIcon\Light\LightScene\" /> <Folder Include="Resources\Phone\PersonalCenter\FacePassage\" /> <Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" /> - <Folder Include="Other\Siri\" /> - <Folder Include="Other\Siri\Data\" /> - <Folder Include="Other\Siri\Support\" /> - <Folder Include="Other\Siri\UI\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -483,7 +476,6 @@ <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" /> @@ -503,18 +495,6 @@ <Compile Include="Other\JLCountrycode.cs" /> <Compile Include="BlueWifi.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" /> - <Compile Include="Other\Siri\HDLRunSceneIntentHandlder.cs" /> - <Compile Include="Other\Siri\Data\SceneDateManager.cs" /> - <Compile Include="Other\Siri\Data\DataManager.cs" /> - <Compile Include="Other\Siri\Support\NSUserDefaultsHelper.cs" /> - <Compile Include="Other\Siri\Support\NSUserActivityHelper.cs" /> - <Compile Include="Other\Siri\UI\Cells.cs" /> </ItemGroup> <ItemGroup> <BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" /> @@ -1437,9 +1417,10 @@ <Project>{ACC48A7F-250B-4915-A250-9BC399DBD6B3}</Project> <Name>SiriIntentsUI</Name> </ProjectReference> - </ItemGroup> - <ItemGroup> - <Content Include="Base.lproj\Intents.intentdefinition" /> + <ProjectReference Include="..\HdlSiriKit\HdlSiriKit.csproj"> + <Project>{A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}</Project> + <Name>HdlSiriKit</Name> + </ProjectReference> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> diff --git a/HDL-ON_iOS/Other/SkipControl.cs b/HDL-ON_iOS/Other/SkipControl.cs index 7bcbc47..c3fc220 100644 --- a/HDL-ON_iOS/Other/SkipControl.cs +++ b/HDL-ON_iOS/Other/SkipControl.cs @@ -22,20 +22,9 @@ //HDL_ON_iOS.AppDelegate.rootViewController.PushViewController(user, true); - NSMutableArray list = new NSMutableArray(); - foreach (var localScene in HDL_ON.Entity.FunctionList.List.scenes) - { - list.Add(new HDLSceneSiri.HDLSiriSceneModel() - { - UserSceneId = localScene.userSceneId, - Name = localScene.name, - }); - } - var vc = new HDLSceneSiri.HDLSiriSceneListViewController(); - vc.DataSource = list; //vc.TitleName //PresentViewController(vc, true, null); - HDL_ON_iOS.AppDelegate.rootViewController.PushViewController(vc, true); + //HDL_ON_iOS.AppDelegate.rootViewController.PushViewController(vc, true); } } diff --git a/HDL_APP_Project.sln b/HDL_APP_Project.sln index 9bffd46..e285b21 100644 --- a/HDL_APP_Project.sln +++ b/HDL_APP_Project.sln @@ -14,7 +14,9 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriIntentsUI", "SiriIntentsUI\SiriIntentsUI.csproj", "{ACC48A7F-250B-4915-A250-9BC399DBD6B3}" EndProject -Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "SiriBinding", "SiriBinding\SiriBinding.csproj", "{3ED45164-1242-414A-8B08-2751710F6E05}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriBinding", "SiriBinding\SiriBinding.csproj", "{77FFAB61-395D-4AD3-863E-C4E32B5038E7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HdlSiriKit", "HdlSiriKit\HdlSiriKit.csproj", "{A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -93,18 +95,30 @@ {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Release|iPhone.Build.0 = Release|iPhone {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {3ED45164-1242-414A-8B08-2751710F6E05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Debug|iPhone.Build.0 = Debug|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Release|Any CPU.Build.0 = Release|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Release|iPhone.ActiveCfg = Release|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Release|iPhone.Build.0 = Release|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {3ED45164-1242-414A-8B08-2751710F6E05}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Debug|iPhone.Build.0 = Debug|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Release|Any CPU.Build.0 = Release|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Release|iPhone.ActiveCfg = Release|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Release|iPhone.Build.0 = Release|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {77FFAB61-395D-4AD3-863E-C4E32B5038E7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Debug|iPhone.Build.0 = Debug|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Release|Any CPU.Build.0 = Release|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Release|iPhone.ActiveCfg = Release|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Release|iPhone.Build.0 = Release|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/HDL-ON_iOS/Base.lproj/Intents.intentdefinition b/HdlSiriKit/Base.lproj/Intents.intentdefinition similarity index 100% rename from HDL-ON_iOS/Base.lproj/Intents.intentdefinition rename to HdlSiriKit/Base.lproj/Intents.intentdefinition diff --git a/HdlSiriKit/HdlSiriKit.csproj b/HdlSiriKit/HdlSiriKit.csproj new file mode 100644 index 0000000..c78f73a --- /dev/null +++ b/HdlSiriKit/HdlSiriKit.csproj @@ -0,0 +1,79 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.30703</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{A8BDEE23-339E-48D2-A5F9-BCF037E6B9E7}</ProjectGuid> + <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <TemplateGuid>{a52b8a63-bc84-4b47-910d-692533484892}</TemplateGuid> + <OutputType>Library</OutputType> + <RootNamespace>HdlSiriKit</RootNamespace> + <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> + <AssemblyName>HdlSiriKit</AssemblyName> + <RestoreProjectStyle>PackageReference</RestoreProjectStyle> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>portable</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG;</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>portable</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Xml" /> + <Reference Include="System.Core" /> + <Reference Include="Xamarin.iOS" /> + <Reference Include="Shared.IOS.HDLSceneSiri"> + <HintPath>..\..\HDLXamarinSceneSiri\Shared.IOS.HDLSceneSiri\Shared.IOS.HDLSceneSiri\bin\Release\Shared.IOS.HDLSceneSiri.dll</HintPath> + </Reference> + </ItemGroup> + <ItemGroup> + <Folder Include="Resources\" /> + <Folder Include="Siri\" /> + <Folder Include="Base.lproj\" /> + </ItemGroup> + <ItemGroup> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Siri\Data\DataManager.cs" /> + <Compile Include="Siri\Data\SceneDateManager.cs" /> + <Compile Include="Siri\HDLRunSceneIntentHandlder.cs" /> + <Compile Include="Siri\SiriBaseView.cs" /> + <Compile Include="Siri\SiriBaseView.designer.cs"> + <DependentUpon>..\..\HDL-ON_iOS\Other\Siri\SiriBaseView.cs</DependentUpon> + </Compile> + <Compile Include="Siri\SiriScene.cs" /> + <Compile Include="Siri\Support\NSUserActivityHelper.cs" /> + <Compile Include="Siri\Support\NSUserDefaultsHelper.cs" /> + <Compile Include="Siri\UI\Cells.cs" /> + <Compile Include="Siri\VoiceShortcutDataManager.cs" /> + <Compile Include="SkipControl.cs" /> + </ItemGroup> + <ItemGroup> + <InterfaceDefinition Include="Siri\SiriBaseView.xib" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\SiriBinding\SiriBinding.csproj"> + <Project>{77FFAB61-395D-4AD3-863E-C4E32B5038E7}</Project> + <Name>SiriBinding</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Content Include="Base.lproj\Intents.intentdefinition" /> + </ItemGroup> + <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> + <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> +</Project> \ No newline at end of file diff --git a/HdlSiriKit/Properties/AssemblyInfo.cs b/HdlSiriKit/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..88a5f1a --- /dev/null +++ b/HdlSiriKit/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +锘縰sing System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("HdlSiriKit")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("HdlSiriKit")] +[assembly: AssemblyCopyright("Copyright 漏 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("50c7b8c9-e664-45af-b88e-0c9b8b9c1be1")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/HDL-ON_iOS/Other/Siri/Data/DataManager.cs b/HdlSiriKit/Siri/Data/DataManager.cs similarity index 100% rename from HDL-ON_iOS/Other/Siri/Data/DataManager.cs rename to HdlSiriKit/Siri/Data/DataManager.cs diff --git a/HDL-ON_iOS/Other/Siri/Data/SceneDateManager.cs b/HdlSiriKit/Siri/Data/SceneDateManager.cs similarity index 100% rename from HDL-ON_iOS/Other/Siri/Data/SceneDateManager.cs rename to HdlSiriKit/Siri/Data/SceneDateManager.cs diff --git a/HDL-ON_iOS/Other/Siri/HDLRunSceneIntentHandlder.cs b/HdlSiriKit/Siri/HDLRunSceneIntentHandlder.cs similarity index 100% rename from HDL-ON_iOS/Other/Siri/HDLRunSceneIntentHandlder.cs rename to HdlSiriKit/Siri/HDLRunSceneIntentHandlder.cs diff --git a/HDL-ON_iOS/Other/Siri/SiriBaseView.cs b/HdlSiriKit/Siri/SiriBaseView.cs similarity index 95% rename from HDL-ON_iOS/Other/Siri/SiriBaseView.cs rename to HdlSiriKit/Siri/SiriBaseView.cs index 87c302e..994dc9b 100644 --- a/HDL-ON_iOS/Other/Siri/SiriBaseView.cs +++ b/HdlSiriKit/Siri/SiriBaseView.cs @@ -21,7 +21,7 @@ base.ViewWillAppear(animated); //HDL_ON_iOS.AppDelegate.rootViewController.NavigationBarHidden = true; - HDL_ON_iOS.AppDelegate.rootViewController.SetNavigationBarHidden(false, true); + //AppDelegate.rootViewController.SetNavigationBarHidden(false, true); } public override void ViewDidLoad() @@ -43,7 +43,6 @@ } - var ddd = Xamarin.Essentials.DeviceInfo.VersionString; diff --git a/HDL-ON_iOS/Other/Siri/SiriBaseView.designer.cs b/HdlSiriKit/Siri/SiriBaseView.designer.cs similarity index 100% rename from HDL-ON_iOS/Other/Siri/SiriBaseView.designer.cs rename to HdlSiriKit/Siri/SiriBaseView.designer.cs diff --git a/HDL-ON_iOS/Other/Siri/SiriBaseView.xib b/HdlSiriKit/Siri/SiriBaseView.xib similarity index 100% rename from HDL-ON_iOS/Other/Siri/SiriBaseView.xib rename to HdlSiriKit/Siri/SiriBaseView.xib diff --git a/HDL-ON_iOS/Other/Siri/SiriScene.cs b/HdlSiriKit/Siri/SiriScene.cs similarity index 100% rename from HDL-ON_iOS/Other/Siri/SiriScene.cs rename to HdlSiriKit/Siri/SiriScene.cs diff --git a/HDL-ON_iOS/Other/Siri/Support/NSUserActivityHelper.cs b/HdlSiriKit/Siri/Support/NSUserActivityHelper.cs similarity index 100% rename from HDL-ON_iOS/Other/Siri/Support/NSUserActivityHelper.cs rename to HdlSiriKit/Siri/Support/NSUserActivityHelper.cs diff --git a/HDL-ON_iOS/Other/Siri/Support/NSUserDefaultsHelper.cs b/HdlSiriKit/Siri/Support/NSUserDefaultsHelper.cs similarity index 100% rename from HDL-ON_iOS/Other/Siri/Support/NSUserDefaultsHelper.cs rename to HdlSiriKit/Siri/Support/NSUserDefaultsHelper.cs diff --git a/HDL-ON_iOS/Other/Siri/UI/Cells.cs b/HdlSiriKit/Siri/UI/Cells.cs similarity index 100% rename from HDL-ON_iOS/Other/Siri/UI/Cells.cs rename to HdlSiriKit/Siri/UI/Cells.cs diff --git a/HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs b/HdlSiriKit/Siri/VoiceShortcutDataManager.cs similarity index 100% rename from HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs rename to HdlSiriKit/Siri/VoiceShortcutDataManager.cs diff --git a/HdlSiriKit/SkipControl.cs b/HdlSiriKit/SkipControl.cs new file mode 100644 index 0000000..82a4aa4 --- /dev/null +++ b/HdlSiriKit/SkipControl.cs @@ -0,0 +1,28 @@ +锘縰sing System; +using Foundation; + +namespace HdlSiriKit +{ + public class SkipControl + { + public SkipControl() + { + } + + public void SpikSiriSceneView() + { + + NSMutableArray list = new NSMutableArray(); + foreach (var localScene in HDL_ON.Entity.FunctionList.List.scenes) + { + list.Add(new HDLSceneSiri.HDLSiriSceneModel() + { + UserSceneId = localScene.userSceneId, + Name = localScene.name, + }); + } + var vc = new HDLSceneSiri.HDLSiriSceneListViewController(); + vc.DataSource = list; + } + } +} -- Gitblit v1.8.0