修改个人资料验证失败问题

yinqiaojuan
1 parent af7d2e72
Showing 7 changed files with 41 additions and 82 deletions
CNLiveBPersonalVerificationModule.podspec
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPerAuthSuccessController.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/CNBPerAuthManager.h
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/CNBPerAuthManager.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/CNBPerAuthViewModel.m
Example/CNLiveBPersonalVerificationModule.xcodeproj/project.pbxproj
Example/CNLiveBPersonalVerificationModule/CNLIVEViewController.m
@@ -32,94 +32,53 @@ TODO: Add long description of the pod here.
 #  s.source_files = 'CNLiveBPersonalVerificationModule/Classes/**/*'
 s.subspec 'CNBInstitutionInfo' do |institution|
-    institution.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/**'
-    institution.subspec 'Controller' do |controller|
-       controller.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/*.{h,m}'
-        controller.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/View'
-    end
-    institution.subspec 'View' do |view|
-        view.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/*.{h,m}'
-        view.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/ViewModel'
-        view.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/Model'
-    end
     institution.subspec 'Model' do |model|
         model.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Model/*.{h,m}'
     end
     institution.subspec 'ViewModel' do |viewModel|
-        viewModel.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/*.{h,m}'
-        viewModel.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/Model'
-    end
+            viewModel.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/*.{h,m}'
+            viewModel.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/Model'
+        end
+    institution.subspec 'View' do |view|
+            view.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/*.{h,m}'
+            view.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/ViewModel'
+        end
+    institution.subspec 'Controller' do |controller|
+           controller.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/*.{h,m}'
+            controller.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/View'
+        end
     institution.subspec 'Services' do |service|
-        service.source_files  = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Services/*.{h,m}'
-    end
-    institution.resource_bundles = {
-         'CNLiveBPersonalVerificationModule' => ['CNLiveBPersonalVerificationModule/Assets/CNBInstitutionInfo/CNLiveBPersonalVerificationModule.bundle']
-    }
+            service.source_files  = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Services/*.{h,m}'
+            service.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/Controller'
+        end
     institution.dependency 'CNLiveTripartiteManagement/Masonry'
     institution.dependency 'CNLiveTripartiteManagement/QMUIKit'
     institution.dependency 'CNLiveTripartiteManagement/MJExtension'
     institution.dependency 'CNLiveTripartiteManagement/SDWebImage'
     institution.dependency 'CNLiveTripartiteManagement/MJRefresh'
-    institution.dependency 'CNLiveTripartiteManagement/YYKit'
+    #institution.dependency 'CNLiveTripartiteManagement/YYKit'
     institution.dependency 'CNLiveTripartiteManagement/AFNetworking'
     #基础库
     institution.dependency 'CNLiveBaseKit'
     #基础类目
     institution.dependency 'CNLiveCommonCategory'
-    #基础UI
+#    #基础UI
     institution.dependency 'CNLiveCustomUI'
-    #用户库
+#    #用户库
      institution.dependency 'CNLiveUserManagement'
-     #网络请求
+#     #网络请求
      institution.dependency 'CNLiveRequestBastKit'
-     #环境库
+#     #环境库
      institution.dependency 'CNLiveEnvironment'
-     #基础库
-     institution.dependency 'CNLiveBaseClass'
-     #协议库
+#     #基础库
+#     institution.dependency 'CNLiveBaseClass'
+#     #协议库
      institution.dependency 'CNLiveBeeHive'
      institution.dependency 'CNLiveBServices'
-    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 = {
-#         'CNLiveBPersonalVerificationModule' => ['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
-
+institution.resource_bundles = {
+         'CNLiveBPersonalVerificationModule' => ['CNLiveBPersonalVerificationModule/Assets/CNBInstitutionInfo/CNLiveBPersonalVerificationModule.bundle']
+    }
+    end
   s.frameworks = 'UIKit', 'Foundation'
 end
@@ -45,7 +45,7 @@ static NSString *groupIdentifier = @&quot;CNBGroupInfoCell&quot;;
     [super viewDidLoad];
     [self.view addSubview:self.tableView];
     self.title = @"身份校验";
-    if (self.data && [self.data isKindOfClass:[NSDictionary class]]) {
+    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) {
@@ -6,7 +6,6 @@
 //
 #import <Foundation/Foundation.h>
-#import "YYCache.h"
 NS_ASSUME_NONNULL_BEGIN
 @interface CNBPerAuthManager : NSObject
@@ -8,7 +8,6 @@
 #import "CNBPerAuthManager.h"
 #import "CNUserInfoManager.h"
 #import "NSString+CNLiveExtension.h"
-static YYCache *yycache = nil;
 @interface CNBPerAuthManager ()
 @end
@@ -12,6 +12,7 @@
 #import <QMUIKit/QMUIKit.h>
 #import "CNBPerCertificationSuccessModel.h"
 #import "CNLiveBaseKit.h"
+#import "CNLiveEnvironment.h"
 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window
 @implementation CNBPerAuthViewModel
 #pragma mark - 请求机构等列表
@@ -26,7 +27,7 @@
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-    NSString *url = @"http://cmstest.cnlive.com:8768/contentApi/getAllSp";
+    NSString *url = cn_API_Classify(@"/contentApi/getAllSp");
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:url Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (responseObject && [responseObject isKindOfClass:[NSDictionary class]]) {
             NSString *errorCode = [NSString stringWithFormat:@"%@",[responseObject objectForKey:@"errorCode"]];
@@ -61,7 +62,7 @@
     NSDictionary *param = @{
         @"institution":CNLiveStringIsEmpty(institutionStr) ? @"":institutionStr
     };
-    NSString *url = @"https://apiwjjtest.cnlive.com/Daren/buser/saveInstitution.action";
+    NSString *url = cn_API_Host(@"/Daren/buser/saveInstitution.action");
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:url Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (!error) {
             if (responseObject && [responseObject isKindOfClass:[NSDictionary class]]) {
@@ -86,7 +87,8 @@
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     NSMutableArray *array = [NSMutableArray array];
-    NSString *url = @"https://apiwjjtest.cnlive.com/Daren/buser/getBUserInfo.action";
+    NSString *url = cn_API_Host(@"/Daren/buser/getBUserInfo.action");
+//    NSString *url = @"https://apiwjjtest.cnlive.com/Daren/buser/getBUserInfo.action";
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:url Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (!error) {
             if (responseObject && [responseObject isKindOfClass:[NSDictionary class]]) {
@@ -358,12 +358,9 @@
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBPersonalVerificationModule_Example/Pods-CNLiveBPersonalVerificationModule_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
@@ -374,19 +371,15 @@
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
-				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
 				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBPersonalVerificationModule.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
@@ -397,7 +390,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -10,6 +10,7 @@
 #import "CNBPersonalVerificationController.h"
 #import "CNBPerAuthSuccessController.h"
 #import "CNBPerCertificationController.h"
+#import "CNLiveBPersonAuthentProtocol.h"
 @interface CNLIVEViewController ()
 @end
@@ -38,12 +39,18 @@
         [self.view addSubview:button];
     }
 }
+
 - (void)buttonAction {
     CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
     [self.navigationController pushViewController:vc animated:NO];
+//    id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];
+//    CNBPersonalVerificationController *vc = (CNBPersonalVerificationController *)[service pushToAddPerAuthInstitutionsController:@{}];
+//    [self.navigationController pushViewController:vc animated:NO];
 }
 - (void)successBtnAction {
-  CNBPerAuthSuccessController *vc = [[CNBPerAuthSuccessController alloc]init];
+     id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];
+        CNBPerAuthSuccessController *vc = (CNBPerAuthSuccessController *)[service pushToPersonalAuthenticationSuccessController:@{}];
+//  CNBPerAuthSuccessController *vc = [[CNBPerAuthSuccessController alloc]init];
     [self.navigationController pushViewController:vc animated:NO];
 }
 - (void)buttonClick:(UIButton *)sender {
@@ -59,6 +66,7 @@
                [self.navigationController pushViewController:vc animated:NO];
     }
 }
+ 
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];