提交0.0.6

梁星国
1 parent bd6c5c18
Showing 8 changed files with 81 additions and 29 deletions
CNLiveOrganizationValidationModule.podspec
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_detailCer@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_detailCer@3x.png
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementContentController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveOrganizationValidationModule'
-  s.version          = '0.0.5'
+  s.version          = '0.0.6'
   s.summary          = '机构认证模块'
  
 # This description is used to generate tags and improve search results.
@@ -6,8 +6,26 @@
 //
  
 #import "CNLiveBAgreementContentController.h"
+#import <WebKit/WebKit.h>
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNLiveRequestBastKit/CNLiveNetworkRequest.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <CNLiveUserManagement/CNUserInfoManager.h>
+#import <CNLiveBeeHive/CNLiveBeeHive.h>
+#import <MJExtension/MJExtension.h>
+#import <QMUIKit/QMUIKit.h>
+#import <YYKit/YYKit.h>
+#import <objc/runtime.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
  
-@interface CNLiveBAgreementContentController ()
+//https://wjj.ys1.cnliveimg.com/term/cnBNraqxy.html
+
+#define CNLiveBOrganizationContentAgreementUrl cn_API_Refund(@"/term/cnBNraqxy.html")
+@interface CNLiveBAgreementContentController ()<WKNavigationDelegate,WKUIDelegate,UIScrollViewDelegate>
+
+@property (strong, nonatomic) WKWebView *wkwebView;
+
+@property (strong, nonatomic) NSString *url;
  
 @end
  
@@ -17,16 +35,26 @@
     [super viewDidLoad];
     self.title = @"机构认证";
     [self.view setBackgroundColor:[UIColor whiteColor]];
+    [self initWKWebView];
+    
+    
 }
  
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
+-(void)initWKWebView
+{
+    self.view.backgroundColor = [UIColor whiteColor];
+    self.url = CNLiveBOrganizationContentAgreementUrl;
+    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, KScreenHeight)];
+    self.view = webView;
+    NSURL *url = [NSURL URLWithString:self.url];
+    NSURLRequest *request = [NSURLRequest requestWithURL:url];
+    [webView loadRequest:request];
+
+    
 }
-*/
+
+
+
+
  
 @end
@@ -22,6 +22,7 @@
 #import <objc/runtime.h>
 #import <YBImageBrowser/YBImageBrowser.h>
 #import <YBImageBrowser/YBIBImageData.h>
+#import "UIImage+OrganizationValidation.h"
  
  
 //体育中国-详情
@@ -38,6 +39,9 @@
 /** 列表 */
 @property (nonatomic , strong) UITableView *tableView;
  
+@property (nonatomic , strong) NSString *kindStr;
+
+@property (nonatomic , strong) UIImageView *showImageV;
  
  
 @end
@@ -52,6 +56,7 @@
     self = [super init];
     if (self) {
         self.detailModel = [[CNLiveOrganizationDetailModel alloc]init];
+        self.kindStr = @"";
     }
     return self;
 }
@@ -87,13 +92,24 @@
     self.title = @"认证机构";
     [self.view setBackgroundColor:[UIColor whiteColor]];
  
+    
     [self.view addSubview:self.tableView];
+    [self.tableView addSubview:self.showImageV];
     self.tableView.tableHeaderView = self.headerView;
  
     if (!self.detailModel.account) {
         [self loadData];
     }
  
+    [self.detailModel.comTypList enumerateObjectsUsingBlock:^(CNLiveOrganizationTipModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        NSString *str = [NSString stringWithFormat:@"%@",obj.ID];
+        if (self.detailModel.account) {
+            if ([str isEqualToString:self.detailModel.account.com_type_id]) {
+                self.kindStr = [NSString stringWithFormat:@"%@",obj.name];
+            }
+        }
+    }];
+    
 }
  
 #pragma mark -
@@ -135,7 +151,7 @@
  
         }else {
             CNLiveBOrganizationDetailCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationDetailCell forIndexPath:indexPath];
-            [cell editUIWithIndexPath:indexPath detailModel:self.detailModel];
+            [cell editUIWithIndexPath:indexPath detailModel:self.detailModel kindStr:self.kindStr];
             return cell;
         }
  
