0.0.2 修改一些UI问题

yinqiaojuan
1 parent e63922c7
Showing 12 changed files with 54 additions and 27 deletions
CNLiveBPersonalVerificationModule.podspec
CNLiveBPersonalVerificationModule/Assets/CNBInstitutionInfo/CNLiveBPersonalVerificationModule.bundle/zhuangtai_kong@2x.png
CNLiveBPersonalVerificationModule/Assets/CNBInstitutionInfo/CNLiveBPersonalVerificationModule.bundle/zhuangtai_kong@3x.png
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPerAuthSuccessController.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPersonalVerificationController.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Services/CNBPersonAuthenticationServices.h
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPerAuthHeaderView.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPerAuthTypeRadioView.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/CNBPerAuthViewModel.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/CNLivePerAuthGetImage.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveBPersonalVerificationModule'
-  s.version          = '0.0.1'
+  s.version          = '0.0.2'
   s.summary          = 'B端个人资料认证开发'
 # This description is used to generate tags and improve search results.
@@ -75,7 +75,7 @@ s.subspec &#39;CNBInstitutionInfo&#39; do |institution|
 #     #协议库
      institution.dependency 'CNLiveBeeHive'
      institution.dependency 'CNLiveBServices'
-institution.resource_bundles = {
+     institution.resource_bundles = {
          'CNLiveBPersonalVerificationModule' => ['CNLiveBPersonalVerificationModule/Assets/CNBInstitutionInfo/CNLiveBPersonalVerificationModule.bundle']
     }
@@ -96,7 +96,7 @@ s.subspec &#39;CNBPersonCardInfo&#39; do |card|
         end
     card.ios.vendored_frameworks = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework'
     card.resource_bundles = {
-         'CNLiveBPersonalVerificationModule' => ['CNLiveBPersonalVerificationModule/Assets/CNBPersonCardInfo/CNBPersonCardInfo.bundle']
+         'CNBPersonCardInfo' => ['CNLiveBPersonalVerificationModule/Assets/CNBPersonCardInfo/CNBPersonCardInfo.bundle']
     }
     card.dependency 'CNLiveTripartiteManagement/Masonry'
     card.dependency 'CNLiveTripartiteManagement/QMUIKit'
@@ -46,14 +46,22 @@ static NSString *groupIdentifier = @&quot;CNBGroupInfoCell&quot;;
     [self.view addSubview:self.tableView];
     self.title = @"身份校验";
     if (self.data && [self.data isKindOfClass:[NSDictionary class]] && self.data.count > 0) {
-        CNBPerCertificationSuccessModel *successModel = [CNBPerCertificationSuccessModel mj_objectWithKeyValues:self.data];
-        self.infoModel = successModel.bUserIdentity;
-        for (CNBInstitutionModel *model in successModel.institution) {
-            [self.institutionArray addObject:model];
+        if ([[self.data allKeys] containsObject:@"institution"]) {
+            NSArray *array = self.data[@"institution"];
+            if (array.count > 0) {
+                CNBPerCertificationSuccessModel *successModel = [CNBPerCertificationSuccessModel mj_objectWithKeyValues:self.data];
+                self.infoModel = successModel.bUserIdentity;
+                for (CNBInstitutionModel *model in successModel.institution) {
+                    [self.institutionArray addObject:model];
+                }
+                [self.institutionArray insertObject:successModel.bUserIdentity atIndex:0];
+                [self.tableView reloadData];
+            }else {
+                [self showEmptyView:CNBPerAuthErrorTypeNoData];
+            }
+        }else {
+             [self showEmptyView:CNBPerAuthErrorTypeNoData];
         }
-        [self.institutionArray insertObject:successModel.bUserIdentity atIndex:0];
-        [self.tableView reloadData];
-        
     }else {
         [self requestPerAuthSuccessData];
     }
@@ -66,14 +74,25 @@ static NSString *groupIdentifier = @&quot;CNBGroupInfoCell&quot;;
                if (!strongSelf) {
                    return ;
                }
-        CNBPerCertificationSuccessModel *successModel = dataArray[0];
-        strongSelf.infoModel = successModel.bUserIdentity;
-        for (CNBInstitutionModel *model in successModel.institution) {
-            [strongSelf.institutionArray addObject:model];
+        if (dataArray.count > 0) {
+            CNBPerCertificationSuccessModel *successModel = dataArray[0];
+            if (successModel.bUserIdentity && successModel.institution.count > 0) {
+                strongSelf.infoModel = successModel.bUserIdentity;
+                           for (CNBInstitutionModel *model in successModel.institution) {
+                               [strongSelf.institutionArray addObject:model];
+                           }
+                           [strongSelf.emptyView removeFromSuperview ];
+                           strongSelf.tableView.tableFooterView = [UIView new];
+                           [strongSelf.institutionArray insertObject:successModel.bUserIdentity atIndex:0];
+                           [strongSelf.tableView reloadData];
+            }else {
+                [strongSelf showEmptyView:CNBPerAuthErrorTypeNoData];
+            }
+           
+        }else {
+            [strongSelf showEmptyView:CNBPerAuthErrorTypeNoData];
         }
-        [strongSelf.emptyView removeFromSuperview ];
-        [strongSelf.institutionArray insertObject:successModel.bUserIdentity atIndex:0];
-        [strongSelf.tableView reloadData];
+        
     } failureBlock:^(NSError * _Nonnull error) {
         if (error.code == -1009 || error.code == -1001) {
             [weakSelf showEmptyView:CNBPerAuthErrorTypeNoNet];
@@ -99,8 +118,14 @@ static NSString *groupIdentifier = @&quot;CNBGroupInfoCell&quot;;
         imageName = @"wufalianjie";
         titleName = @"接口开小差了，试试重新请求";
         retryName = @"重试";
+    }else if (errorType == CNBPerAuthErrorTypeNoData) {
+        imageName = @"zhuangtai_kong";
+        titleName = @"暂无您的身份内容";
+        retryName = @"";
     }
     [self.emptyView showImage:[CNLivePerAuthGetImage cnLivePerAuth_getImageName:imageName bundle:@"CNLiveBPersonalVerificationModule.bundle/CNLiveBPersonalVerificationModule" targetClass:[self class]] title:titleName detailTitle:@"" retryBtnTitle:retryName];
+    BOOL isHidden = errorType == CNBPerAuthErrorTypeNoData;
+    self.emptyView.retryBtn.hidden = isHidden;
     self.emptyView.retryBtn.backgroundColor = kWhiteColor;
     self.emptyView.retryBtn.layer.masksToBounds = YES;
     self.emptyView.retryBtn.layer.cornerRadius = 14;
@@ -108,7 +133,7 @@ static NSString *groupIdentifier = @&quot;CNBGroupInfoCell&quot;;
     self.emptyView.retryBtn.layer.borderColor = CNLiveColorWithHexString(@"48A7F9").CGColor;
     [self.emptyView.retryBtn setTitleColor:CNLiveColorWithHexString(@"48A7F9") forState:UIControlStateNormal];
     [self.emptyView.retryBtn setTitleColor:CNLiveColorWithHexString(@"48A7F9") forState:UIControlStateHighlighted];
-    [self.view addSubview:self.emptyView];
+    errorType == CNBPerAuthErrorTypeNoData ? self.tableView.tableFooterView = self.emptyView :[self.view addSubview:self.emptyView];
     [self.emptyView.retryBtn addTarget:self action:@selector(retryloadData) forControlEvents:UIControlEventTouchUpInside];
 }
 #pragma mark - tableViewDelegateAndDataSource
@@ -221,7 +246,8 @@ static NSString *groupIdentifier = @&quot;CNBGroupInfoCell&quot;;
 }
 - (CNEmptyView *)emptyView {
     if (!_emptyView) {
-        _emptyView = [[CNEmptyView alloc]initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, KScreenHeight - kNavigationBarHeight) type:1];
+        _emptyView = [[CNEmptyView alloc]initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, KScreenHeight - kNavigationBarHeight) type:0];
+        _emptyView.backgroundColor = [UIColor whiteColor];
     }
     return _emptyView;
 }
