From 4c1abca185a5727da6fb314a0cb4cd44bfe1b3bf Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期五, 07 六月 2024 17:48:47 +0800
Subject: [PATCH] feature appkey修改
---
EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
index 95f6ae0..b904e77 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
@@ -17,6 +17,7 @@
#import "EZDeviceUpgradeViewController.h"
#import <EZOpenSDKFramework/EZStorageInfo.h>
#import "Toast+UIView.h"
+#import "HDLEZDetectionTypeViewController.h"
//#import "EzvizDeviceManager.h"
@@ -25,6 +26,7 @@
@property (nonatomic, strong) NSMutableArray *settingList;
@property (nonatomic, weak) IBOutlet UISwitch *videoSwitch;
@property (nonatomic, weak) IBOutlet UISwitch *actionSwitch;
+@property (nonatomic, strong) UIImageView *actionRightArrow;
@property (weak, nonatomic) IBOutlet UISwitch *hdSwitch;
@property (weak, nonatomic) IBOutlet UISwitch *privacyMaskSwitch;
@property (weak, nonatomic) IBOutlet UIImageView *rightArrowImg;
@@ -223,6 +225,17 @@
cell.textLabel.textAlignment = NSTextAlignmentLeft;
cell.accessoryType = UITableViewCellAccessoryNone;
cell.accessoryView = nil;
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+ UIView *separatorLine = [[UIView alloc] init];
+ separatorLine.hidden = YES; // 榛樿闅愯棌鍒嗗壊绾�
+ [cell.contentView addSubview:separatorLine];
+ separatorLine.backgroundColor = HDLEZHEXCOLOR(0xECEDEE, 1.);
+ [separatorLine mas_makeConstraints:^(MASConstraintMaker *make) {
+ make.left.mas_equalTo(cell.contentView.mas_left).offset(16.);
+ make.bottom.mas_equalTo(cell.contentView.mas_bottom);
+ make.right.mas_equalTo(cell.contentView.mas_right).offset(-16.);
+ make.height.mas_equalTo(0.5);
+ }];
if (indexPath.section == 0)
{
[cell.contentView addSubview:self.nameLabel];
@@ -243,23 +256,25 @@
[cell.contentView addSubview:self.serialLabel];
[self.serialLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(@140);
- make.trailing.mas_equalTo(cell.contentView.mas_trailing).offset(-34);
+ make.trailing.mas_equalTo(cell.contentView.mas_trailing).offset(-16);
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
make.height.mas_equalTo(@20);
}];
self.serialLabel.text = self.deviceInfo.deviceSerial;
+ separatorLine.hidden = NO;
}
else if (indexPath.section == 5)
{
[cell.contentView addSubview:self.hdSwitch];
[self.hdSwitch mas_remakeConstraints:^(MASConstraintMaker *make) {
- make.trailing.mas_equalTo(@(-17));
+ make.trailing.mas_equalTo(@(-16));
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
make.width.mas_equalTo(@51);
make.height.mas_equalTo(@31);
}];
BOOL hdStatus = [[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithFormat:@"EZVideoPlayHardDecodingStatus_%@", self.deviceInfo.deviceSerial]];
self.hdSwitch.on = hdStatus;
+ separatorLine.hidden = NO;
}
else if (indexPath.section == 6)
{
@@ -278,7 +293,7 @@
} else { // 鎽勫儚澶�
[cell.contentView addSubview:self.privacyMaskSwitch];
[self.privacyMaskSwitch mas_remakeConstraints:^(MASConstraintMaker *make) {
- make.trailing.mas_equalTo(@(-17));
+ make.trailing.mas_equalTo(@(-16));
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
make.width.mas_equalTo(@51);
make.height.mas_equalTo(@31);
@@ -289,7 +304,7 @@
{
[cell.contentView addSubview:self.rightArrowImg];
[self.rightArrowImg mas_remakeConstraints:^(MASConstraintMaker *make) {
- make.trailing.mas_equalTo(@(-17));
+ make.trailing.mas_equalTo(@(-16));
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
make.width.mas_equalTo(@16);
make.height.mas_equalTo(@16);
@@ -311,23 +326,32 @@
}
else if (indexPath.section == 3)
{
- [cell.contentView addSubview:self.actionSwitch];
- [self.actionSwitch mas_remakeConstraints:^(MASConstraintMaker *make) {
- make.trailing.mas_equalTo(@(-17));
+// [cell.contentView addSubview:self.actionSwitch];
+// [self.actionSwitch mas_remakeConstraints:^(MASConstraintMaker *make) {
+// make.trailing.mas_equalTo(@(-16));
+// make.centerY.mas_equalTo(cell.contentView.mas_centerY);
+// make.width.mas_equalTo(@51);
+// make.height.mas_equalTo(@31);
+// }];
+ [cell.contentView addSubview:self.actionRightArrow];
+ [self.actionRightArrow mas_remakeConstraints:^(MASConstraintMaker *make) {
+ make.trailing.mas_equalTo(@(-16));
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
- make.width.mas_equalTo(@51);
- make.height.mas_equalTo(@31);
+ make.width.mas_equalTo(@16);
+ make.height.mas_equalTo(@16);
}];
+ separatorLine.hidden = NO;
}
else if (indexPath.section == 4)
{
[cell.contentView addSubview:self.videoSwitch];
[self.videoSwitch mas_remakeConstraints:^(MASConstraintMaker *make) {
- make.trailing.mas_equalTo(@(-17));
+ make.trailing.mas_equalTo(@(-16));
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
make.width.mas_equalTo(@51);
make.height.mas_equalTo(@31);
}];
+ separatorLine.hidden = NO;
}
else
{
@@ -336,17 +360,18 @@
[cell.contentView addSubview:self.currentVersionLabel];
[self.currentVersionLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(@140);
- make.trailing.mas_equalTo(cell.contentView.mas_trailing).offset(-34);
+ make.trailing.mas_equalTo(cell.contentView.mas_trailing).offset(-16);
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
make.height.mas_equalTo(@20);
}];
+ separatorLine.hidden = NO;
}
else
{
[cell.contentView addSubview:self.nVersionLabel];
[self.nVersionLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(@140);
- make.trailing.mas_equalTo(cell.contentView.mas_trailing).offset(-34);
+ make.trailing.mas_equalTo(cell.contentView.mas_trailing).offset(-16);
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
make.height.mas_equalTo(@20);
}];
@@ -417,6 +442,12 @@
else if (indexPath.section == 2 && indexPath.row == 1 && self.updateImageView.hidden == NO)
{
[self performSegueWithIdentifier:@"go2Upgrade" sender:nil];
+ }else if (indexPath.section == 3)
+ {
+ HDLEZDetectionTypeViewController *detectionTypeVC = [[HDLEZDetectionTypeViewController alloc] init];
+ detectionTypeVC.deviceInfo = self.deviceInfo;
+
+ [self.navigationController pushViewController:detectionTypeVC animated:YES];
}
else if (indexPath.section == 7)
{
@@ -738,4 +769,13 @@
return _privacyMaskButton;
}
+- (UIImageView *)actionRightArrow {
+ if (!_actionRightArrow) {
+ _actionRightArrow = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"hdl_ez_list_next"]];
+ _actionRightArrow.contentMode = UIViewContentModeScaleAspectFill;
+ _actionRightArrow.backgroundColor = UIColor.clearColor;
+ }
+ return _actionRightArrow;
+}
+
@end
--
Gitblit v1.8.0