From bf7f42bc3b63a0c2cec5a5adfb44feffab47a077 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 01 四月 2021 15:08:55 +0800
Subject: [PATCH] 2021-04-01 1.更新
---
On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m b/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m
index 4b63f58..d85c3f7 100644
--- a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m
+++ b/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m
@@ -57,7 +57,7 @@
NSString * unlockStr;
NSString * endOfMonitoringStr;
NSString * unlockSuccessfullyStr;
-
+
CGFloat Height66;
// int _openDoorTimeout;
@@ -139,8 +139,8 @@
-(UILabel *)titleUILabel{
if (_titleUILabel == Nil) {
_titleUILabel = [[UILabel alloc] initWithFrame:CGRectMake(90, APP_STATUS_BAR_HEIGHT, self.view.frame.size.width - 180, 44)];
- _titleUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:17.0];
- _titleUILabel.textColor = HEXCOLORA(0X1B2D4D, 1.0);
+ _titleUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:18.0];
+ _titleUILabel.textColor = TextColor;
_titleUILabel.text = @"";
_titleUILabel.textAlignment = NSTextAlignmentCenter;
}
@@ -236,7 +236,7 @@
_screenshotTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, GetRealWidth(100), GetRealWidth(20))];
[_screenshotTextBtn setTitle:@"鎴浘" forState:UIControlStateNormal];
_screenshotTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;
- _screenshotTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];
+ _screenshotTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:14.0];
[_screenshotTextBtn setTitleColor:TextColor forState:UIControlStateNormal];
// [_screenshotTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];
[_screenshotTextBtn addTarget:self action:@selector(screenshotAction) forControlEvents:UIControlEventTouchUpInside | UIControlEventTouchUpOutside];
@@ -279,7 +279,7 @@
if (_unlockTextBtn == nil) {
_unlockTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, GetRealWidth(100), GetRealWidth(20))];
[_unlockTextBtn setTitle:@"寮�閿�" forState:UIControlStateNormal];
- _unlockTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];
+ _unlockTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:14.0];
_unlockTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;
// _unlockTextBtn.titleLabel.textColor = TextColor;
[_unlockTextBtn setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled];
@@ -299,6 +299,10 @@
_openDoorTimeout = 0;
[self startOpenDoorCountdown];
[self showUIAlertView:unlockSuccessfullyStr];
+ // 寮�閿佹垚鍔熷洖璋�
+ if(self.mESCallDelegate != NULL){
+ [self.mESCallDelegate onUnlockAction];
+ }
}
-(void)setUnlock:(BOOL)ISEnable{
--
Gitblit v1.8.0