@@ -324,8 +324,7 @@
         [instritutionArray addObject:instritutionDic];
     }
     [submitDic setObject:instritutionArray forKey:@"Institution"];
-    [submitDic setObject:@"10511059" forKey:@"sid"];
-    
+    [submitDic setObject:CNUserShareModelUid forKey:@"sid"];
     NSString *submitStr = [self objectToJson:submitDic];
     submitStr = [submitStr stringByReplacingOccurrencesOfString:@"\\/" withString:@"/"];
     __weak typeof(self) weakSelf = self;
@@ -10,7 +10,6 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNBPersonAuthenticationServices : NSObject
-
 @end
 NS_ASSUME_NONNULL_END
@@ -78,7 +78,7 @@
 - (QMUIButton *)deleteBtn {
     if (!_deleteBtn) {
         _deleteBtn = [[QMUIButton alloc]init];
-        [_deleteBtn setImage:[CNLivePerAuthGetImage cnLivePerAuth_getImageName:@"delete" bundle:@"CNLiveBPersonalVerificationModule.bundle/CNLiveBPersonalVerificationModule" targetClass:[self class]] forState:UIControlStateNormal];
+        [_deleteBtn setImage:[CNLivePerAuthGetImage cnLivePerAuth_getImageName:@"CNBPerdelete" bundle:@"CNLiveBPersonalVerificationModule.bundle/CNLiveBPersonalVerificationModule" targetClass:[self class]] forState:UIControlStateNormal];
         [_deleteBtn addTarget:self action:@selector(deleteBtnAction) forControlEvents:UIControlEventTouchUpInside];
         _deleteBtn.hidden = YES;
     }
@@ -468,7 +468,8 @@
 }
 - (CNEmptyView *)emptyView {
     if (!_emptyView) {
-        _emptyView = [[CNEmptyView alloc]initWithFrame:CGRectMake(0, KScreenHeight/4 +kNavigationBarHeight, KScreenWidth, KScreenHeight*3/4 - kNavigationBarHeight - kVerticalBottomSafeHeight) type:1];
+        _emptyView = [[CNEmptyView alloc]initWithFrame:CGRectMake(0, KScreenHeight/4 +kNavigationBarHeight + 40, KScreenWidth, KScreenHeight*3/4 - kNavigationBarHeight - kVerticalBottomSafeHeight - 40) type:0];
+        _emptyView.backgroundColor = [UIColor whiteColor];
     }
     return _emptyView;
 }
