提交更改

梁星国
1 parent 6b473c0d
Showing 7 changed files with 81 additions and 32 deletions
CNLiveServiceCenterModule.podspec
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBCreatorViewController.h
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBCreatorViewController.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCertificationCell.h
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCertificationCell.m
Example/Podfile
@@ -81,12 +81,6 @@ Pod::Spec.new do |s|
     ###    所有github三方管理库(非频繁更新)
     ########################################
     s.dependency  'CNLiveTripartiteManagement'
-    
-    #TODO:后面都注释掉直接在主工程导入
-    #认证模块
-    s.dependency  'CNLiveOrganizationValidationModule'
-    #用户认证模块
-    s.dependency 'CNLiveBPersonalVerificationModule'
 end
@@ -12,6 +12,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveBCreatorViewController : CNCommonViewController
+
+@property (strong, nonatomic) NSString *url;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -18,18 +18,11 @@
 #import <objc/runtime.h>
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
-//http://wjjh5.cnlive.com/cnBCzzxy.html
-//http://wjjh5test.cnlive.com/cnBCzzxy.html
-
-
-#define CNLiveBCenterCreaterUrl cn_WjjH5_Host(@"/cnBCzzxy.html")
 @interface CNLiveBCreatorViewController ()<WKNavigationDelegate,WKUIDelegate,UIScrollViewDelegate>
 @property (strong, nonatomic) WKWebView *wkwebView;
-@property (strong, nonatomic) NSString *url;
-
 @property (assign,nonatomic) NSUInteger loadCount;
 @property (assign,nonatomic) UIProgressView *progressView;
@@ -40,7 +33,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.title = @"创作者学院";
     [self.view setBackgroundColor:[UIColor whiteColor]];
     [self initWKWebView];
@@ -58,15 +50,17 @@
     self.view.backgroundColor = [UIColor whiteColor];
-    self.url = CNLiveBCenterCreaterUrl;
     WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, KScreenHeight)];
     [self.view addSubview:webView];
     webView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
     [webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
-    NSURL *url = [NSURL URLWithString:self.url];
-    NSURLRequest *request = [NSURLRequest requestWithURL:url];
-    [webView loadRequest:request];
-    
+    if (self.url) {
+        NSURL *url = [NSURL URLWithString:self.url];
+        if (url) {
+            NSURLRequest *request = [NSURLRequest requestWithURL:url];
+            [webView loadRequest:request];
+        }
+    }
     [self.view insertSubview:webView belowSubview:progress];
 }
@@ -27,10 +27,18 @@
 #import "CNLiveBCreatorViewController.h"
 #import "CNLiveBServiceLiveSelectedView.h"
+/// 认证状态
 #define CNLiveBGetServiceStatusUrl          cn_API_OpenApi2(@"/user/readWJJBStatusById")
+/// 机构认证
 #define CNLiveBOrganizationValidattionStatusUrl        cn_API_OpenApi2(@"/auser/getAccount.action")
+/// 个人认证
 #define CNLiveBOrganizationPersonStatusUrl      cn_API_Host(@"/Daren/buser/getBUserInfo.action")
+//http://wjjh5.cnlive.com/cnBCzzxy.html
+//http://wjjh5test.cnlive.com/cnBCzzxy.html
+/// 创建者url
+#define CNLiveBCenterCreaterUrl cn_WjjH5_Host(@"/cnBCzzxy.html")
+
 @interface CNLiveBServiceCenterController ()<UITableViewDataSource,UITableViewDelegate>
 /** 头部*/
@@ -207,6 +215,11 @@
             }else {
                 [certificationCell configUI:self.centerModel type:CNLiveBServiceCertificationCellTypeInstitutions];
             }
+            __weak typeof(self) weakSelf = self;
+            certificationCell.clickWebViewBlock = ^(CNLiveBServiceCertificationCell * _Nonnull cell, NSString * _Nonnull webUrl) {
+                
+                [weakSelf jumpWebViewForUrl:webUrl];
+            };
             return certificationCell;
         }else if (indexPath.row == 2){
             CNLiveBServiceHelpLearnCell *helpLearnCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBServiceHelpLearnCell forIndexPath:indexPath];
@@ -340,6 +353,8 @@
 ///跳转创作者
 - (void)jumpCreaterVC {
     CNLiveBCreatorViewController *vc = [[CNLiveBCreatorViewController alloc]init];
+    vc.title = @"创作者学院";
+    vc.url = CNLiveBCenterCreaterUrl;
     vc.hidesBottomBarWhenPushed = YES;
     [self.navigationController pushViewController:vc animated:YES];
 }
@@ -352,6 +367,17 @@
 }
+/// 跳转网页
+- (void)jumpWebViewForUrl:(NSString *)url{
+    CNLiveBCreatorViewController *vc = [[CNLiveBCreatorViewController alloc]init];
+    vc.title = @"视讯云";
+    vc.url = url;
+    vc.hidesBottomBarWhenPushed = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+    
+    
+}
+
@@ -24,6 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)configUI:(CNLiveBServiceCenterModel *)model type:(CNLiveBServiceCertificationCellType)type;
+/** 点击按钮l回调 */
+@property (nonatomic, copy) void(^clickWebViewBlock)(CNLiveBServiceCertificationCell *cell,NSString *webUrl);
+
 @end
 NS_ASSUME_NONNULL_END
