.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,9 +1,27 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.Workbench> <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.SiriIntentUI> <MonoDevelop.MacDev.AppleDevelopmentTeam /> </MonoDevelop.Ide.ItemProperties.SiriIntentUI> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench ActiveDocument="SiriBinding/Structs.cs"> <Files> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="203" Column="35" /> <File FileName="HDL-ON_iOS/Other/SkipControl.cs" Line="35" Column="1" /> <File FileName="HDL-ON_iOS/Other/Siri/SiriBaseView.cs" Line="25" Column="2" /> <File FileName="SiriBinding/ApiDefinition.cs" Line="8" Column="18" /> <File FileName="SiriBinding/Structs.cs" Line="7" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True" selected="True" /> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Other" expanded="True" /> </Node> <Node name="SiriBinding" expanded="True"> <Node name="Structs.cs" selected="True" /> </Node> </Node> </State> </Pad> </Pads> @@ -13,11 +31,18 @@ <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> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" /> <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" /> <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" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> HDL-ON_iOS/AppDelegate.cs
@@ -60,7 +60,7 @@ // // If not required for your application you can safely delete this method // return true; //} internal static UINavigationController rootViewController; public static UINavigationController rootViewController; public static void CleanApplicationIconBadgeNumber() { 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,11 @@ <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> </ItemGroup> <ItemGroup> <BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" /> @@ -1405,10 +1408,9 @@ <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project> <Name>Blufi</Name> </ProjectReference> <ProjectReference Include="..\SiriIntentUI\SiriIntentUI.csproj"> <IsAppExtension>true</IsAppExtension> <Project>{B594D3F5-4B93-4988-B45E-150BBFDC8A43}</Project> <Name>SiriIntentUI</Name> <ProjectReference Include="..\SiriBinding\SiriBinding.csproj"> <Project>{77FFAB61-395D-4AD3-863E-C4E32B5038E7}</Project> <Name>SiriBinding</Name> </ProjectReference> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> HDL-ON_iOS/Other/Siri/SiriBaseView.cs
New file @@ -0,0 +1,26 @@ using System; using UIKit; namespace Other.Siri { public partial class SiriBaseView : UIViewController { public SiriBaseView() : base("SiriBaseView", null) { } public override void ViewDidLoad() { base.ViewDidLoad(); // Perform any additional setup after loading the view, typically from a nib. } public override void DidReceiveMemoryWarning() { base.DidReceiveMemoryWarning(); // Release any cached data, images, etc that aren't in use. } } }
New file @@ -0,0 +1,21 @@ // WARNING // // This file has been generated automatically by Xamarin Studio from the outlets and // actions declared in your storyboard file. // Manual changes to this file will not be maintained. // using Foundation; using System; using System.CodeDom.Compiler; using UIKit; namespace Other.Siri { [Register("SiriBaseView")] partial class SiriBaseView { void ReleaseDesignerOutlets() { } } } HDL-ON_iOS/Other/Siri/SiriBaseView.xib
New file @@ -0,0 +1,21 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES"> <dependencies> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SiriBaseView"> <connections> <outlet property="view" destination="2" id="RRd-Eg-VrN"/> </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view contentMode="scaleToFill" id="2"> <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> </objects> </document> HDL-ON_iOS/Other/SkipControl.cs
New file @@ -0,0 +1,34 @@ using System; using CoreGraphics; using Other.Siri; using UIKit; namespace Other { public class SkipControl { public SkipControl() { } public void SkipSiriView() { var user = new SiriBaseView(); user.View.BackgroundColor = UIColor.Magenta; var btn = UIButton.FromType(UIButtonType.System); btn.Frame = new CGRect(20, 200, 280, 44); btn.SetTitle("Click Me", UIControlState.Normal); HDL_ON_iOS.AppDelegate.rootViewController.NavigationBarHidden = true; HDL_ON_iOS.AppDelegate.rootViewController.NavigationBarHidden = false; HDL_ON_iOS.AppDelegate.rootViewController.PushViewController(user, true); btn.TouchUpInside += (sender, e) => { }; user.View.AddSubview(btn); } } } HDL_APP_Project.sln
@@ -10,7 +10,7 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blufi", "HdlBluWi\Blufi.csproj", "{2DDF4C3C-6998-432E-9F43-6786D82F0630}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriLibrary", "SiriLibrary\SiriLibrary.csproj", "{C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriBinding", "SiriBinding\SiriBinding.csproj", "{77FFAB61-395D-4AD3-863E-C4E32B5038E7}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -65,18 +65,18 @@ {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|Any CPU.Build.0 = Debug|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Debug|Any CPU.Build.0 = Debug|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Debug|iPhone.ActiveCfg = Debug|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Debug|iPhone.Build.0 = Debug|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Release|Any CPU.ActiveCfg = Release|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Release|Any CPU.Build.0 = Release|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Release|iPhone.ActiveCfg = Release|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Release|iPhone.Build.0 = Release|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}.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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -198,6 +198,12 @@ bool b = false; btnIcon.MouseUpEventHandler += (sender, e) => { #if __IOS__ var dd =new Other.SkipControl(); dd.SkipSiriView(); return; #endif //ESOnVideo.Current.Test(false); //return; SiriBinding/ApiDefinition.cs
New file @@ -0,0 +1,86 @@ using System; using ObjCRuntime; using Foundation; using UIKit; using Intents; namespace HdlSiri { // @interface HDLRunSceneIntent : INIntent [Watch(5, 0), NoTV, Mac(11, 0), iOS(12, 0)] [BaseType(typeof(INIntent))] interface HDLRunSceneIntent { // @property (readwrite, copy, nonatomic) NSString * _Nullable sceneName; [NullAllowed, Export("sceneName")] string SceneName { get; set; } // @property (readwrite, copy, nonatomic) NSString * _Nullable sceneId; [NullAllowed, Export("sceneId")] string SceneId { get; set; } } // @protocol HDLRunSceneIntentHandling <NSObject> /* Check whether adding [Model] to this declaration is appropriate. [Model] is used to generate a C# class that implements this protocol, and might be useful for protocols that consumers are supposed to implement, since consumers can subclass the generated class instead of implementing the generated interface. If consumers are not supposed to implement this protocol, then [Model] is redundant and will generate code that will never be used. */ [Watch(5, 0), NoTV, Mac(11, 0), iOS(12, 0)] [Protocol] [BaseType(typeof(NSObject))] interface HDLRunSceneIntentHandling { // @required -(void)handleRunScene:(HDLRunSceneIntent * _Nonnull)intent completion:(void (^ _Nonnull)(HDLRunSceneIntentResponse * _Nonnull))completion __attribute__((swift_name("handle(intent:completion:)"))); [Abstract] [Export("handleRunScene:completion:")] void HandleRunScene(HDLRunSceneIntent intent, Action<HDLRunSceneIntentResponse> completion); // @optional -(void)confirmRunScene:(HDLRunSceneIntent * _Nonnull)intent completion:(void (^ _Nonnull)(HDLRunSceneIntentResponse * _Nonnull))completion __attribute__((swift_name("confirm(intent:completion:)"))); [Export("confirmRunScene:completion:")] void ConfirmRunScene(HDLRunSceneIntent intent, Action<HDLRunSceneIntentResponse> completion); } // @interface HDLRunSceneIntentResponse : INIntentResponse [Watch(5, 0), NoTV, Mac(11, 0), iOS(12, 0)] [BaseType(typeof(INIntentResponse))] [DisableDefaultCtor] interface HDLRunSceneIntentResponse { // -(instancetype _Nonnull)initWithCode:(HDLRunSceneIntentResponseCode)code userActivity:(NSUserActivity * _Nullable)userActivity __attribute__((objc_designated_initializer)); [Export("initWithCode:userActivity:")] [DesignatedInitializer] IntPtr Constructor(HDLRunSceneIntentResponseCode code, [NullAllowed] NSUserActivity userActivity); // +(instancetype _Nonnull)successIntentResponseWithSceneName:(NSString * _Nonnull)sceneName __attribute__((swift_name("success(sceneName:)"))); [Static] [Export("successIntentResponseWithSceneName:")] HDLRunSceneIntentResponse SuccessIntentResponseWithSceneName(string sceneName); // +(instancetype _Nonnull)failureIntentResponseWithErrorMessage:(NSString * _Nonnull)errorMessage __attribute__((swift_name("failure(errorMessage:)"))); [Static] [Export("failureIntentResponseWithErrorMessage:")] HDLRunSceneIntentResponse FailureIntentResponseWithErrorMessage(string errorMessage); // @property (readwrite, copy, nonatomic) NSString * _Nullable errorMessage; [NullAllowed, Export("errorMessage")] string ErrorMessage { get; set; } // @property (readwrite, copy, nonatomic) NSString * _Nullable successMessage; [NullAllowed, Export("successMessage")] string SuccessMessage { get; set; } // @property (readwrite, copy, nonatomic) NSString * _Nullable sceneName; [NullAllowed, Export("sceneName")] string SceneName { get; set; } // @property (readonly, nonatomic) HDLRunSceneIntentResponseCode code; [Export("code")] HDLRunSceneIntentResponseCode Code { get; } } } SiriBinding/Properties/AssemblyInfo.cs
New file @@ -0,0 +1,34 @@ using System.Reflection; using System.Runtime.CompilerServices; using Foundation; // This attribute allows you to mark your assemblies as “safe to link”. // When the attribute is present, the linker—if enabled—will process the assembly // even if you’re using the “Link SDK assemblies only” option, which is the default for device builds. [assembly: LinkerSafe] // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. [assembly: AssemblyTitle("NativeLibrary")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("NativeLibrary")] [assembly: AssemblyCopyright("Copyright © 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. [assembly: AssemblyVersion("1.0.*")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] SiriBinding/SiriBinding.csproj
File was renamed from SiriLibrary/SiriLibrary.csproj @@ -1,17 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" 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>{C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}</ProjectGuid> <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <TemplateGuid>{a52b8a63-bc84-4b47-910d-692533484892}</TemplateGuid> <ProjectTypeGuids>{8FFB629D-F513-41CE-95D2-7ECE97B6EEEC};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectGuid>{77FFAB61-395D-4AD3-863E-C4E32B5038E7}</ProjectGuid> <TemplateGuid>{b6f3ff35-79b2-4f25-a2fc-60a7cf61013b}</TemplateGuid> <OutputType>Library</OutputType> <RootNamespace>SiriLibrary</RootNamespace> <RootNamespace>NativeLibrary</RootNamespace> <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>SiriLibrary</AssemblyName> <AssemblyName>NativeLibrary</AssemblyName> <RestoreProjectStyle>PackageReference</RestoreProjectStyle> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -22,6 +20,7 @@ <DefineConstants>DEBUG;</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>portable</DebugType> @@ -29,19 +28,29 @@ <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" /> </ItemGroup> <ItemGroup> <Folder Include="Resources\" /> </ItemGroup> <ItemGroup> <Compile Include="Class1.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <ItemGroup> <ObjcBindingApiDefinition Include="ApiDefinition.cs" /> </ItemGroup> <ItemGroup> <ObjcBindingCoreSource Include="Structs.cs" /> </ItemGroup> <ItemGroup> <NativeReference Include="..\ThirdPartyIntegration\siri\libOnProSiriIntents.a"> <Kind>Static</Kind> <SmartLink>False</SmartLink> </NativeReference> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" /> </Project> SiriBinding/Structs.cs
New file @@ -0,0 +1,18 @@ using ObjCRuntime; namespace HdlSiri { [Watch(5, 0), NoTV, Mac(11, 0), iOS(12, 0)] [Native] public enum HDLRunSceneIntentResponseCode : long { Unspecified = 0, Ready, ContinueInApp, InProgress, Success, Failure, FailureRequiringAppLaunch, Error = 100 } } SiriLibrary/Class1.cs
File was deleted SiriLibrary/Properties/AssemblyInfo.cs
File was deleted ThirdPartyIntegration/siri/libOnProSiriIntents.aBinary files differ
