From 56fa922385d2b9b4f41c536320dea3c8cd264440 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 08 五月 2021 16:55:57 +0800
Subject: [PATCH] 2021-05-08 1.隐藏录像功能
---
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m | 2 +-
EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs | 2 +-
EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a | 0
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo.xcodeproj/project.pbxproj | 10 +++++-----
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m | 6 +++++-
EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m | 4 ++++
EZSDK/EZSDK/EZSDK.m | 4 +++-
7 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo.xcodeproj/project.pbxproj b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo.xcodeproj/project.pbxproj
index a679e8b..4cb039c 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo.xcodeproj/project.pbxproj
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo.xcodeproj/project.pbxproj
@@ -1543,7 +1543,7 @@
0D8CF36B1BDF1ABA00A50266 = {
CreatedOnToolsVersion = 7.1;
DevelopmentTeam = BVTA78PRYA;
- ProvisioningStyle = Manual;
+ ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.AccessWiFi = {
enabled = 0;
@@ -1948,9 +1948,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
CLANG_CXX_LIBRARY = "libc++";
CODE_SIGN_ENTITLEMENTS = EZOpenSDKDemo/EZOpenSDK.entitlements;
- CODE_SIGN_IDENTITY = "iPhone Distribution";
+ CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- CODE_SIGN_STYLE = Manual;
+ CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 200628;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = BVTA78PRYA;
@@ -1978,10 +1978,10 @@
MARKETING_VERSION = 4.15.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
- PRODUCT_BUNDLE_IDENTIFIER = com.evoyo.home;
+ PRODUCT_BUNDLE_IDENTIFIER = com.hdl.on;
PRODUCT_NAME = EZOpenSDK;
PROVISIONING_PROFILE = "";
- PROVISIONING_PROFILE_SPECIFIER = ComEvoyoHomeDevelopment20210301;
+ PROVISIONING_PROFILE_SPECIFIER = "";
VALID_ARCHS = "arm64 armv7 armv7s";
WRAPPER_EXTENSION = app;
};
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m
index 670ba82..935f895 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/DeviceListCell.m
@@ -35,7 +35,7 @@
}
self.nameLabel.text = [NSString stringWithFormat:@"%@",deviceInfo.deviceName];
-// self.cameraImageView.contentMode = UIViewContentModeScaleAspectFit;
+ // self.cameraImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.cameraImageView sd_setImageWithURL:[NSURL URLWithString:deviceInfo.deviceCover] placeholderImage:[UIImage imageNamed:@"device_default"]];
// [EZOPENSDK capturePicture:cameraInfo.deviceSerial channelNo:cameraInfo.channelNo completion:^(NSString *url, NSError *error) {
// if(!error){
@@ -44,8 +44,12 @@
// }];
// [EZOPENSDK cap]
+ //2021-05-08 闅愯棌褰曞儚鎸夐挳
+ self.recordButton.hidden = YES;
+
self.messageButton.hidden = NO;
self.settingButton.hidden = NO;
+
if (self.isShared)
{
self.messageButton.hidden = YES;
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
index ae7d6c7..a6a7de9 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
@@ -55,7 +55,7 @@
// */
// [self performSegueWithIdentifier:@"go2CameraList" sender:nil];
- [EZSDK setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIwOTZiNzZmYzVlNTk0MzNjOGI2YTBjOWIwODg2MWVhZiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiIxODgyNDg2NDE0MyIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiTEUwMDAiLCJhcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzMjg4ODYyNzMwMDM4NTU4NzQiLCJleHAiOjE2MTg4MTcyNjUsIm5iZiI6MTYxODgxMDA2NX0.Mjtc_9EGn6elmVJK4B9GVDcGDTJcM70QEhwof5ReMUGgm9mQtCt9VRLKhyDlH28yzlKZ0kVUsQxsqw0ZcfrqdjzIEWQgA-VtnAru3HqkwDuLvhvJz3v2L_jUyD-TBgC5USdGZEgGDaqb-9shthA6w__Kky_N2t-O_tF0XoNO29k" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI0YmM4YzhlZTllMmU0YTc0YmNiOGY5YmZlMmUzZTU2YyIsImhlYWRlclByZWZpeCI6IkJlYXJlciAiLCJ0ZW5hbnRJZCI6IjIwIiwidG9rZW5UeXBlIjoicmVmcmVzaF90b2tlbiIsImFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTMyODg4NjI3MzAwMzg1NTg3NCIsImV4cCI6MTYxOTQxNTg3NSwibmJmIjoxNjE4ODExMDc1fQ.droDmbiOgr0J8yn1BrZzZa_1idmsQV2T0kMAvGpu8yg8WEA6jKKT4FBS6SwgLwZY5q-evTrkSebU5LGJizJP288BInBF4PhNotjSVn0pXZ3xJ1QQuEZ4ZRmsw9n0Nl-BLMEaNHDqNfi4odkzFlQNb4NijAK1zEqXRpFozg_rR3s"];
+ [EZSDK setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJkODQ5ODllZDMzODQ0ZmFiYWViMWM4YTRlMDlmZDFlMCIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiIxODgyNDg2NDE0MyIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiTEUwMDAiLCJhcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzMjg4ODYyNzMwMDM4NTU4NzQiLCJleHAiOjE2MTk1MDczMDEsIm5iZiI6MTYxOTUwMDEwMX0.dS-Lme85XjrHK6fRC1_9hzednq9YLz6gtaaW-50gX3F2eidl3XDa8AP17KrCNhxkAMrOBRpZ0sxqGM7y-WPpUy0p_ytiTt5F1k8MR--Q7njpxxUMttuGzKEmj4Xk1G1Mx55zVlzvIBOHIFm44upWoIObW34nbMjnr8tIa2H7FEY" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI4NmMwYmI1MGQ5N2Q0OGU4OWIzMmRlZDE5NjdmOGE5MiIsImhlYWRlclByZWZpeCI6IkJlYXJlciAiLCJ0ZW5hbnRJZCI6IjIwIiwidG9rZW5UeXBlIjoicmVmcmVzaF90b2tlbiIsImFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTMyODg4NjI3MzAwMzg1NTg3NCIsImV4cCI6MTYyMDEwNDkwMSwibmJmIjoxNjE5NTAwMTAxfQ.AgejbuQdmsc7UItIGtcDoWAepuHo56amU7dhmbndj-0TlbmFPOPQbIxvs8nEAQeCAFavrHctWGCypaW8MTvmYTOISbf4n2-Jk8wQX5xJdwEzNI0kJrTeIY1yejo9c12LT1ZL6y-8WkDjRKATDOCrrfy-bdsqFo78VEuUtp_tFeQ"];
[EZSDK setRequestHttpsHostAndPlatform:@"https://test-gz.hdlcontrol.com" platform:2];
diff --git a/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a b/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
index 1004a29..9efe895 100644
--- a/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
+++ b/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
Binary files differ
diff --git a/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs b/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
index 4a9e2cc..8f1a669 100644
--- a/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
+++ b/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.2.1")]
+[assembly: AssemblyVersion("1.3.1")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
diff --git a/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m b/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m
index 3d9623a..935f895 100644
--- a/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m
+++ b/EZSDK/EZSDK/EZ/TableViewCells/DeviceListCell.m
@@ -44,8 +44,12 @@
// }];
// [EZOPENSDK cap]
+ //2021-05-08 闅愯棌褰曞儚鎸夐挳
+ self.recordButton.hidden = YES;
+
self.messageButton.hidden = NO;
self.settingButton.hidden = NO;
+
if (self.isShared)
{
self.messageButton.hidden = YES;
diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index d283890..57ebd9c 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -25,13 +25,15 @@
@implementation EZSDK
+static BOOL isHavelibInit=NO;
+
/**
鍒濆鍖朣DK
浼犲叆鍥藉唴鐗坘ey 鍜屾捣澶栫増globalAppKey
*/
+ (BOOL)initLibWithAppKey:(NSString *)appKey globalAppKey:(NSString *)globalAppKey
{
- static BOOL isHavelibInit=NO;
+
if (!isHavelibInit) {
// isHavelibInit=YES;
// NSLog(@"绗竴娆″垵濮嬪寲钀ょ煶搴�");
--
Gitblit v1.8.0