From cf977559d6821a1ccce2acae076835a8037f2a90 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期一, 05 六月 2023 11:47:18 +0800
Subject: [PATCH] 1.提交萤石demo 2.修改部分UI
---
EZSDK/EZSDK/EZ/Global/EZHttpUtil.m | 92 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 8 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
index c9f2102..e258090 100644
--- a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
@@ -24,6 +24,7 @@
#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_DeviceMessage @"/home-wisdom/app/device/message"//钀ょ煶璁惧娑堟伅鍒楄〃
#define API_POST_EZ_GetAlarmList @"/home-wisdom/platform/yingshi/alarm/records"//鑾峰彇鎶ヨ娑堟伅
#define API_POST_EZ_DeleteAlarmMes @"/home-wisdom/platform/yingshi/alarm/delete"//鍒犻櫎鎶ヨ娑堟伅
@@ -34,7 +35,7 @@
#define SECRET_KEY @"WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"
-#define TIME_OUT 15.0f
+#define TIME_OUT 30.0f
@implementation EZHttpUtil
@@ -57,7 +58,7 @@
* @param block 鍥炶皟block
*/
- (void)getChildToken:(void (^)(NSString *accessToken))block{
-
+
//2.璁剧疆璇锋眰鍙傛暟
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
[parameters setValue: [NSString stringWithFormat:@"%d", [GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
@@ -116,7 +117,7 @@
verifyCode:(NSString *)verifyCode
completion:(void (^)(ResponseData *responseData))completion{
- //2.璁剧疆璇锋眰鍙傛暟
+ //璁剧疆璇锋眰鍙傛暟
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
[parameters setValue:deviceSerial forKey:@"deviceSerial"];
[parameters setValue:verifyCode forKey:@"validateCode"];
@@ -125,7 +126,32 @@
parameters = [self GetSignRequestDictionary:parameters];
+ HDLEZLog(@"娣诲姞璁惧鍙傛暟锛�%@",parameters);
+
+
[self requestHttpsPost:API_POST_EZ_AddDevice parameters:parameters completion:^(ResponseData *responseData) {
+ if (responseData.success){//娣诲姞鎴愬姛锛岃Е鍙戜唬鐞�
+ if ([EZSDK sharedInstance].delegate&&[[EZSDK sharedInstance].delegate respondsToSelector:@selector(addDeviceSuccessed:)]) {
+// HDLEZLog(@"娣诲姞璁惧璁惧鎴愬姛鍥炶皟:%@",parameters[@"deviceSerial"]);
+ [[EZSDK sharedInstance].delegate addDeviceSuccessed:parameters[@"deviceSerial"]];
+//
+// //璁剧疆璁惧鍘绘帀楠岃瘉鐮�
+// [EZOPENSDK setDeviceEncryptStatus:deviceSerial
+// verifyCode:verifyCode
+// encrypt:NO
+// completion:^(NSError *error) {
+// if (error)
+// {
+//
+// }
+// else
+// {
+// }
+//
+// }];
+ }
+ }
+
if (completion) {
completion (responseData);
}
@@ -229,20 +255,17 @@
* @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];
@@ -294,7 +317,7 @@
*/
- (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"];
@@ -329,7 +352,7 @@
parameters = [self GetSignRequestDictionary:parameters];
- NSLog(@"娣诲姞涓存椂瀵嗙爜鍙傛暟锛�%@",parameters);
+ NSLog(@"娣诲姞涓存椂瀵嗙爜鍙傛暟1锛�%@",parameters);
[self requestHttpsPost:API_POST_EZ_AddTemp parameters:parameters completion:^(ResponseData *responseData) {
if (completion) {
@@ -365,6 +388,37 @@
}
}];
+}
+
+/**
+ * @since 娌充笢鑾峰彇璁惧娑堟伅
+ * @param deviceId 璁惧id
+ * @param pageSize 椤甸潰澶у皬
+ * @param pageNo 褰撳墠椤�
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘垚鍔�
+ *
+ */
+- (void)getDeviceMessageByHDL:(NSString *)deviceId
+ pageSize:(NSInteger)pageSize
+ pageNo:(NSInteger)pageNo
+ completion:(void (^)(ResponseData *responseData))completion{
+ //璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceId forKey:@"deviceId"];
+ [parameters setValue:[NSString stringWithFormat:@"%ld",(long)pageSize] forKey:@"pageSize"];
+ [parameters setValue:[NSString stringWithFormat:@"%ld",(long)pageNo] forKey:@"pageNo"];
+ [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_DeviceMessage parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
}
/// 鍒锋柊token
@@ -421,6 +475,8 @@
completion(responseData);
return;
}];
+ }else{
+ completion(responseData);
}
}];
}else{
@@ -457,6 +513,9 @@
[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
[request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
[request setValue:GlobalKit.shareKit.hdlAccessToken forHTTPHeaderField:@"Authorization"];
+ //璇█绫诲瀷
+ [manager.requestSerializer setValue:[self getCurrentLanguage] forHTTPHeaderField:@"language"];
+
//4.dataTaskWithRequest
[[manager dataTaskWithRequest:request completionHandler:^(NSURLResponse * _Nonnull response, id _Nullable responseObject, NSError * _Nullable error) {
if (completion) {
@@ -568,6 +627,23 @@
return true;
}
+/*鑾峰彇褰撳墠绯荤粺璇█
+ */
+-(NSString *)getCurrentLanguage{
+ NSArray *languages = [NSLocale preferredLanguages];
+ NSString *currentLocaleLanguageCode=@"en";
+ if (languages.count>0) {
+ currentLocaleLanguageCode = languages.firstObject;
+ if ([currentLocaleLanguageCode hasPrefix:@"zh"]) {//涓枃
+ currentLocaleLanguageCode = @"cn";
+ }else {//鍏跺畠璇█
+ currentLocaleLanguageCode = @"en";
+ }
+ }
+ return currentLocaleLanguageCode;
+}
+
+
@end
--
Gitblit v1.8.0