From 485a9553e08984a945d692483b1aea15a02ef5ab Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期一, 13 三月 2023 11:09:17 +0800
Subject: [PATCH] 1.更新sdk到5.1.1 2.新增临时密码列表界面 3.新增跳转添加设备页接口 4.新增添加门锁设备逻辑
---
EZSDK/EZSDK/EZ/Global/EZHttpUtil.m | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 175 insertions(+), 2 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
index d87504f..c9f2102 100644
--- a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
@@ -14,10 +14,16 @@
#define TestRequestHttpsHost @"https://test-gz.hdlcontrol.com"
#pragma mark API
+#define API_POST_EZ_VerifyLocalLock @"/home-wisdom/platform/yingshi/lock/verifyLocalLock"//钀ょ煶闂ㄩ攣鏈湴楠岃瘉
#define API_POST_EZ_AddDevice @"/home-wisdom/platform/yingshi/child/addDevice"
#define API_POST_EZ_GetChildToken @"/home-wisdom/platform/yingshi/child/token"
#define API_POST_EZ_ChildDelDevice @"/home-wisdom/platform/yingshi/child/deleteDevice"
#define API_POST_EZ_RefreshToken @"/smart-footstone/member/oauth/login"
+#define API_POST_EZ_LockAuth @"/home-wisdom/platform/yingshi/lock/auth"//钀ょ煶闂ㄩ攣缁堢鎺堟潈
+#define API_POST_EZ_RemoteOpen @"/home-wisdom/platform/yingshi/lock/remote/open/door"//钀ょ煶闂ㄩ攣杩滅▼寮�閿�
+#define API_POST_EZ_TempList @"/home-wisdom/platform/yingshi/lock/temp/list"//钀ょ煶闂ㄤ复鏃跺瘑鐮佸垪琛�
+#define API_POST_EZ_AddTemp @"/home-wisdom/platform/yingshi/lock/temp/add"//钀ょ煶闂ㄦ坊鍔犱复鏃跺瘑鐮�
+#define API_POST_EZ_DeleteTemp @"/home-wisdom/platform/yingshi/lock/temp/delete"//钀ょ煶闂ㄥ垹闄や复鏃跺瘑鐮�
#define API_POST_EZ_GetAlarmList @"/home-wisdom/platform/yingshi/alarm/records"//鑾峰彇鎶ヨ娑堟伅
#define API_POST_EZ_DeleteAlarmMes @"/home-wisdom/platform/yingshi/alarm/delete"//鍒犻櫎鎶ヨ娑堟伅
@@ -72,6 +78,31 @@
// return task;
}
+
+/**
+ * @since 娌充笢娣诲姞璁惧涔嬪墠鏈湴楠岃瘉鐨勬帴鍙ｏ紙鏅鸿兘闂ㄩ攣浣跨敤锛岃皟鐢ㄦ帴鍙ｅ悗杈撳叆闂ㄩ攣瀵嗙爜锛屽啀杩涜缁戝畾锛�
+ * @param deviceSerial 璁惧搴忓垪鍙�
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀鸿皟鐢ㄩ獙璇佹帴鍙ｆ垚鍔�
+ *
+ */
+- (void)verifyLocalLockByHDL:(NSString *)deviceSerial
+ completion:(void (^)(ResponseData *responseData))completion{
+ //2.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceSerial forKey:@"deviceSerial"];
+ [parameters setValue:[NSString stringWithFormat:@"%@",[GlobalKit shareKit].hdlAppKey] forKey:@"appKey"];
+ [parameters setValue: [NSString stringWithFormat:@"%d",[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
+ [parameters setValue:[GlobalKit shareKit].hdlHomeId forKey:@"homeId"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ [self requestHttpsPost:API_POST_EZ_VerifyLocalLock parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+}
+
/**
* @since 娌充笢娣诲姞璁惧鐨勬帴鍙�
* 鏍规嵁璁惧搴忓垪鍙峰拰璁惧楠岃瘉鐮佹坊鍔犺澶囨帴鍙�
@@ -194,6 +225,147 @@
}];
}
+/**
+ * @since 娌充笢闂ㄩ攣缁堢鎺堟潈鎺ュ彛
+ * @param password 闂ㄩ攣瀵嗙爜
+ * @param deviceId 璁惧id
+ * @param verifyCode sdk鑾峰彇鐨勬牎楠岀爜
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
+ *
+ */
+- (void)authLockByHDL:(NSString *)password
+ deviceId:(NSString *)deviceId
+ verifyCode:(NSString *)verifyCode
+ completion:(void (^)(ResponseData *responseData))completion{
+ //2.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceId forKey:@"deviceId"];
+ [parameters setValue:[NSString stringWithFormat:@"%@",[GlobalKit shareKit].hdlAppKey] forKey:@"appKey"];
+ [parameters setValue:password forKey:@"password"];
+ [parameters setValue:verifyCode forKey:@"verifyCode"];
+ [parameters setValue:[GlobalKit shareKit].hdlHomeId forKey:@"homeId"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ NSLog(@"缁堢鎺堟潈鍙傛暟锛�%@",parameters);
+
+ [self requestHttpsPost:API_POST_EZ_LockAuth parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+
+}
+
+/**
+ * @since 娌充笢杩滅▼寮�閿佹帴鍙�
+ * @param streamToken 璁惧搴忓垪鍙�
+ * @param deviceId 璁惧id
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
+ *
+ */
+- (void)remoteOpenByHDL:(NSString *)streamToken
+ deviceId:(NSString *)deviceId
+ completion:(void (^)(ResponseData *responseData))completion{
+ //2.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceId forKey:@"deviceId"];
+ [parameters setValue:[NSString stringWithFormat:@"%@",[GlobalKit shareKit].hdlAppKey] forKey:@"appKey"];
+ [parameters setValue:streamToken forKey:@"streamToken"];
+ [parameters setValue:[GlobalKit shareKit].hdlHomeId forKey:@"homeId"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ NSLog(@"寮�闂ㄥ弬鏁帮細%@",parameters);
+
+ [self requestHttpsPost:API_POST_EZ_RemoteOpen parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+
+}
+
+/**
+ * @since 娌充笢鑾峰彇涓存椂瀵嗙爜鍒楄〃鎺ュ彛
+ * @param deviceId 璁惧id
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘垚鍔�
+ *
+ */
+- (void)getTempListByHDL:(NSString *)deviceId
+ completion:(void (^)(ResponseData *responseData))completion{
+ //2.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceId forKey:@"deviceId"];
+ [parameters setValue:[NSString stringWithFormat:@"%@",[GlobalKit shareKit].hdlAppKey] forKey:@"appKey"];
+ [parameters setValue:[GlobalKit shareKit].hdlHomeId forKey:@"homeId"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ NSLog(@"鑾峰彇涓存椂瀵嗙爜鍒楄〃鍙傛暟锛�%@",parameters);
+
+ [self requestHttpsPost:API_POST_EZ_TempList parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+}
+
+/**
+ * @since 娌充笢娣诲姞涓存椂瀵嗙爜鎺ュ彛
+ * @param tempInfo 涓存椂瀵嗙爜淇℃伅
+ * @param deviceId 璁惧id
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘垚鍔�
+ *
+ */
+- (void)addTempByHDL:(HDLEZTemInfoModel *)tempInfo
+ deviceId:(NSString *)deviceId
+ completion:(void (^)(ResponseData *responseData))completion{
+ //璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithDictionary:[tempInfo yy_modelToJSONObject]];
+ [parameters setValue:deviceId forKey:@"deviceId"];
+ [parameters setValue:[NSString stringWithFormat:@"%@",[GlobalKit shareKit].hdlAppKey] forKey:@"appKey"];
+ [parameters setValue:[GlobalKit shareKit].hdlHomeId forKey:@"homeId"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ NSLog(@"娣诲姞涓存椂瀵嗙爜鍙傛暟锛�%@",parameters);
+
+ [self requestHttpsPost:API_POST_EZ_AddTemp parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+}
+
+/**
+ * @since 娌充笢鍒犻櫎涓存椂瀵嗙爜鎺ュ彛
+ * @param extVisitorId 涓存椂瀵嗙爜绱㈠紩
+ * @param deviceId 璁惧id
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘垚鍔�
+ *
+ */
+- (void)deleteTempByHDL:(NSString *)extVisitorId
+ deviceId:(NSString *)deviceId
+ completion:(void (^)(ResponseData *responseData))completion{
+ //璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:extVisitorId forKey:@"extVisitorId"];
+ [parameters setValue:deviceId forKey:@"deviceId"];
+ [parameters setValue:[NSString stringWithFormat:@"%@",[GlobalKit shareKit].hdlAppKey] forKey:@"appKey"];
+ [parameters setValue:[GlobalKit shareKit].hdlHomeId forKey:@"homeId"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ NSLog(@"鍒犻櫎涓存椂瀵嗙爜鍙傛暟锛�%@",parameters);
+
+ [self requestHttpsPost:API_POST_EZ_DeleteTemp parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+
+}
/// 鍒锋柊token
/// @param block 缁撴灉
@@ -251,9 +423,10 @@
}];
}
}];
+ }else{
+ completion(responseData);
}
- completion(responseData);
}
}];
}
@@ -292,7 +465,7 @@
if(responseObject != NULL){
//4.瑙ｆ瀽鎷垮埌鐨勫搷搴旀暟鎹�
- NSLog(@"%@",[[NSString alloc]initWithData:responseObject encoding:NSUTF8StringEncoding]);
+ NSLog(@"鏁版嵁杩斿洖%@",[[NSString alloc]initWithData:responseObject encoding:NSUTF8StringEncoding]);
NSDictionary * outDic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingAllowFragments error:nil];
responseData = [[ResponseData alloc] initWithDictionary:outDic];
}
--
Gitblit v1.8.0