1
wxr
2021-11-26 015d94a8c3a3bcdaa7de04a7fd7799046866db36
1
1个文件已添加
6个文件已修改
1 文件已重命名
100 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DLL/IOS/Shared.IOS.HDLSceneSiri.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL_APP_Project.sln 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SiriIntents/SiriIntents.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SiriIntentsUI/SiriIntentsUI.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SiriKit/Data/NSUserDefaultsHelper.cs 补丁 | 查看 | 原始文档 | blame | 历史
SiriKit/HDLRunSceneIntentHandlder.cs 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SiriKit/SiriKit.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -2,35 +2,24 @@
  <MonoDevelop.Ide.ItemProperties.SiriIntentUI>
    <MonoDevelop.MacDev.AppleDevelopmentTeam />
  </MonoDevelop.Ide.ItemProperties.SiriIntentUI>
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.3E789E7C-7F16-463D-8CAD-6AA84628D6C8" />
  <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="SiriKit/SiriScene.cs">
    <Files>
      <File FileName="SiriKit/HDLRunSceneIntentHandlder.cs" Line="26" Column="16" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2452" Column="49" />
      <File FileName="HDL_ON/Entity/Function/SecurityAlarm.cs" Line="12" Column="18" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="649" Column="50" />
      <File FileName="SiriKit/Data/DataManager.cs" Line="1" Column="1" />
      <File FileName="SiriKit/Data/SceneDateManager.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="129" Column="55" />
      <File FileName="SiriKit/HDLRunSceneIntentHandlder.cs" Line="13" Column="29" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
      <File FileName="HDL_ON/Entity/Function/SecurityAlarm.cs" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
      <File FileName="SiriKit/Data/SceneDateManager.cs" />
      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
      <File FileName="SiriKit/Support/NSUserActivityHelper.cs" Line="11" Column="13" />
      <File FileName="SiriKit/SiriScene.cs" Line="8" Column="23" />
    </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="DriverLayer" expanded="True" />
                <Node name="Server" expanded="True">
                  <Node name="HttpUtil.cs" selected="True" />
                </Node>
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
              </Node>
            </Node>
            <Node name="SiriKit" expanded="True">
              <Node name="Data" expanded="True" />
              <Node name="Support" expanded="True" />
              <Node name="SiriScene.cs" selected="True" />
            </Node>
          </Node>
        </State>
@@ -52,7 +41,7 @@
    <String>HDLSiriKit/HDLSiriKit.csproj</String>
    <String>SiriBinding/SiriBinding.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
DLL/IOS/Shared.IOS.HDLSceneSiri.dll
Binary files differ
HDL_APP_Project.sln
@@ -16,8 +16,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriIntents", "SiriIntents\SiriIntents.csproj", "{760980F5-1CD3-4F4F-9134-34D87BECD790}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriBinding", "SiriBinding\SiriBinding.csproj", "{77FFAB61-395D-4AD3-863E-C4E32B5038E7}"
EndProject
Global
    GlobalSection(SharedMSBuildProjectFiles) = preSolution
        HDL_ON\HDL_ON.projitems*{09712674-2a38-407b-b1e2-560b2c352f9a}*SharedItemsImports = 4
@@ -107,18 +105,6 @@
        {760980F5-1CD3-4F4F-9134-34D87BECD790}.Release|iPhone.Build.0 = Release|iPhone
        {760980F5-1CD3-4F4F-9134-34D87BECD790}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
        {760980F5-1CD3-4F4F-9134-34D87BECD790}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
        {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
SiriIntents/SiriIntents.csproj
@@ -86,9 +86,6 @@
    <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\" />
SiriIntentsUI/SiriIntentsUI.csproj
@@ -90,9 +90,6 @@
    <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\" />
SiriKit/Data/NSUserDefaultsHelper.cs
SiriKit/HDLRunSceneIntentHandlder.cs
@@ -1,51 +1,22 @@
using System;
using HDLSceneSiri;
using ObjCRuntime;
//using HdlSiri;
namespace SiriKit
{
    public class HDLRunSceneIntentHandlder : HDLRunSceneIntentHandling
    {
        override public void ConfirmRunScene(HDLRunSceneIntent intent, Action<HDLRunSceneIntentResponse> completion)
        public override void HandleHDLRunScene(HDLRunSceneIntent intent,  Action<HDLRunSceneIntentResponse> completion)
        {
            Console.WriteLine("ConfirmRunScene");
            //SceneDateManager sdm = new SceneDateManager();
            //if(sdm.IsLgoin)
            {
                //执行成功
                HDLRunSceneIntentResponse rsp = new HDLRunSceneIntentResponse(HDLRunSceneIntentResponseCode.Success,null);
                rsp.SceneName = intent.SceneName;
                rsp.SuccessMessage = @"请等待...";
                completion(rsp);
            }
            //else
            //{
            //    completion(new HDLRunSceneIntentResponse(HDLRunSceneIntentResponseCode.Error, null) { ErrorMessage = "未登录" });
            //}
            var rsp = new HDLRunSceneIntentResponse(HDLRunSceneIntentResponseCode.InProgress, null);
            completion(rsp);
        }
        public override void HandleRunScene(HDLRunSceneIntent intent,  Action<HDLRunSceneIntentResponse> completion)
        public override void ConfirmHDLRunScene(HDLRunSceneIntent intent,Action<HDLRunSceneIntentResponse> completion)
        {
            Console.WriteLine("HandleRunScene");
            completion(new HDLRunSceneIntentResponse(HDLRunSceneIntentResponseCode.Success, null));
            //SceneDateManager sdm = new SceneDateManager();
            //if (sdm.IsLgoin)
            {
                //执行成功
                HDLRunSceneIntentResponse rsp = new HDLRunSceneIntentResponse(HDLRunSceneIntentResponseCode.Success, null);
                rsp.SceneName = intent.SceneName;
                rsp.SuccessMessage = @"执行成功";
                completion(rsp);
            }
            //else
            //{
            //    completion(new HDLRunSceneIntentResponse(HDLRunSceneIntentResponseCode.Error, null) { ErrorMessage = "未登录" });
            //}
            //throw new NotImplementedException();
        }
    }
}
SiriKit/SiriKit.csproj
@@ -38,7 +38,7 @@
    <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>
      <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -54,8 +54,8 @@
    <Compile Include="Data\DataManager.cs" />
    <Compile Include="Data\SceneDateManager.cs" />
    <Compile Include="Support\NSUserActivityHelper.cs" />
    <Compile Include="Support\NSUserDefaultsHelper.cs" />
    <Compile Include="HDLRunSceneIntentHandlder.cs" />
    <Compile Include="Data\NSUserDefaultsHelper.cs" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="Base.lproj\Intents.intentdefinition" />