删除无用类

yanglingyu
1 parent 30d81b1b
Showing 9 changed files with 5 additions and 468 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Header/PrefixHeader.pch
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
CNLiveScioLive/Pages/Home/新闻详情/Controller/ArticleDetailViewController.h
CNLiveScioLive/Pages/Home/新闻详情/Controller/ArticleDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/Controller/VideoDetailViewController.m
CNLiveScioLive/Pages/Home/答记者问/Controller/CNLiveReporterAskedViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/My/我的收藏/Controller/CNLiveMyCollectionViewController.m
@@ -365,9 +365,6 @@
 		08940D752154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; };
 		08940D762154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; };
 		08940D772154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; };
-		08940D7E2154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */; };
-		08940D7F2154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */; };
-		08940D802154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */; };
 		08940D832154F15900F85DB6 /* VideoDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D822154F15900F85DB6 /* VideoDetailViewController.m */; };
 		08940D842154F15900F85DB6 /* VideoDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D822154F15900F85DB6 /* VideoDetailViewController.m */; };
 		08940D852154F15900F85DB6 /* VideoDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D822154F15900F85DB6 /* VideoDetailViewController.m */; };
@@ -846,8 +843,6 @@
 		0886E3C32179D99900C777A3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		08940D732154EB2C00F85DB6 /* UILabel+TextAlign.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+TextAlign.h"; sourceTree = "<group>"; };
 		08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+TextAlign.m"; sourceTree = "<group>"; };
-		08940D7C2154F05F00F85DB6 /* ArticleDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ArticleDetailViewController.h; sourceTree = "<group>"; };
-		08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ArticleDetailViewController.m; sourceTree = "<group>"; };
 		08940D812154F15900F85DB6 /* VideoDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoDetailViewController.h; sourceTree = "<group>"; };
 		08940D822154F15900F85DB6 /* VideoDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoDetailViewController.m; sourceTree = "<group>"; };
 		08940D862154F6FD00F85DB6 /* CNLiveNewsDetailModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveNewsDetailModel.h; sourceTree = "<group>"; };
@@ -1449,8 +1444,6 @@
 		08940D792154F04A00F85DB6 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				08940D7C2154F05F00F85DB6 /* ArticleDetailViewController.h */,
-				08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */,
 				08940D812154F15900F85DB6 /* VideoDetailViewController.h */,
 				08940D822154F15900F85DB6 /* VideoDetailViewController.m */,
 			);
@@ -2658,7 +2651,6 @@
 				C3E502D52152427E00DA4320 /* CNHomeRightViewController.m in Sources */,
 				08B5C569215334CC00F5476E /* CNLiveSettingViewController.m in Sources */,
 				08B5C5B721537D7000F5476E /* CNLiveWebViewController.m in Sources */,
-				08940D7E2154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */,
 				08585D50215B4C7200FC2CA2 /* PGDatePicker+YearAndMonth.m in Sources */,
 				08585DB8215B4DA300FC2CA2 /* ThreeImageTableViewCell.m in Sources */,
 				08384857215CA75C00186618 /* OldVideoDetailViewController.m in Sources */,
@@ -2801,7 +2793,6 @@
 				08585D72215B4C7200FC2CA2 /* PGPickerTableView.m in Sources */,
 				083847E2215C5DDD00186618 /* VPImageCropperViewController.m in Sources */,
 				084ACE232154B1270089E035 /* CNHomeModel.m in Sources */,
-				08940D7F2154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */,
 				08C08FF3214FA24F00E23D16 /* CNLiveBaseNavigationController.m in Sources */,
 				08B5C5B321536BFF00F5476E /* AlertViewTool.m in Sources */,
 				08C0907A2150C79C00E23D16 /* UIViewExt.m in Sources */,
@@ -2955,7 +2946,6 @@
 				08585D73215B4C7200FC2CA2 /* PGPickerTableView.m in Sources */,
 				083847E3215C5DDD00186618 /* VPImageCropperViewController.m in Sources */,
 				084ACE242154B1270089E035 /* CNHomeModel.m in Sources */,
-				08940D802154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */,
 				08C08FF4214FA24F00E23D16 /* CNLiveBaseNavigationController.m in Sources */,
 				08B5C5B421536BFF00F5476E /* AlertViewTool.m in Sources */,
 				08C0907B2150C79C00E23D16 /* UIViewExt.m in Sources */,
@@ -32,8 +32,6 @@
 //h5
 #import "CNLiveWebViewController.h"
