From cf977559d6821a1ccce2acae076835a8037f2a90 Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期一, 05 六月 2023 11:47:18 +0800 Subject: [PATCH] 1.提交萤石demo 2.修改部分UI --- EZSDK/EZSDK/EZ/UIViewControllers/EZWifiConfigViewController.m | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZWifiConfigViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZWifiConfigViewController.m index 336c9ec..99162d9 100644 --- a/EZSDK/EZSDK/EZ/UIViewControllers/EZWifiConfigViewController.m +++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZWifiConfigViewController.m @@ -591,13 +591,20 @@ self.animationImageView.animationImages = nil; //璋冩暣鍥剧墖楂樺害 - self.animationImageView.image = [UIImage imageNamed:@"addDevice_success"];//鎴愬姛鏍囩ず鍥剧墖 - - [self.animationImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(@90); - make.leading.trailing.mas_equalTo(@0); - make.height.mas_equalTo(@(185 * [UIScreen mainScreen].bounds.size.width/320.0f)); +// self.animationImageView.image = [UIImage imageNamed:@"addDevice_success"];//鎴愬姛鏍囩ず鍥剧墖 + self.animationImageView.image = [UIImage imageNamed:@"hdl_ez_add_device_success"];//鎴愬姛鏍囩ず鍥剧墖 + [self.animationImageView mas_updateConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(@100); + make.leading.mas_equalTo(([UIScreen mainScreen].bounds.size.width-80)/2); + make.trailing.mas_equalTo(-([UIScreen mainScreen].bounds.size.width-80)/2); + make.height.mas_equalTo(80); }]; + +// [self.animationImageView mas_remakeConstraints:^(MASConstraintMaker *make) { +// make.top.mas_equalTo(@90); +// make.leading.trailing.mas_equalTo(@0); +// make.height.mas_equalTo(@(185 * [UIScreen mainScreen].bounds.size.width/320.0f)); +// }]; [self.view addSubview:self.completionLabel]; @@ -810,8 +817,8 @@ if ([vc isKindOfClass:[EZAddByQRCodeViewController class]]) {//璺宠浆鍒版壂鐮侀〉 - ((EZAddByQRCodeViewController *)vc).shouldPop = YES; - [self.navigationController popToViewController:vc animated:YES]; +// ((EZAddByQRCodeViewController *)vc).shouldPop = YES; + [self.navigationController popToViewController:((EZAddByQRCodeViewController *)vc).prevController animated:YES]; break; } } -- Gitblit v1.8.0