From 6b58ff6be1b45ed911b00aff680eaecb0fc73fc5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 21 七月 2021 16:05:44 +0800
Subject: [PATCH] 2021-07-21 1.录像回放隐藏相关功能
---
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Assets.xcassets/device_bg.imageset/device_bg.png | 0
EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs | 2
EZSDK/EZSDK/EZ/UIViewControllers/EZPlaybackViewController.m | 13 +++
EZSDK/EZSDK/EZ/UIViewControllers/EZAPWiFiConfigViewController.m | 2
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZAPWiFiConfigViewController.m | 2
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m | 30 +++++++---
/dev/null | 55 ------------------
EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a | 0
EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m | 6 +
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZSettingViewController.m | 6 +
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m | 4
EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m | 5 -
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZPlaybackViewController.m | 13 +++
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Assets.xcassets/device_bg.imageset/Contents.json | 21 +++++++
14 files changed, 81 insertions(+), 78 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Assets.xcassets/device_bg.imageset/Contents.json b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Assets.xcassets/device_bg.imageset/Contents.json
new file mode 100644
index 0000000..b1bc3ee
--- /dev/null
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Assets.xcassets/device_bg.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "device_bg.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Assets.xcassets/device_bg.imageset/device_bg.png b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Assets.xcassets/device_bg.imageset/device_bg.png
new file mode 100644
index 0000000..e78c0ce
--- /dev/null
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Assets.xcassets/device_bg.imageset/device_bg.png
Binary files differ
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 b3c8980..3c1cc2e 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,8 +35,8 @@
}
self.nameLabel.text = [NSString stringWithFormat:@"%@",deviceInfo.deviceName];
- // self.cameraImageView.contentMode = UIViewContentModeScaleAspectFit;
- [self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:deviceInfo.deviceCover] placeholderImage:[UIImage imageNamed:@"device_default"]];
+// self.cameraImageView.contentMode = UIViewContentModeScaleAspectFill;
+ [self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:@""] placeholderImage:[UIImage imageNamed:@"device_bg"]];
// [EZOPENSDK capturePicture:cameraInfo.deviceSerial channelNo:cameraInfo.channelNo completion:^(NSString *url, NSError *error) {
// if(!error){
// [self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:url]];
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZAPWiFiConfigViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZAPWiFiConfigViewController.m
index 7f32d14..eff6e76 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZAPWiFiConfigViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZAPWiFiConfigViewController.m
@@ -123,7 +123,7 @@
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = self.wifiPwdLabel.text;
- [self.view makeToast:@"done" duration:1.5 position:@"center"];
+ [self.view makeToast:NSLocalizedString(@"done",@"纭畾") duration:1.5 position:@"center"];
}
- (IBAction)addBtnClick:(id)sender
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZPlaybackViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZPlaybackViewController.m
index 52a7d2c..d7f2e5f 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZPlaybackViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZPlaybackViewController.m
@@ -190,6 +190,10 @@
cloudRateStr = @[@"x1",@"x4",@"x8",@"x16",@"x32"];
sdCardRateStr = @[@"x1",@"x4",@"x8",@"x16"];
+
+ //2021-07-21 闅愯棌streamPlayBtn
+ [self.streamPlayBtn setHidden:YES];
+
}
- (void)viewWillDisappear:(BOOL)animated {
@@ -295,6 +299,8 @@
cell.deviceSerial = _cameraInfo.deviceSerial;
cell.isSelectedDevice = _isSelectedDevice;
cell.delegate = self;
+ //2021-07-21 闅愯棌涓嬭浇鎸夐挳
+ [cell.downloadBtn setHidden:YES];
if(_isSelectedDevice)
{
@@ -659,7 +665,8 @@
}
else
{
- [UIView dd_showMessage:[NSString stringWithFormat:@"error code is %d",(int) error.code] onParentView:self.view];
+ NSString *mes = [NSString stringWithFormat:@"%@(%ld)",NSLocalizedString(@"setting_opration_fail", @"鎿嶄綔澶辫触"), (long)error.code];
+ [UIView dd_showMessage:mes onParentView:self.view];
[weakSelf.playbackList.header endRefreshing];
[weakSelf.records removeAllObjects];
[weakSelf.playbackList reloadData];
@@ -678,7 +685,9 @@
if (error)
{
if (error.code > 0) {
- [UIView dd_showMessage:[NSString stringWithFormat:@"error code is %d",(int) error.code] onParentView:self.view];
+ NSString *mes = [NSString stringWithFormat:@"%@(%ld)",NSLocalizedString(@"setting_opration_fail", @"鎿嶄綔澶辫触"), (long)error.code];
+ [UIView dd_showMessage:mes onParentView:self.view];
+
}
[weakSelf.playbackList.header endRefreshing];
[weakSelf.records removeAllObjects];
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZSettingViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZSettingViewController.m
index 9e9bad1..2719447 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZSettingViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZSettingViewController.m
@@ -378,9 +378,9 @@
// }];
[EZHttpUtil.sharedManager deleteDeviceByHDL:self.deviceInfo.deviceSerial completion:^(ResponseData *responseData) {
+ [hud hide:YES];
if(responseData.success)
{
- [hud hide:YES];
NSArray *viewControllers = self.navigationController.viewControllers;
for (UIViewController *vc in viewControllers)
{
@@ -391,6 +391,10 @@
break;
}
}
+ }else{
+ NSString *mes = [NSString stringWithFormat:@"%@(%@)",NSLocalizedString(@"setting_opration_fail", @"鎿嶄綔澶辫触"),responseData.code];
+
+ [self.view makeToast:mes duration:2.0 position:@"center"];
}
}];
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
index 82d242f..3cecf2c 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
@@ -56,11 +56,9 @@
// */
// [self performSegueWithIdentifier:@"go2CameraList" sender:nil];
- [[EZSDK sharedInstance] setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIyYTAwZGRmOTNjMGY0YzlhYjljNjU2M2VhMDJjZjhmMyIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInVzZXJBY2NvdW50Ijoid3hyIiwidGVuYW50SWQiOiIyMCIsInVzZXJUeXBlIjoiVVNFUl9DIiwidG9rZW5UeXBlIjoiYWNjZXNzX3Rva2VuIiwidXNlck5hbWUiOiJrYWVkZSIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2MjU2NjA0NjQsIm5iZiI6MTYyNTY1MzI2NH0.I4YfZQqm1p1SwJQbNWyUEOWXCqpYCWQdmAMOR-xlOMJ0pYFh3_nyjPBiWypTTMgy5nTpj7IqUM1bHwHWGsDEInF4Bl6trxrgOE39Toj-aY1UJcViYhx7e3E3ChrlXptVfKtk3cVEtDlFkMdHdHiJi-6OZox4KOz_AallI8lFIlo" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI1ZjdmOGFkY2I3MGU0NzYwOWE0NTcxOTZmOTAyOTY1OSIsImNvbXBhbnlJZCI6IjAiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidGVuYW50SWQiOiIyMCIsInRva2VuVHlwZSI6InJlZnJlc2hfdG9rZW4iLCJvcGVuQXBwbGljYXRpb25JZCI6IjAiLCJ1c2VySWQiOiIxMzkyMDM1NTY4MjA0NDIzMTY5IiwiZXhwIjoxNjI2MjU4MDY0LCJuYmYiOjE2MjU2NTMyNjR9.DB1pGaM6xtpQiP_KvaAHbWDZtxjLXZwJCgFfrp_XA0bnV8wMC8SE7K_uoP79c97WGqcmpHJVY-x8NCVJneGpIKN2oSCvX0Sn0uAttqni4zbVjmErC2AmpONJwWY27GYjHk4LFri03p38D-5zlULFo3ITtN3Il2aJOjVOpyNCcuI"];
- [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://test-gz.hdlcontrol.com" platform:1 homeId:@"1396717478877241345"];
-
+ [self initChina];
__weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
@@ -77,8 +75,22 @@
}
}];
}
-
-
+-(void)initTest{
+
+
+}
+-(void)initChina{
+// [[EZSDK sharedInstance] setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI3NzEwNjRjODZhOTU0MzM0ODgyYzVmZDNhNWUxNDdiMyIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzNTAyODA5OTU5OTg4NjMzNjEiLCJleHAiOjE2MjY2NzE4ODQsIm5iZiI6MTYyNjY2NDY4NH0.bER2i5FI5Y8QVDFhDY6yNB7Q8fM844C-yM4jmk1M5H16hhxiQYSyVAL5ljKmMrBC9YXhJbd0QeqoSflhYLy98-e9VxBgdNdyKQAIMb4pW8jdbDRrSWhM5QMRwxcbiCG_6C3n4qqYBqH7JuYS6BkQ96QQK6ly0lLgL_Nib9JFRt4" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI0NzJkMzk1ZmVmMmM0YTk2YTZmZDAzYWZmNTVkYjdkMSIsImNvbXBhbnlJZCI6IjAiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidGVuYW50SWQiOiIyMCIsInRva2VuVHlwZSI6InJlZnJlc2hfdG9rZW4iLCJvcGVuQXBwbGljYXRpb25JZCI6IjAiLCJ1c2VySWQiOiIxMzUwMjgwOTk1OTk4ODYzMzYxIiwiZXhwIjoxNjI3MjY5NDg0LCJuYmYiOjE2MjY2NjQ2ODR9.QFgMui3Wg8wIG9yRxJ-zpL0nsMs7g6Z03yVpsp0ZKhW3NvoK4agT3WmkrHIhxAqpMr1foSzuxhs-JYk3b9398rJByHelWzkaKNWXjG4LHz2lAlooSEgrgM9NqRsnNfs31aYB5AHvGYF1FuUO0YS367Uafx_NM6LgfBz3n4sWFyw"];
+//
+//
+// [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://china-gateway.hdlcontrol.com" platform:1 homeId:@"1409421094585028610"];
+ [[EZSDK sharedInstance] setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJiZTVmYzRhZjQwODA0Y2Y0OTA5OTk5YTcyYWIwNTVjYSIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoi5ZiJ5LmQIiwib3BlbkFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTM1NzEzODQzNDgyODMzMzA1OCIsImV4cCI6MTYyNjg1MjY5NSwibmJmIjoxNjI2ODQ1NDk1fQ.ZjLGpFDfEXhViUEVqYY5UggMorgqAmj38rHXfHSp1pX008Lk0_KH9lz3R05iCfLign74LSYdTd4OfVkyDYb2pt_bIjZr3w0kZdbun8v4Ofu4bFrFFdI4qACPbc7GjXFI2tC_0A_uvekTB6nCRm3lW-GWAvTocR6UWsA_UGsMDIM" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJjNDQ1M2EyMDE0MzU0MWRlYWRmOTgyYjQ3YmEyYjU0YiIsImNvbXBhbnlJZCI6IjAiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidGVuYW50SWQiOiIyMCIsInRva2VuVHlwZSI6InJlZnJlc2hfdG9rZW4iLCJvcGVuQXBwbGljYXRpb25JZCI6IjAiLCJ1c2VySWQiOiIxMzU3MTM4NDM0ODI4MzMzMDU4IiwiZXhwIjoxNjI3NDUwNDEzLCJuYmYiOjE2MjY4NDU2MTN9.TN9-Y72sesOx-qL6V6BHdbLIqeM26OepFe0uHRIMSXKncRzU9NwknYgREli6k0GDe3965aQD7IeQh-jJTPOxS39VqGjzfuH_E-yfx2wt2aHPbDVZAOBalInSSOGHsJEnw-kEh5BIFDDvq-6tysHemQvxkR3zK5S9XKimwxeCZOg"];
+
+
+ [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://china-gateway.hdlcontrol.com" platform:1 homeId:@"1417299149361909761"];
+
+
+}
- (IBAction)logout:(id)sender
{
@@ -101,10 +113,10 @@
// [[EZSDK sharedInstance] PlayWithDeviceSerial:@"F44133728"];
- EZAlarmInfo *info = [[EZAlarmInfo alloc] init];
- info.alarmName = @"浜轰綋妫�娴�";
- info.alarmPicUrl = @"https://i.ys7.com/streamer/alarm/url/get?fileId=20210707204930-F41014762-1-00000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&ct=1&lc=90&bn=1_hikalarm";
- [[EZSDK sharedInstance] goToEZMessagePhotoVC:info];
+// EZAlarmInfo *info = [[EZAlarmInfo alloc] init];
+// info.alarmName = @"浜轰綋妫�娴�";
+// info.alarmPicUrl = @"https://i.ys7.com/streamer/alarm/url/get?fileId=20210707204930-F41014762-1-00000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&ct=1&lc=90&bn=1_hikalarm";
+// [[EZSDK sharedInstance] goToEZMessagePhotoVC:info];
}
}];
diff --git a/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a b/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
index fcf41a2..715aa50 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 2f581db..eb389fd 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.4.3")]
+[assembly: AssemblyVersion("1.4.5")]
// 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/EZ/TableViewCells/DeviceListCell.m b/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m
index abf9966..3c1cc2e 100644
--- a/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m
+++ b/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m
@@ -35,8 +35,8 @@
}
self.nameLabel.text = [NSString stringWithFormat:@"%@",deviceInfo.deviceName];
- // self.cameraImageView.contentMode = UIViewContentModeScaleAspectFit;
- [self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:deviceInfo.deviceCover] placeholderImage:[UIImage imageNamed:@"device_default"]];
+// self.cameraImageView.contentMode = UIViewContentModeScaleAspectFill;
+ [self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:@""] placeholderImage:[UIImage imageNamed:@"device_bg"]];
// [EZOPENSDK capturePicture:cameraInfo.deviceSerial channelNo:cameraInfo.channelNo completion:^(NSString *url, NSError *error) {
// if(!error){
// [self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:url]];
@@ -45,7 +45,6 @@
// [EZOPENSDK cap]
// //2021-05-08 闅愯棌褰曞儚鎸夐挳
-// //2021-07-07 鍙栨秷闅愯棌
// self.recordButton.hidden = YES;
self.messageButton.hidden = NO;
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZAPWiFiConfigViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZAPWiFiConfigViewController.m
index 7f32d14..eff6e76 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZAPWiFiConfigViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZAPWiFiConfigViewController.m
@@ -123,7 +123,7 @@
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = self.wifiPwdLabel.text;
- [self.view makeToast:@"done" duration:1.5 position:@"center"];
+ [self.view makeToast:NSLocalizedString(@"done",@"纭畾") duration:1.5 position:@"center"];
}
- (IBAction)addBtnClick:(id)sender
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZPlaybackViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZPlaybackViewController.m
index 52a7d2c..d7f2e5f 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZPlaybackViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZPlaybackViewController.m
@@ -190,6 +190,10 @@
cloudRateStr = @[@"x1",@"x4",@"x8",@"x16",@"x32"];
sdCardRateStr = @[@"x1",@"x4",@"x8",@"x16"];
+
+ //2021-07-21 闅愯棌streamPlayBtn
+ [self.streamPlayBtn setHidden:YES];
+
}
- (void)viewWillDisappear:(BOOL)animated {
@@ -295,6 +299,8 @@
cell.deviceSerial = _cameraInfo.deviceSerial;
cell.isSelectedDevice = _isSelectedDevice;
cell.delegate = self;
+ //2021-07-21 闅愯棌涓嬭浇鎸夐挳
+ [cell.downloadBtn setHidden:YES];
if(_isSelectedDevice)
{
@@ -659,7 +665,8 @@
}
else
{
- [UIView dd_showMessage:[NSString stringWithFormat:@"error code is %d",(int) error.code] onParentView:self.view];
+ NSString *mes = [NSString stringWithFormat:@"%@(%ld)",NSLocalizedString(@"setting_opration_fail", @"鎿嶄綔澶辫触"), (long)error.code];
+ [UIView dd_showMessage:mes onParentView:self.view];
[weakSelf.playbackList.header endRefreshing];
[weakSelf.records removeAllObjects];
[weakSelf.playbackList reloadData];
@@ -678,7 +685,9 @@
if (error)
{
if (error.code > 0) {
- [UIView dd_showMessage:[NSString stringWithFormat:@"error code is %d",(int) error.code] onParentView:self.view];
+ NSString *mes = [NSString stringWithFormat:@"%@(%ld)",NSLocalizedString(@"setting_opration_fail", @"鎿嶄綔澶辫触"), (long)error.code];
+ [UIView dd_showMessage:mes onParentView:self.view];
+
}
[weakSelf.playbackList.header endRefreshing];
[weakSelf.records removeAllObjects];
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
index 9e9bad1..2719447 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
@@ -378,9 +378,9 @@
// }];
[EZHttpUtil.sharedManager deleteDeviceByHDL:self.deviceInfo.deviceSerial completion:^(ResponseData *responseData) {
+ [hud hide:YES];
if(responseData.success)
{
- [hud hide:YES];
NSArray *viewControllers = self.navigationController.viewControllers;
for (UIViewController *vc in viewControllers)
{
@@ -391,6 +391,10 @@
break;
}
}
+ }else{
+ NSString *mes = [NSString stringWithFormat:@"%@(%@)",NSLocalizedString(@"setting_opration_fail", @"鎿嶄綔澶辫触"),responseData.code];
+
+ [self.view makeToast:mes duration:2.0 position:@"center"];
}
}];
diff --git a/EZSDK/EZSDK/EZDeviceInfo.h b/EZSDK/EZSDK/EZDeviceInfo.h
deleted file mode 100644
index 60a8460..0000000
--- a/EZSDK/EZSDK/EZDeviceInfo.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// EZDeviceInfo.h
-// EzvizOpenSDK
-//
-// Created by DeJohn Dong on 15/9/16.
-// Copyright (c) 2015骞� Ezviz. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-/// 姝ょ被涓鸿澶囦俊鎭璞�
-@interface EZDeviceInfo : NSObject
-
-/// 璁惧鍏宠仈鐨勯�氶亾淇℃伅
-@property (nonatomic, strong) NSArray *cameraInfo;
-/// 璁惧鍏宠仈鐨勯�氶亾鏁伴噺
-@property (nonatomic) NSInteger cameraNum;
-/// 鍏锋湁闃叉姢鑳藉姏鐨勮澶囧竷鎾ら槻鐘舵�侊細0-鐫＄湢锛�8-鍦ㄥ锛�16-澶栧嚭锛屾櫘閫欼PC甯冩挙闃茬姸鎬侊細0-鎾ら槻锛�1-甯冮槻
-@property (nonatomic) NSInteger defence;
-/// 璁惧鍏宠仈鐨勬帰娴嬪櫒鏁伴噺
-@property (nonatomic) NSInteger detectorNum;
-/// 璁惧鍏宠仈鐨勬帰娴嬪櫒淇℃伅
-@property (nonatomic, strong) NSArray *detectorInfo;
-/// 璁惧鍥剧墖
-@property (nonatomic, copy) NSString *deviceCover;
-/// 璁惧鍚嶇О
-@property (nonatomic, copy) NSString *deviceName;
-/// 璁惧搴忓垪鍙�
-@property (nonatomic, copy) NSString *deviceSerial;
-/// 璁惧绫诲瀷
-@property (nonatomic, copy) NSString *deviceType;
-/// 璁惧鐗堟湰鍙�
-@property (nonatomic, copy) NSString *deviceVersion;
-/// 璁惧鏄惁寮�鍚姞瀵�
-@property (nonatomic) BOOL isEncrypt;
-/// 璁惧鐘舵�侊紝1-鍦ㄧ嚎锛�2-涓嶅湪绾�
-@property (nonatomic) NSInteger status;
-/// 鏄惁鏀寔瀵硅 0-涓嶆敮鎸佸璁诧紝1-鏀寔鍏ㄥ弻宸ュ璁诧紝3-鏀寔鍗婂弻宸ュ璁�
-@property (nonatomic) NSInteger isSupportTalk;
-/// 鏄惁鏀寔浜戝彴鎺у埗
-@property (nonatomic) BOOL isSupportPTZ;
-/// 鏄惁鏀寔鏀惧ぇ
-@property (nonatomic) BOOL isSupportZoom;
-///鏄惁鏀寔鎻愮ず闊冲紑鍏�
-@property (nonatomic) BOOL isSupportAudioOnOff;
-/// 鏄惁鏀寔涓績闀滃儚缈昏浆
-@property (nonatomic) BOOL isSupportMirrorCenter;
-/// 鏄惁鏀寔澹版尝閰嶇綉
-@property (nonatomic) BOOL isSupportSoundWave;
-/// 璁惧澶х被
-@property (nonatomic,copy) NSString *category;
-/// 娣诲姞鏃堕棿
-@property (nonatomic,strong) NSDate *addTime;
-
-@end
--
Gitblit v1.8.0