From f99cf1d5cc50407394501853be06cb39f38a092c Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Wed, 28 Mar 2018 14:09:19 +0800
Subject: [PATCH] 界面更换与适配调整
---
pregnancy_guard/BaseProject/Views/Cell/SearchDeviceCell.m | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pregnancy_guard/BaseProject/Views/Cell/SearchDeviceCell.m b/pregnancy_guard/BaseProject/Views/Cell/SearchDeviceCell.m
index d2bf241..4844b08 100644
--- a/pregnancy_guard/BaseProject/Views/Cell/SearchDeviceCell.m
+++ b/pregnancy_guard/BaseProject/Views/Cell/SearchDeviceCell.m
@@ -34,7 +34,7 @@
[super layoutSubviews];
self.deviceName.frame = CGRectMake(20+20, 10, SCREEN_WIDTH/2, 20);
- self.deviceLink.frame = CGRectMake(SCREEN_WIDTH-40, 10, SCREEN_WIDTH/3, 20);
+ self.deviceLink.frame = CGRectMake(SCREEN_WIDTH-100-20, 10, 100, 20);
self.imageTag.frame = CGRectMake(20, 15, 10, 10);
}
@@ -70,18 +70,18 @@
_deviceLink = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
_deviceLink.font = [UIFont systemFontOfSize:16];
_deviceLink.textAlignment = UITextAlignmentRight;
- _deviceLink.textColor = kUIColorFromRGB(0x5a5a5a);
+ _deviceLink.textColor = [UIColor redColor];
[self.contentView addSubview:_deviceLink];
}
return _deviceLink;
}
-- (void)setItemView:(DeviceSpareModel*)model
+- (void)setItemView:(NSString *) bleName
{
self.imageTag.image = [UIImage imageNamed:@"icon_lanya_tag"];
- [self.deviceName setText:@"USR-BLE101"];
- [self.deviceLink setText:@"������"];
+ [self.deviceName setText:bleName];
+ [self.deviceLink setText:@"������ >"];
}
@end
--
Gitblit v1.8.0