Commit c7060f7d780b69a0c66f674acda992864fa3a6dc
1 parent
53c30e7a
提交服务中心头部UI
Showing
23 changed files
with
178 additions
and
83 deletions
CNLiveServiceCenterModule.podspec
| ... | ... | @@ -31,7 +31,7 @@ Pod::Spec.new do |s| |
| 31 | 31 | s.ios.deployment_target = '9.0' |
| 32 | 32 | s.requires_arc = true |
| 33 | 33 | |
| 34 | - s.resources = "CNLiveServiceCenterModule/Classes/*.{png,bundle}" | |
| 34 | + s.resources = "CNLiveServiceCenterModule/Assets/*.{png,bundle}" | |
| 35 | 35 | s.source_files = "CNLiveServiceCenterModule/Classes/**/**/*.{h,m}" |
| 36 | 36 | |
| 37 | 37 | # s.resource_bundles = { |
| ... | ... | @@ -81,6 +81,10 @@ Pod::Spec.new do |s| |
| 81 | 81 | s.dependency 'CNLiveTencentopenapi' |
| 82 | 82 | #组件化-接口库CNLiveServices |
| 83 | 83 | s.dependency 'CNLiveServices' |
| 84 | - | |
| 84 | + ######################################## | |
| 85 | + ### 所有github三方管理库(非频繁更新) | |
| 86 | + ######################################## | |
| 87 | + s.dependency 'CNLiveTripartiteManagement' | |
| 88 | + | |
| 85 | 89 | |
| 86 | 90 | end | ... | ... |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Other/CNLiveServiceCenterModule.bundle/Root.plist renamed to CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/Root.plist
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Other/CNLiveServiceCenterModule.bundle/en.lproj/Root.strings renamed to CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/en.lproj/Root.strings
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_enterTip@2x.png
0 → 100644
307 Bytes
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_enterTip@3x.png
0 → 100644
519 Bytes
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_enterprise@2x.png
0 → 100644
1.07 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_enterprise@3x.png
0 → 100644
2.96 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_headerBg@2x.png
0 → 100644
173 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_headerBg@3x.png
0 → 100644
289 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_location@2x.png
0 → 100644
611 Bytes
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_location@3x.png
0 → 100644
1.06 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_person@2x.png
0 → 100644
13.6 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_person@3x.png
0 → 100644
31.1 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_personCertification@2x.png
0 → 100644
2.02 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_personCertification@3x.png
0 → 100644
4.04 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_personLog@2x.png
0 → 100644
763 Bytes
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_personLog@3x.png
0 → 100644
1.28 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_wjj_attestation@2x.png
0 → 100644
6.92 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_wjj_attestation@3x.png
0 → 100644
14.5 KB
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
| ... | ... | @@ -140,6 +140,21 @@ |
| 140 | 140 | |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | +#pragma mark - | |
| 144 | +#pragma mark - <UIScrollViewDelegate> | |
| 145 | + | |
| 146 | +- (void)scrollViewDidScroll:(UIScrollView *)scrollView { | |
| 147 | + | |
| 148 | + CGFloat distance = scrollView.contentOffset.y; | |
| 149 | + NSLog(@"输出内容 contentOffsetY = %f",distance); | |
| 150 | + if (distance < 0) { | |
| 151 | + self.headerView.bgHeaderImageV.frame = CGRectMake(distance, distance, -distance + self.headerView.frame.size.width, self.headerView.frame.size.height - distance); | |
| 152 | + }else { | |
| 153 | + self.headerView.bgHeaderImageV.frame = CGRectMake(0, 0, self.headerView.frame.size.width, self.headerView.frame.size.height); | |
| 154 | + } | |
| 155 | + | |
| 156 | +} | |
| 157 | + | |
| 143 | 158 | |
| 144 | 159 | |
| 145 | 160 | #pragma mark - |
| ... | ... | @@ -154,7 +169,7 @@ |
| 154 | 169 | |
| 155 | 170 | - (UITableView *)tableView { |
| 156 | 171 | if (_tableView == nil) { |
| 157 | - _tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped]; | |
| 172 | + _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, -kStatusHeight, KScreenWidth, KScreenHeight + kStatusHeight - kVerticalTabBarTotalHeight) style:UITableViewStyleGrouped]; | |
| 158 | 173 | _tableView.backgroundColor = [UIColor whiteColor]; |
| 159 | 174 | [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"Cell"]; |
| 160 | 175 | _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; |
| ... | ... | @@ -167,7 +182,7 @@ |
| 167 | 182 | |
| 168 | 183 | - (UIView *)headerView { |
| 169 | 184 | if (!_headerView) { |
| 170 | - _headerView = [[CNLiveBServiceCenterHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 135)]; | |
| 185 | + _headerView = [[CNLiveBServiceCenterHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 135 * (KScreenHeight/667))]; | |
| 171 | 186 | } |
| 172 | 187 | return _headerView;; |
| 173 | 188 | } | ... | ... |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.h
| ... | ... | @@ -12,6 +12,9 @@ NS_ASSUME_NONNULL_BEGIN |
| 12 | 12 | |
| 13 | 13 | @interface CNLiveBServiceCenterHeaderView : UIView |
| 14 | 14 | |
| 15 | +/*** 服务页面背景 ***/ | |
| 16 | +@property (nonatomic, strong) UIImageView *bgHeaderImageV; | |
| 17 | + | |
| 15 | 18 | - (void)configUI:(CNLiveBServiceCenterModel *)model; |
| 16 | 19 | |
| 17 | 20 | @property (nonatomic, strong) CNLiveBServiceCenterModel *model; | ... | ... |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
| ... | ... | @@ -7,12 +7,15 @@ |
| 7 | 7 | |
| 8 | 8 | #import "CNLiveBServiceCenterHeaderView.h" |
| 9 | 9 | #import "CNLiveBServiceCenterModel.h" |
| 10 | +#import <Masonry/Masonry.h> | |
| 11 | +#import "UIImage+Service.h" | |
| 12 | +#import <CNLiveBaseKit/CNLiveBaseKit.h> | |
| 13 | + | |
| 10 | 14 | |
| 11 | 15 | |
| 12 | 16 | @interface CNLiveBServiceCenterHeaderView() |
| 13 | 17 | |
| 14 | -/*** 服务页面背景 ***/ | |
| 15 | -@property (nonatomic, strong) UIImageView *bgHeaderImageV; | |
| 18 | + | |
| 16 | 19 | /*** 用户头像 ***/ |
| 17 | 20 | @property (nonatomic, strong) UIImageView *userImageV; |
| 18 | 21 | /*** 用户名称 ***/ |
| ... | ... | @@ -29,6 +32,8 @@ |
| 29 | 32 | @property (nonatomic, strong) UILabel *locationL; |
| 30 | 33 | /** 身份认证*/ |
| 31 | 34 | @property (nonatomic, strong) CNLiveBCenterAuthEnterView *enterView; |
| 35 | +/** 圆角试图*/ | |
| 36 | +@property (nonatomic, strong) UIView *roundedView; | |
| 32 | 37 | |
| 33 | 38 | |
| 34 | 39 | |
| ... | ... | @@ -71,7 +76,7 @@ |
| 71 | 76 | } |
| 72 | 77 | |
| 73 | 78 | |
| 74 | -#pragma mark - ***setupUI*** | |
| 79 | +#pragma mark - ***setupUI***r | |
| 75 | 80 | - (void)setupUI { |
| 76 | 81 | |
| 77 | 82 | [self setBackgroundColor:[UIColor whiteColor]]; |
| ... | ... | @@ -84,6 +89,32 @@ |
| 84 | 89 | [self addSubview:self.locationImageV]; |
| 85 | 90 | [self addSubview:self.locationL]; |
| 86 | 91 | [self addSubview:self.enterView]; |
| 92 | + [self addSubview:self.roundedView]; | |
| 93 | + | |
| 94 | + | |
| 95 | + self.bgHeaderImageV.frame = CGRectMake(0, 0, self.frame.size.width, self.frame.size.height); | |
| 96 | + | |
| 97 | + self.roundedView.frame = CGRectMake(0, self.frame.size.height - 15, self.frame.size.width, 15); | |
| 98 | + UIBezierPath *fieldPath = [UIBezierPath bezierPathWithRoundedRect:self.roundedView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(15 , 15)]; | |
| 99 | + CAShapeLayer *fieldLayer = [[CAShapeLayer alloc] init]; | |
| 100 | + fieldLayer.frame = self.roundedView.bounds; | |
| 101 | + fieldLayer.path = fieldPath.CGPath; | |
| 102 | + self.roundedView.layer.mask = fieldLayer; | |
| 103 | + | |
| 104 | + self.enterView.frame = CGRectMake(self.frame.size.width - 101, 62.5, 101, 27); | |
| 105 | + UIBezierPath *enterFieldPath = [UIBezierPath bezierPathWithRoundedRect:self.enterView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerBottomLeft cornerRadii:CGSizeMake(13.5 , 13.5)]; | |
| 106 | + CAShapeLayer *enterFieldLayer = [[CAShapeLayer alloc] init]; | |
| 107 | + enterFieldLayer.frame = self.enterView.bounds; | |
| 108 | + enterFieldLayer.path = enterFieldPath.CGPath; | |
| 109 | + self.enterView.layer.mask = enterFieldLayer; | |
| 110 | + | |
| 111 | + | |
| 112 | + //测试 | |
| 113 | + self.userImageV.image = [UIImage imageNamedFromBundle:@"service_person"]; | |
| 114 | + self.userNameL.text = @"用户昵称"; | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 87 | 118 | |
| 88 | 119 | |
| 89 | 120 | } |
| ... | ... | @@ -93,42 +124,48 @@ |
| 93 | 124 | |
| 94 | 125 | __weak typeof(self) weakSelf = self; |
| 95 | 126 | |
| 96 | -// [self.platformHeaderImageV mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 97 | -// make.left.equalTo(weakSelf.mas_left).offset(10); | |
| 98 | -// make.centerY.equalTo(weakSelf.mas_centerY); | |
| 99 | -// make.width.mas_equalTo(40*RATIO); | |
| 100 | -// make.height.mas_equalTo(40*RATIO); | |
| 101 | -// }]; | |
| 102 | -// | |
| 103 | -// [self.platformVIPLogo mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 104 | -// make.right.equalTo(weakSelf.platformHeaderImageV.mas_right).offset(2); | |
| 105 | -// make.bottom.equalTo(weakSelf.platformHeaderImageV.mas_bottom); | |
| 106 | -// make.width.mas_equalTo(17*RATIO); | |
| 107 | -// make.height.mas_equalTo(13*RATIO); | |
| 108 | -// }]; | |
| 109 | -// | |
| 110 | -// [self.platformTitle mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 111 | -// make.top.equalTo(weakSelf.mas_top).offset(13); | |
| 112 | -// make.left.equalTo(weakSelf.platformHeaderImageV.mas_right).offset(10); | |
| 113 | -// make.right.equalTo(weakSelf.mas_right).offset(-80); | |
| 114 | -// make.height.mas_equalTo(15*RATIO); | |
| 115 | -// }]; | |
| 116 | -// | |
| 117 | -// [self.platformTSubitle mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 118 | -// make.left.equalTo(weakSelf.platformTitle.mas_left); | |
| 119 | -// make.right.equalTo(weakSelf.platformTitle.mas_right); | |
| 120 | -// make.top.equalTo(weakSelf.platformTitle.mas_bottom).offset(8); | |
| 121 | -// make.height.mas_equalTo(12*RATIO); | |
| 122 | -// }]; | |
| 123 | -// | |
| 124 | -// [self.attentionBtn mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 125 | -// make.right.equalTo(weakSelf.mas_right).offset(-10); | |
| 126 | -// make.centerY.equalTo(weakSelf.mas_centerY); | |
| 127 | -// make.width.mas_equalTo(62*RATIO); | |
| 128 | -// make.height.mas_equalTo(21*RATIO); | |
| 129 | -// }]; | |
| 127 | + [self.userImageV mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 128 | + make.left.equalTo(weakSelf.mas_left).offset(15); | |
| 129 | + make.top.equalTo(weakSelf.mas_top).offset(46); | |
| 130 | + make.width.mas_equalTo(60 * KScreenWidth / 375); | |
| 131 | + make.height.mas_equalTo(60 * KScreenWidth / 375); | |
| 132 | + }]; | |
| 133 | + | |
| 134 | + [self.userNameL mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 135 | + make.top.equalTo(weakSelf.mas_top).offset(45); | |
| 136 | + make.left.equalTo(weakSelf.userImageV.mas_right).offset(10); | |
| 137 | + make.right.equalTo(weakSelf.mas_right).offset(-100); | |
| 138 | + make.height.mas_equalTo(18); | |
| 139 | + }]; | |
| 140 | + | |
| 141 | + [self.wjjCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 142 | + make.left.equalTo(weakSelf.userImageV.mas_right).offset(9.5); | |
| 143 | + make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(8); | |
| 144 | + make.width.mas_equalTo(53); | |
| 145 | + make.height.mas_equalTo(19); | |
| 146 | + }]; | |
| 147 | + | |
| 148 | + [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 149 | + make.left.equalTo(weakSelf.userImageV.mas_right).offset(66); | |
| 150 | + make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10); | |
| 151 | + make.width.mas_equalTo(14); | |
| 152 | + make.height.mas_equalTo(15); | |
| 153 | + }]; | |
| 130 | 154 | |
| 131 | -// self.lineLayer.frame = CGRectMake(0, 59.5 *RATIO, KScreenWidth, 0.5); | |
| 155 | + [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 156 | + make.left.equalTo(weakSelf.userImageV.mas_right).offset(84); | |
| 157 | + make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10); | |
| 158 | + make.width.mas_equalTo(14); | |
| 159 | + make.height.mas_equalTo(15); | |
| 160 | + }]; | |
| 161 | + | |
| 162 | + [self.locationImageV mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 163 | + make.left.equalTo(weakSelf.userImageV.mas_right).offset(12); | |
| 164 | + make.bottom.equalTo(weakSelf.mas_bottom).offset(38); | |
| 165 | + make.width.mas_equalTo(9); | |
| 166 | + make.height.mas_equalTo(10.5); | |
| 167 | + }]; | |
| 168 | + | |
| 132 | 169 | |
| 133 | 170 | |
| 134 | 171 | } |
| ... | ... | @@ -158,10 +195,7 @@ |
| 158 | 195 | { |
| 159 | 196 | if (!_bgHeaderImageV) { |
| 160 | 197 | _bgHeaderImageV = [[UIImageView alloc]init]; |
| 161 | - _bgHeaderImageV.layer.masksToBounds = YES; | |
| 162 | - _bgHeaderImageV.layer.cornerRadius = 20; | |
| 163 | - _bgHeaderImageV.layer.borderColor = [UIColor yellowColor].CGColor; | |
| 164 | - _bgHeaderImageV.layer.borderWidth = 1; | |
| 198 | + _bgHeaderImageV.image = [UIImage imageNamedFromBundle:@"service_headerBg"]; | |
| 165 | 199 | // UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(platformImageViewAction:)]; |
| 166 | 200 | // [_bgHeaderImageV addGestureRecognizer:tap]; |
| 167 | 201 | _bgHeaderImageV.userInteractionEnabled = YES; |
| ... | ... | @@ -176,7 +210,6 @@ |
| 176 | 210 | { |
| 177 | 211 | if (!_userImageV) { |
| 178 | 212 | _userImageV = [[UIImageView alloc]init]; |
| 179 | - _userImageV.image = [UIImage imageNamed:@"certification_show"]; | |
| 180 | 213 | } |
| 181 | 214 | return _userImageV; |
| 182 | 215 | } |
| ... | ... | @@ -186,8 +219,8 @@ |
| 186 | 219 | |
| 187 | 220 | if (!_userNameL) { |
| 188 | 221 | _userNameL = [[UILabel alloc]init]; |
| 189 | - _userNameL.textColor = [UIColor yellowColor]; | |
| 190 | - _userNameL.font = [UIFont systemFontOfSize:15]; | |
| 222 | + _userNameL.textColor = RGBOF(0xF2F6FD); | |
| 223 | + _userNameL.font = [UIFont systemFontOfSize:18]; | |
| 191 | 224 | _userNameL.numberOfLines = 1; |
| 192 | 225 | _userNameL.userInteractionEnabled = YES; |
| 193 | 226 | // UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(platformTitleAction:)]; |
| ... | ... | @@ -203,7 +236,7 @@ |
| 203 | 236 | { |
| 204 | 237 | if (!_wjjCertificationImageV) { |
| 205 | 238 | _wjjCertificationImageV = [[UIImageView alloc]init]; |
| 206 | - _wjjCertificationImageV.image = [UIImage imageNamed:@"certification_show"]; | |
| 239 | + _wjjCertificationImageV.image = [UIImage imageNamedFromBundle:@"service_wjj_attestation"]; | |
| 207 | 240 | } |
| 208 | 241 | return _wjjCertificationImageV; |
| 209 | 242 | } |
| ... | ... | @@ -213,7 +246,7 @@ |
| 213 | 246 | { |
| 214 | 247 | if (!_personCertificationImageV) { |
| 215 | 248 | _personCertificationImageV = [[UIImageView alloc]init]; |
| 216 | - _personCertificationImageV.image = [UIImage imageNamed:@"certification_show"]; | |
| 249 | + _personCertificationImageV.image = [UIImage imageNamedFromBundle:@"service_personCertification"]; | |
| 217 | 250 | } |
| 218 | 251 | return _personCertificationImageV; |
| 219 | 252 | } |
| ... | ... | @@ -223,7 +256,7 @@ |
| 223 | 256 | { |
| 224 | 257 | if (!_enterpriseCertificationImageV) { |
| 225 | 258 | _enterpriseCertificationImageV = [[UIImageView alloc]init]; |
| 226 | - _enterpriseCertificationImageV.image = [UIImage imageNamed:@"certification_show"]; | |
| 259 | + _enterpriseCertificationImageV.image = [UIImage imageNamedFromBundle:@"service_enterprise"]; | |
| 227 | 260 | } |
| 228 | 261 | return _enterpriseCertificationImageV; |
| 229 | 262 | } |
| ... | ... | @@ -261,6 +294,17 @@ |
| 261 | 294 | |
| 262 | 295 | } |
| 263 | 296 | |
| 297 | +/*** 圆角试图 ***/ | |
| 298 | +- (UIView *)roundedView { | |
| 299 | + | |
| 300 | + if (!_roundedView) { | |
| 301 | + _roundedView = [[UIView alloc]init]; | |
| 302 | + [_roundedView setBackgroundColor:[UIColor whiteColor]]; | |
| 303 | + } | |
| 304 | + return _roundedView; | |
| 305 | + | |
| 306 | +} | |
| 307 | + | |
| 264 | 308 | |
| 265 | 309 | |
| 266 | 310 | @end |
| ... | ... | @@ -314,11 +358,14 @@ |
| 314 | 358 | #pragma mark - ***setupUI*** |
| 315 | 359 | - (void)setupUI { |
| 316 | 360 | |
| 317 | - [self setBackgroundColor:[UIColor whiteColor]]; | |
| 361 | + [self setBackgroundColor:RGBOF(0x65b5f6)]; | |
| 318 | 362 | [self addSubview:self.authImageV]; |
| 319 | 363 | [self addSubview:self.authL]; |
| 320 | 364 | [self addSubview:self.authTipImageV]; |
| 321 | 365 | |
| 366 | + //测试 | |
| 367 | + self.authL.text = @"用户未认证"; | |
| 368 | + | |
| 322 | 369 | } |
| 323 | 370 | |
| 324 | 371 | #pragma mark - ***layoutUI*** |
| ... | ... | @@ -326,26 +373,26 @@ |
| 326 | 373 | |
| 327 | 374 | __weak typeof(self) weakSelf = self; |
| 328 | 375 | |
| 329 | -// [self.platformHeaderImageV mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 330 | -// make.left.equalTo(weakSelf.mas_left).offset(10); | |
| 331 | -// make.centerY.equalTo(weakSelf.mas_centerY); | |
| 332 | -// make.width.mas_equalTo(40*RATIO); | |
| 333 | -// make.height.mas_equalTo(40*RATIO); | |
| 334 | -// }]; | |
| 335 | -// | |
| 336 | -// [self.platformVIPLogo mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 337 | -// make.right.equalTo(weakSelf.platformHeaderImageV.mas_right).offset(2); | |
| 338 | -// make.bottom.equalTo(weakSelf.platformHeaderImageV.mas_bottom); | |
| 339 | -// make.width.mas_equalTo(17*RATIO); | |
| 340 | -// make.height.mas_equalTo(13*RATIO); | |
| 341 | -// }]; | |
| 342 | -// | |
| 343 | -// [self.platformTitle mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 344 | -// make.top.equalTo(weakSelf.mas_top).offset(13); | |
| 345 | -// make.left.equalTo(weakSelf.platformHeaderImageV.mas_right).offset(10); | |
| 346 | -// make.right.equalTo(weakSelf.mas_right).offset(-80); | |
| 347 | -// make.height.mas_equalTo(15*RATIO); | |
| 348 | -// }]; | |
| 376 | + [self.authImageV mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 377 | + make.left.equalTo(weakSelf.mas_left).offset(8); | |
| 378 | + make.centerY.equalTo(weakSelf.mas_centerY); | |
| 379 | + make.width.mas_equalTo(12); | |
| 380 | + make.height.mas_equalTo(14); | |
| 381 | + }]; | |
| 382 | + | |
| 383 | + [self.authTipImageV mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 384 | + make.right.equalTo(weakSelf.mas_right).offset(-4.5); | |
| 385 | + make.centerY.equalTo(weakSelf.mas_centerY); | |
| 386 | + make.width.mas_equalTo(5); | |
| 387 | + make.height.mas_equalTo(10); | |
| 388 | + }]; | |
| 389 | + | |
| 390 | + [self.authL mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 391 | + make.centerY.equalTo(weakSelf.mas_centerY); | |
| 392 | + make.left.equalTo(weakSelf.authImageV.mas_right).offset(4); | |
| 393 | + make.right.equalTo(weakSelf.authTipImageV.mas_left).offset(-4); | |
| 394 | + make.height.mas_equalTo(12); | |
| 395 | + }]; | |
| 349 | 396 | |
| 350 | 397 | |
| 351 | 398 | } |
| ... | ... | @@ -373,10 +420,7 @@ |
| 373 | 420 | { |
| 374 | 421 | if (!_authImageV) { |
| 375 | 422 | _authImageV = [[UIImageView alloc]init]; |
| 376 | - _authImageV.layer.masksToBounds = YES; | |
| 377 | - _authImageV.layer.cornerRadius = 20; | |
| 378 | - _authImageV.layer.borderColor = [UIColor yellowColor].CGColor; | |
| 379 | - _authImageV.layer.borderWidth = 1; | |
| 423 | + _authImageV.image = [UIImage imageNamedFromBundle:@"service_personLog"]; | |
| 380 | 424 | } |
| 381 | 425 | return _authImageV; |
| 382 | 426 | } |
| ... | ... | @@ -386,8 +430,8 @@ |
| 386 | 430 | |
| 387 | 431 | if (!_authL) { |
| 388 | 432 | _authL = [[UILabel alloc]init]; |
| 389 | - _authL.textColor = [UIColor yellowColor]; | |
| 390 | - _authL.font = [UIFont systemFontOfSize:15]; | |
| 433 | + _authL.textColor = [UIColor whiteColor]; | |
| 434 | + _authL.font = [UIFont systemFontOfSize:12]; | |
| 391 | 435 | _authL.numberOfLines = 1; |
| 392 | 436 | |
| 393 | 437 | } |
| ... | ... | @@ -400,10 +444,7 @@ |
| 400 | 444 | { |
| 401 | 445 | if (!_authTipImageV) { |
| 402 | 446 | _authTipImageV = [[UIImageView alloc]init]; |
| 403 | - _authTipImageV.layer.masksToBounds = YES; | |
| 404 | - _authTipImageV.layer.cornerRadius = 20; | |
| 405 | - _authTipImageV.layer.borderColor = [UIColor yellowColor].CGColor; | |
| 406 | - _authTipImageV.layer.borderWidth = 1; | |
| 447 | + _authTipImageV.image = [UIImage imageNamedFromBundle:@"service_enterTip"]; | |
| 407 | 448 | } |
| 408 | 449 | return _authTipImageV; |
| 409 | 450 | } | ... | ... |
Example/CNLiveServiceCenterModule.xcodeproj/project.pbxproj
| ... | ... | @@ -350,11 +350,13 @@ |
| 350 | 350 | ); |
| 351 | 351 | inputPaths = ( |
| 352 | 352 | "${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Example/Pods-CNLiveServiceCenterModule_Example-resources.sh", |
| 353 | + "${PODS_ROOT}/BaiduMapKit/BaiduMapKit/BaiduMapAPI_Map.framework/mapapi.bundle", | |
| 353 | 354 | "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", |
| 354 | 355 | "${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle", |
| 355 | 356 | ); |
| 356 | 357 | name = "[CP] Copy Pods Resources"; |
| 357 | 358 | outputPaths = ( |
| 359 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mapapi.bundle", | |
| 358 | 360 | "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle", |
| 359 | 361 | "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle", |
| 360 | 362 | ); |
| ... | ... | @@ -387,15 +389,30 @@ |
| 387 | 389 | "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", |
| 388 | 390 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", |
| 389 | 391 | "${BUILT_PRODUCTS_DIR}/CNLiveVoiceToTextKit/CNLiveVoiceToTextKit.framework", |
| 392 | + "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", | |
| 393 | + "${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework", | |
| 390 | 394 | "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", |
| 395 | + "${BUILT_PRODUCTS_DIR}/Ks3SDK/Ks3SDK.framework", | |
| 396 | + "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework", | |
| 391 | 397 | "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", |
| 392 | 398 | "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework", |
| 393 | 399 | "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", |
| 400 | + "${BUILT_PRODUCTS_DIR}/PGDatePicker/PGDatePicker.framework", | |
| 401 | + "${BUILT_PRODUCTS_DIR}/PGPickerView/PGPickerView.framework", | |
| 402 | + "${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework", | |
| 394 | 403 | "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", |
| 395 | 404 | "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", |
| 405 | + "${BUILT_PRODUCTS_DIR}/RSKImageCropper/RSKImageCropper.framework", | |
| 406 | + "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", | |
| 396 | 407 | "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", |
| 408 | + "${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework", | |
| 397 | 409 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", |
| 410 | + "${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework", | |
| 411 | + "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", | |
| 412 | + "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", | |
| 398 | 413 | "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", |
| 414 | + "${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework", | |
| 415 | + "${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework", | |
| 399 | 416 | ); |
| 400 | 417 | name = "[CP] Embed Pods Frameworks"; |
| 401 | 418 | outputPaths = ( |
| ... | ... | @@ -416,15 +433,30 @@ |
| 416 | 433 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", |
| 417 | 434 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", |
| 418 | 435 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveVoiceToTextKit.framework", |
| 436 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", | |
| 437 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework", | |
| 419 | 438 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", |
| 439 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Ks3SDK.framework", | |
| 440 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework", | |
| 420 | 441 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", |
| 421 | 442 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework", |
| 422 | 443 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", |
| 444 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGDatePicker.framework", | |
| 445 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGPickerView.framework", | |
| 446 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework", | |
| 423 | 447 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", |
| 424 | 448 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", |
| 449 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSKImageCropper.framework", | |
| 450 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", | |
| 425 | 451 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", |
| 452 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework", | |
| 426 | 453 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", |
| 454 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework", | |
| 455 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", | |
| 456 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", | |
| 427 | 457 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", |
| 458 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework", | |
| 459 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework", | |
| 428 | 460 | ); |
| 429 | 461 | runOnlyForDeploymentPostprocessing = 0; |
| 430 | 462 | shellPath = /bin/sh; | ... | ... |