-//新闻图文详情
-//#import "ArticleDetailViewController.h"
 //新闻视频详情
 //#import "VideoDetailViewController.h"
 //Old详情
@@ -303,32 +303,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
  */
 #pragma mark - Action
 - (void)pushViewControllerWithModel:(CNHomeModel *)model {
-//    if ([model.type isEqualToString:@"program"]) {
-//        //视频
-//        VideoDetailViewController *vc = [[VideoDetailViewController alloc] init];
-//        vc.model = model;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
-//
-//    } else if ([model.type isEqualToString:@"article"]) {
-//        //文章
-//        ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
-//        vc.model = model;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
-//
-//    } else if ([model.type isEqualToString:@"subject"]) {
-//        //        SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
-//        //        vc.title = @"国新专题";
-//        //        vc.hidesBottomBarWhenPushed = YES;
-//
-//    } else if ([model.type isEqualToString:@"LK"]) {
-//        ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
-//        vc.model = model;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
-//
-//    }
     NSDictionary *_dic = [model toDictionary];
     if ([@"program" isEqualToString:_dic[@"type"]]) {
         //视频
-//
-//  ArticleDetailViewController.h
-//  CNLiveScioLive
-//
-//  Created by CNLive-zxw on 2018/9/21.
-//  Copyright © 2018年 CNLive. All rights reserved.
-//
-
-#import "CNLiveBaseViewController.h"
-@class CNHomeModel;
-@interface ArticleDetailViewController : CNLiveBaseViewController
-@property (nonatomic, strong) CNHomeModel *model;
-
-@end
-//
-//  ArticleDetailViewController.m
-//  CNLiveScioLive
-//
-//  Created by CNLive-zxw on 2018/9/21.
-//  Copyright © 2018年 CNLive. All rights reserved.
-//
-
-#import "ArticleDetailViewController.h"
-#import "CNHomeModel.h"
-#import "CNLiveNewsDetailModel.h"
-#import <WebKit/WebKit.h>
-#import "CNLiveNewsDetailsView.h"
-
-@interface ArticleDetailViewController ()<WKScriptMessageHandler,WKNavigationDelegate,WKUIDelegate>
-{
-    UIProgressView *_progressView;
-    NSString *_htmlString;
-    NSString *_htmlUrl;
-    BOOL _isHaveVideo;
-
-}
-//@property (nonatomic, strong) NSMutableArray *data;
-//@property (nonatomic, strong) UITableView *tableView;
-@property (nonatomic, strong) WKWebView *webView;
-@property (nonatomic, strong) CNLiveNewsDetailsView *detailsView;
-
-@property (nonatomic, strong) NSArray *fontArray;
-@property (nonatomic, assign) NSInteger fontIndex;
-
-@end
-
-@implementation ArticleDetailViewController
-#pragma mark - Data
-/*
-- (void)loadData{
-//    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
-//        [SVProgressHUD showErrorWithStatus:CustomStr(@"NetworkiInterruption") duration:0.5];
-//        return;
-//    }
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
-    NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",self.model.cmsContentId];
-    NSDictionary *parameters = @{@"params":categoryId};
-    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    
-    [XWHTTPTool POST:strUrl params:parameters success:^(id json) {
-        
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
-        
-        // 请求成功，解析数据
-        NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
-        
-        if ([dic[@"errorCode"] isEqualToString:@"0"]) {
-            
-            NSArray *programs = dic[@"programs"];
-            
-            if ([programs isKindOfClass:[NSArray class]]) {
-                for (NSDictionary *dics in programs) {
-                    [CNLiveNewsDetailModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    
-                    NSLog(@"%@",dics);
-                    [self.data addObject:[CNLiveNewsDetailModel mj_objectWithKeyValues:dics]];
-                }
-                
-            }
-            
-        } else {
-            [MBProgressHUD hideHUDForView:self.view animated:YES];
-            [AlertViewTool showHUDAddedToView:self.view text:dic[@"errorMessage"]];
-            
-        }
-        
-        
-    } failure:^(NSError *error) {
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
-        [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"ServerBusy")];
-        
-    }];
-}
-- (void)loadMoreData{
- 
-    
-}
- */
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    [self.navigationController.navigationBar addSubview:_progressView];
-    
-    NSError *error = nil;
-    [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryPlayback error: &error];
-    [[AVAudioSession sharedInstance] setActive:YES error:nil];
-    //计数统计
-    
-    if ([self.model.cmsColumnId isEqualToString:@"spzl/srbd/"]) {
-        //深入报道
-        [CNLiveStat event:@"srbdsl"];
-    }else if ([self.model.cmsColumnId  isEqualToString:@"spzl/zcjd/"]){
-        //国新图说
-        [CNLiveStat event:@"gxtssl"];
-    }else if ([self.model.cmsColumnId  isEqualToString:@"spzl/gzdt/"]){
-        //要闻
-        [CNLiveStat event:@"ywsl"];
-    }else if ([self.model.cmsColumnId isEqualToString:@"spzl/hyjj/"]){
-        //焦点
-        [CNLiveStat event:@"jdsl"];
-    }else if ([self.model.cmsColumnId  isEqualToString:@"spzl/lingdaoyaowen/"]){
-        //领导要闻
-        [CNLiveStat event:@"ldywsl"];
-    }else if ([self.model.cmsColumnId  isEqualToString:@"spzl/bw/"]){
-        //部委
-        [CNLiveStat event:@"bwsl"];
-    }else if ([self.model.cmsColumnId  isEqualToString:@"spzl/dfdt/"]){
-        //地方外宣
-        [CNLiveStat event:@"dfwxsl"];
-    }else if ([self.model.cmsColumnId isEqualToString:@"spzl/scio/"]){
-        //scio news
-        [CNLiveStat event:@"newssl"];
-    }else if ([self.model.cmsColumnId  isEqualToString:@"spzl/wqtw/"]){
-        //往期图文
-        [CNLiveStat event:@"wqtwsl"];
-    }else if ([self.model.cmsColumnId isEqualToString:@"spzl/fbhgg/"]){
-        //发布会公告
-        [CNLiveStat event:@"fbhggsl"];
-    }else if ([self.model.cmsColumnId  isEqualToString:@"spzl/toutiao/"]){
-        //头条
-        [CNLiveStat event:@"ttsl"];
-    }else if ([self.model.cmsColumnId  isEqualToString:@"spzl/yidaiyilu/"]){
-        //一带一路
-        [CNLiveStat event:@"ydylsl"];
-    }else if ([self.model.cmsColumnId isEqualToString:@"spzl/zixun/"]){
-        //资讯
-        [CNLiveStat event:@"zxsl"];
-    }
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    [self setUpNavigationBar];
-    
-    _fontIndex = [[NSUserDefaults standardUserDefaults] integerForKey:@"FontSize"];
-    
-    _htmlString = [NSString stringWithContentsOfURL:[NSURL URLWithString:self.model.pageUrl] encoding:NSUTF8StringEncoding error:nil];
-    //替换掉html页面中的展示js
-    NSString *replace = [_htmlString stringByReplacingOccurrencesOfString:@"previewImage.start(obj);" withString:@""];
-    _htmlString = replace;
-    _htmlUrl = self.model.pageUrl;
-    if ([_htmlString containsString:@"<video"]) {
-        _isHaveVideo = YES;
-        [[JGMusicManager shareMusicManager] playStop];
-    }
-    [self createUI];
-
-
-    // Do any additional setup after loading the view.
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    [_progressView removeFromSuperview];
-}
-- (NSString *)setHTMLString {
-    NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<p><font style=\"font-size:20px;\"><strong>%@</strong></font><p>%@</p><font color=\"#184085\">%@</font> </p>",self.model.title,self.model.createDate,@"来源 : 国新网"];
-    NSString * htmlcontent = [NSString stringWithFormat:@"<div id=\"webview_content_wrapper\">%@<font style=\"font-size:%@px;\">%@</font></div>",htmlHeader,_fontArray[_fontIndex],self.model.content];
-    NSLog(@"htmlcontent = %@",htmlcontent);
-    return htmlcontent;
-}
-#pragma mark - UI
-- (void)setUpNavigationBar{
-    self.navigationController.navigationBar.barTintColor = Color_Blue;
-    self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]};
-    //左
-    UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 44)];
-    headerButton.layer.cornerRadius = 2.0;
-    headerButton.layer.masksToBounds = true;
-    [headerButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
-    [headerButton addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
-    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:headerButton];
-    self.navigationItem.title = self.model.cmsColumnName;
-    
-}
-- (void)createUI{
-    [self.view addSubview:self.webView];
-    [_webView loadHTMLString:_htmlString baseURL:[NSURL URLWithString:_htmlUrl]];
-    self.detailsView.dic = [self.model toDictionary];
-
-    self.detailsView.pics = @[@"cnlive_fontsize", @"cnlive_isfavorite" ,@"cnlive_share"];
-    __weak typeof(self) weakSelf = self;
-
-    self.detailsView.block = ^(NSInteger tag) {
-        switch (tag) {
-            case 1000://字体
-            {
-                if (weakSelf.fontArray.count - 1 == weakSelf.fontIndex) {
-                    weakSelf.fontIndex = 0;
-                } else {
-                    weakSelf.fontIndex++;
-                }
-                if (0 == weakSelf.fontIndex) {
-                    NSLog(@"0");
-//                    [weakSelf.webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '100%'"];
-                    [weakSelf.webView evaluateJavaScript:[NSString stringWithFormat:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust = '100%'"] completionHandler:nil];
-                } else if (1 == weakSelf.fontIndex) {
-                    NSLog(@"1");
-//                    [weakSelf.webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '120%'"];
-                    [weakSelf.webView evaluateJavaScript:[NSString stringWithFormat:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust = '120%'"] completionHandler:nil];
-                } else if (2 == weakSelf.fontIndex) {
-                    NSLog(@"2");
-//                    [weakSelf.webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '140%'"];
-                    [weakSelf.webView evaluateJavaScript:[NSString stringWithFormat:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust = '140%'"] completionHandler:nil];
-                }
-            }
-                break;
-            case 1001://收藏
-            {
-                NSDictionary *dic = [weakSelf.model toDictionary];
-                TableData *notice = [[TableData alloc] initWithJSONDictionary:dic];
-                BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
-                if (!isIn) {
-                    BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
-                    if (isInsert) {
-                        [AlertViewTool showHUDAddedToView:weakSelf.view text:CustomStr(@"CollectSuccess")];
-                        [weakSelf.detailsView.btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
-                        
-                    }
-                    
-                } else {
-                    BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
-                    if (isDelete) {
-                        [AlertViewTool showHUDAddedToView:weakSelf.view text:CustomStr(@"CancelCollect")];
-                        [weakSelf.detailsView.btn setImage:[UIImage imageNamed:@"cnlive_isfavorite"] forState:UIControlStateNormal];
-                        
-                    }
-                }
-                
-                
-            }
-                break;
-            case 1002://分享
-            {
-                [[TemplateShareManager manager] shareImage:self.model.img title:self.model.title text:self.model.desc?self.model.desc:self.model.title url:self.model.pageUrl controller:self];
-                return;
-            }
-                break;
-                
-            default:
-                break;
-        }
-        
-    };
-    [self.view addSubview:self.detailsView];
-}
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-#pragma mark - WKScriptMessageHandler
-- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message{
-    
-}
-
-/*
-#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.
-}
-*/
-#pragma mark - Lazy Laoding
-- (WKWebView *)webView {
-    if (!_webView) {
-        
-        WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc]init];
-        config.preferences = [WKPreferences new];
-        config.preferences.minimumFontSize = 10;
-        config.preferences.javaScriptEnabled = YES;
-        config.preferences.javaScriptCanOpenWindowsAutomatically = YES;
-        config.userContentController = [[WKUserContentController alloc]init];
-        [config.userContentController addScriptMessageHandler:self name:@"goback"];
-        
-        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight-NavBarHeight-TabBarHeight) configuration:config];
-        _webView.navigationDelegate = self;
-        _webView.UIDelegate = self;
-        _webView.scrollView.bounces = NO;
-        [_webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil];
-
-    }
-    return _webView;
-}
-- (UIProgressView *)progressView{
-    if(!_progressView){
-        _progressView = [[UIProgressView alloc]initWithFrame:CGRectMake(0, 44, CGRectGetWidth(self.view.frame), 2)];
-        _progressView.progressTintColor = Color_Blue;
-        [self.view addSubview:self.progressView];
-    }
-    return  _progressView;
-}
-- (NSArray *)fontArray{
-    if (!_fontArray) {
-        _fontArray = [[NSArray alloc] initWithObjects:@"16", @"20", @"24", nil];
-    }
-    return _fontArray;
-}
-
-//- (UITableView *)tableView{
-//    if(!_tableView){
-//        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight-45-NavBarHeight-TabBarHeight) style:UITableViewStylePlain];
-//        _tableView.delegate = self;
-//        _tableView.dataSource = self;
-//        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-//        _tableView.backgroundColor = HEXCOLOR(0xebebeb);
-//
-//_tableView.estimatedRowHeight = 0;
-//_tableView.estimatedSectionHeaderHeight = 0;
-//_tableView.estimatedSectionFooterHeight = 0;
-//        //  设置上拉加载
-//        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
-//        _tableView.mj_footer = footer;
-//
-//    }
-//    return _tableView;
-//}
-//- (NSMutableArray *)data{
-//    if (!_data) {
-//        _data = [[NSMutableArray alloc] init];
-//    }
-//    return _data;
-//}
-#pragma mark - 监听
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
-    if ([keyPath isEqual:@"estimatedProgress"] && object == self.webView) {
-        [self.progressView setAlpha:1.0f];
-        [self.progressView setProgress:self.webView.estimatedProgress animated:YES];
-        if (self.webView.estimatedProgress  >= 1.0f) {
-            [UIView animateWithDuration:0.3 delay:0.3 options:UIViewAnimationOptionCurveEaseOut animations:^{
-                [self.progressView setAlpha:0.0f];
-            } completion:^(BOOL finished) {
-                [self.progressView setProgress:0.0f animated:YES];
-            }];
-        }
-    }else{
-        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-    }
-}
-
-- (void)dealloc{
-    [self.webView removeObserver:self forKeyPath:@"estimatedProgress"];
-    [self.webView setNavigationDelegate:nil];
-    [self.webView setUIDelegate:nil];
-}
-- (CNLiveNewsDetailsView *)detailsView{
-    if (!_detailsView) {
-        _detailsView = [[CNLiveNewsDetailsView alloc] initWithFrame:CGRectMake(0, MainScreenHeight-TabBarHeight-NavBarHeight, MainScreenWidth, TabBarHeight)];
-    }
-    return _detailsView;
-}
-@end
@@ -546,10 +546,11 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
         vc.hidesBottomBarWhenPushed = YES;
         [self.navigationController pushViewController:vc animated:YES];
     } else if ([model.type isEqualToString:@"article"]) {
-//        ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
-//        vc.model = model;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
+        NSDictionary *_dic = [model toDictionary];
+        OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:_dic];
+        vc.title = _dic[@"cmsColumnName"];
+        vc.hidesBottomBarWhenPushed = YES;
+        [self.navigationController pushViewController:vc animated:YES];
     }
 }
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -263,32 +263,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
 }
 #pragma mark - Action
 - (void)pushViewControllerWithModel:(CNHomeModel *)model {
-//    if ([model.type isEqualToString:@"program"]) {
-//        //视频
-//        VideoDetailViewController *vc = [[VideoDetailViewController alloc] init];
-//        vc.model = model;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
-//
-//    } else if ([model.type isEqualToString:@"article"]) {
-//        //文章
-//        ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
-//        vc.model = model;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
-//
-//    } else if ([model.type isEqualToString:@"subject"]) {
-//        //        SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
-//        //        vc.title = @"国新专题";
-//        //        vc.hidesBottomBarWhenPushed = YES;
-//
-//    } else if ([model.type isEqualToString:@"LK"]) {
-//        ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
-//        vc.model = model;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
-//
-//    }
     NSDictionary *_dic = [model toDictionary];
     if ([@"program" isEqualToString:_dic[@"type"]]) {
         //视频
@@ -9,7 +9,6 @@
 #import "VideoTableViewCell.h"
 #import "ArticleTableViewCell.h"
 #import "VideoPlayBackViewController.h"
-//#import "ArticleDetailViewController.h"
 //#import "OldVideoDetailViewController.h"
 @interface VideoPlayBackViewController ()<CNLivePlayerControllerDelegate> {
@@ -133,31 +133,6 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
         [self.navigationController pushViewController:vc animated:YES];
     }
-//    if ([homeModel.type isEqualToString:@"program"]) {
-//        //视频
-//        VideoDetailViewController *vc = [[VideoDetailViewController alloc] init];
-//        vc.model = homeModel;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
-//
-//    } else if ([homeModel.type isEqualToString:@"article"]) {
-//        //文章
-//        ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
-//        vc.model = homeModel;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
-//
-//    } else if ([homeModel.type isEqualToString:@"subject"]) {
-//        SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
-//        vc.title = @"国新专题";
-//        vc.hidesBottomBarWhenPushed = YES;
-//
-//    } else if ([homeModel.type isEqualToString:@"LK"]) {
-//        ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
-//        vc.model = homeModel;
-//        vc.hidesBottomBarWhenPushed = YES;
-//        [self.navigationController pushViewController:vc animated:YES];
-//    }
 }
 /*