From d56c8422138cd82d2ea9bed8e2f4b0bc7766be4b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 02 三月 2021 15:38:32 +0800
Subject: [PATCH] 2021-03-02 1.最近新云端接口
---
EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs | 2
EZSDK/EZSDK/EZ/Global/EZHttpUtil.h | 53 ++++
EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m | 55 +++-
EZSDK/EZSDK.xcodeproj/project.pbxproj | 18 +
EZSDK/EZSDK/EZSDK.h | 9
EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs | 5
EZSDK/EZSDK/EZ/Global/ResponseData.m | 64 +++++
EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m | 6
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m | 2
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/zh-Hans.lproj/Localizable.strings | 2
EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a | 0
EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m | 23 +
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.m | 32 +
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.h | 1
EZSDK/EZSDK/EZ/Global/GlobalKit.m | 30 ++
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h | 1
EZSDK/EZSDK/EZ/Global/ResponseData.h | 29 ++
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m | 1
EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m | 4
EZSDK/EZSDK/EZ/Global/EZHttpUtil.m | 297 ++++++++++++++++++++++++
EZSDK/EZSDK/EZSDK.m | 18 +
EZSDK/EZSDK/EZ/Global/GlobalKit.h | 12
22 files changed, 609 insertions(+), 55 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h
index 05553ce..ef9f9e2 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h
@@ -11,7 +11,6 @@
NS_ASSUME_NONNULL_BEGIN
-
/// 娌充笢鎺ュ彛缃戠粶璇锋眰宸ュ叿绫�
@interface EZHttpUtil : NSObject
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.h b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.h
index 6451635..47c5d44 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.h
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.h
@@ -23,6 +23,7 @@
- (id)initWithDictionary:(NSDictionary *)dic;
/**鏄惁鎴愬姛*/
- (BOOL)success;
+
@end
NS_ASSUME_NONNULL_END
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.m
index 30e621e..25d1404 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/ResponseData.m
@@ -10,16 +10,17 @@
@implementation ResponseData
-
-/// Description
-- (BOOL)success
-{
- //娌充笢code涓�0 锛岃悿鐭充负200 浠ｈ〃鎴愬姛
- return [self.code isEqual: @"0"] || [self.code isEqual: @"200"] ;
+/// init
+-(id)init {
+ if (self = [super init]) {
+ self.code = @"-1";
+ self.message = @"璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒";
+
+ }
+ return self;
}
-
-/// 瑙ｆ瀽杩斿洖瀛楀吀鍙傛暟
+/// 鍒濆鍖栧苟瑙ｆ瀽杩斿洖瀛楀吀鍙傛暟
/// @param dic 杩斿洖鍙傛暟
- (id)initWithDictionary:(NSDictionary *)dic
{
@@ -35,15 +36,16 @@
self.data = mData;
} else {
//娌℃湁杩斿洖鏁版嵁
- self.message = @"缃戠粶閿欒";
+ self.message = @"璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒";
self.data = nil;
- self.code = @"-2";
+ self.code = @"-1";
}
}
//鎺ユ敹鍒板紓甯�
@catch (NSException *exception) {
+ self.message = @"鏁版嵁瑙ｆ瀽閿欒";
self.data = dic;
- self.code = @"-1";
+ self.code = @"-2";
}
@finally {
@@ -51,4 +53,12 @@
}
return self;
}
+
+/// Description
+- (BOOL)success
+{
+ //娌充笢code涓�0 锛岃悿鐭充负200 浠ｈ〃鎴愬姛
+ return [self.code isEqual: @"0"] || [self.code isEqual: @"200"] ;
+}
+
@end
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m
index 4b294c4..670ba82 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m
@@ -35,6 +35,7 @@
}
self.nameLabel.text = [NSString stringWithFormat:@"%@",deviceInfo.deviceName];
+// self.cameraImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:deviceInfo.deviceCover] placeholderImage:[UIImage imageNamed:@"device_default"]];
// [EZOPENSDK capturePicture:cameraInfo.deviceSerial channelNo:cameraInfo.channelNo completion:^(NSString *url, NSError *error) {
// if(!error){
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m
index d094b07..e1727fe 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m
@@ -178,7 +178,7 @@
if (error.code == EZ_HTTPS_DEVICE_ADDED_MYSELF || error.code == EZ_HTTPS_DEVICE_ONLINE_ADDED)
{
self.statusLabel.textColor = [UIColor blackColor];
- self.statusLabel.text = NSLocalizedString(@"ad_already_added",@"鎮ㄥ凡娣诲姞杩囨璁惧");
+ self.statusLabel.text = NSLocalizedString(@"ad_already_added",@"姝よ澶囧凡琚坊鍔�");
self.statusLabel.hidden = NO;
}
else if (error.code == EZ_HTTPS_DEVICE_ONLINE_IS_ADDED || error.code == EZ_HTTPS_DEVICE_OFFLINE_IS_ADDED)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/zh-Hans.lproj/Localizable.strings b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/zh-Hans.lproj/Localizable.strings
index 2de8646..5a741a3 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/zh-Hans.lproj/Localizable.strings
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/zh-Hans.lproj/Localizable.strings
@@ -31,7 +31,7 @@
"ad_restart_tip"="闀挎寜璁惧涓婄殑reset閿�10绉掑悗鏉惧紑锛屽苟绛夊緟澶х害30绉掔洿鍒拌澶囧惎鍔ㄥ畬鎴�";
"ad_restart_done"="鎴戝凡閲嶅惎濂�";
"ad_get_device_info_msg"="姝ｅ湪鏌ヨ璁惧淇℃伅锛岃绋嶅悗...";
-"ad_already_added"="鎮ㄥ凡娣诲姞杩囨璁惧";
+"ad_already_added"="姝よ澶囧凡琚坊鍔�";
"ad_added_by_others"="姝よ澶囧凡琚埆浜烘坊鍔�";
"get_info_fail"="鏌ヨ澶辫触锛岀綉缁滀笉缁欏姏";
"ad_input_manual"="鎵嬪姩杈撳叆";
diff --git a/EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs b/EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs
index c0c1ae3..2d0efaa 100644
--- a/EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs
+++ b/EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs
@@ -20,6 +20,11 @@
[Export("setEZAccessToken:")]
void SetEZAccessToken(string accessToken);
+ // +(void)setHDlAccessToken:(NSString *)accessToken refreshToken:(NSString *)refreshToken;
+ [Static]
+ [Export("setHDlAccessToken:refreshToken:")]
+ void SetHDlAccessToken(string accessToken, string refreshToken);
+
// +(void)go2EZvizMonitor;
[Static]
[Export("go2EZvizMonitor")]
diff --git a/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a b/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
index f61cf5f..f913fc6 100644
--- a/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
+++ b/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
Binary files differ
diff --git a/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs b/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
index af36ac9..fd0a691 100644
--- a/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
+++ b/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.0.6")]
+[assembly: AssemblyVersion("1.0.7")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
diff --git a/EZSDK/EZSDK.xcodeproj/project.pbxproj b/EZSDK/EZSDK.xcodeproj/project.pbxproj
index 8359177..e8a7178 100644
--- a/EZSDK/EZSDK.xcodeproj/project.pbxproj
+++ b/EZSDK/EZSDK.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
+ B965BE0325EE0B0D00E58AFB /* EZHttpUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B965BDFF25EE0B0D00E58AFB /* EZHttpUtil.m */; };
+ B965BE0425EE0B0D00E58AFB /* ResponseData.m in Sources */ = {isa = PBXBuildFile; fileRef = B965BE0025EE0B0D00E58AFB /* ResponseData.m */; };
B9BC92FF25C0FC3500C024FE /* EZSDK.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC92FE25C0FC3500C024FE /* EZSDK.m */; };
B9BC930025C0FC3500C024FE /* EZSDK.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = B9BC92FD25C0FC3500C024FE /* EZSDK.h */; };
B9BC956225C0FC6C00C024FE /* DeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC94D125C0FC6B00C024FE /* DeviceInfo.m */; };
@@ -159,6 +161,10 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
+ B965BDFF25EE0B0D00E58AFB /* EZHttpUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZHttpUtil.m; sourceTree = "<group>"; };
+ B965BE0025EE0B0D00E58AFB /* ResponseData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResponseData.m; sourceTree = "<group>"; };
+ B965BE0125EE0B0D00E58AFB /* EZHttpUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZHttpUtil.h; sourceTree = "<group>"; };
+ B965BE0225EE0B0D00E58AFB /* ResponseData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponseData.h; sourceTree = "<group>"; };
B9BC92FA25C0FC3500C024FE /* libEZSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libEZSDK.a; sourceTree = BUILT_PRODUCTS_DIR; };
B9BC92FD25C0FC3500C024FE /* EZSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EZSDK.h; sourceTree = "<group>"; };
B9BC92FE25C0FC3500C024FE /* EZSDK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EZSDK.m; sourceTree = "<group>"; };
@@ -1008,10 +1014,10 @@
isa = PBXGroup;
children = (
B9BC991A25C0FFBA00C024FE /* CameraListCell.h */,
- B9BC991B25C0FFBA00C024FE /* DeviceListCell.h */,
- B9BC991C25C0FFBA00C024FE /* MessageListCell.h */,
- B9BC991D25C0FFBA00C024FE /* DeviceListCell.m */,
B9BC991E25C0FFBA00C024FE /* CameraListCell.m */,
+ B9BC991B25C0FFBA00C024FE /* DeviceListCell.h */,
+ B9BC991D25C0FFBA00C024FE /* DeviceListCell.m */,
+ B9BC991C25C0FFBA00C024FE /* MessageListCell.h */,
B9BC991F25C0FFBA00C024FE /* MessageListCell.m */,
);
path = TableViewCells;
@@ -1115,6 +1121,10 @@
children = (
B9BC997125C0FFBB00C024FE /* GlobalKit.h */,
B9BC997025C0FFBB00C024FE /* GlobalKit.m */,
+ B965BE0125EE0B0D00E58AFB /* EZHttpUtil.h */,
+ B965BDFF25EE0B0D00E58AFB /* EZHttpUtil.m */,
+ B965BE0225EE0B0D00E58AFB /* ResponseData.h */,
+ B965BE0025EE0B0D00E58AFB /* ResponseData.m */,
);
path = Global;
sourceTree = "<group>";
@@ -1389,6 +1399,7 @@
B9BC99F325C0FFBD00C024FE /* UIButton+WebCache.m in Sources */,
B9BC99B925C0FFBD00C024FE /* MWTapDetectingImageView.m in Sources */,
B9BC99DE25C0FFBD00C024FE /* AFHTTPRequestOperationManager.m in Sources */,
+ B965BE0425EE0B0D00E58AFB /* ResponseData.m in Sources */,
B9BC999F25C0FFBD00C024FE /* DALabeledCircularProgressView.m in Sources */,
B9BC99B825C0FFBD00C024FE /* UIImage+MWPhotoBrowser.m in Sources */,
B9BC99E025C0FFBD00C024FE /* AFHTTPRequestOperation.m in Sources */,
@@ -1418,6 +1429,7 @@
B9BC9A0E25C0FFBD00C024FE /* EZLocalDeviceListViewController.m in Sources */,
B9BC9A1125C0FFBD00C024FE /* EZDeviceRestartTipsViewController.m in Sources */,
B9BC99CA25C0FFBD00C024FE /* UIImageView+DDKit.m in Sources */,
+ B965BE0325EE0B0D00E58AFB /* EZHttpUtil.m in Sources */,
B9BC9A2825C0FFBD00C024FE /* EZPlaybackViewController.m in Sources */,
B9BC9A1C25C0FFBD00C024FE /* EZSupportViewController.m in Sources */,
B9BC92FF25C0FC3500C024FE /* EZSDK.m in Sources */,
diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h
new file mode 100644
index 0000000..ef9f9e2
--- /dev/null
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h
@@ -0,0 +1,53 @@
+//
+// EZHttpUtil.h
+// EZOpenSDKDemo
+//
+// Created by 闄堝槈涔� on 2021/2/26.
+// Copyright 漏 2021 hikvision. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "ResponseData.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// 娌充笢鎺ュ彛缃戠粶璇锋眰宸ュ叿绫�
+@interface EZHttpUtil : NSObject
+
+#pragma mark -鎺ュ彛
+/**
+ * @since 娌充笢鑾峰彇瀛愯处鍙穞oken鐨勬帴鍙�
+ *
+ * @param block 鍥炶皟block
+ */
++ (void)getChildToken:(void (^)(NSString *accessToken))block;
+
+/**
+ * @since 娌充笢娣诲姞璁惧鐨勬帴鍙�
+ * 鏍规嵁璁惧搴忓垪鍙峰拰璁惧楠岃瘉鐮佹坊鍔犺澶囨帴鍙�
+ *
+ * @param deviceSerial 璁惧搴忓垪鍙�
+ * @param verifyCode 璁惧楠岃瘉鐮�
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
+ *
+ * @return operation
+ */
++ (void)addDeviceByHDL:(NSString *)deviceSerial
+ verifyCode:(NSString *)verifyCode
+ completion:(void (^)(ResponseData *responseData))completion;
+
+/**
+ * @since 娌充笢鍒犻櫎璁惧鐨勬帴鍙�
+ * 鏍规嵁璁惧搴忓垪鍙峰垹闄よ澶囨帴鍙�
+ *
+ * @param deviceSerial 璁惧搴忓垪鍙�
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
+ *
+ * @return operation
+ */
++ (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
new file mode 100644
index 0000000..8f37e15
--- /dev/null
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
@@ -0,0 +1,297 @@
+//
+// EZHttpUtil.m
+// EZOpenSDKDemo
+//
+// Created by 闄堝槈涔� on 2021/2/26.
+// Copyright 漏 2021 hikvision. All rights reserved.
+//
+
+#import "EZHttpUtil.h"
+#import <Foundation/Foundation.h>
+#import <CommonCrypto/CommonDigest.h>
+#import "AFNetworking.h"
+
+#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_RefreshToken @"/smart-footstone/member/oauth/login"
+
+
+#pragma mark APP_KEY
+#define APP_KEY @"HDL-HOME-APP-TEST"
+#define SECRET_KEY @"WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"
+
+
+@implementation EZHttpUtil
+
+#pragma mark -鎺ュ彛璇锋眰閮ㄥ垎
+
+
+
+
+
+/**
+ * @since 娌充笢鑾峰彇瀛愯处鍙穞oken鐨勬帴鍙�
+ *
+ * @param block 鍥炶皟block
+ */
++ (void)getChildToken:(void (^)(NSString *accessToken))block{
+
+ //2.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ 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"];
+ }
+ block(token);
+ }
+
+ }];
+
+// return task;
+}
+/**
+ * @since 娌充笢娣诲姞璁惧鐨勬帴鍙�
+ * 鏍规嵁璁惧搴忓垪鍙峰拰璁惧楠岃瘉鐮佹坊鍔犺澶囨帴鍙�
+ *
+ * @param deviceSerial 璁惧搴忓垪鍙�
+ * @param verifyCode 璁惧楠岃瘉鐮�
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
+ *
+ * @return operation
+ */
++ (void)addDeviceByHDL:(NSString *)deviceSerial
+ verifyCode:(NSString *)verifyCode
+ completion:(void (^)(ResponseData *responseData))completion{
+
+ //2.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceSerial forKey:@"deviceSerial"];
+ [parameters setValue:verifyCode forKey:@"validateCode"];
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ [self requestHttpsPost:API_POST_EZ_AddDevice parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+
+// return task;
+}
+
+/**
+ * @since 娌充笢鍒犻櫎璁惧鐨勬帴鍙�
+ * 鏍规嵁璁惧搴忓垪鍙峰垹闄よ澶囨帴鍙�
+ *
+ * @param deviceSerial 璁惧搴忓垪鍙�
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
+ *
+ * @return operation
+ */
++ (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion{
+ //1.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceSerial forKey:@"deviceSerial"];
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ [self requestHttpsPost:API_POST_EZ_ChildDelDevice parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+
+// return task;
+}
+
+
+
+/// 鍒锋柊token
+/// @param block 缁撴灉
++ (void)refreshHDLToken:(void (^)(BOOL isSuccess))block{
+
+ //1.璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:GlobalKit.shareKit.hdlRefreshToken forKey:@"refreshToken"];
+ [parameters setValue:@"refresh_token" forKey:@"grantType"];
+ [parameters setValue:@"APP" forKey:@"platform"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ [self requestHttpsBase:API_POST_EZ_RefreshToken parameters:parameters completion:^(ResponseData *responseData) {
+ if (block) {
+ if (responseData) {
+ if(responseData.success){
+ [EZSDK setHDlAccessToken:
+ [NSString stringWithFormat:@"%@%@",responseData.data[@"headerPrefix"], responseData.data[@"accessToken"]]
+ refreshToken:responseData.data[@"refreshToken"]];
+
+ block(YES);
+ return;
+ }
+ }
+ block(NO);
+ }
+ }];
+
+
+// return task;
+}
+
+
+#pragma mark HttpUtil
+
+/// 閫氱敤 璇锋眰鏈嶅姟鍣ㄦ柟娉�
+/// @param apiPath 鎺ュ彛鍦板潃
+/// @param parameters 璇锋眰鍙傛暟
+/// @param completion 璇锋眰鍝嶅簲鍙傛暟
++ (void)requestHttpsPost:(NSString *)apiPath
+ parameters:(NSMutableDictionary *)parameters
+ completion:(void (^)(ResponseData *responseData))completion{
+
+ [self requestHttpsBase:apiPath parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ if([responseData.code isEqual:@"10001"]){
+ //鍒锋柊token
+ [self refreshHDLToken:^(BOOL isSuccess) {
+ if (isSuccess) {
+ //鍒锋柊token鎴愬姛锛岄噸鏂拌姹備竴娆�
+ [self requestHttpsBase:apiPath parameters:parameters completion:^(ResponseData *responseData) {
+ completion(responseData);
+ return;
+ }];
+ }
+ }];
+ }
+
+ completion(responseData);
+ }
+ }];
+}
+
+/// 閫氱敤 璇锋眰鏈嶅姟鍣ㄦ柟娉�
+/// @param apiPath 鎺ュ彛鍦板潃
+/// @param parameters 璇锋眰鍙傛暟
+/// @param completion 璇锋眰鍝嶅簲鍙傛暟
++ (void)requestHttpsBase:(NSString *)apiPath
+ parameters:(NSMutableDictionary *)parameters
+ completion:(void (^)(ResponseData *responseData))completion{
+
+ //1,鍒涘缓浣犲緱璇锋眰url
+ NSString *URL = @"";
+ if([GlobalKit shareKit].GlobalRequestHttpsHost == NULL){
+ URL = @"https://test-gz.hdlcontrol.com";
+ }
+ URL = [NSString stringWithFormat:@"%@%@", URL, apiPath];
+
+// NSURLSessionDataTask * task=nil;
+ AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
+ AFHTTPResponseSerializer *responseSerializer = [AFHTTPResponseSerializer serializer];
+ manager.responseSerializer = responseSerializer;
+
+ //3.request
+ NSMutableURLRequest * request = [[AFJSONRequestSerializer serializer] requestWithMethod:@"post" URLString:URL parameters:parameters error:nil];
+ request.timeoutInterval = 10.0f;
+ [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
+ [request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
+ [request setValue:GlobalKit.shareKit.hdlAccessToken forHTTPHeaderField:@"Authorization"];
+ //4.dataTaskWithRequest
+ [[manager dataTaskWithRequest:request completionHandler:^(NSURLResponse * _Nonnull response, id _Nullable responseObject, NSError * _Nullable error) {
+ if (completion) {
+ ResponseData *responseData = [[ResponseData alloc] init];
+ responseData.code = @"-1";
+
+ if(responseObject != NULL){
+ //4.瑙ｆ瀽鎷垮埌鐨勫搷搴旀暟鎹�
+ NSLog(@"%@",[[NSString alloc]initWithData:responseObject encoding:NSUTF8StringEncoding]);
+ NSDictionary * outDic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingAllowFragments error:nil];
+ responseData = [[ResponseData alloc] initWithDictionary:outDic];
+ }
+
+ if (!responseData) {
+ responseData = [[ResponseData alloc] init];
+ }
+ completion(responseData);
+ }
+ }]resume];
+// return task;
+}
+
+/**
+ * 鍩虹鏈嶅姟鐨勬帴鍙ｉ兘瑕佹牎楠宻ign
+ */
++(NSMutableDictionary *)GetSignRequestDictionary:(NSMutableDictionary *)params{
+ if(params == NULL){
+ params =[NSMutableDictionary dictionary];
+ }
+ UInt64 recordTime = [[NSDate date] timeIntervalSince1970]*1000;
+ [params setValue:APP_KEY forKey:@"appKey"];
+ [params setValue:[NSString stringWithFormat:@"%llu",recordTime] forKey:@"timestamp"];
+ //1.瀵筀EY鍗囧簭
+ NSArray *keyArray = [params allKeys];
+ NSArray *sortKeyArray = [keyArray sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) {
+ return [obj1 compare:obj2 options:NSNumericSearch];
+ }];
+ //2.2 鎷兼帴鎸塙RL閿�煎
+ NSString *newString = @"";
+ for(NSString *key in sortKeyArray){
+ if(params[key] != NULL){
+ NSString *valueStr = params[key];
+ //妫�娴嬪綋鍓嶅弬鏁版槸鍚﹂渶瑕佸弬涓庢牎楠�
+ if([self IfValueNeedSign:valueStr]){
+ newString = [newString stringByAppendingString:[NSString stringWithFormat:@"%@=%@&", key,valueStr]];
+ }
+ }
+ }
+ //2.3 鎷兼帴SECRET_KEY
+ newString = [newString substringToIndex:[newString length] - 1];
+ newString = [newString stringByAppendingString: SECRET_KEY];
+ //2.4 MD5杞崲+杞皬鍐�
+ if(newString == nil || newString == NULL){
+ newString = @"";
+ }
+ NSString* signstr = [self signMD5Encrypt:newString];
+ [params setValue:signstr forKey:@"sign"];
+
+ return params;
+}
+
+/**
+ MD5杞崲+杞皬鍐�
+ */
++ (NSString*)signMD5Encrypt:(NSString *)str
+{
+ const char *cStr = [str UTF8String];
+ unsigned char digest[CC_MD5_DIGEST_LENGTH];
+ CC_MD5( cStr, strlen(cStr),digest );
+ NSMutableString *result = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2];
+ for(int i = 0; i < CC_MD5_DIGEST_LENGTH; i++)
+ [result appendFormat:@"%02x", digest[i]];
+ return result;
+
+
+}
+
+/// <summary>
+/// 鍒ゆ柇褰撳墠鍊兼槸鍚﹂渶瑕佸弬涓庣鍚嶏紝淇濇寔璺熶簯绔竴鑷�
+/// 绌哄瓧绗︿覆涓嶅弬涓�
+/// 鏁扮粍,闆嗗悎,瀵硅薄涓嶅弬涓�
+/// </summary>
+/// <param name="valueStr"></param>
+/// <returns></returns>
++(bool)IfValueNeedSign:(NSString *)valueStr{
+ if (( (valueStr == nil || [valueStr isKindOfClass:[NSNull class]] || valueStr.length == 0))//鍒ょ┖瀛楃
+ || ([[valueStr substringToIndex:1] isEqual:@"{"])//鍒ゆ柇鏄惁涓哄璞�
+ || ([[valueStr substringToIndex:1] isEqual:@"["])//鍒ゆ柇鏄惁涓烘暟缁�
+ ) {
+ return false;
+ }
+ return true;
+}
+
+
+@end
diff --git a/EZSDK/EZSDK/EZ/Global/GlobalKit.h b/EZSDK/EZSDK/EZ/Global/GlobalKit.h
index a462dd7..959f77a 100644
--- a/EZSDK/EZSDK/EZ/Global/GlobalKit.h
+++ b/EZSDK/EZSDK/EZ/Global/GlobalKit.h
@@ -10,16 +10,17 @@
//#define CURR_LANG ([[NSLocale preferredLanguages] objectAtIndex:0])
//#define LanguageIsChinese ([CURR_LANG rangeOfString:@"zh-Hans"].location != NSNotFound)
-
////涓枃璧板浗鍐咃紝 涓嶆槸涓枃璧版捣澶�
#define EZOPENSDK LanguageIsChinese ? [EZOpenSDK class] : [EZGlobalSDK class]
-//2021-02-01 涓嶈�冭檻娴峰鍏堬紝榛樿鍥藉唴
+//2021-02-01 涓嶈�冭檻娴峰鍏�
#define LanguageIsChinese true
-
-
@interface GlobalKit : NSObject
+
+@property (nonatomic, copy) NSString *GlobalRequestHttpsHost;
+@property (nonatomic, copy) NSString *hdlAccessToken;
+@property (nonatomic, copy) NSString *hdlRefreshToken;
@property (nonatomic, copy) NSString *accessToken;
@property (nonatomic, copy) NSString *deviceSerialNo; //璁惧搴忓垪鍙�
@@ -35,4 +36,7 @@
- (void)clearDeviceInfo;
//+(void)hello;
+
+
+
@end
diff --git a/EZSDK/EZSDK/EZ/Global/GlobalKit.m b/EZSDK/EZSDK/EZ/Global/GlobalKit.m
index 714770e..00c5894 100644
--- a/EZSDK/EZSDK/EZ/Global/GlobalKit.m
+++ b/EZSDK/EZSDK/EZ/Global/GlobalKit.m
@@ -8,6 +8,10 @@
#import "GlobalKit.h"
+#define EZOpenSDKAccessToken @"EZOpenSDKAccessToken"
+#define EZhdlAccessToken @"EZhdlAccessToken"
+#define EZhdlRefreshToken @"EZhdlRefreshToken"
+
@implementation GlobalKit
+ (instancetype)shareKit
@@ -25,7 +29,10 @@
self = [super init];
if (self)
{
- _accessToken = [[NSUserDefaults standardUserDefaults] objectForKey:@"EZOpenSDKAccessToken"];
+ _accessToken = [[NSUserDefaults standardUserDefaults] objectForKey:EZOpenSDKAccessToken];
+ _hdlAccessToken = [[NSUserDefaults standardUserDefaults] objectForKey:EZhdlAccessToken];
+ _hdlRefreshToken = [[NSUserDefaults standardUserDefaults] objectForKey:EZhdlRefreshToken];
+
_deviceVerifyCodeBySerial = [NSMutableDictionary new];
}
return self;
@@ -35,14 +42,31 @@
- (void)setAccessToken:(NSString *)accessToken
{
_accessToken = accessToken;
- [[NSUserDefaults standardUserDefaults] setObject:accessToken?:@"" forKey:@"EZOpenSDKAccessToken"];
+ [[NSUserDefaults standardUserDefaults] setObject:accessToken?:@"" forKey:EZOpenSDKAccessToken];
[[NSUserDefaults standardUserDefaults] synchronize];
}
+
+- (void)setHdlAccessToken:(NSString *)hdlAccessToken
+{
+ _hdlAccessToken = hdlAccessToken;
+ [[NSUserDefaults standardUserDefaults] setObject:hdlAccessToken?:@"" forKey:EZhdlAccessToken];
+ [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
+- (void)setHdlRefreshToken:(NSString *)hdlRefreshToken
+{
+ _hdlRefreshToken = hdlRefreshToken;
+ [[NSUserDefaults standardUserDefaults] setObject:hdlRefreshToken?:@"" forKey:EZhdlRefreshToken];
+ [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
- (void)clearSession
{
_accessToken = nil;
- [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"EZOpenSDKAccessToken"];
+ _hdlRefreshToken = nil;
+ _hdlRefreshToken = nil;
+ [[NSUserDefaults standardUserDefaults] removeObjectForKey:EZOpenSDKAccessToken];
[[NSUserDefaults standardUserDefaults] synchronize];
}
diff --git a/EZSDK/EZSDK/EZ/Global/ResponseData.h b/EZSDK/EZSDK/EZ/Global/ResponseData.h
new file mode 100644
index 0000000..47c5d44
--- /dev/null
+++ b/EZSDK/EZSDK/EZ/Global/ResponseData.h
@@ -0,0 +1,29 @@
+//
+// ResponseData.h
+// EZOpenSDKDemo
+//
+// Created by 闄堝槈涔� on 2021/3/1.
+// Copyright 漏 2021 hikvision. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+/**
+ ResponseData
+ */
+@interface ResponseData : NSObject
+/** 鍝嶅簲鐘舵�佺爜 */
+@property (nonatomic, copy) NSString *code;
+/** 閿欒淇℃伅*/
+@property (nonatomic, copy) NSString *message;
+/** 鎺ユ敹鏁版嵁鐨勫瓧鍏� */
+@property (nonatomic, strong) NSDictionary * __nullable data;
+/** 瀛楀吀澶勭悊 */
+- (id)initWithDictionary:(NSDictionary *)dic;
+/**鏄惁鎴愬姛*/
+- (BOOL)success;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/EZSDK/EZSDK/EZ/Global/ResponseData.m b/EZSDK/EZSDK/EZ/Global/ResponseData.m
new file mode 100644
index 0000000..25d1404
--- /dev/null
+++ b/EZSDK/EZSDK/EZ/Global/ResponseData.m
@@ -0,0 +1,64 @@
+//
+// ResponseData.m
+// EZOpenSDKDemo
+//
+// Created by 闄堝槈涔� on 2021/3/1.
+// Copyright 漏 2021 hikvision. All rights reserved.
+//
+
+#import "ResponseData.h"
+
+@implementation ResponseData
+
+/// init
+-(id)init {
+ if (self = [super init]) {
+ self.code = @"-1";
+ self.message = @"璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒";
+
+ }
+ return self;
+}
+
+/// 鍒濆鍖栧苟瑙ｆ瀽杩斿洖瀛楀吀鍙傛暟
+/// @param dic 杩斿洖鍙傛暟
+- (id)initWithDictionary:(NSDictionary *)dic
+{
+ if (self = [super init]) {
+ @try {
+ if (dic) {
+ //1.鍙栧嚭杩斿洖鏁版嵁鐨勭姸鎬佺爜
+ self.code = [NSString stringWithFormat:@"%@", dic[@"code"]];
+ //2.鎻愮ず淇℃伅
+ self.message = [dic objectForKey:@"message"];
+ //3.杩斿洖鏁版嵁
+ NSDictionary *mData = (NSDictionary *)[dic objectForKey:@"data"];
+ self.data = mData;
+ } else {
+ //娌℃湁杩斿洖鏁版嵁
+ self.message = @"璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒";
+ self.data = nil;
+ self.code = @"-1";
+ }
+ }
+ //鎺ユ敹鍒板紓甯�
+ @catch (NSException *exception) {
+ self.message = @"鏁版嵁瑙ｆ瀽閿欒";
+ self.data = dic;
+ self.code = @"-2";
+ }
+ @finally {
+
+ }
+ }
+ return self;
+}
+
+/// Description
+- (BOOL)success
+{
+ //娌充笢code涓�0 锛岃悿鐭充负200 浠ｈ〃鎴愬姛
+ return [self.code isEqual: @"0"] || [self.code isEqual: @"200"] ;
+}
+
+@end
diff --git a/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m b/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m
index dd8051f..3d9623a 100644
--- a/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m
+++ b/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m
@@ -35,12 +35,14 @@
}
self.nameLabel.text = [NSString stringWithFormat:@"%@",deviceInfo.deviceName];
- [self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:deviceInfo.deviceCover] placeholderImageScale:nil];
+ // self.cameraImageView.contentMode = UIViewContentModeScaleAspectFit;
+ [self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:deviceInfo.deviceCover] placeholderImage:[UIImage imageNamed:@"device_default"]];
// [EZOPENSDK capturePicture:cameraInfo.deviceSerial channelNo:cameraInfo.channelNo completion:^(NSString *url, NSError *error) {
// if(!error){
// [self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:url]];
// }
// }];
+// [EZOPENSDK cap]
self.messageButton.hidden = NO;
self.settingButton.hidden = NO;
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m
index 0c32699..e1727fe 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m
@@ -14,7 +14,7 @@
#import "EZWifiConfigViewController.h"
#import "EZWifiTipsViewController.h"
#import "MBProgressHUD.h"
-
+#import "EZSDK.h"
@interface EZDeviceResultViewController ()<UIAlertViewDelegate>
@@ -82,12 +82,21 @@
[GlobalKit shareKit].deviceVerifyCode = [alertView textFieldAtIndex:0].text;
__weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
hud.labelText = NSLocalizedString(@"ad_adding_msg", @"姝ｅ湪娣诲姞锛岃绋嶅��...");
- [EZOPENSDK addDevice:[GlobalKit shareKit].deviceSerialNo
- verifyCode:[GlobalKit shareKit].deviceVerifyCode
- completion:^(NSError *error) {
- [hud hide:YES];
- [self handleTheError:error];
- }];
+
+// [EZOPENSDK addDevice:[GlobalKit shareKit].deviceSerialNo
+// verifyCode:[GlobalKit shareKit].deviceVerifyCode
+// completion:^(NSError *error) {
+// [hud hide:YES];
+// [self handleTheError:error];
+// }];
+
+ [EZHttpUtil addDeviceByHDL:[GlobalKit shareKit].deviceSerialNo
+ verifyCode:[GlobalKit shareKit].deviceVerifyCode
+ completion:^(ResponseData *responseData) {
+ [hud hide:YES];
+ [self handleTheError:responseData];
+ }];
+
}
else if (alertView.tag == 0xbb && buttonIndex == 1)
{
@@ -112,12 +121,20 @@
{
__weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
hud.labelText = NSLocalizedString(@"ad_adding_msg", @"姝ｅ湪娣诲姞锛岃绋嶅��...");
- [EZOPENSDK addDevice:[GlobalKit shareKit].deviceSerialNo
- verifyCode:[GlobalKit shareKit].deviceVerifyCode
- completion:^(NSError *error) {
- [hud hide:YES];
- [self handleTheError:error];
- }];
+// [EZOPENSDK addDevice:[GlobalKit shareKit].deviceSerialNo
+// verifyCode:[GlobalKit shareKit].deviceVerifyCode
+// completion:^(NSError *error) {
+// [hud hide:YES];
+// [self handleTheError:error];
+// }];
+ [EZHttpUtil addDeviceByHDL:[GlobalKit shareKit].deviceSerialNo
+ verifyCode:[GlobalKit shareKit].deviceVerifyCode
+ completion:^(ResponseData *responseData) {
+ [hud hide:YES];
+ [self handleTheError:responseData];
+ }];
+
+
}
else
{
@@ -161,7 +178,7 @@
if (error.code == EZ_HTTPS_DEVICE_ADDED_MYSELF || error.code == EZ_HTTPS_DEVICE_ONLINE_ADDED)
{
self.statusLabel.textColor = [UIColor blackColor];
- self.statusLabel.text = NSLocalizedString(@"ad_already_added",@"鎮ㄥ凡娣诲姞杩囨璁惧");
+ self.statusLabel.text = NSLocalizedString(@"ad_already_added",@"姝よ澶囧凡琚坊鍔�");
self.statusLabel.hidden = NO;
}
else if (error.code == EZ_HTTPS_DEVICE_ONLINE_IS_ADDED || error.code == EZ_HTTPS_DEVICE_OFFLINE_IS_ADDED)
@@ -212,24 +229,24 @@
}
-- (void)handleTheError:(NSError *)error
+- (void)handleTheError:(ResponseData *)responseData
{
- if (!error)
+ if (responseData.success)
{
[self performSegueWithIdentifier:@"go2WifiResult" sender:nil];
return;
}
- if (error.code == 105002)
+ if ([responseData.code isEqual: @"20010"])
{
UIAlertView *retryAlertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"device_verify_code_wrong", @"楠岃瘉鐮侀敊璇�") message:nil delegate:self cancelButtonTitle:NSLocalizedString(@"cancel", @"鍙栨秷") otherButtonTitles:NSLocalizedString(@"retry", @"閲嶈瘯"), nil];
retryAlertView.tag = 0xbb;
[retryAlertView show];
}
- else if (error.code == 105000)
+ else if ([responseData.code isEqual: @"20017"])
{
[UIView dd_showMessage:NSLocalizedString(@"ad_already_added",@"鎮ㄥ凡娣诲姞杩囨璁惧")];
}
- else if (error.code == 105001)
+ else if ([responseData.code isEqual: @"20013"])
{
[UIView dd_showMessage:NSLocalizedString(@"ad_added_by_others",@"姝よ澶囧凡琚埆浜烘坊鍔�")];
}
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m
index 0d0df48..a40c299 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m
@@ -51,7 +51,9 @@
- (void)viewDidLoad
{
[super viewDidLoad];
-
+
+// [[UIBarButtonItem appearance] setBackButtonTitlePositionAdjustment:UIOffsetMake(0, -60)
+// forBarMetrics:UIBarMetricsDefault];
// Uncomment the following line to preserve selection between presentations.
// self.clearsSelectionOnViewWillAppear = NO;
@@ -64,6 +66,8 @@
// self.title.
self.logoutBtn.title = NSLocalizedString(@"Logout", @"娉ㄩ攢");
+ self.logoutBtn.title = @"";
+ [self.logoutBtn setEnabled: NO];
[self checkEZIsLogin];
}
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
index f6acccb..8511c5e 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
@@ -360,8 +360,25 @@
{
__weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
hud.labelText = NSLocalizedString(@"message_deleting", @"姝ｅ湪鍒犻櫎锛岃绋嶅��...");
- [EZOPENSDK deleteDevice:self.deviceInfo.deviceSerial completion:^(NSError *error) {
- if(!error)
+// [EZOPENSDK deleteDevice:self.deviceInfo.deviceSerial completion:^(NSError *error) {
+// if(!error)
+// {
+// [hud hide:YES];
+// NSArray *viewControllers = self.navigationController.viewControllers;
+// for (UIViewController *vc in viewControllers)
+// {
+// if([vc isKindOfClass:[EZDeviceTableViewController class]])
+// {
+// ((EZDeviceTableViewController *)vc).needRefresh = YES;
+// [self.navigationController popToViewController:vc animated:YES];
+// break;
+// }
+// }
+// }
+// }];
+
+ [EZHttpUtil deleteDeviceByHDL:self.deviceInfo.deviceSerial completion:^(ResponseData *responseData) {
+ if(responseData.success)
{
[hud hide:YES];
NSArray *viewControllers = self.navigationController.viewControllers;
@@ -376,6 +393,8 @@
}
}
}];
+
+
}
}
diff --git a/EZSDK/EZSDK/EZSDK.h b/EZSDK/EZSDK/EZSDK.h
index 822308f..2872116 100644
--- a/EZSDK/EZSDK/EZSDK.h
+++ b/EZSDK/EZSDK/EZSDK.h
@@ -7,6 +7,7 @@
#import <Foundation/Foundation.h>
+
@interface EZSDK : NSObject
/**
鍒濆鍖朣DK
@@ -17,6 +18,10 @@
璁剧疆SDK鐨刟ccessToken
*/
+(void)setEZAccessToken:(NSString *) accessToken;
+/**
+ 璁剧疆HDLSDK鐨刟ccessToken
+ */
++(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken;
/**
鐩存帴璺宠浆鍒拌悿鐭虫憚鍍忓ご鍒楄〃
*/
@@ -37,9 +42,5 @@
鍥炴斁鎾斁鍘嗗彶
*/
+(void)playBackVideo:(NSObject*)deviceInfo;
-
-
-
-
@end
diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index 700013e..c813e1e 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -6,8 +6,7 @@
//
#import "EZSDK.h"
-#import "DeviceInfo.h"
-#import "EZDeviceInfo.h"
+//#import "DeviceInfo.h"
#import "EZDeviceInfo.h"
#import "EZOpenSDK.h"
#import "GlobalKit.h"
@@ -19,6 +18,10 @@
#import "EZPlaybackViewController.h"
#import "EZDeviceTableViewController.h"
#import "EZHCNetDeviceSDK.h"
+
+
+
+
@implementation EZSDK
@@ -58,7 +61,14 @@
[EZOPENSDK setAccessToken:accessToken];
}
-
+/**
+ 璁剧疆HDLSDK鐨刟ccessToken
+ */
++(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken
+{
+ [[GlobalKit shareKit] setHdlAccessToken:accessToken];
+ [[GlobalKit shareKit] setHdlRefreshToken:refreshToken];
+}
//鑾峰彇褰撳墠灞忓箷鏄剧ず鐨剉iewcontroller (杩欓噷闈㈣幏鍙栫殑鐩稿綋浜巖ootViewController)
+(UINavigationController *)getCurrentVC
@@ -278,4 +288,6 @@
// }
//}
+
+
@end
--
Gitblit v1.8.0