@@ -10,6 +10,7 @@
 #import <Masonry/Masonry.h>
 #import "UIImage+Service.h"
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import <YYKit/YYKit.h>
 @interface CNLiveBServiceCertificationCell()
 /** 背景*/
@@ -17,7 +18,7 @@
 /** 头部*/
 @property (nonatomic, strong) UILabel *titleL;
 /** 内容*/
-@property (nonatomic, strong) UILabel *contentL;
+@property (nonatomic, strong) YYLabel *contentL;
 /** 认证*/
 @property (nonatomic, strong) UIButton *certificationBtn;
 /** 认证Log*/
@@ -55,7 +56,7 @@
 #pragma mark - ***setupUI***
 - (void)setupUI {
-    self.selectionStyle = UITableViewCellSelectionStyleNone;        
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
     [self setBackgroundColor:[UIColor whiteColor]];
     [self addSubview:self.cellBGimageV];
@@ -79,14 +80,14 @@
         make.right.equalTo(weakSelf.mas_right).offset(0);
         make.bottom.equalTo(weakSelf.mas_bottom).offset(0);
     }];
-
+    
     [self.titleL mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(weakSelf.mas_left).offset(20.5);
         make.top.equalTo(weakSelf.mas_top).offset(26.5);
         make.width.mas_equalTo(100);
         make.height.mas_equalTo(17);
     }];
-
+    
     [self.contentL mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(weakSelf.titleL.mas_left).offset(0);
         make.top.equalTo(weakSelf.titleL.mas_bottom).offset(13);
@@ -101,7 +102,7 @@
         make.height.mas_equalTo(25);
     }];
-
+    
 }
@@ -132,7 +133,29 @@
     }else {
         self.titleL.text = @"机构认证";
         self.titleL.textColor = RGBOF(0xe7a010);
-        self.contentL.text = @"适合企业、媒体、国家机构和其他知名机构申请。\n申请方式：在B端申请或在电脑打开链接:http://open.cnlive.com/操作申请。";
+        NSString *contentText = @"适合企业、媒体、国家机构和其他知名机构申请。\n申请方式：在B端申请或在电脑打开链接:http://open.cnlive.com/操作申请。";
+        NSString *tipText = @"http://open.cnlive.com/";
+        NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:contentText];
+        
+        NSRange range = [contentText rangeOfString:tipText];
+        // 2. 将属性设置为文本，可以使用几乎所有的CoreText属性。
+        text.font = [UIFont systemFontOfSize:12];
+        text.color = RGBOF(0x7b7b7b);
+        __weak typeof(self) weakSelf = self;
+        [text setTextHighlightRange:range
+                              color:[UIColor colorWithRed:0.093 green:0.492 blue:1.000 alpha:1.000]
+                    backgroundColor:[UIColor whiteColor]
+                          tapAction:^(UIView *containerView, NSAttributedString *text, NSRange range, CGRect rect) {
+            //点击文本的操作
+            NSLog(@"输出内容");
+            if (weakSelf.clickWebViewBlock) {
+                weakSelf.clickWebViewBlock(weakSelf, tipText);
+            }
+            
+        }];
+        
+        
+        self.contentL.attributedText = text;
         if (model) {
             if ([model.institutionStatus isEqualToString:@"1"]) {
@@ -154,10 +177,10 @@
 #pragma mark - ***事件实现***
 - (void)attentionBtnAction:(UIButton *)sender {
-//    if (self.clickAttentionBtnBlock) {
-//        self.clickAttentionBtnBlock(self, sender);
-//    }
-//
+    //    if (self.clickAttentionBtnBlock) {
+    //        self.clickAttentionBtnBlock(self, sender);
+    //    }
+    //
 }
@@ -187,10 +210,10 @@
 }
 /***  内容 ***/
-- (UILabel *)contentL {
+- (YYLabel *)contentL {
     if (!_contentL) {
-        _contentL = [[UILabel alloc]init];
+        _contentL = [[YYLabel alloc]init];
         _contentL.font = [UIFont systemFontOfSize:12];
         _contentL.textAlignment = NSTextAlignmentLeft;
         //让内容置顶
@@ -236,7 +259,7 @@
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
-
+    
     // Configure the view for the selected state
 }
@@ -14,6 +14,12 @@ target &#39;CNLiveServiceCenterModule_Example&#39; do
   target 'CNLiveServiceCenterModule_Tests' do
     inherit! :search_paths
+    
+    #TODO:后面都注释掉直接在主工程导入
+    #认证模块
+    pod 'CNLiveOrganizationValidationModule'
+    #用户认证模块
+    pod 'CNLiveBPersonalVerificationModule'
   end