From f338bb377a9e2f87f876cf8c5f0124d84da85bea Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 15 三月 2023 14:18:40 +0800
Subject: [PATCH] 1.引入自定义button和scrollview 2.引入时间选择器组件 3.完善临时密码功能 4.修改部分类名
---
EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
index c4fbbca..a830842 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
@@ -22,7 +22,7 @@
#import "Toast+UIView.h"
#import "EZStreamPlayer.h"
#import "MBProgressHUD.h"
-
+#import "EZPMPlayPrivateTokenInfo.h"
#define MinimumZoomScale 1.0
#define MaximumZoomScale 4.0
@@ -89,6 +89,8 @@
@property (weak, nonatomic) IBOutlet UILabel *streamTypeLabel;
@property (weak, nonatomic) IBOutlet UIScrollView *scrollView;
@property (weak, nonatomic) IBOutlet UILabel *zoomSizeLabel;
+
+@property (nonatomic, copy) NSString *streamToken;
@end
@@ -219,6 +221,13 @@
self.scrollView.userInteractionEnabled = YES;
self.scrollView.multipleTouchEnabled = YES;
self.scrollView.pagingEnabled = NO;
+
+ if ([GlobalKit shareKit].deviceType==HDLEZDeviceType_Door) {//涓洪棬閿佹椂锛屽彧鏄剧ず楹﹀厠椋庡拰寮�闂ㄦ寜閽�
+ self.captureButton.hidden=YES;
+ self.localRecordButton.hidden=YES;
+
+ [self.controlButton setTitle:NSLocalizedString(@"device_open", @"寮�闂�") forState:UIControlStateNormal];
+ }
}
- (void)viewDidAppear:(BOOL)animated {
@@ -493,6 +502,11 @@
}
}
+/** 鏅鸿兘闂ㄩ攣寮�闂╰oken */
+- (void)player:(EZPlayer *)player playPrivateTokenInfo:(EZPMPlayPrivateTokenInfo *)tokenInfo {
+ NSLog(@"寮�闂╰oken--->%@", tokenInfo.token);
+ self.streamToken=tokenInfo.token;
+}
#pragma mark - ValidateCode Methods
- (void)showSetPassword
@@ -703,7 +717,9 @@
if (error)
{
- [self.view makeToast:[NSString stringWithFormat:@"%@", error.description]];
+// [self.view makeToast:[NSString stringWithFormat:@"%@", error.description]];
+
+ [self.view makeToast:NSLocalizedString(@"setting_opration_fail", @"鎿嶄綔澶辫触")];
return;
}
[weakSelf.player stopRealPlay];
@@ -796,6 +812,18 @@
- (IBAction)ptzViewShow:(id)sender
{
+ if ([GlobalKit shareKit].deviceType==HDLEZDeviceType_Door) {//涓洪棬閿佽澶囨椂锛屾墽琛屽紑闂�
+ NSString *verifyCode = [[GlobalKit shareKit].deviceVerifyCodeBySerial objectForKey:self.deviceInfo.deviceSerial];
+
+ [[EZHttpUtil sharedManager] authLockByHDL:@"123456" deviceId:self.deviceInfo.deviceSerial verifyCode:verifyCode completion:^(ResponseData * _Nonnull responseData) {
+ NSLog(@"缁堢鎺堟潈缁撴灉锛�%@",responseData.data);
+ [[EZHttpUtil sharedManager] remoteOpenByHDL:self.streamToken deviceId:self.deviceInfo.deviceSerial completion:^(ResponseData * _Nonnull responseData) {
+ NSLog(@"寮�闂ㄧ粨鏋滐細%@",responseData.data);
+ }];
+ }];
+ return;
+ }
+
self.ptzView.hidden = NO;
[self.bottomView bringSubviewToFront:self.ptzView];
self.ptzControlButton.alpha = 0;
--
Gitblit v1.8.0