@@ -419,8 +435,7 @@
     //URL: https://api.cnlive.com/open/api2/auser/getAccount.action?
     NSString *strUrl = CNLiveBOrganizationValidattionStatusUrl;
     NSDictionary *dict = @{
-        @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid],
-        @"sign":@""
+        @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid]
     };
     [QMUITips showLoadingInView:self.view];
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
@@ -446,10 +461,19 @@
         if (!err) {
             CNLiveOrganizationDetailModel *detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:data];
             self.detailModel = detailModel;
+            [self.detailModel.comTypList enumerateObjectsUsingBlock:^(CNLiveOrganizationTipModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                   NSString *str = [NSString stringWithFormat:@"%@",obj.ID];
+                   if (self.detailModel.account) {
+                       if ([str isEqualToString:self.detailModel.account.com_type_id]) {
+                                 self.kindStr = [NSString stringWithFormat:@"%@",obj.name];
+                             }
+                   }
+            }];
             [self.tableView reloadData];
  
+        }else {
+            [QMUITips showError:err.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:0.5];//@"上传失败"
         }
-#pragma mark - TODO: 报错信息
  
     }];
  
@@ -483,6 +507,15 @@
     return _headerView;;
 }
  
+- (UIImageView * )showImageV {
+    if (!_showImageV) {
+        _showImageV = [[UIImageView alloc] init];
+        _showImageV.image = [UIImage imageNamedFromOrganization:@"organization_detailCer"];
+        _showImageV.frame = CGRectMake(kScreenWidth - 81 -10, 16, 81, 81);
+    }
+    return _showImageV;
+}
+
  
 //
 //
@@ -161,7 +161,6 @@
     };
     self.footerView.clickAgreementButtonBlock = ^(CNLiveBOrganizationTVFooteriew * _Nonnull footerView, UIButton * _Nonnull agreementBtn) {
         footerView.agreementBtn.selected = ! footerView.agreementBtn.selected;
-#pragma mark - TODO: 记录内容
  
     };
     self.footerView.clickAgreementLBlock = ^(CNLiveBOrganizationTVFooteriew * _Nonnull footerView, UILabel * _Nonnull agreementL) {
@@ -506,8 +505,7 @@
         [self.tableView reloadData];
     }
  
-    
-#pragma mark - TODO: 获取图片
+
     if (self.navigationController) {
         [self.navigationController popViewControllerAnimated:YES];
     }
@@ -706,18 +704,13 @@
  
  
  
-
-#pragma mark - TODO:
 #pragma mark - *** 事件实现 ***
  
 - (void)jumpCommitVC {
  
  
     NSLog(@"公司全称 = %@,企业logo上传路径 = %@,企业简称 = %@,企业代码 = %@,企业简介 = %@,企业地址 = %@,选择企业类型 = %@,webUrl = %@,法人 = %@,联系人* = %@,合同编号 = %@,营业执照编号 = %@,营业执照 = %@",self.companyName,self.logoUrl,self.companyShortName,self.companyId,self.companyContent,self.companyAdress,self.tipModel.name,self.webUrl,self.legalPerson,self.contact,self.contractCount,self.licenseCount,self.licenseImageUrl);
-    
-    //    CNLiveBAgreementCommitFinishController *commitVC = [[CNLiveBAgreementCommitFinishController alloc]init];
-    //    [self.navigationController pushViewController:commitVC animated:YES];
-    
+
     if (!self.footerView.agreementBtn.isSelected) {
         [QMUITips showWithText:@"请同意安全协议" inView:self.view hideAfterDelay:0.5];
         return;
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
  
 @property (strong, nonatomic) NSIndexPath *indexPath;
  
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel;
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel kindStr:(NSString *)kindStr;
  
 @end
  
@@ -76,7 +76,7 @@
 #pragma mark - ***监听实现***
  
 #pragma mark - ***editUI**
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel {
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel kindStr:(NSString *)kindStr {
  
  
     if (!indexPath) {
@@ -150,12 +150,10 @@
  
             NSString *titleStr = @"企业类型:";
             NSString *content = @"";
-            if (isDetail) {
-                content = [NSString stringWithFormat:@"%@",detailModel.account.com_type_id?detailModel.account.com_type_id:@""];
+            if (isDetail && kindStr && kindStr.length > 0) {
+                content = [NSString stringWithFormat:@"%@",kindStr?kindStr:@""];
             }
  
-            
-            
             NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;