提交0.0.4

梁星国
1 parent faae2a63
Showing 3 changed files with 29 additions and 20 deletions
CNLiveServiceCenterModule.podspec
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
Example/CNLiveServiceCenterModule/CNLIVEBAppDelegate.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
     s.name             = 'CNLiveServiceCenterModule'
-    s.version          = '0.0.3'
+    s.version          = '0.0.4'
     s.summary          = '网家家企业端服务中心模块'
  
     # This description is used to generate tags and improve search results.
@@ -87,8 +87,7 @@ Pod::Spec.new do |s|
     ###    所有github三方管理库(非频繁更新)
     ########################################
     s.dependency  'CNLiveTripartiteManagement'
-    
-#    s.dependency  'CNLiveOrganizationValidationModule'
+    s.dependency  'CNLiveOrganizationValidationModule'
  
  
 end
@@ -60,7 +60,7 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     self.navigationController.navigationBarHidden = YES;
-//    [self loadStatus];
+    //    [self loadStatus];
 }
  
 - (void)viewDidLoad {
@@ -140,7 +140,7 @@
             if (indexPath.row == 0) {
                 [certificationCell configUI:[CNLiveBServiceCenterModel new] type:CNLiveBServiceCertificationCellTypePerson];
             }else {
-                 [certificationCell configUI:[CNLiveBServiceCenterModel new] type:CNLiveBServiceCertificationCellTypeInstitutions];
+                [certificationCell configUI:[CNLiveBServiceCenterModel new] type:CNLiveBServiceCertificationCellTypeInstitutions];
             }
             return certificationCell;
         }else if (indexPath.row == 2){
@@ -269,18 +269,18 @@
     NSString *appId = [NSString stringWithFormat:@"%@",AppId];
     NSString *uid = [NSString stringWithFormat:@"%@",@"10514333"];//CNUserShareModel.uid
     NSString *token = [NSString stringWithFormat:@"%@",@"RkFYeLkl/u5S7tW8UcOkT/BgxDgw4wRl2IcNNhtX0dlnOLY/PL7CjnmmJyhKGpkj"];//CNUserShareModel.token
-//    //将参数进行排序，用 a=b&c=d 的拼接成字符串，最后拼上 key=AppKey
-//    NSString *sortString = [NSString stringWithFormat:@"%@&key=%@", [TIMTools sortParameters:params], APPKey];
-//    //对排序过的参数进行sha1加密，并转成大写
-//    NSString *signString = [[TIMTools sha1:sortString] uppercaseString];
+    //    //将参数进行排序，用 a=b&c=d 的拼接成字符串，最后拼上 key=AppKey
+    //    NSString *sortString = [NSString stringWithFormat:@"%@&key=%@", [TIMTools sortParameters:params], APPKey];
+    //    //对排序过的参数进行sha1加密，并转成大写
+    //    NSString *signString = [[TIMTools sha1:sortString] uppercaseString];
 #pragma mark - TODO:请求路径刷新
     NSDictionary *dict = @{
-                           @"appId":appId,
-                           @"uid":uid,
-                           @"clientPlat":@"i",
-                           @"token":token,
-//                           @"sign":@"2A5F8868275C4562801D8F75DDE21D2BF9CA156F",
-                           };
+        @"appId":appId,
+        @"uid":uid,
+        @"clientPlat":@"i",
+        @"token":token,
+        //                           @"sign":@"2A5F8868275C4562801D8F75DDE21D2BF9CA156F",
+    };
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
@@ -303,7 +303,7 @@
  
  
     }];
- 
+    
  
 }
  
@@ -342,22 +342,27 @@
             NSDictionary *dicContent = (NSDictionary *)data;
             if (dicContent) {
                 if ([dicContent containsObjectForKey:@"isCertification"]) {
-                    NSString *isCertificationStr = [NSString stringWithFormat:@"%@"[dicContent objectForKey:@"isCertification"]];
+                    NSString *isCertificationStr = [NSString stringWithFormat:@"%@",[dicContent objectForKey:@"isCertification"]];
                     if ([isCertificationStr isEqualToString:@"0"]) {
                         ///  填表页
                         id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
-                        UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:@{}];
+                        UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:dicContent];
                         [self.navigationController pushViewController:vc animated:YES];
  
                         isEnter = YES;
                     }else if ([isCertificationStr isEqualToString:@"1"]) {
                         /// 详情页
                         id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
-                        UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:@{}];
+                        UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
                         [self.navigationController pushViewController:vc animated:YES];
  
                         isEnter = YES;
                     }else if ([isCertificationStr isEqualToString:@"2"]) {
+#pragma mark - TODO:  测试先用
+                        /// 详情页
+                        id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
+                        UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
+                        [self.navigationController pushViewController:vc animated:YES];
  
                         isEnter = YES;
                     }
@@ -372,7 +377,7 @@
         }else {
  
         }
-  
+        
     }];
  
  
@@ -65,6 +65,11 @@ static NSString * uuid;
     NSLog(@"打印appkey%@",APPKey);
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [CNLiveNetworking setResponseSerializerType:CNLiveResponseSerializerJSON];
+    
+    CNUserShareModel.faceUrl = @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg";
+    CNUserShareModel.nickname = @"";
+    CNUserShareModel.mobile = @"15027621766";
+    CNUserShareModel.uid = @"10514578";
  
 }
 - (NSString *)appUUIDString