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/EZLivePlayViewController.m |   63 +++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
index 2167f96..7835c22 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
@@ -94,6 +94,8 @@
 
 @property (nonatomic, copy) NSString *streamToken;
 
+@property (nonatomic, strong) UIView *doorPlayerView;//闂ㄩ攣鎾斁view
+
 @end
 
 @implementation EZLivePlayViewController
@@ -240,6 +242,21 @@
 //    }
 }
 
+/*娣诲姞闂ㄩ攣鎾斁view
+ */
+-(UIView*)doorPlayerView{
+    if (!_doorPlayerView) {
+        _doorPlayerView=[[UIView alloc] init];
+        [_playerView addSubview:_doorPlayerView];
+        [_doorPlayerView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerX.equalTo(_playerView.mas_centerX);
+            make.top.bottom.equalTo(_playerView);
+            make.width.mas_equalTo(_doorPlayerView.mas_height).multipliedBy(1);
+        }];
+    }
+    return _doorPlayerView;
+}
+
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     self.navigationController.navigationBar.hidden = NO;//2021-02-01
@@ -288,11 +305,15 @@
 /*鑾峰彇璁惧淇℃伅
  */
 -(void)getDeviceInfo{
+    __weak __typeof(self)weakSelf = self;
     //鑾峰彇璁惧淇℃伅
     [EZOpenSDK getDeviceInfo:self.deviceSerial completion:^(EZDeviceInfo *deviceInfo, NSError *error) {
         if(error)
         {
-            NSLog(@"EZ 鏌ヨ璁惧淇℃伅澶辫触");
+            NSLog(@"EZ 鏌ヨ璁惧淇℃伅澶辫触:%@",error);
+            [weakSelf.view makeToast:error.userInfo[@"NSLocalizedDescription"]
+                            duration:1.5
+                            position:@"center"];
             return;
         }
         if (deviceInfo) {
@@ -372,7 +393,11 @@
         [_player setPlayVerifyCode:verifyCode];
         [_talkPlayer setPlayVerifyCode:verifyCode];
     }
-    [_player setPlayerView:_playerView];
+//    if ([GlobalKit shareKit].deviceType==HDLEZDeviceType_Door) {//涓洪棬閿佹椂
+        [_player setPlayerView:self.doorPlayerView];
+//    }else{
+//        [_player setPlayerView:_playerView];
+//    }
     BOOL hdStatus = [[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithFormat:@"EZVideoPlayHardDecodingStatus_%@", self.deviceInfo.deviceSerial]];
     [_player setHDPriority:hdStatus];
     [_player startRealPlay];
@@ -450,7 +475,7 @@
         __weak __typeof(self)weakSelf = self;
         [[EZHttpUtil sharedManager] authLockByHDL:content deviceId:self.deviceId  completion:^(ResponseData * _Nonnull responseData) {
             if (responseData.success) {
-                [[EZHttpUtil sharedManager] remoteOpenByHDL:self.streamToken deviceId:self.deviceId completion:^(ResponseData * _Nonnull responseData) {
+                [[EZHttpUtil sharedManager] remoteOpenByHDL:weakSelf.streamToken deviceId:weakSelf.deviceId completion:^(ResponseData * _Nonnull responseData) {
                     [MBProgressHUD hideHUDForView:weakSelf.view animated:YES];
                     if (responseData.success) {
                         [weakSelf.view makeToast:HDLEZLocallizedString(@"device_open_success")
@@ -581,21 +606,25 @@
 }
 
 
-///**
-// *  鏀跺埌鐨勭敾闈㈤暱瀹藉��
-// *
-// *  @param player 鎾斁鍣ㄥ璞�
-// *  @param height 楂樺害
-// *  @param width  瀹藉害
-// */
-//- (void)player:(EZPlayer *)player didReceivedDisplayHeight:(NSInteger)height displayWidth:(NSInteger)width{
+/**
+ *  鏀跺埌鐨勭敾闈㈤暱瀹藉��
+ *
+ *  @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);
-//
-//}
+    CGFloat playerVH=self.playerView.frame.size.height;
+//    HDLEZLog(@"楂橈細%ld",(long)playerVH);
+    CGFloat ratio=((CGFloat)width)/((CGFloat)height);
+//    HDLEZLog(@"姣斾緥锛�%f",ratio);
+    CGFloat playerVW=playerVH*ratio;
+//    HDLEZLog(@"瀹斤細%ld",(long)playerVW);
+    [self.doorPlayerView mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(_doorPlayerView.mas_height).multipliedBy(ratio);
+    }];
+}
 
 
 - (void)player:(EZPlayer *)player didPlayFailed:(NSError *)error

--
Gitblit v1.8.0