From 413b74eb37fa6b9e7ae38b22e8d777a74bd7a972 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 21 六月 2023 15:09:03 +0800
Subject: [PATCH] feature 门锁历史记录UI调整

---
 EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
index d790261..35c1a4c 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
@@ -24,6 +24,7 @@
 #import "MBProgressHUD.h"
 #import <EZOpenSDKFramework/EZPMPlayPrivateTokenInfo.h>
 #import "HDLEZAlertInputView.h"
+#import "HDLEZOPButton.h"
 #define MinimumZoomScale 1.0
 #define MaximumZoomScale 4.0
 
@@ -101,9 +102,9 @@
 // 鍛煎彨瑙嗗浘鐩稿叧鎺т欢
 @property (weak, nonatomic) IBOutlet UIView *videoCallOutView;      // 鍛煎彨寮规
 @property (weak, nonatomic) IBOutlet UILabel *callOutAlertLabel;    // 鎻愮ず璇█
-@property (weak, nonatomic) IBOutlet UIButton *hangUpButton;        // 鎸傛柇鎸夐挳
-@property (weak, nonatomic) IBOutlet UIButton *ignoreButton;        // 蹇界暐鎸夐挳
-@property (weak, nonatomic) IBOutlet UIButton *answerButton;        // 鎺ュ惉鎸夐挳
+@property (weak, nonatomic) IBOutlet HDLEZOPButton *hangUpButton;        // 鎸傛柇鎸夐挳
+@property (weak, nonatomic) IBOutlet HDLEZOPButton *ignoreButton;        // 蹇界暐鎸夐挳
+@property (weak, nonatomic) IBOutlet HDLEZOPButton *answerButton;        // 鎺ュ惉鎸夐挳
 
 @end
 
@@ -342,6 +343,7 @@
     self.localRecordButton.enabled = NO;
     self.streamPlayBtn.hidden = YES;
     self.isShowAlert = YES;
+    NSLog(@"#####鍒濆鍖栨柟娉曞睍绀�");
     
     if (_url)
     {
@@ -476,11 +478,14 @@
     
     self.callOutAlertLabel.text = HDLEZLocallizedString(@"device_callout_alert_message");
     [self.hangUpButton setTitle:HDLEZLocallizedString(@"device_callout_hang_up") forState:UIControlStateNormal];
+    self.hangUpButton.imagePosition = HDLEZOPButtonImagePositionTop;
+    self.hangUpButton.spacingBetweenImageAndTitle = 12.;
     [self.ignoreButton setTitle:HDLEZLocallizedString(@"device_callout_ignore") forState:UIControlStateNormal];
+    self.ignoreButton.imagePosition = HDLEZOPButtonImagePositionTop;
+    self.ignoreButton.spacingBetweenImageAndTitle = 12.;
     [self.answerButton setTitle:HDLEZLocallizedString(@"device_callout_answer") forState:UIControlStateNormal];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        self.isShowAlert = NO;
-    });
+    self.answerButton.imagePosition = HDLEZOPButtonImagePositionTop;
+    self.answerButton.spacingBetweenImageAndTitle = 12.;
 }
 
 /*寮�閿�
@@ -889,6 +894,7 @@
         self.largeTitleLabel.hidden = NO;
         self.largeBackButton.hidden = YES;
         self.bottomView.hidden = YES;
+        self.videoCallOutView.hidden = YES;
                 
         [self.scrollView setTranslatesAutoresizingMaskIntoConstraints:NO];
         [self.toolBar setTranslatesAutoresizingMaskIntoConstraints:NO];
@@ -927,7 +933,6 @@
 
 - (IBAction)largeBack:(id)sender
 {
-    NSLog(@"######鏀跺洖妯睆锛�");
     _landscape = NO;
     if (self.isVideoDoorLock) {
         self.navigationController.navigationBarHidden = NO;
@@ -936,6 +941,7 @@
         self.bottomView.hidden = NO;
         self.largeTitleLabel.hidden = YES;
         self.localRecrodContraint.constant = 10;
+        self.videoCallOutView.hidden = !self.isShowAlert;
         
         [self.scrollView setTranslatesAutoresizingMaskIntoConstraints:NO];
         [self.toolBar setTranslatesAutoresizingMaskIntoConstraints:NO];
@@ -1351,14 +1357,18 @@
 
 - (IBAction)clickCalloutHangupAction:(id)sender {
     [UIView dd_showMessage:@"鎸傛柇寮�鍙戜腑..."];
+    self.isShowAlert = NO;
 }
 
 - (IBAction)clickCalloutIgnoreAction:(id)sender {
     [UIView dd_showMessage:@"蹇界暐寮�鍙戜腑..."];
+    self.isShowAlert = NO;
 }
 
 - (IBAction)clickCalloutAnswerAction:(id)sender {
     [UIView dd_showMessage:@"鎺ュ惉寮�鍙戜腑..."];
+    self.isShowAlert = NO;
+    [self talkButtonClicked:self.talkButton];
 }
 
 
@@ -1366,12 +1376,15 @@
 /// 灞曠ず鍛煎彨寮规
 - (void)showCallOutAlertView {
     self.videoCallOutView.hidden = NO;
+    [UIView dd_showMessage:@"灞曠ず鍛煎彨寮规"];
+    NSLog(@"灞曠ず鍛煎彨寮规");
 }
 
 /// 闅愯棌鍛煎彨寮规
 - (void)hiddenCallOutAlertView {
     self.videoCallOutView.hidden = YES;
-
+    [UIView dd_showMessage:@"闅愯棌鍛煎彨寮规"];
+    NSLog(@"闅愯棌鍛煎彨寮规");
 }
 
 #pragma mark - Private Methods
@@ -1633,8 +1646,10 @@
 - (void)setIsShowAlert:(BOOL)isShowAlert {
     _isShowAlert = isShowAlert;
     if (isShowAlert) {
+        NSLog(@"#####set鏂规硶灞曠ず");
         [self showCallOutAlertView];
     } else {
+        NSLog(@"#####set鏂规硶闅愯棌");
         [self hiddenCallOutAlertView];
     }
 }

--
Gitblit v1.8.0