Commit 497164da79f0d4f63a76548f89f407635b983ad6

Authored by 梁星国
1 parent 7591cf2a

提交0.0.12_适配和列表显示问题

CNLiveOrganizationValidationModule.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveOrganizationValidationModule' 10 s.name = 'CNLiveOrganizationValidationModule'
11 - s.version = '0.0.11' 11 + s.version = '0.0.12'
12 s.summary = '机构认证模块' 12 s.summary = '机构认证模块'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.m
@@ -110,6 +110,15 @@ @@ -110,6 +110,15 @@
110 } 110 }
111 }]; 111 }];
112 112
  113 + self.extendedLayoutIncludesOpaqueBars = YES;
  114 + if (@available(iOS 11.0, *)) {
  115 + self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
  116 +
  117 + }else {
  118 + self.automaticallyAdjustsScrollViewInsets = NO;
  119 +
  120 + }
  121 +
113 } 122 }
114 123
115 #pragma mark - 124 #pragma mark -
@@ -487,7 +496,7 @@ @@ -487,7 +496,7 @@
487 496
488 - (UITableView *)tableView { 497 - (UITableView *)tableView {
489 if (_tableView == nil) { 498 if (_tableView == nil) {
490 - _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight) style:UITableViewStyleGrouped]; 499 + _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, KScreenHeight - kNavigationBarHeight) style:UITableViewStyleGrouped];
491 _tableView.backgroundColor = [UIColor whiteColor]; 500 _tableView.backgroundColor = [UIColor whiteColor];
492 [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"Cell"]; 501 [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"Cell"];
493 [_tableView registerClass:[CNLiveBOrganizationImageVDetailCell class] forCellReuseIdentifier:kCNLiveBOrganizationImageVDetailCell]; 502 [_tableView registerClass:[CNLiveBOrganizationImageVDetailCell class] forCellReuseIdentifier:kCNLiveBOrganizationImageVDetailCell];
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
@@ -170,6 +170,15 @@ @@ -170,6 +170,15 @@
170 170
171 self.pickerVC = [[UIImagePickerController alloc] init]; 171 self.pickerVC = [[UIImagePickerController alloc] init];
172 self.pickerVC.delegate = self; 172 self.pickerVC.delegate = self;
  173 +
  174 + self.extendedLayoutIncludesOpaqueBars = YES;
  175 + if (@available(iOS 11.0, *)) {
  176 + self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
  177 +
  178 + }else {
  179 + self.automaticallyAdjustsScrollViewInsets = NO;
  180 +
  181 + }
173 } 182 }
174 183
175 #pragma mark - 184 #pragma mark -
@@ -1030,7 +1039,8 @@ @@ -1030,7 +1039,8 @@
1030 CNLiveBAgreementCommitFinishController *vc = [[CNLiveBAgreementCommitFinishController alloc]init]; 1039 CNLiveBAgreementCommitFinishController *vc = [[CNLiveBAgreementCommitFinishController alloc]init];
1031 [self.navigationController pushViewController:vc animated:YES]; 1040 [self.navigationController pushViewController:vc animated:YES];
1032 }else { 1041 }else {
1033 - [QMUITips showError:error.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];//@"上传失败" 1042 + NSString *errorMsg = [NSString stringNamed:@"%@",error.domain ? error.domain : @"请求失败"];
  1043 + [QMUITips showError:errorMsg inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];//@"上传失败"
1034 } 1044 }
1035 1045
1036 } 1046 }
@@ -1049,7 +1059,7 @@ @@ -1049,7 +1059,7 @@
1049 1059
1050 - (UITableView *)tableView { 1060 - (UITableView *)tableView {
1051 if (_tableView == nil) { 1061 if (_tableView == nil) {
1052 - _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight) style:UITableViewStyleGrouped]; 1062 + _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, KScreenHeight - kNavigationBarHeight) style:UITableViewStyleGrouped];
1053 _tableView.backgroundColor = [UIColor whiteColor]; 1063 _tableView.backgroundColor = [UIColor whiteColor];
1054 [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"Cell"]; 1064 [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"Cell"];
1055 [_tableView registerClass:[CNLiveBOrganizationTFCell class] forCellReuseIdentifier:kCNLiveBOrganizationTFCell]; 1065 [_tableView registerClass:[CNLiveBOrganizationTFCell class] forCellReuseIdentifier:kCNLiveBOrganizationTFCell];
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopSelectedView.m
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 fieldLayer.path = fieldPath.CGPath; 85 fieldLayer.path = fieldPath.CGPath;
86 self.headerView.layer.mask = fieldLayer; 86 self.headerView.layer.mask = fieldLayer;
87 87
88 - self.tableView.frame = CGRectMake(0, 50, KScreenWidth, KScreenHeight/2); 88 + self.tableView.frame = CGRectMake(0, 50, KScreenWidth, KScreenHeight/2 -50);
89 [self.headerView addSubview:self.tableView]; 89 [self.headerView addSubview:self.tableView];
90 /** tableView */ 90 /** tableView */
91 self.tableView.delegate = self; 91 self.tableView.delegate = self;
Example/CNLiveOrganizationValidationModule/CNLIVEBAppDelegate.m
@@ -73,7 +73,7 @@ static NSString * uuid; @@ -73,7 +73,7 @@ static NSString * uuid;
73 CNUserShareModel.faceUrl = @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg"; 73 CNUserShareModel.faceUrl = @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg";
74 CNUserShareModel.nickname = @""; 74 CNUserShareModel.nickname = @"";
75 CNUserShareModel.mobile = @"15027621766"; 75 CNUserShareModel.mobile = @"15027621766";
76 - CNUserShareModel.uid = @"10514506"; 76 + CNUserShareModel.uid = @"10514501";
77 77
78 } 78 }
79 - (NSString *)appUUIDString 79 - (NSString *)appUUIDString