From 06c09ecbdf83cc5cc33971ffb75ba81e85b6eb33 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 29 十一月 2021 15:31:26 +0800
Subject: [PATCH] 2021-11-29 1.更新
---
HDLSceneSiriDemo/HDLSceneSiriDemo/ViewController.m | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/HDLSceneSiriDemo/HDLSceneSiriDemo/ViewController.m b/HDLSceneSiriDemo/HDLSceneSiriDemo/ViewController.m
index fbdc1ab..d9884f6 100644
--- a/HDLSceneSiriDemo/HDLSceneSiriDemo/ViewController.m
+++ b/HDLSceneSiriDemo/HDLSceneSiriDemo/ViewController.m
@@ -7,7 +7,7 @@
#import "ViewController.h"
#import "HDLSiriSceneListViewController.h"
-#import "HDLSiriSceneModel.h"
+#import "HDLSiriShortcutModel.h"
@interface ViewController ()
@@ -21,16 +21,49 @@
}
-(void)gotoSiriSceneListViewController{
+
+
+ NSMutableArray *dataList = [NSMutableArray new];
+ //1.鍦烘櫙
+ HDLSiriShortcutModel *sceneModel = [[HDLSiriShortcutModel alloc] init];
+ sceneModel.title = @"鍦烘櫙";
+ sceneModel.content = @"灏嗗満鏅坊鍔犲埌Siri鎹峰緞锛屽嵆鍙�氳繃Siri璇煶鎵ц";
NSMutableArray *list = [NSMutableArray new];
for(int i = 0; i<10; i++){
- HDLSiriSceneModel *model = [[HDLSiriSceneModel alloc] init];
- model.name = [NSString stringWithFormat:@"鍥炲妯″紡%d",i];
- model.userSceneId = [NSString stringWithFormat:@"userSceneId%d",i];
+ HDLSiriControlModel *model = [[HDLSiriControlModel alloc] init];
+ model.controlType = @"1";
+ model.controlName = [NSString stringWithFormat:@"鍥炲妯″紡%d",i];
+ model.controlId = [NSString stringWithFormat:@"userSceneId%d",i];
+ model.actionName = @"鎵ц鍦烘櫙";
+ model.controlJSONStr = @"2";
[list addObject:model];
}
+ sceneModel.list = [NSArray arrayWithArray:list];
+ [dataList addObject:sceneModel];
+
+ //2.瀹夐槻
+ HDLSiriShortcutModel *securityModel = [[HDLSiriShortcutModel alloc] init];
+ securityModel.title = @"瀹夐槻";
+ securityModel.content =@"灏嗗畨闃叉坊鍔犲埌Siri鎹峰緞锛屽嵆鍙�氳繃Siri璇煶鎵ц";
+ NSMutableArray *list2 = [NSMutableArray new];
+ for(int i = 0; i<10; i++){
+ HDLSiriControlModel *model = [[HDLSiriControlModel alloc] init];
+ model.controlType = @"2";
+ model.controlName = [NSString stringWithFormat:@"澶栧嚭甯冮槻%d",i];
+ model.controlId = [NSString stringWithFormat:@"usecurityId%d",i];
+ model.actionName = @"鎵ц瀹夐槻";
+ model.controlJSONStr = @"{\"userSecurityId\":\"111111111\",\"gatewayId\":\"2222222\",\"sid\":\"333333\",\"status\":\"enable\"}";
+// model.sid = [NSString stringWithFormat:@"securityId%d",i];
+ [list2 addObject:model];
+ }
+ securityModel.list = [NSArray arrayWithArray:list2];
+ [dataList addObject:securityModel];
+
+
HDLSiriSceneListViewController *vc = [[HDLSiriSceneListViewController alloc] init];
- vc.dataSource = list;
+ vc.dataSource = dataList;
+ vc.homeId = @"000000";
[self.navigationController pushViewController:vc animated:YES];
}
--
Gitblit v1.8.0