| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DLL/IOS/Shared.IOS.HDLSceneSiri.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Other/SkipControl.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SiriIntents/HDLRunSceneIntentHandlder.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SiriIntents/Server/HttpServerRequest.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SiriIntentsUI/IntentViewController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SiriKit/Base.lproj/Intents.intentdefinition | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -3,61 +3,25 @@ <MonoDevelop.MacDev.AppleDevelopmentTeam /> </MonoDevelop.Ide.ItemProperties.SiriIntentUI> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="SiriIntentsUI/IntentViewController.cs"> <Files> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs" Line="9" Column="40" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="51" Column="35" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" Line="112" Column="75" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="282" Column="55" /> <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="593" Column="55" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="192" Column="15" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InputPushText.cs" Line="83" Column="24" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs" Line="85" Column="66" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" Line="458" Column="45" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="213" Column="55" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" Line="465" Column="12" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs" Line="433" Column="17" /> <File FileName="HDL_ON/Entity/Function/SecurityAlarm.cs" Line="138" Column="29" /> <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" expanded="True"> <Node name="Common" expanded="True"> <Node name="Utlis" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI0-Public" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="2-Classification" expanded="True" /> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True" /> <Node name="Scene" expanded="True" /> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="ArmCenter" expanded="True"> <Node name="PushConfigPage.cs" selected="True" /> </Node> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True" /> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True" /> <Node name="Other" expanded="True" /> </Node> <Node name="SiriIntents" expanded="True" /> <Node name="SiriIntentsUI" expanded="True"> <Node name="IntentViewController.cs" 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> DLL/IOS/Shared.IOS.HDLSceneSiri.dllBinary files differ
HDL-ON_iOS/Other/SkipControl.cs
@@ -1,8 +1,11 @@ using System; using CoreGraphics; using Foundation; using HDL_ON.Entity; using HDLSceneSiri; using Intents; using IntentsUI; using Shared; using UIKit; namespace Other @@ -24,20 +27,104 @@ var sDM = new SiriKit.SceneDateManager(); Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}"); //NSMutableArray list = new NSMutableArray(); //foreach (var localScene in HDL_ON.Entity.FunctionList.List.scenes) //{ // list.Add(new HDLSceneSiri.HDLSiriControlModel() // { // 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); //1.初始化dataList NSMutableArray dataSourceList = new NSMutableArray(); //2.初始化场景列表数据 HDLSiriShortcutModel sceneModel = new HDLSiriShortcutModel(); if (Language.CurrentLanguage == "Chinese") { sceneModel.Title = "场景"; sceneModel.Content = "将场景添加到快捷指令，即可通过Siri执行"; } else { sceneModel.Title = "Scenes"; sceneModel.Content = "Add the scene to the shortcut, which can be executed through Siri"; } NSMutableArray list = new NSMutableArray(); foreach (var localScene in HDL_ON.Entity.FunctionList.List.scenes) { list.Add(new HDLSceneSiri.HDLSiriSceneModel() list.Add(new HDLSiriControlModel() { UserSceneId = localScene.userSceneId, Name = localScene.name, ControlId = localScene.userSceneId,//不能为空 ControlName = localScene.name,//不能为空 ControlType = "1",//不能为空 ControlJSONStr = "1",//不能为空 ActionName = Language.CurrentLanguage == "Chinese"? "场景": "Scene"//不能为空 }); } var vc = new HDLSceneSiri.HDLSiriSceneListViewController(); vc.DataSource = list; //vc.TitleName //PresentViewController(vc, true, null); sceneModel.List = NSArray.FromArray<HDLSiriControlModel>(list); dataSourceList.Add(sceneModel); //3.初始化安防列表数据 HDLSiriShortcutModel securityModel = new HDLSiriShortcutModel(); if (Language.CurrentLanguage == "Chinese") { securityModel.Title = "安防"; securityModel.Content = "将安防添加到快捷指令，即可通过Siri执行"; }else { securityModel.Title = "Security"; securityModel.Content = "Add security to the shortcut, which can be executed through Siri"; } NSMutableArray list2 = new NSMutableArray(); foreach (var temp in HDL_ON.Entity.FunctionList.List.securities) { SecurityState securityState = new SecurityState() { gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId, sid = temp.sid, status = "enable", userSecurityId = temp.userSecurityId }; var ControlJSONStr = Newtonsoft.Json.JsonConvert.SerializeObject(securityState); list2.Add(new HDLSiriControlModel() { ControlId = temp.userSecurityId,//不能为空 ControlName = temp.name,//不能为空 ControlType = "2",//不能为空 ControlJSONStr = ControlJSONStr,//不能为空 ActionName = Language.CurrentLanguage == "Chinese" ? "安防" : "Security"//不能为空 }); } securityModel.List = NSArray.FromArray<HDLSiriControlModel>(list2); dataSourceList.Add(securityModel); //4.跳转Siri添加或者编辑管理页面 HDLSceneSiri.HDLSiriSceneListViewController vc = new HDLSceneSiri.HDLSiriSceneListViewController(); vc.DataSource = dataSourceList; vc.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;//不能为空 if (Language.CurrentLanguage == "Chinese") { vc.TitleName = "快捷指令"; } else { vc.TitleName = "Shortcut instruction"; } HDL_ON_iOS.AppDelegate.rootViewController.PushViewController(vc, true); } public void SetData(bool isLogin, string accessToken, string refreshToken, string regionUrl, string homeId) SiriIntents/HDLRunSceneIntentHandlder.cs
@@ -1,4 +1,5 @@ using System; using System.Collections.Generic; using Foundation; using HDLSceneSiri; using ObjCRuntime; @@ -54,7 +55,20 @@ { if (Server.HttpServerRequest.Ins.DataManager.IsLgoin) { var result = Server.HttpServerRequest.Ins.ExecuteScene(intent.SceneId); var result = "-1"; if (intent.ControlType == "1") { result = Server.HttpServerRequest.Ins.ExecuteScene(intent.ControlId); } else { var security = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityState>(intent.ControlJSONStr); var sendObj = new List<SecurityState>() { new SecurityState() { gatewayId =security.gatewayId,sid = security.sid, status = security.status, userSecurityId = security.userSecurityId } }; result = Server.HttpServerRequest.Ins.SetSecurityStatus(sendObj); } if (result == "0") { var rsp = new HDLRunSceneIntentResponse(HDLRunSceneIntentResponseCode.Success, null); @@ -104,4 +118,29 @@ } } } /// <summary> /// 安防状态配置 /// </summary> public class SecurityState { /// <summary> /// 安防云端id /// </summary> public string userSecurityId; /// <summary> /// 网关id 网关id 如果传的是sid该字段需要传 /// </summary> public string gatewayId; /// <summary> /// 安防sid /// </summary> public string sid; /// <summary> /// 状态 enable布防、disable撒防 /// </summary> public string status; } } SiriIntents/Server/HttpServerRequest.cs
@@ -85,7 +85,7 @@ /// <summary> /// 设置安防防区状态 /// </summary> public ResponsePackNew SetSecurityStatus(List<object> securityStates) public string SetSecurityStatus(object securityStates) { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DataManager.HomeId); @@ -93,7 +93,7 @@ var requestJson = HttpUtil.GetSignRequestJson(d); var pack = HttpUtil.RequestHttpsPostFroHome( NewAPI.Api_Post_Security_StatusSet, requestJson); return pack; return pack.Code; }
@@ -59,8 +59,8 @@ HDLRunSceneIntentResponse rsp = interaction.IntentResponse as HDLRunSceneIntentResponse; this.lblMsg.Text = rsp.SuccessMessage; this.lblMsg.TextColor = UIColor.Black; this.lblMsg.Frame = new CGRect(0, 0, DesiredSize().Width, 180); CGSize size = new CGSize(DesiredSize().Width, 180); this.lblMsg.Frame = new CGRect(0, 0, DesiredSize().Width, 100); CGSize size = new CGSize(DesiredSize().Width, 100); if (completion != null) SiriKit/Base.lproj/Intents.intentdefinition
@@ -24,28 +24,28 @@ <key>INIntentDescriptionID</key> <string>Pe02nj</string> <key>INIntentLastParameterTag</key> <integer>2</integer> <integer>22</integer> <key>INIntentName</key> <string>HDLRunScene</string> <key>INIntentParameterCombinations</key> <dict> <key>sceneName,sceneId</key> <key>controlName,controlId,controlType,controlJSONStr,actionName,homeId</key> <dict> <key>INIntentParameterCombinationIsPrimary</key> <true/> <key>INIntentParameterCombinationSupportsBackgroundExecution</key> <true/> <key>INIntentParameterCombinationTitle</key> <string>执行场景“${sceneName}”</string> <string>${actionName}“${controlName}”</string> <key>INIntentParameterCombinationTitleID</key> <string>oCGdw4</string> <string>3GPMaH</string> </dict> </dict> <key>INIntentParameters</key> <array> <dict> <key>INIntentParameterDisplayName</key> <string>Scene Name</string> <string>Control Name</string> <key>INIntentParameterDisplayNameID</key> <string>wC0SgK</string> <key>INIntentParameterDisplayPriority</key> @@ -58,7 +58,7 @@ <string>xz2KkJ</string> </dict> <key>INIntentParameterName</key> <string>sceneName</string> <string>controlName</string> <key>INIntentParameterTag</key> <integer>1</integer> <key>INIntentParameterType</key> @@ -66,7 +66,7 @@ </dict> <dict> <key>INIntentParameterDisplayName</key> <string>Scene Id</string> <string>Control Id</string> <key>INIntentParameterDisplayNameID</key> <string>MtgGtd</string> <key>INIntentParameterDisplayPriority</key> @@ -79,9 +79,93 @@ <string>hQHCm1</string> </dict> <key>INIntentParameterName</key> <string>sceneId</string> <string>controlId</string> <key>INIntentParameterTag</key> <integer>2</integer> <key>INIntentParameterType</key> <string>String</string> </dict> <dict> <key>INIntentParameterDisplayName</key> <string>Home Id</string> <key>INIntentParameterDisplayNameID</key> <string>Re9KKp</string> <key>INIntentParameterDisplayPriority</key> <integer>3</integer> <key>INIntentParameterMetadata</key> <dict> <key>INIntentParameterMetadataCapitalization</key> <string>Sentences</string> <key>INIntentParameterMetadataDefaultValueID</key> <string>mQMSns</string> </dict> <key>INIntentParameterName</key> <string>homeId</string> <key>INIntentParameterTag</key> <integer>12</integer> <key>INIntentParameterType</key> <string>String</string> </dict> <dict> <key>INIntentParameterDisplayName</key> <string>Control Type</string> <key>INIntentParameterDisplayNameID</key> <string>TBoK4E</string> <key>INIntentParameterDisplayPriority</key> <integer>4</integer> <key>INIntentParameterMetadata</key> <dict> <key>INIntentParameterMetadataCapitalization</key> <string>Sentences</string> <key>INIntentParameterMetadataDefaultValueID</key> <string>Yg2EJK</string> </dict> <key>INIntentParameterName</key> <string>controlType</string> <key>INIntentParameterTag</key> <integer>14</integer> <key>INIntentParameterType</key> <string>String</string> </dict> <dict> <key>INIntentParameterDisplayName</key> <string>Control JSON Str</string> <key>INIntentParameterDisplayNameID</key> <string>WYEDs9</string> <key>INIntentParameterDisplayPriority</key> <integer>5</integer> <key>INIntentParameterMetadata</key> <dict> <key>INIntentParameterMetadataCapitalization</key> <string>Sentences</string> <key>INIntentParameterMetadataDefaultValueID</key> <string>WXdhpn</string> </dict> <key>INIntentParameterName</key> <string>controlJSONStr</string> <key>INIntentParameterTag</key> <integer>21</integer> <key>INIntentParameterType</key> <string>String</string> </dict> <dict> <key>INIntentParameterDisplayName</key> <string>Action Name</string> <key>INIntentParameterDisplayNameID</key> <string>sB0JdL</string> <key>INIntentParameterDisplayPriority</key> <integer>6</integer> <key>INIntentParameterMetadata</key> <dict> <key>INIntentParameterMetadataCapitalization</key> <string>Sentences</string> <key>INIntentParameterMetadataDefaultValueID</key> <string>nGpmbm</string> </dict> <key>INIntentParameterName</key> <string>actionName</string> <key>INIntentParameterTag</key> <integer>22</integer> <key>INIntentParameterType</key> <string>String</string> </dict> @@ -92,7 +176,7 @@ <array> <dict> <key>INIntentResponseCodeFormatString</key> <string>${sceneName}</string> <string>${controlName}</string> <key>INIntentResponseCodeFormatStringID</key> <string>Pq8YBC</string> <key>INIntentResponseCodeName</key> @@ -149,13 +233,13 @@ </dict> <dict> <key>INIntentResponseParameterDisplayName</key> <string>Scene Name</string> <string>Control Name</string> <key>INIntentResponseParameterDisplayNameID</key> <string>pqg7cb</string> <key>INIntentResponseParameterDisplayPriority</key> <integer>3</integer> <key>INIntentResponseParameterName</key> <string>sceneName</string> <string>controlName</string> <key>INIntentResponseParameterTag</key> <integer>3</integer> <key>INIntentResponseParameterType</key>
