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/UIViewControllers/EZPlaybackViewController.m | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZPlaybackViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZPlaybackViewController.m
index 52a7d2c..0f12198 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZPlaybackViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZPlaybackViewController.m
@@ -10,21 +10,21 @@
#import "UIViewController+EZBackPop.h"
#import "DDCollectionViewFlowLayout.h"
#import "MJRefresh.h"
-#import "EZRecordDownloader.h"
-#import "EZDeviceRecordDownloadTask.h"
-#import "EZCloudRecordDownloadTask.h"
+#import <EZOpenSDKFramework/EZRecordDownloader.h>
+#import <EZOpenSDKFramework/EZDeviceRecordDownloadTask.h>
+#import <EZOpenSDKFramework/EZCloudRecordDownloadTask.h>
#import "EZRecordCell.h"
#import "DDKit.h"
-#import "EZCloudRecordFile.h"
-#import "EZDeviceRecordFile.h"
-#import "EZPlayer.h"
+#import <EZOpenSDKFramework/EZCloudRecordFile.h>
+#import <EZOpenSDKFramework/EZDeviceRecordFile.h>
+#import <EZOpenSDKFramework/EZPlayer.h>
#import "HIKLoadView.h"
#import "Masonry.h"
-#import "EZCameraInfo.h"
+#import <EZOpenSDKFramework/EZCameraInfo.h>
#import "MBProgressHUD.h"
#import "Toast+UIView.h"
#import "EZCustomTableView.h"
-#import "EZStreamPlayer.h"
+#import <EZOpenSDKFramework/EZStreamPlayer.h>
@interface EZPlaybackViewController ()<DDCollectionViewDelegateFlowLayout, UICollectionViewDataSource,EZPlayerDelegate, UIAlertViewDelegate, EZRecordCellDelegate, EZCustomTableViewDelegate,EZStreamPlayerDelegate>
@@ -190,6 +190,11 @@
cloudRateStr = @[@"x1",@"x4",@"x8",@"x16",@"x32"];
sdCardRateStr = @[@"x1",@"x4",@"x8",@"x16"];
+
+ //2021-07-21 闅愯棌streamPlayBtn鍜宺ateBtn
+ [self.streamPlayBtn setHidden:YES];
+ [self.rateBtn setHidden:YES];
+
}
- (void)viewWillDisappear:(BOOL)animated {
@@ -295,6 +300,8 @@
cell.deviceSerial = _cameraInfo.deviceSerial;
cell.isSelectedDevice = _isSelectedDevice;
cell.delegate = self;
+ //2021-07-21 闅愯棌涓嬭浇鎸夐挳
+ [cell.downloadBtn setHidden:YES];
if(_isSelectedDevice)
{
@@ -659,7 +666,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 +686,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];
--
Gitblit v1.8.0