@@ -13,6 +13,7 @@
 #import "CNBPerCertificationSuccessModel.h"
 #import "CNLiveBaseKit.h"
 #import "CNLiveEnvironment.h"
+#import "CNUserInfoManager.h"
 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window
 @implementation CNBPerAuthViewModel
 #pragma mark - 请求机构等列表
@@ -21,8 +22,8 @@
         @"spId": CNLiveStringIsEmpty(spId) ? @"": spId,
         @"type" : CNLiveStringIsEmpty(type) ? @"": type,
         @"homepageId":CNLiveStringIsEmpty(homepageId) ? @"": homepageId,
-        @"page": [NSString stringWithFormat:@"%ld",page],
-        @"pageSize":[NSString stringWithFormat:@"%d",10],
+        @"page": [NSString stringWithFormat:@"%ld",(long)page],
+        @"pageSize":[NSString stringWithFormat:@"%d",10]
     };
     [CNLiveNetworking setupShowDataResult:NO];
@@ -83,6 +84,7 @@
 + (void)getPerAuthSuccessList:(void (^)(NSMutableArray *dataArray))successBlock failureBlock:(void (^)(NSError * error))failureBlock {
     NSDictionary *param = @{
         @"sid":@"10513196"
+//        @"sid":CNUserShareModelUid
     };
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
@@ -98,7 +100,6 @@
                     if (responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]) {
                         CNBPerCertificationSuccessModel *model = [CNBPerCertificationSuccessModel mj_objectWithKeyValues:responseObject[@"data"]];
                         [array addObject:model];
-                        
                     }
                     !successBlock ? :successBlock(array);
                 }else {
@@ -31,6 +31,7 @@
     }
     NSString *imgName = [NSString stringWithFormat:@"%@@%zdx.png",imageName,scale];
     UIImage *image = [UIImage imageNamed:imgName inBundle:targetBundle compatibleWithTraitCollection:nil];
+    
     if (image) {
         return image;
     }else {