From eeb0fad802f9558eb74c6964480b38b49e016c45 Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期四, 06 四月 2023 17:40:08 +0800 Subject: [PATCH] 1.增加不能app配网提示页功能 2.修改部分或计划语言 --- EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m | 38 ++++++++++++++++++++++++++++++-------- 1 files changed, 30 insertions(+), 8 deletions(-) diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m index f648436..2167f96 100644 --- a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m +++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m @@ -11,18 +11,18 @@ #import <Photos/Photos.h> #import "EZLivePlayViewController.h" #import "UIViewController+EZBackPop.h" -#import "EZDeviceInfo.h" -#import "EZPlayer.h" +#import <EZOpenSDKFramework/EZDeviceInfo.h> +#import <EZOpenSDKFramework/EZPlayer.h> #import "DDKit.h" #import "Masonry.h" #import "HIKLoadView.h" #import "MBProgressHUD.h" -#import "EZCameraInfo.h" +#import <EZOpenSDKFramework/EZCameraInfo.h> #import <AVFoundation/AVFoundation.h> #import "Toast+UIView.h" -#import "EZStreamPlayer.h" +#import <EZOpenSDKFramework/EZStreamPlayer.h> #import "MBProgressHUD.h" -#import "EZPMPlayPrivateTokenInfo.h" +#import <EZOpenSDKFramework/EZPMPlayPrivateTokenInfo.h> #import "HDLEZAlertInputView.h" #define MinimumZoomScale 1.0 #define MaximumZoomScale 4.0 @@ -415,9 +415,9 @@ self.scrollView.multipleTouchEnabled = YES; self.scrollView.pagingEnabled = NO; - if ([GlobalKit shareKit].deviceType==HDLEZDeviceType_Door) {//涓洪棬閿佹椂锛屽彧鏄剧ず楹﹀厠椋庡拰寮�闂ㄦ寜閽� - self.captureButton.hidden=YES; - self.localRecordButton.hidden=YES; + if ([GlobalKit shareKit].deviceType==HDLEZDeviceType_Door) {//涓洪棬閿佹椂锛屾樉绀洪害鍏嬮 +// self.captureButton.hidden=YES; +// self.localRecordButton.hidden=YES; self.controlButton.hidden=YES; //閲嶈鎺у埗鍙版寜閽� @@ -579,6 +579,23 @@ [_emptyButton setTitle:[NSString stringWithFormat:fromatStr,value] forState:UIControlStateNormal]; } + + +///** +// * 鏀跺埌鐨勭敾闈㈤暱瀹藉�� +// * +// * @param player 鎾斁鍣ㄥ璞� +// * @param height 楂樺害 +// * @param width 瀹藉害 +// */ +//- (void)player:(EZPlayer *)player didReceivedDisplayHeight:(NSInteger)height displayWidth:(NSInteger)width{ +// HDLEZLog(@"鐢婚潰闀匡細%ld锛屽锛�%ld",(long)height,(long)width); +// CGFloat playerVH=self.playerView.frame.size.height; +// CGFloat playerVW=playerVH*(width/height); +// self.playerView.frame=CGRectMake(0, 0, 50, 50); +// HDLEZLog(@"playerView鐨刦rame锛�%f",self.playerView.frame.size.width); +// +//} - (void)player:(EZPlayer *)player didPlayFailed:(NSError *)error @@ -859,6 +876,11 @@ self.localRecordButton.enabled = NO; self.captureButton.enabled = NO; self.playerPlayButton.hidden = NO; + + //寮�闂ㄦ寜閽疆鐏帮紝涓嶇粰鐐瑰嚮锛堟殏鍋滅殑鎯呭喌涓嬩笉缁欏紑闂級 + [_unlockButton setImage:[UIImage imageNamed:@"hdl_ez_ic_unlock_disable"] forState:UIControlStateNormal]; + _unlockButton.enabled=NO; + } else { -- Gitblit v1.8.0