图片相关

王军波
1 parent 1cf3b9d7
Showing 6 changed files with 125 additions and 55 deletions
CNLiveBPersonalVerificationModule.podspec
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPerCertificationController.m
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/ApplyForShootController.m
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/View/ApplyForShootCell.m
CNLiveIDCardAuthGetImage.h
CNLiveIDCardAuthGetImage.m
@@ -81,45 +81,45 @@ s.subspec &#39;CNBInstitutionInfo&#39; do |institution|
     end
-#s.subspec 'CNBPersonCardInfo' do |card|
-#    card.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/**'
-#    card.subspec 'Controller' do |controller|
-#        controller.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/*.{h,m}'
-#               controller.dependency 'CNLiveBPersonalVerificationModule/CNBPersonCardInfo/View'
-#    end
-#    card.subspec 'View' do |view|
-#        view.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/View/*.{h,m}'
-#         view.dependency 'CNLiveBPersonalVerificationModule/CNBPersonCardInfo/Model'
-#        end
-#    card.subspec 'Model' do |model|
-#        model.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Model/*.{h,m}'
-#        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 = {
-#         'CNBPersonCardInfo' => ['CNLiveBPersonalVerificationModule/Assets/CNBPersonCardInfo/CNBPersonCardInfo.bundle']
-#    }
-#    card.dependency 'CNLiveTripartiteManagement/Masonry'
-#    card.dependency 'CNLiveTripartiteManagement/QMUIKit'
-#    card.dependency 'CNLiveTripartiteManagement/MJExtension'
-#    card.dependency 'CNLiveTripartiteManagement/SDWebImage'
-#    card.dependency 'CNLiveTripartiteManagement/MJRefresh'
-#    card.dependency 'CNLiveTripartiteManagement/YYKit'
-#    card.dependency 'CNLiveTripartiteManagement/AFNetworking'
-#    #基础库
-#    card.dependency 'CNLiveBaseKit'
-#    #基础类目
-#    card.dependency 'CNLiveCommonCategory'
-#    ##基础UI
-#    card.dependency 'CNLiveCustomUI'
-#    ##用户库
-#    card.dependency 'CNLiveUserManagement'
-#    # #网络请求
-#     card.dependency 'CNLiveRequestBastKit'
-#     card.dependency 'CNLiveEnvironment'
-#     card.dependency 'CNLiveBaseClass'
-#     card.dependency 'CNLiveBaseTools'
-#     card.dependency 'CNLiveBusinessTools'
-#    end
+s.subspec 'CNBPersonCardInfo' do |card|
+    card.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/**'
+    card.subspec 'Controller' do |controller|
+        controller.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/*.{h,m}'
+               controller.dependency 'CNLiveBPersonalVerificationModule/CNBPersonCardInfo/View'
+    end
+    card.subspec 'View' do |view|
+        view.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/View/*.{h,m}'
+         view.dependency 'CNLiveBPersonalVerificationModule/CNBPersonCardInfo/Model'
+        end
+    card.subspec 'Model' do |model|
+        model.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Model/*.{h,m}'
+        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 = {
+         'CNBPersonCardInfo' => ['CNLiveBPersonalVerificationModule/Assets/CNBPersonCardInfo/CNBPersonCardInfo.bundle']
+    }
+    card.dependency 'CNLiveTripartiteManagement/Masonry'
+    card.dependency 'CNLiveTripartiteManagement/QMUIKit'
+    card.dependency 'CNLiveTripartiteManagement/MJExtension'
+    card.dependency 'CNLiveTripartiteManagement/SDWebImage'
+    card.dependency 'CNLiveTripartiteManagement/MJRefresh'
+    card.dependency 'CNLiveTripartiteManagement/YYKit'
+    card.dependency 'CNLiveTripartiteManagement/AFNetworking'
+    #基础库
+    card.dependency 'CNLiveBaseKit'
+    #基础类目
+    card.dependency 'CNLiveCommonCategory'
+    ##基础UI
+    card.dependency 'CNLiveCustomUI'
+    ##用户库
+    card.dependency 'CNLiveUserManagement'
+    # #网络请求
+     card.dependency 'CNLiveRequestBastKit'
+     card.dependency 'CNLiveEnvironment'
+     card.dependency 'CNLiveBaseClass'
+     card.dependency 'CNLiveBaseTools'
+     card.dependency 'CNLiveBusinessTools'
+    end
   s.frameworks = 'UIKit', 'Foundation'
@@ -76,7 +76,7 @@
 }
 #pragma mark - Action
 - (void)sureBtnAction {
-    
+    [self.navigationController popToRootViewControllerAnimated:YES];
 }
 #pragma mark - lazy
 - (UIImageView *)showImageV {
@@ -24,6 +24,7 @@
 #import "CNUserInfoManager.h"
 #import "CNLiveBusinessTools.h"
 #import "CNLiveEnvironment.h"
+#import "CNLiveIDCardAuthGetImage.h"
 static NSString *shootCellId = @"shootCellId";
 static NSString *confirmCellId = @"confirmCellId";
@@ -139,7 +140,7 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                             weakSelf.isFontSucc = NO;
                             NSIndexPath *index = [NSIndexPath indexPathForRow:0 inSection:0];
                             ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                            cell.imgV.image = [UIImage imageNamed:@"observer_idcard_front"];
+                            cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_front" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                             weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                             [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                         }];
@@ -153,7 +154,7 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                             weakSelf.isBackSucc = NO;
                             NSIndexPath *index = [NSIndexPath indexPathForRow:1 inSection:0];
                             ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                            cell.imgV.image = [UIImage imageNamed:@"observer_idcard_back"];
+                            cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_back" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                             weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                             [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                         }];
@@ -165,7 +166,7 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                             weakSelf.isBackSucc = NO;
                             NSIndexPath *index = [NSIndexPath indexPathForRow:1 inSection:0];
                             ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                            cell.imgV.image = [UIImage imageNamed:@"observer_idcard_back"];
+                            cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_back" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                             weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                             [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                         }];
@@ -195,14 +196,14 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                                     weakSelf.isFontSucc = NO;
                                     NSIndexPath *index = [NSIndexPath indexPathForRow:0 inSection:0];
                                     ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                                    cell.imgV.image = [UIImage imageNamed:@"observer_idcard_front"];
+                                    cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_front" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                                     weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                                     [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                                 } else {
                                     weakSelf.isBackSucc = NO;
                                     NSIndexPath *index = [NSIndexPath indexPathForRow:1 inSection:0];
                                     ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                                    cell.imgV.image = [UIImage imageNamed:@"observer_idcard_back"];
+                                    cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_back" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                                     weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                                     [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                                 }
@@ -262,7 +263,7 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                             weakSelf.isFontSucc = NO;
                             NSIndexPath *index = [NSIndexPath indexPathForRow:0 inSection:0];
                             ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                            cell.imgV.image = [UIImage imageNamed:@"observer_idcard_front"];
+                            cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_front" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                             weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                             [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                         }];
@@ -276,7 +277,7 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                             weakSelf.isBackSucc = NO;
                             NSIndexPath *index = [NSIndexPath indexPathForRow:1 inSection:0];
                             ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                            cell.imgV.image = [UIImage imageNamed:@"observer_idcard_back"];
+                            cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_back" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                             weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                             [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                         }];
@@ -297,14 +298,14 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                                 weakSelf.isFontSucc = NO;
                                 NSIndexPath *index = [NSIndexPath indexPathForRow:0 inSection:0];
                                 ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                                cell.imgV.image = [UIImage imageNamed:@"observer_idcard_front"];
+                                cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_front" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                                 weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                                 [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                             } else {
                                 weakSelf.isBackSucc = NO;
                                 NSIndexPath *index = [NSIndexPath indexPathForRow:1 inSection:0];
                                 ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                                cell.imgV.image = [UIImage imageNamed:@"observer_idcard_back"];
+                                cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_back" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                                 weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                                 [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                             }
@@ -360,14 +361,14 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                     weakSelf.isFontSucc = NO;
                     NSIndexPath *index = [NSIndexPath indexPathForRow:0 inSection:0];
                     ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                    cell.imgV.image = [UIImage imageNamed:@"observer_idcard_front"];
+                    cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_front" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                     weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                     [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                 } else {
                     weakSelf.isBackSucc = NO;
                     NSIndexPath *index = [NSIndexPath indexPathForRow:1 inSection:0];
                     ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                    cell.imgV.image = [UIImage imageNamed:@"observer_idcard_back"];
+                    cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_back" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                     weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                     [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
                 }
@@ -395,14 +396,14 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                 weakSelf.isFontSucc = NO;
                 NSIndexPath *index = [NSIndexPath indexPathForRow:0 inSection:0];
                 ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                cell.imgV.image = [UIImage imageNamed:@"observer_idcard_front"];
+                cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_front" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                 weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                 [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
             } else {
                 weakSelf.isBackSucc = NO;
                 NSIndexPath *index = [NSIndexPath indexPathForRow:1 inSection:0];
                 ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
-                cell.imgV.image = [UIImage imageNamed:@"observer_idcard_back"];
+                cell.imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"observer_idcard_back" bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
                 weakSelf.confirmCell.confirmButton.backgroundColor = RGB(216, 216, 216);
                 [weakSelf.confirmCell.confirmButton setTitleColor:RGB(180, 180, 180) forState:UIControlStateNormal];
             }
@@ -11,6 +11,7 @@
 #import <Masonry/Masonry.h>
 #import "CNLiveBaseKit.h"
 #import <QMUIKit/QMUIKit.h>
+#import "CNLiveIDCardAuthGetImage.h"
 @interface ApplyForShootCell ()
 @property (nonatomic, strong) UILabel *titleLab;
@@ -34,7 +35,7 @@
 - (void)setModel:(AgreementModel *)model {
     _titleLab.text = model.shootTitle;
-    _imgV.image = [UIImage imageNamed:model.shootImage];
+    _imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:model.shootImage bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
     if (model.isFront) {
         self.lineV.hidden = NO;
         NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:@"请拍摄本人身份证正面 注意避免证件反光"];
@@ -151,7 +152,7 @@
 - (UIButton *)shootBtn {
     if (!_shootBtn) {
         _shootBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_shootBtn setImage:[UIImage imageNamed:@"dl_xiangji"] forState:UIControlStateNormal];
+        [_shootBtn setImage:[CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:@"dl_xiangji" bundle:@"CNBPersonCardInfo.bundle/CNLiveBPersonalVerificationModule" targetClass:[self class]] forState:UIControlStateNormal];
         [_shootBtn addTarget:self action:@selector(shootPhotoAction:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _shootBtn;
+//
+//  CNLiveIDCardAuthGetImage.h
+//  CNLiveBPersonalVerificationModule
+//
+//  Created by cnliveJunBo on 2020/4/22.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveIDCardAuthGetImage : NSObject
+
+/// 组件内获取图片
+/// @param imageName 图片名字
+/// @param bundlePath 图片所在bundle
+/// @param targetClass 与bundle在同一级别的class
++ (UIImage *)cnLiveIDCardAuth_getImageName:(NSString *)imageName bundle:(NSString *)bundlePath targetClass:(Class)targetClass;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveIDCardAuthGetImage.m
+//  CNLiveBPersonalVerificationModule
+//
+//  Created by cnliveJunBo on 2020/4/22.
+//
+
+#import "CNLiveIDCardAuthGetImage.h"
+
+@implementation CNLiveIDCardAuthGetImage
+/**
+ *  创建图片
+ *
+ *  @param imageName 图片名字
+ *  @param bundlePath 图片所在的bundle名字
+ *  @param targetClass 类和bundle的同级目录
+ *  @return 返回UIImage
+ */
++ (UIImage *)cnLiveIDCardAuth_getImageName:(NSString *)imageName bundle:(NSString *)bundlePath targetClass:(Class)targetClass{
+    
+    NSInteger scale = [[UIScreen mainScreen]scale];
+    NSBundle *bundle = [NSBundle bundleForClass:targetClass];
+    NSURL *url = [bundle URLForResource:bundlePath withExtension:@"bundle"];
+    
+    if (!url) {
+        return [UIImage new];
+    }
+    NSBundle *targetBundle = [NSBundle bundleWithURL:url];
+    if (!targetBundle) {
+        return [UIImage new];
+    }
+    NSString *imgName = [NSString stringWithFormat:@"%@@%zdx.png",imageName,scale];
+    UIImage *image = [UIImage imageNamed:imgName inBundle:targetBundle compatibleWithTraitCollection:nil];
+    
+    if (image) {
+        return image;
+    }else {
+        if ([UIImage imageNamed:imgName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil]) {
+            return [UIImage imageNamed:imgName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
+        }else{
+            return [UIImage new];
+        }
+    }
+
+}
+@end