Commit b5c66744d200ce69ceb874abe0bf5226c4ab7af6
1 parent
286db5d9
提交细节更改网络判断
Showing
16 changed files
with
154 additions
and
102 deletions
CNLiveServiceCenterModule.podspec
| @@ -49,9 +49,8 @@ Pod::Spec.new do |s| | @@ -49,9 +49,8 @@ Pod::Spec.new do |s| | ||
| 49 | ######################################## | 49 | ######################################## |
| 50 | #CNLive组件 | 50 | #CNLive组件 |
| 51 | s.dependency 'CNLiveBeeHive' #核心路由架构 | 51 | s.dependency 'CNLiveBeeHive' #核心路由架构 |
| 52 | - s.dependency 'CNLiveModuleServiceProtocols' | 52 | + #模块协议 |
| 53 | s.dependency 'CNLiveBServices' | 53 | s.dependency 'CNLiveBServices' |
| 54 | - | ||
| 55 | #分享工具库 | 54 | #分享工具库 |
| 56 | s.dependency 'CNLiveShareToolKit' | 55 | s.dependency 'CNLiveShareToolKit' |
| 57 | #基础请求组件库 | 56 | #基础请求组件库 |
| @@ -72,24 +71,19 @@ Pod::Spec.new do |s| | @@ -72,24 +71,19 @@ Pod::Spec.new do |s| | ||
| 72 | s.dependency 'CNLiveCacheManagerKit' | 71 | s.dependency 'CNLiveCacheManagerKit' |
| 73 | #环境库 | 72 | #环境库 |
| 74 | s.dependency 'CNLiveEnvironment' | 73 | s.dependency 'CNLiveEnvironment' |
| 75 | - #iCould文件取得 | ||
| 76 | - s.dependency 'CNLiveICloudPicker' | ||
| 77 | - # #系统定位 | ||
| 78 | - # pod 'CNLiveLocationManager' | ||
| 79 | #上传 (新加) | 74 | #上传 (新加) |
| 80 | s.dependency 'CNLiveUploadManager' | 75 | s.dependency 'CNLiveUploadManager' |
| 81 | #相册 (新加) | 76 | #相册 (新加) |
| 82 | s.dependency 'CNLiveImagePickerController' | 77 | s.dependency 'CNLiveImagePickerController' |
| 83 | - #腾讯QQ库 | ||
| 84 | - s.dependency 'CNLiveTencentopenapi' | ||
| 85 | #组件化-接口库CNLiveServices | 78 | #组件化-接口库CNLiveServices |
| 86 | s.dependency 'CNLiveServices' | 79 | s.dependency 'CNLiveServices' |
| 87 | ######################################## | 80 | ######################################## |
| 88 | ### 所有github三方管理库(非频繁更新) | 81 | ### 所有github三方管理库(非频繁更新) |
| 89 | ######################################## | 82 | ######################################## |
| 90 | s.dependency 'CNLiveTripartiteManagement' | 83 | s.dependency 'CNLiveTripartiteManagement' |
| 84 | + #认证模块 | ||
| 91 | s.dependency 'CNLiveOrganizationValidationModule' | 85 | s.dependency 'CNLiveOrganizationValidationModule' |
| 92 | - s.dependency 'CNLiveBPersonalVerificationModule' | 86 | + #用户认证模块 |
| 93 | s.dependency 'CNLiveBPersonalVerificationModule' | 87 | s.dependency 'CNLiveBPersonalVerificationModule' |
| 94 | 88 | ||
| 95 | 89 |
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_auth@2x.png
0 → 100644
18.6 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_auth@3x.png
0 → 100644
36.6 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_ creatorLog@2x.png renamed to CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_creatorLog@2x.png
39.6 KB
CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_ creatorLog@3x.png renamed to CNLiveServiceCenterModule/Assets/CNLiveServiceCenterModule.bundle/service_creatorLog@3x.png
130 KB
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.h
| @@ -6,10 +6,11 @@ | @@ -6,10 +6,11 @@ | ||
| 6 | // | 6 | // |
| 7 | 7 | ||
| 8 | #import <UIKit/UIKit.h> | 8 | #import <UIKit/UIKit.h> |
| 9 | +#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h> | ||
| 9 | 10 | ||
| 10 | NS_ASSUME_NONNULL_BEGIN | 11 | NS_ASSUME_NONNULL_BEGIN |
| 11 | 12 | ||
| 12 | -@interface CNLiveBServiceCenterController : UIViewController | 13 | +@interface CNLiveBServiceCenterController : CNCommonViewController |
| 13 | 14 | ||
| 14 | @end | 15 | @end |
| 15 | 16 |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
| @@ -35,7 +35,14 @@ | @@ -35,7 +35,14 @@ | ||
| 35 | /** 列表 */ | 35 | /** 列表 */ |
| 36 | @property (nonatomic , strong) UITableView *tableView; | 36 | @property (nonatomic , strong) UITableView *tableView; |
| 37 | 37 | ||
| 38 | -/** 状态部分*/ | 38 | +/** 个人认证状态*/ |
| 39 | +@property (nonatomic , strong) NSString *personStatus; | ||
| 40 | + | ||
| 41 | +/** 机构认证状态 */ | ||
| 42 | +@property (nonatomic , strong) NSString *institutionStatus; | ||
| 43 | + | ||
| 44 | +@property (nonatomic , strong) CNLiveBServiceCenterModel *centerModel; | ||
| 45 | + | ||
| 39 | 46 | ||
| 40 | 47 | ||
| 41 | @end | 48 | @end |
| @@ -49,7 +56,11 @@ | @@ -49,7 +56,11 @@ | ||
| 49 | { | 56 | { |
| 50 | self = [super init]; | 57 | self = [super init]; |
| 51 | if (self) { | 58 | if (self) { |
| 52 | - | 59 | + self.personStatus = @"0"; |
| 60 | + self.institutionStatus = @"0"; | ||
| 61 | + self.centerModel = [[CNLiveBServiceCenterModel alloc]init]; | ||
| 62 | + self.centerModel.personStatus = self.personStatus; | ||
| 63 | + self.centerModel.institutionStatus = self.institutionStatus; | ||
| 53 | } | 64 | } |
| 54 | return self; | 65 | return self; |
| 55 | } | 66 | } |
| @@ -98,6 +109,10 @@ | @@ -98,6 +109,10 @@ | ||
| 98 | 109 | ||
| 99 | self.tableView.tableHeaderView = self.headerView; | 110 | self.tableView.tableHeaderView = self.headerView; |
| 100 | 111 | ||
| 112 | +#pragma mark - TODO:获取用户信息显示 | ||
| 113 | + | ||
| 114 | + [self.headerView configUIWithIsPerson:self.personStatus isEnterprise:self.institutionStatus]; | ||
| 115 | + | ||
| 101 | self.headerView.clickUserImageVBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, UIImageView * _Nonnull userImageV) { | 116 | self.headerView.clickUserImageVBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, UIImageView * _Nonnull userImageV) { |
| 102 | NSLog(@"点击-用户头像"); | 117 | NSLog(@"点击-用户头像"); |
| 103 | 118 | ||
| @@ -147,9 +162,9 @@ | @@ -147,9 +162,9 @@ | ||
| 147 | if (indexPath.row == 0 || indexPath.row == 1) { | 162 | if (indexPath.row == 0 || indexPath.row == 1) { |
| 148 | CNLiveBServiceCertificationCell *certificationCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBServiceCertificationCell forIndexPath:indexPath]; | 163 | CNLiveBServiceCertificationCell *certificationCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBServiceCertificationCell forIndexPath:indexPath]; |
| 149 | if (indexPath.row == 0) { | 164 | if (indexPath.row == 0) { |
| 150 | - [certificationCell configUI:[CNLiveBServiceCenterModel new] type:CNLiveBServiceCertificationCellTypePerson]; | 165 | + [certificationCell configUI:self.centerModel type:CNLiveBServiceCertificationCellTypePerson]; |
| 151 | }else { | 166 | }else { |
| 152 | - [certificationCell configUI:[CNLiveBServiceCenterModel new] type:CNLiveBServiceCertificationCellTypeInstitutions]; | 167 | + [certificationCell configUI:self.centerModel type:CNLiveBServiceCertificationCellTypeInstitutions]; |
| 153 | } | 168 | } |
| 154 | return certificationCell; | 169 | return certificationCell; |
| 155 | }else if (indexPath.row == 2){ | 170 | }else if (indexPath.row == 2){ |
| @@ -273,18 +288,15 @@ | @@ -273,18 +288,15 @@ | ||
| 273 | 288 | ||
| 274 | #pragma mark - | 289 | #pragma mark - |
| 275 | #pragma mark - *** 接口 *** | 290 | #pragma mark - *** 接口 *** |
| 291 | + | ||
| 292 | +/// 获取用户认证状态 | ||
| 276 | - (void)loadStatus{ | 293 | - (void)loadStatus{ |
| 277 | #pragma mark - TODO:请求路径刷新 | 294 | #pragma mark - TODO:请求路径刷新 |
| 278 | 295 | ||
| 279 | NSString *strUrl = CNLiveBGetServiceStatusUrl; | 296 | NSString *strUrl = CNLiveBGetServiceStatusUrl; |
| 280 | NSString *appId = [NSString stringWithFormat:@"%@",AppId]; | 297 | NSString *appId = [NSString stringWithFormat:@"%@",AppId]; |
| 281 | - NSString *uid = [NSString stringWithFormat:@"%@",@"10514333"];//CNUserShareModel.uid | ||
| 282 | - NSString *token = [NSString stringWithFormat:@"%@",@"RkFYeLkl/u5S7tW8UcOkT/BgxDgw4wRl2IcNNhtX0dlnOLY/PL7CjnmmJyhKGpkj"];//CNUserShareModel.token | ||
| 283 | - // //将参数进行排序,用 a=b&c=d 的拼接成字符串,最后拼上 key=AppKey | ||
| 284 | - // NSString *sortString = [NSString stringWithFormat:@"%@&key=%@", [TIMTools sortParameters:params], APPKey]; | ||
| 285 | - // //对排序过的参数进行sha1加密,并转成大写 | ||
| 286 | - // NSString *signString = [[TIMTools sha1:sortString] uppercaseString]; | ||
| 287 | -#pragma mark - TODO:请求路径刷新 | 298 | + NSString *uid = [NSString stringWithFormat:@"%@",CNUserShareModel.uid]; |
| 299 | + NSString *token = [NSString stringWithFormat:@"%@",CNUserShareModel.token]; | ||
| 288 | NSDictionary *dict = @{ | 300 | NSDictionary *dict = @{ |
| 289 | @"appId":appId, | 301 | @"appId":appId, |
| 290 | @"uid":uid, | 302 | @"uid":uid, |
| @@ -311,7 +323,22 @@ | @@ -311,7 +323,22 @@ | ||
| 311 | } | 323 | } |
| 312 | } | 324 | } |
| 313 | 325 | ||
| 314 | - | 326 | + if (!err) { |
| 327 | + NSDictionary * contentDic = (NSDictionary *)data; | ||
| 328 | + if ([contentDic containsObjectForKey:@"personStatus"]) { | ||
| 329 | + self.personStatus = [NSString stringWithFormat:@"%@",[contentDic objectForKey:@"personStatus"] ? [contentDic objectForKey:@"personStatus"] : @"0"]; | ||
| 330 | + self.centerModel.personStatus = self.personStatus; | ||
| 331 | + | ||
| 332 | + } | ||
| 333 | + | ||
| 334 | + if ([contentDic containsObjectForKey:@"institutionStatus"]) { | ||
| 335 | + self.institutionStatus = [NSString stringWithFormat:@"%@",[contentDic objectForKey:@"institutionStatus"] ? [contentDic objectForKey:@"institutionStatus"] : @"0"]; | ||
| 336 | + self.centerModel.institutionStatus = self.institutionStatus; | ||
| 337 | + | ||
| 338 | + } | ||
| 339 | + [self.headerView configUIWithIsPerson:self.personStatus isEnterprise:self.institutionStatus]; | ||
| 340 | + [self.tableView reloadData]; | ||
| 341 | + } | ||
| 315 | 342 | ||
| 316 | }]; | 343 | }]; |
| 317 | 344 | ||
| @@ -319,6 +346,7 @@ | @@ -319,6 +346,7 @@ | ||
| 319 | } | 346 | } |
| 320 | 347 | ||
| 321 | 348 | ||
| 349 | +/// 检查个人认证状态 | ||
| 322 | - (void)checkPersonCertification { | 350 | - (void)checkPersonCertification { |
| 323 | 351 | ||
| 324 | //URL: https://apiwjjtest.cnlive.com/Daren/buser/getBUserInfo.action? | 352 | //URL: https://apiwjjtest.cnlive.com/Daren/buser/getBUserInfo.action? |
| @@ -347,7 +375,7 @@ | @@ -347,7 +375,7 @@ | ||
| 347 | } | 375 | } |
| 348 | } | 376 | } |
| 349 | 377 | ||
| 350 | - if (!error) { | 378 | + if (!err) { |
| 351 | BOOL isEnter = NO; | 379 | BOOL isEnter = NO; |
| 352 | NSDictionary *dicContent = (NSDictionary *)data; | 380 | NSDictionary *dicContent = (NSDictionary *)data; |
| 353 | if (dicContent) { | 381 | if (dicContent) { |
| @@ -371,7 +399,6 @@ | @@ -371,7 +399,6 @@ | ||
| 371 | 399 | ||
| 372 | isEnter = YES; | 400 | isEnter = YES; |
| 373 | }else if ([ischeckStatusStr isEqualToString:@"2"]) {//审核中 | 401 | }else if ([ischeckStatusStr isEqualToString:@"2"]) {//审核中 |
| 374 | -#pragma mark - TODO: 测试先用 | ||
| 375 | id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)]; | 402 | id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)]; |
| 376 | UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent]; | 403 | UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent]; |
| 377 | [self.navigationController pushViewController:vc animated:YES]; | 404 | [self.navigationController pushViewController:vc animated:YES]; |
| @@ -380,7 +407,6 @@ | @@ -380,7 +407,6 @@ | ||
| 380 | 407 | ||
| 381 | isEnter = YES; | 408 | isEnter = YES; |
| 382 | }else if ([ischeckStatusStr isEqualToString:@"3"]) {//审核失败 | 409 | }else if ([ischeckStatusStr isEqualToString:@"3"]) {//审核失败 |
| 383 | -#pragma mark - TODO: 测试先用 | ||
| 384 | id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)]; | 410 | id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)]; |
| 385 | UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent]; | 411 | UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent]; |
| 386 | [self.navigationController pushViewController:vc animated:YES]; | 412 | [self.navigationController pushViewController:vc animated:YES]; |
| @@ -392,11 +418,19 @@ | @@ -392,11 +418,19 @@ | ||
| 392 | } | 418 | } |
| 393 | 419 | ||
| 394 | if (!isEnter) { | 420 | if (!isEnter) { |
| 395 | -#pragma mark - TODO:弹框 | ||
| 396 | - ///弹框 | 421 | + |
| 422 | + [QMUITips showError:err.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:0.5];//@"上传失败" | ||
| 397 | } | 423 | } |
| 398 | 424 | ||
| 399 | }else { | 425 | }else { |
| 426 | + if (error) { | ||
| 427 | + if (error.code == -1001 || error.code == -1009) { | ||
| 428 | + [QMUITips showError:@"网络连接已断开" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5]; | ||
| 429 | + }else { | ||
| 430 | + [QMUITips showError:error.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];//@"上传失败" | ||
| 431 | + } | ||
| 432 | + return; | ||
| 433 | + } | ||
| 400 | 434 | ||
| 401 | } | 435 | } |
| 402 | 436 |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Model/CNLiveBServiceCenterModel.h
| @@ -11,6 +11,10 @@ NS_ASSUME_NONNULL_BEGIN | @@ -11,6 +11,10 @@ NS_ASSUME_NONNULL_BEGIN | ||
| 11 | 11 | ||
| 12 | @interface CNLiveBServiceCenterModel : NSObject | 12 | @interface CNLiveBServiceCenterModel : NSObject |
| 13 | 13 | ||
| 14 | +@property (nonatomic, strong) NSString *personStatus; | ||
| 15 | + | ||
| 16 | +@property (nonatomic, strong) NSString *institutionStatus; | ||
| 17 | + | ||
| 14 | @end | 18 | @end |
| 15 | 19 | ||
| 16 | NS_ASSUME_NONNULL_END | 20 | NS_ASSUME_NONNULL_END |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Model/Layout/CNLiveBServiceCenterLayout.h deleted
100644 → 0
| 1 | -// | ||
| 2 | -// CNLiveBServiceCenterLayout.h | ||
| 3 | -// AFNetworking | ||
| 4 | -// | ||
| 5 | -// Created by 梁星国 on 2020/4/8. | ||
| 6 | -// | ||
| 7 | - | ||
| 8 | -#import <Foundation/Foundation.h> | ||
| 9 | -@class CNLiveBServiceCenterModel; | ||
| 10 | - | ||
| 11 | -NS_ASSUME_NONNULL_BEGIN | ||
| 12 | - | ||
| 13 | -@interface CNLiveBServiceCenterLayout : NSObject | ||
| 14 | - | ||
| 15 | -@property (strong ,nonatomic) CNLiveBServiceCenterModel * model; | ||
| 16 | - | ||
| 17 | -/** 详情标题高度 */ | ||
| 18 | -@property (nonatomic, assign) CGFloat totalHeight; | ||
| 19 | - | ||
| 20 | -/** 编辑数据 */ | ||
| 21 | -- (void)editModel:(CNLiveBServiceCenterModel *)model; | ||
| 22 | - | ||
| 23 | -@end | ||
| 24 | - | ||
| 25 | -NS_ASSUME_NONNULL_END |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Model/Layout/CNLiveBServiceCenterLayout.m deleted
100644 → 0
| 1 | -// | ||
| 2 | -// CNLiveBServiceCenterLayout.m | ||
| 3 | -// AFNetworking | ||
| 4 | -// | ||
| 5 | -// Created by 梁星国 on 2020/4/8. | ||
| 6 | -// | ||
| 7 | - | ||
| 8 | -#import "CNLiveBServiceCenterLayout.h" | ||
| 9 | -#import "CNLiveBServiceCenterModel.h" | ||
| 10 | - | ||
| 11 | -@implementation CNLiveBServiceCenterLayout | ||
| 12 | - | ||
| 13 | -- (instancetype)init | ||
| 14 | -{ | ||
| 15 | - self = [super init]; | ||
| 16 | - if (self) { | ||
| 17 | - self.totalHeight = 0.0; | ||
| 18 | - | ||
| 19 | - } | ||
| 20 | - return self; | ||
| 21 | -} | ||
| 22 | - | ||
| 23 | -- (void)editModel:(CNLiveBServiceCenterModel *)model { | ||
| 24 | - self.model = model; | ||
| 25 | - | ||
| 26 | - self.totalHeight = 106; | ||
| 27 | - | ||
| 28 | -} | ||
| 29 | - | ||
| 30 | - | ||
| 31 | - | ||
| 32 | -@end |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.h
| @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN | @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN | ||
| 16 | /*** 服务页面背景 ***/ | 16 | /*** 服务页面背景 ***/ |
| 17 | @property (nonatomic, strong) UIImageView *bgHeaderImageV; | 17 | @property (nonatomic, strong) UIImageView *bgHeaderImageV; |
| 18 | 18 | ||
| 19 | -- (void)configUIWithIsWjj:(NSInteger)isWjj isPerson:(NSInteger)isPerson isEnterprise:(NSInteger)isEnterprise; | 19 | +- (void)configUIWithIsPerson:(NSString *)isPerson isEnterprise:(NSString *)isEnterprise; |
| 20 | 20 | ||
| 21 | @property (nonatomic, strong) CNLiveBServiceCenterModel *model; | 21 | @property (nonatomic, strong) CNLiveBServiceCenterModel *model; |
| 22 | 22 |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
| @@ -196,9 +196,59 @@ | @@ -196,9 +196,59 @@ | ||
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | #pragma mark - editUI | 198 | #pragma mark - editUI |
| 199 | -- (void)configUIWithIsWjj:(NSInteger)isWjj isPerson:(NSInteger)isPerson isEnterprise:(NSInteger)isEnterprise { | 199 | +- (void)configUIWithIsPerson:(NSString *)isPerson isEnterprise:(NSString *)isEnterprise { |
| 200 | 200 | ||
| 201 | - | 201 | + if ([isPerson isEqualToString:@"1"]) { |
| 202 | + self.personCertificationImageV.hidden = NO; | ||
| 203 | + }else { | ||
| 204 | + self.personCertificationImageV.hidden = YES; | ||
| 205 | + } | ||
| 206 | + | ||
| 207 | + if ([isEnterprise isEqualToString:@"1"]) { | ||
| 208 | + self.enterpriseCertificationImageV.hidden = NO; | ||
| 209 | + }else { | ||
| 210 | + self.enterpriseCertificationImageV.hidden = YES; | ||
| 211 | + } | ||
| 212 | + | ||
| 213 | + __weak typeof(self) weakSelf = self; | ||
| 214 | + | ||
| 215 | + if (self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden) { | ||
| 216 | + | ||
| 217 | + }else if (self.personCertificationImageV.hidden && !self.enterpriseCertificationImageV.hidden){ | ||
| 218 | + [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) { | ||
| 219 | + make.left.equalTo(weakSelf.userImageV.mas_right).offset(66); | ||
| 220 | + make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10); | ||
| 221 | + make.width.mas_equalTo(14); | ||
| 222 | + make.height.mas_equalTo(15); | ||
| 223 | + }]; | ||
| 224 | + | ||
| 225 | + }else if (!self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden){ | ||
| 226 | + | ||
| 227 | + [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) { | ||
| 228 | + make.left.equalTo(weakSelf.userImageV.mas_right).offset(66); | ||
| 229 | + make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10); | ||
| 230 | + make.width.mas_equalTo(14); | ||
| 231 | + make.height.mas_equalTo(15); | ||
| 232 | + }]; | ||
| 233 | + | ||
| 234 | + }else { | ||
| 235 | + | ||
| 236 | + [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) { | ||
| 237 | + make.left.equalTo(weakSelf.userImageV.mas_right).offset(66); | ||
| 238 | + make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10); | ||
| 239 | + make.width.mas_equalTo(14); | ||
| 240 | + make.height.mas_equalTo(15); | ||
| 241 | + }]; | ||
| 242 | + | ||
| 243 | + [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) { | ||
| 244 | + make.left.equalTo(weakSelf.userImageV.mas_right).offset(84); | ||
| 245 | + make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10); | ||
| 246 | + make.width.mas_equalTo(14); | ||
| 247 | + make.height.mas_equalTo(15); | ||
| 248 | + }]; | ||
| 249 | + | ||
| 250 | + | ||
| 251 | + } | ||
| 202 | 252 | ||
| 203 | } | 253 | } |
| 204 | 254 |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCertificationCell.m
| @@ -64,11 +64,7 @@ | @@ -64,11 +64,7 @@ | ||
| 64 | [self addSubview:self.certificationBtn]; | 64 | [self addSubview:self.certificationBtn]; |
| 65 | [self addSubview:self.certificationLogImageV]; | 65 | [self addSubview:self.certificationLogImageV]; |
| 66 | 66 | ||
| 67 | - //测试 | ||
| 68 | -// self.contentView.backgroundColor = [UIColor yellowColor]; | ||
| 69 | -// self.contentL.backgroundColor = [UIColor yellowColor]; | ||
| 70 | - self.titleL.text = @"个人认证"; | ||
| 71 | - self.contentL.text = @"适合企业、媒体、国家机构和其他知名机构申请。\n申请方式:在B端申请或在电脑打开链接:http://open.cnlive.com/操作申请."; | 67 | + self.certificationLogImageV.frame = CGRectMake(KScreenWidth - 56 -22, 22, 56, 56); |
| 72 | 68 | ||
| 73 | } | 69 | } |
| 74 | 70 | ||
| @@ -116,13 +112,40 @@ | @@ -116,13 +112,40 @@ | ||
| 116 | self.titleL.text = @"个人认证"; | 112 | self.titleL.text = @"个人认证"; |
| 117 | self.titleL.textColor = RGBOF(0x389fef); | 113 | self.titleL.textColor = RGBOF(0x389fef); |
| 118 | self.contentL.text = @"适合公众人物、领域专家、名师讲座和网络名人申请。\n申请方式:在B端——申请入驻下选择“身份认证”进行申请。"; | 114 | self.contentL.text = @"适合公众人物、领域专家、名师讲座和网络名人申请。\n申请方式:在B端——申请入驻下选择“身份认证”进行申请。"; |
| 119 | - [self.certificationBtn setBackgroundColor:RGBOF(0x4EABFD)]; | 115 | + |
| 116 | + | ||
| 117 | + if (model) { | ||
| 118 | + | ||
| 119 | + if ([model.personStatus isEqualToString:@"1"]) { | ||
| 120 | + self.certificationLogImageV.hidden = NO; | ||
| 121 | + self.certificationBtn.selected = YES; | ||
| 122 | + [self.certificationBtn setBackgroundColor:RGBOF(0xeeeeee)]; | ||
| 123 | + }else { | ||
| 124 | + self.certificationLogImageV.hidden = YES; | ||
| 125 | + self.certificationBtn.selected = NO; | ||
| 126 | + [self.certificationBtn setBackgroundColor:RGBOF(0x4EABFD)]; | ||
| 127 | + } | ||
| 128 | + | ||
| 129 | + } | ||
| 130 | + | ||
| 120 | 131 | ||
| 121 | }else { | 132 | }else { |
| 122 | self.titleL.text = @"机构认证"; | 133 | self.titleL.text = @"机构认证"; |
| 123 | self.titleL.textColor = RGBOF(0xe7a010); | 134 | self.titleL.textColor = RGBOF(0xe7a010); |
| 124 | self.contentL.text = @"适合企业、媒体、国家机构和其他知名机构申请。\n申请方式:在B端申请或在电脑打开链接:http://open.cnlive.com/操作申请。"; | 135 | self.contentL.text = @"适合企业、媒体、国家机构和其他知名机构申请。\n申请方式:在B端申请或在电脑打开链接:http://open.cnlive.com/操作申请。"; |
| 125 | - [self.certificationBtn setBackgroundColor:RGBOF(0xF0AD24)]; | 136 | + |
| 137 | + if (model) { | ||
| 138 | + if ([model.institutionStatus isEqualToString:@"1"]) { | ||
| 139 | + self.certificationLogImageV.hidden = NO; | ||
| 140 | + self.certificationBtn.selected = YES; | ||
| 141 | + [self.certificationBtn setBackgroundColor:RGBOF(0xeeeeee)]; | ||
| 142 | + }else { | ||
| 143 | + self.certificationLogImageV.hidden = YES; | ||
| 144 | + self.certificationBtn.selected = NO; | ||
| 145 | + [self.certificationBtn setBackgroundColor:RGBOF(0xF0AD24)]; | ||
| 146 | + } | ||
| 147 | + | ||
| 148 | + } | ||
| 126 | } | 149 | } |
| 127 | 150 | ||
| 128 | 151 | ||
| @@ -183,7 +206,7 @@ | @@ -183,7 +206,7 @@ | ||
| 183 | - (UIButton *)certificationBtn | 206 | - (UIButton *)certificationBtn |
| 184 | { | 207 | { |
| 185 | if (!_certificationBtn) { | 208 | if (!_certificationBtn) { |
| 186 | - _certificationBtn = [UIButton buttonWithType:UIButtonTypeSystem]; | 209 | + _certificationBtn = [UIButton buttonWithType:UIButtonTypeCustom]; |
| 187 | [_certificationBtn setTitle:@"去认证" forState:UIControlStateNormal]; | 210 | [_certificationBtn setTitle:@"去认证" forState:UIControlStateNormal]; |
| 188 | [_certificationBtn setTitle:@"已认证" forState:UIControlStateSelected]; | 211 | [_certificationBtn setTitle:@"已认证" forState:UIControlStateSelected]; |
| 189 | [_certificationBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; | 212 | [_certificationBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; |
| @@ -204,7 +227,7 @@ | @@ -204,7 +227,7 @@ | ||
| 204 | { | 227 | { |
| 205 | if (!_certificationLogImageV) { | 228 | if (!_certificationLogImageV) { |
| 206 | _certificationLogImageV = [[UIImageView alloc]init]; | 229 | _certificationLogImageV = [[UIImageView alloc]init]; |
| 207 | - _certificationLogImageV.image = [UIImage imageNamedFromService:@"service_personLog"]; | 230 | + _certificationLogImageV.image = [UIImage imageNamedFromService:@"service_auth"]; |
| 208 | } | 231 | } |
| 209 | return _certificationLogImageV; | 232 | return _certificationLogImageV; |
| 210 | } | 233 | } |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceHelpLearnCell.m
| @@ -88,7 +88,7 @@ | @@ -88,7 +88,7 @@ | ||
| 88 | { | 88 | { |
| 89 | if (!_cellContentImageV) { | 89 | if (!_cellContentImageV) { |
| 90 | _cellContentImageV = [[UIImageView alloc]init]; | 90 | _cellContentImageV = [[UIImageView alloc]init]; |
| 91 | - _cellContentImageV.image = [UIImage imageNamedFromService:@"service_ creatorLog"]; | 91 | + _cellContentImageV.image = [UIImage imageNamedFromService:@"service_creatorLog"]; |
| 92 | } | 92 | } |
| 93 | return _cellContentImageV; | 93 | return _cellContentImageV; |
| 94 | } | 94 | } |
Example/CNLiveServiceCenterModule.xcodeproj/project.pbxproj
| @@ -377,14 +377,13 @@ | @@ -377,14 +377,13 @@ | ||
| 377 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", | 377 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", |
| 378 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework", | 378 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework", |
| 379 | "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", | 379 | "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", |
| 380 | + "${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework", | ||
| 380 | "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", | 381 | "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", |
| 381 | "${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework", | 382 | "${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework", |
| 382 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", | 383 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", |
| 383 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", | 384 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", |
| 384 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", | 385 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 385 | - "${BUILT_PRODUCTS_DIR}/CNLiveICloudPicker/CNLiveICloudPicker.framework", | ||
| 386 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", | 386 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", |
| 387 | - "${BUILT_PRODUCTS_DIR}/CNLiveModuleServiceProtocols/CNLiveModuleServiceProtocols.framework", | ||
| 388 | "${BUILT_PRODUCTS_DIR}/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule.framework", | 387 | "${BUILT_PRODUCTS_DIR}/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule.framework", |
| 389 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", | 388 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", |
| 390 | "${BUILT_PRODUCTS_DIR}/CNLiveServiceCenterModule/CNLiveServiceCenterModule.framework", | 389 | "${BUILT_PRODUCTS_DIR}/CNLiveServiceCenterModule/CNLiveServiceCenterModule.framework", |
| @@ -413,6 +412,8 @@ | @@ -413,6 +412,8 @@ | ||
| 413 | "${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework", | 412 | "${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework", |
| 414 | "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", | 413 | "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", |
| 415 | "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", | 414 | "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", |
| 415 | + "${BUILT_PRODUCTS_DIR}/YBImageBrowser/YBImageBrowser.framework", | ||
| 416 | + "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework", | ||
| 416 | "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", | 417 | "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", |
| 417 | "${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework", | 418 | "${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework", |
| 418 | "${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework", | 419 | "${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework", |
| @@ -424,14 +425,13 @@ | @@ -424,14 +425,13 @@ | ||
| 424 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", | 425 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", |
| 425 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", | 426 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", |
| 426 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", | 427 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", |
| 428 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework", | ||
| 427 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", | 429 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", |
| 428 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework", | 430 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework", |
| 429 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", | 431 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", |
| 430 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", | 432 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", |
| 431 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", | 433 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 432 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveICloudPicker.framework", | ||
| 433 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", | 434 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", |
| 434 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveModuleServiceProtocols.framework", | ||
| 435 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveOrganizationValidationModule.framework", | 435 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveOrganizationValidationModule.framework", |
| 436 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", | 436 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", |
| 437 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveServiceCenterModule.framework", | 437 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveServiceCenterModule.framework", |
| @@ -460,6 +460,8 @@ | @@ -460,6 +460,8 @@ | ||
| 460 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework", | 460 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework", |
| 461 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", | 461 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", |
| 462 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", | 462 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", |
| 463 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBImageBrowser.framework", | ||
| 464 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", | ||
| 463 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", | 465 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", |
| 464 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework", | 466 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework", |
| 465 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework", | 467 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework", |
Example/CNLiveServiceCenterModule/CNLIVEBViewController.h