From 1a27ef122fb0a2b9f1c19dd609897728b795df5d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 09 七月 2021 18:27:41 +0800
Subject: [PATCH] 2021-07-09 1.告警消息相关接口替换，改为河东管理
---
EZSDK/EZSDK/EZ/Global/EZHttpUtil.m | 104 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 94 insertions(+), 10 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
index 17f63a5..d87504f 100644
--- a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
@@ -10,14 +10,18 @@
#import <Foundation/Foundation.h>
#import <CommonCrypto/CommonDigest.h>
#import "AFNetworking.h"
+#import "YYModel.h"
#define TestRequestHttpsHost @"https://test-gz.hdlcontrol.com"
#pragma mark API
-#define API_POST_EZ_AddDevice @"/home-wisdom/platform/childAddDevice"
-#define API_POST_EZ_GetChildToken @"/home-wisdom/platform/childToken"
-#define API_POST_EZ_ChildDelDevice @"/home-wisdom/platform/childDelDevice"
+#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_GetAlarmList @"/home-wisdom/platform/yingshi/alarm/records"//鑾峰彇鎶ヨ娑堟伅
+#define API_POST_EZ_DeleteAlarmMes @"/home-wisdom/platform/yingshi/alarm/delete"//鍒犻櫎鎶ヨ娑堟伅
+#define API_POST_EZ_ReadAlarmMes @"/home-wisdom/platform/yingshi/alarm/updateChecked"//鏍囪鎶ヨ娑堟伅宸茶
#pragma mark APP_KEY
#define APP_KEY @"HDL-HOME-APP-TEST"
@@ -50,14 +54,16 @@
//2.璁剧疆璇锋眰鍙傛暟
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
- [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
+ [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_GetChildToken parameters:parameters completion:^(ResponseData *responseData) {
if (block) {
NSString * token = @"";
if(responseData.success){
- token = responseData.data[@"accessToken"];
+// token = responseData.data[@"accessToken"];
+ token = [NSString stringWithFormat:@"%@",responseData.data];
}
block(token);
}
@@ -83,10 +89,12 @@
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
[parameters setValue:deviceSerial forKey:@"deviceSerial"];
[parameters setValue:verifyCode forKey:@"validateCode"];
- [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
+ [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_AddDevice parameters:parameters completion:^(ResponseData *responseData) {
+ [self requestHttpsPost:API_POST_EZ_AddDevice parameters:parameters completion:^(ResponseData *responseData) {
if (completion) {
completion (responseData);
}
@@ -107,7 +115,9 @@
//1.璁剧疆璇锋眰鍙傛暟
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
[parameters setValue:deviceSerial forKey:@"deviceSerial"];
- [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
+ [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_ChildDelDevice parameters:parameters completion:^(ResponseData *responseData) {
@@ -119,6 +129,70 @@
// return task;
}
+
+/**
+ * 鏍规嵁璁惧搴忓垪鍙疯幏鍙栧憡璀︿俊鎭垪琛�
+ */
+- (void)getAlarmList:(NSString *)deviceSerial
+ pageNo:(NSInteger)pageNo
+ pageSize:(NSInteger)pageSize
+ completion:(void (^)(ResponseData *responseData))completion{
+
+ //1.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceSerial forKey:@"deviceSerial"];
+ [parameters setValue:[GlobalKit shareKit].hdlHomeId forKey:@"homeId"];
+ [parameters setValue:[NSString stringWithFormat:@"%ld",(long)pageSize] forKey:@"pageSize"];
+ [parameters setValue:[NSString stringWithFormat:@"%ld",(long)pageNo] forKey:@"pageNo"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+ NSLog(@"HDLpageNo:%ld",(long)pageNo);
+ [self requestHttpsPost:API_POST_EZ_GetAlarmList parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+}
+
+/**
+ * 鎵归噺鍒犻櫎鎶ヨ璁板綍
+ */
+- (void)deleteAlarmMessage:(NSArray *)alarmIds
+ completion:(void (^)(ResponseData *responseData))completion{
+
+ //1.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:[alarmIds yy_modelToJSONObject] forKey:@"alarmIds"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ [self requestHttpsPost:API_POST_EZ_DeleteAlarmMes parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+}
+
+
+/**
+ * 鎵归噺鏍囪鎶ヨ璁板綍宸茶
+ */
+- (void)readAlarmMessage:(NSArray *)alarmIds
+ completion:(void (^)(ResponseData *responseData))completion{
+
+ //1.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:@"1" forKey:@"isChecked"];
+ [parameters setValue:[alarmIds yy_modelToJSONObject] forKey:@"alarmIds"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ [self requestHttpsPost:API_POST_EZ_ReadAlarmMes parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+}
/// 鍒锋柊token
@@ -137,7 +211,7 @@
if (block) {
if (responseData) {
if(responseData.success){
- [EZSDK setHDlAccessToken:
+ [[EZSDK sharedInstance] setHDlAccessToken:
[NSString stringWithFormat:@"%@%@",responseData.data[@"headerPrefix"], responseData.data[@"accessToken"]]
refreshToken:responseData.data[@"refreshToken"]];
@@ -251,7 +325,8 @@
NSString *newString = @"";
for(NSString *key in sortKeyArray){
if(params[key] != NULL){
- NSString *valueStr = params[key];
+ //Key瀵瑰簲鐨剉alue寮鸿浆涓篘SString
+ NSString *valueStr = [NSString stringWithFormat:@"%@",[params objectForKey:key]];
//妫�娴嬪綋鍓嶅弬鏁版槸鍚﹂渶瑕佸弬涓庢牎楠�
if([self IfValueNeedSign:valueStr]){
newString = [newString stringByAppendingString:[NSString stringWithFormat:@"%@=%@&", key,valueStr]];
@@ -311,7 +386,10 @@
if (( [self stringIsNullOrEmpty:valueStr])//鍒ょ┖瀛楃
|| ([[valueStr substringToIndex:1] isEqual:@"{"])//鍒ゆ柇鏄惁涓哄璞�
|| ([[valueStr substringToIndex:1] isEqual:@"["])//鍒ゆ柇鏄惁涓烘暟缁�
+ || ([[valueStr substringToIndex:1] isEqual:@"("])//鍒ゆ柇鏄惁涓烘暟缁�
) {
+
+// HDLSDKLog(@"涓嶆牎楠�: %@",valueStr);
return false;
}
return true;
@@ -319,3 +397,9 @@
@end
+
+
+#pragma mark - 淇敼璁板綍
+//2021-07-07
+//V1.1.3
+//1.鏇挎崲涓烘柊鎺ュ彛锛屾牴鎹甴omeId娉ㄥ唽钀ょ煶瀛愯处鍙锋柟妗堛��
--
Gitblit v1.8.0