From 54ada3b3c6c58da67dda2ecaea4b19b42ab5c257 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 29 三月 2023 17:51:47 +0800
Subject: [PATCH] 1.改用萤石动态库，解决openssl版本冲突问题 2.设备回调成功增加返回设备序列号 3.优化部分功能
---
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZLivePlayViewController.m | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZLivePlayViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZLivePlayViewController.m
index ad5c353..279634d 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZLivePlayViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZLivePlayViewController.m
@@ -223,11 +223,13 @@
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
+ self.navigationController.navigationBar.hidden = NO;//2021-02-01
self.ptzViewContraint.constant = self.bottomView.frame.size.height;
self.talkViewContraint.constant = self.ptzViewContraint.constant;
}
- (void)viewWillDisappear:(BOOL)animated {
+// self.navigationController.navigationBarHidden = YES;//2021-02-01 娣诲姞闅愯棌navigationBarHidden
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(hideQualityView) object:nil];
//缁撴潫鏈湴褰曞儚
if(self.localRecordButton.selected)
@@ -701,7 +703,8 @@
if (error)
{
- [self.view makeToast:[NSString stringWithFormat:@"%@", error.description]];
+ [self.view makeToast:NSLocalizedString(@"setting_opration_fail", @"鎿嶄綔澶辫触")];
+// [self.view makeToast:[NSString stringWithFormat:@"%@", error.description]];
return;
}
[weakSelf.player stopRealPlay];
--
Gitblit v1.8.0