iOS Team / ScioLive · Commits

Commit 4de6d3e9ee49efdee170e6b47a4bd3a92e12be68

Authored by yanglingyu
1 parent 30d81b1b

删除无用类

Inline Side-by-side
Showing 9 changed files with 5 additions and 468 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @4de6d3e
... ... @@ -365,9 +365,6 @@
365 365 08940D752154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; };
366 366 08940D762154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; };
367 367 08940D772154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; };
368   - 08940D7E2154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */; };
369   - 08940D7F2154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */; };
370   - 08940D802154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */; };
371 368 08940D832154F15900F85DB6 /* VideoDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D822154F15900F85DB6 /* VideoDetailViewController.m */; };
372 369 08940D842154F15900F85DB6 /* VideoDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D822154F15900F85DB6 /* VideoDetailViewController.m */; };
373 370 08940D852154F15900F85DB6 /* VideoDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D822154F15900F85DB6 /* VideoDetailViewController.m */; };
... ... @@ -846,8 +843,6 @@
846 843 0886E3C32179D99900C777A3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
847 844 08940D732154EB2C00F85DB6 /* UILabel+TextAlign.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+TextAlign.h"; sourceTree = "<group>"; };
848 845 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+TextAlign.m"; sourceTree = "<group>"; };
849   - 08940D7C2154F05F00F85DB6 /* ArticleDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ArticleDetailViewController.h; sourceTree = "<group>"; };
850   - 08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ArticleDetailViewController.m; sourceTree = "<group>"; };
851 846 08940D812154F15900F85DB6 /* VideoDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoDetailViewController.h; sourceTree = "<group>"; };
852 847 08940D822154F15900F85DB6 /* VideoDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoDetailViewController.m; sourceTree = "<group>"; };
853 848 08940D862154F6FD00F85DB6 /* CNLiveNewsDetailModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveNewsDetailModel.h; sourceTree = "<group>"; };
... ... @@ -1449,8 +1444,6 @@
1449 1444 08940D792154F04A00F85DB6 /* Controller */ = {
1450 1445 isa = PBXGroup;
1451 1446 children = (
1452   - 08940D7C2154F05F00F85DB6 /* ArticleDetailViewController.h */,
1453   - 08940D7D2154F05F00F85DB6 /* ArticleDetailViewController.m */,
1454 1447 08940D812154F15900F85DB6 /* VideoDetailViewController.h */,
1455 1448 08940D822154F15900F85DB6 /* VideoDetailViewController.m */,
1456 1449 );
... ... @@ -2658,7 +2651,6 @@
2658 2651 C3E502D52152427E00DA4320 /* CNHomeRightViewController.m in Sources */,
2659 2652 08B5C569215334CC00F5476E /* CNLiveSettingViewController.m in Sources */,
2660 2653 08B5C5B721537D7000F5476E /* CNLiveWebViewController.m in Sources */,
2661   - 08940D7E2154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */,
2662 2654 08585D50215B4C7200FC2CA2 /* PGDatePicker+YearAndMonth.m in Sources */,
2663 2655 08585DB8215B4DA300FC2CA2 /* ThreeImageTableViewCell.m in Sources */,
2664 2656 08384857215CA75C00186618 /* OldVideoDetailViewController.m in Sources */,
... ... @@ -2801,7 +2793,6 @@
2801 2793 08585D72215B4C7200FC2CA2 /* PGPickerTableView.m in Sources */,
2802 2794 083847E2215C5DDD00186618 /* VPImageCropperViewController.m in Sources */,
2803 2795 084ACE232154B1270089E035 /* CNHomeModel.m in Sources */,
2804   - 08940D7F2154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */,
2805 2796 08C08FF3214FA24F00E23D16 /* CNLiveBaseNavigationController.m in Sources */,
2806 2797 08B5C5B321536BFF00F5476E /* AlertViewTool.m in Sources */,
2807 2798 08C0907A2150C79C00E23D16 /* UIViewExt.m in Sources */,
... ... @@ -2955,7 +2946,6 @@
2955 2946 08585D73215B4C7200FC2CA2 /* PGPickerTableView.m in Sources */,
2956 2947 083847E3215C5DDD00186618 /* VPImageCropperViewController.m in Sources */,
2957 2948 084ACE242154B1270089E035 /* CNHomeModel.m in Sources */,
2958   - 08940D802154F05F00F85DB6 /* ArticleDetailViewController.m in Sources */,
2959 2949 08C08FF4214FA24F00E23D16 /* CNLiveBaseNavigationController.m in Sources */,
2960 2950 08B5C5B421536BFF00F5476E /* AlertViewTool.m in Sources */,
2961 2951 08C0907B2150C79C00E23D16 /* UIViewExt.m in Sources */,
... ...
CNLiveScioLive/Pages/Header/PrefixHeader.pch
  View file @4de6d3e
... ... @@ -32,8 +32,6 @@
32 32 //h5
33 33 #import "CNLiveWebViewController.h"
34 34  
35   -//新闻图文详情
36   -//#import "ArticleDetailViewController.h"
37 35 //新闻视频详情
38 36 //#import "VideoDetailViewController.h"
39 37 //Old详情
... ...
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
  View file @4de6d3e
... ... @@ -303,32 +303,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
303 303 */
304 304 #pragma mark - Action
305 305 - (void)pushViewControllerWithModel:(CNHomeModel *)model {
306   -// if ([model.type isEqualToString:@"program"]) {
307   -// //视频
308   -// VideoDetailViewController *vc = [[VideoDetailViewController alloc] init];
309   -// vc.model = model;
310   -// vc.hidesBottomBarWhenPushed = YES;
311   -// [self.navigationController pushViewController:vc animated:YES];
312   -//
313   -// } else if ([model.type isEqualToString:@"article"]) {
314   -// //文章
315   -// ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
316   -// vc.model = model;
317   -// vc.hidesBottomBarWhenPushed = YES;
318   -// [self.navigationController pushViewController:vc animated:YES];
319   -//
320   -// } else if ([model.type isEqualToString:@"subject"]) {
321   -// // SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
322   -// // vc.title = @"国新专题";
323   -// // vc.hidesBottomBarWhenPushed = YES;
324   -//
325   -// } else if ([model.type isEqualToString:@"LK"]) {
326   -// ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
327   -// vc.model = model;
328   -// vc.hidesBottomBarWhenPushed = YES;
329   -// [self.navigationController pushViewController:vc animated:YES];
330   -//
331   -// }
332 306 NSDictionary *_dic = [model toDictionary];
333 307 if ([@"program" isEqualToString:_dic[@"type"]]) {
334 308 //视频
... ...
CNLiveScioLive/Pages/Home/新闻详情/Controller/ArticleDetailViewController.h deleted 100755 → 0
  View file @30d81b1
1   -//
2   -// ArticleDetailViewController.h
3   -// CNLiveScioLive
4   -//
5   -// Created by CNLive-zxw on 2018/9/21.
6   -// Copyright © 2018年 CNLive. All rights reserved.
7   -//
8   -
9   -#import "CNLiveBaseViewController.h"
10   -@class CNHomeModel;
11   -@interface ArticleDetailViewController : CNLiveBaseViewController
12   -@property (nonatomic, strong) CNHomeModel *model;
13   -
14   -@end
CNLiveScioLive/Pages/Home/新闻详情/Controller/ArticleDetailViewController.m deleted 100755 → 0
  View file @30d81b1
1   -//
2   -// ArticleDetailViewController.m
3   -// CNLiveScioLive
4   -//
5   -// Created by CNLive-zxw on 2018/9/21.
6   -// Copyright © 2018年 CNLive. All rights reserved.
7   -//
8   -
9   -#import "ArticleDetailViewController.h"
10   -#import "CNHomeModel.h"
11   -#import "CNLiveNewsDetailModel.h"
12   -#import <WebKit/WebKit.h>
13   -#import "CNLiveNewsDetailsView.h"
14   -
15   -@interface ArticleDetailViewController ()<WKScriptMessageHandler,WKNavigationDelegate,WKUIDelegate>
16   -{
17   - UIProgressView *_progressView;
18   - NSString *_htmlString;
19   - NSString *_htmlUrl;
20   - BOOL _isHaveVideo;
21   -
22   -}
23   -//@property (nonatomic, strong) NSMutableArray *data;
24   -//@property (nonatomic, strong) UITableView *tableView;
25   -@property (nonatomic, strong) WKWebView *webView;
26   -@property (nonatomic, strong) CNLiveNewsDetailsView *detailsView;
27   -
28   -@property (nonatomic, strong) NSArray *fontArray;
29   -@property (nonatomic, assign) NSInteger fontIndex;
30   -
31   -@end
32   -
33   -@implementation ArticleDetailViewController
34   -#pragma mark - Data
35   -/*
36   -- (void)loadData{
37   -// if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
38   -// [SVProgressHUD showErrorWithStatus:CustomStr(@"NetworkiInterruption") duration:0.5];
39   -// return;
40   -// }
41   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
42   - NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",self.model.cmsContentId];
43   - NSDictionary *parameters = @{@"params":categoryId};
44   - [MBProgressHUD showHUDAddedTo:self.view animated:YES];
45   -
46   - [XWHTTPTool POST:strUrl params:parameters success:^(id json) {
47   -
48   - [MBProgressHUD hideHUDForView:self.view animated:YES];
49   -
50   - // 请求成功，解析数据
51   - NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
52   -
53   - if ([dic[@"errorCode"] isEqualToString:@"0"]) {
54   -
55   - NSArray *programs = dic[@"programs"];
56   -
57   - if ([programs isKindOfClass:[NSArray class]]) {
58   - for (NSDictionary *dics in programs) {
59   - [CNLiveNewsDetailModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
60   - return @{ @"ID" : @"id" ,@"Description" : @"description" };
61   - }];
62   -
63   - NSLog(@"%@",dics);
64   - [self.data addObject:[CNLiveNewsDetailModel mj_objectWithKeyValues:dics]];
65   - }
66   -
67   - }
68   -
69   - } else {
70   - [MBProgressHUD hideHUDForView:self.view animated:YES];
71   - [AlertViewTool showHUDAddedToView:self.view text:dic[@"errorMessage"]];
72   -
73   - }
74   -
75   -
76   - } failure:^(NSError *error) {
77   - [MBProgressHUD hideHUDForView:self.view animated:YES];
78   - [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"ServerBusy")];
79   -
80   - }];
81   -}
82   -- (void)loadMoreData{
83   -
84   -
85   -}
86   - */
87   -- (void)viewWillAppear:(BOOL)animated {
88   - [super viewWillAppear:animated];
89   - [self.navigationController.navigationBar addSubview:_progressView];
90   -
91   - NSError *error = nil;
92   - [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryPlayback error: &error];
93   - [[AVAudioSession sharedInstance] setActive:YES error:nil];
94   - //计数统计
95   -
96   - if ([self.model.cmsColumnId isEqualToString:@"spzl/srbd/"]) {
97   - //深入报道
98   - [CNLiveStat event:@"srbdsl"];
99   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/zcjd/"]){
100   - //国新图说
101   - [CNLiveStat event:@"gxtssl"];
102   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/gzdt/"]){
103   - //要闻
104   - [CNLiveStat event:@"ywsl"];
105   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/hyjj/"]){
106   - //焦点
107   - [CNLiveStat event:@"jdsl"];
108   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/lingdaoyaowen/"]){
109   - //领导要闻
110   - [CNLiveStat event:@"ldywsl"];
111   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/bw/"]){
112   - //部委
113   - [CNLiveStat event:@"bwsl"];
114   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/dfdt/"]){
115   - //地方外宣
116   - [CNLiveStat event:@"dfwxsl"];
117   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/scio/"]){
118   - //scio news
119   - [CNLiveStat event:@"newssl"];
120   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/wqtw/"]){
121   - //往期图文
122   - [CNLiveStat event:@"wqtwsl"];
123   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/fbhgg/"]){
124   - //发布会公告
125   - [CNLiveStat event:@"fbhggsl"];
126   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/toutiao/"]){
127   - //头条
128   - [CNLiveStat event:@"ttsl"];
129   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/yidaiyilu/"]){
130   - //一带一路
131   - [CNLiveStat event:@"ydylsl"];
132   - }else if ([self.model.cmsColumnId isEqualToString:@"spzl/zixun/"]){
133   - //资讯
134   - [CNLiveStat event:@"zxsl"];
135   - }
136   -}
137   -
138   -- (void)viewDidLoad {
139   - [super viewDidLoad];
140   - [self setUpNavigationBar];
141   -
142   - _fontIndex = [[NSUserDefaults standardUserDefaults] integerForKey:@"FontSize"];
143   -
144   - _htmlString = [NSString stringWithContentsOfURL:[NSURL URLWithString:self.model.pageUrl] encoding:NSUTF8StringEncoding error:nil];
145   - //替换掉html页面中的展示js
146   - NSString *replace = [_htmlString stringByReplacingOccurrencesOfString:@"previewImage.start(obj);" withString:@""];
147   - _htmlString = replace;
148   - _htmlUrl = self.model.pageUrl;
149   - if ([_htmlString containsString:@"<video"]) {
150   - _isHaveVideo = YES;
151   - [[JGMusicManager shareMusicManager] playStop];
152   - }
153   - [self createUI];
154   -
155   -
156   - // Do any additional setup after loading the view.
157   -}
158   -
159   -- (void)viewWillDisappear:(BOOL)animated {
160   - [super viewWillDisappear:animated];
161   - [_progressView removeFromSuperview];
162   -}
163   -- (NSString *)setHTMLString {
164   - 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,@"来源 : 国新网"];
165   - NSString * htmlcontent = [NSString stringWithFormat:@"<div id=\"webview_content_wrapper\">%@<font style=\"font-size:%@px;\">%@</font></div>",htmlHeader,_fontArray[_fontIndex],self.model.content];
166   - NSLog(@"htmlcontent = %@",htmlcontent);
167   - return htmlcontent;
168   -}
169   -#pragma mark - UI
170   -- (void)setUpNavigationBar{
171   - self.navigationController.navigationBar.barTintColor = Color_Blue;
172   - self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]};
173   - //左
174   - UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 44)];
175   - headerButton.layer.cornerRadius = 2.0;
176   - headerButton.layer.masksToBounds = true;
177   - [headerButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
178   - [headerButton addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
179   - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:headerButton];
180   - self.navigationItem.title = self.model.cmsColumnName;
181   -
182   -}
183   -- (void)createUI{
184   - [self.view addSubview:self.webView];
185   - [_webView loadHTMLString:_htmlString baseURL:[NSURL URLWithString:_htmlUrl]];
186   - self.detailsView.dic = [self.model toDictionary];
187   -
188   - self.detailsView.pics = @[@"cnlive_fontsize", @"cnlive_isfavorite" ,@"cnlive_share"];
189   - __weak typeof(self) weakSelf = self;
190   -
191   - self.detailsView.block = ^(NSInteger tag) {
192   - switch (tag) {
193   - case 1000://字体
194   - {
195   - if (weakSelf.fontArray.count - 1 == weakSelf.fontIndex) {
196   - weakSelf.fontIndex = 0;
197   - } else {
198   - weakSelf.fontIndex++;
199   - }
200   - if (0 == weakSelf.fontIndex) {
201   - NSLog(@"0");
202   -// [weakSelf.webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '100%'"];
203   - [weakSelf.webView evaluateJavaScript:[NSString stringWithFormat:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust = '100%'"] completionHandler:nil];
204   - } else if (1 == weakSelf.fontIndex) {
205   - NSLog(@"1");
206   -// [weakSelf.webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '120%'"];
207   - [weakSelf.webView evaluateJavaScript:[NSString stringWithFormat:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust = '120%'"] completionHandler:nil];
208   - } else if (2 == weakSelf.fontIndex) {
209   - NSLog(@"2");
210   -// [weakSelf.webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '140%'"];
211   - [weakSelf.webView evaluateJavaScript:[NSString stringWithFormat:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust = '140%'"] completionHandler:nil];
212   - }
213   - }
214   - break;
215   - case 1001://收藏
216   - {
217   - NSDictionary *dic = [weakSelf.model toDictionary];
218   - TableData *notice = [[TableData alloc] initWithJSONDictionary:dic];
219   - BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
220   - if (!isIn) {
221   - BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
222   - if (isInsert) {
223   - [AlertViewTool showHUDAddedToView:weakSelf.view text:CustomStr(@"CollectSuccess")];
224   - [weakSelf.detailsView.btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
225   -
226   - }
227   -
228   - } else {
229   - BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
230   - if (isDelete) {
231   - [AlertViewTool showHUDAddedToView:weakSelf.view text:CustomStr(@"CancelCollect")];
232   - [weakSelf.detailsView.btn setImage:[UIImage imageNamed:@"cnlive_isfavorite"] forState:UIControlStateNormal];
233   -
234   - }
235   - }
236   -
237   -
238   - }
239   - break;
240   - case 1002://分享
241   - {
242   - [[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];
243   - return;
244   - }
245   - break;
246   -
247   - default:
248   - break;
249   - }
250   -
251   - };
252   - [self.view addSubview:self.detailsView];
253   -}
254   -- (void)didReceiveMemoryWarning {
255   - [super didReceiveMemoryWarning];
256   - // Dispose of any resources that can be recreated.
257   -}
258   -#pragma mark - WKScriptMessageHandler
259   -- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message{
260   -
261   -}
262   -
263   -/*
264   -#pragma mark - Navigation
265   -
266   -// In a storyboard-based application, you will often want to do a little preparation before navigation
267   -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
268   - // Get the new view controller using [segue destinationViewController].
269   - // Pass the selected object to the new view controller.
270   -}
271   -*/
272   -#pragma mark - Lazy Laoding
273   -- (WKWebView *)webView {
274   - if (!_webView) {
275   -
276   - WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc]init];
277   - config.preferences = [WKPreferences new];
278   - config.preferences.minimumFontSize = 10;
279   - config.preferences.javaScriptEnabled = YES;
280   - config.preferences.javaScriptCanOpenWindowsAutomatically = YES;
281   - config.userContentController = [[WKUserContentController alloc]init];
282   - [config.userContentController addScriptMessageHandler:self name:@"goback"];
283   -
284   - _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight-NavBarHeight-TabBarHeight) configuration:config];
285   - _webView.navigationDelegate = self;
286   - _webView.UIDelegate = self;
287   - _webView.scrollView.bounces = NO;
288   - [_webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil];
289   -
290   - }
291   - return _webView;
292   -}
293   -- (UIProgressView *)progressView{
294   - if(!_progressView){
295   - _progressView = [[UIProgressView alloc]initWithFrame:CGRectMake(0, 44, CGRectGetWidth(self.view.frame), 2)];
296   - _progressView.progressTintColor = Color_Blue;
297   - [self.view addSubview:self.progressView];
298   - }
299   - return _progressView;
300   -}
301   -- (NSArray *)fontArray{
302   - if (!_fontArray) {
303   - _fontArray = [[NSArray alloc] initWithObjects:@"16", @"20", @"24", nil];
304   - }
305   - return _fontArray;
306   -}
307   -
308   -//- (UITableView *)tableView{
309   -// if(!_tableView){
310   -// _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight-45-NavBarHeight-TabBarHeight) style:UITableViewStylePlain];
311   -// _tableView.delegate = self;
312   -// _tableView.dataSource = self;
313   -// _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
314   -// _tableView.backgroundColor = HEXCOLOR(0xebebeb);
315   -//
316   -//_tableView.estimatedRowHeight = 0;
317   -//_tableView.estimatedSectionHeaderHeight = 0;
318   -//_tableView.estimatedSectionFooterHeight = 0;
319   -// // 设置上拉加载
320   -// MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
321   -// _tableView.mj_footer = footer;
322   -//
323   -// }
324   -// return _tableView;
325   -//}
326   -//- (NSMutableArray *)data{
327   -// if (!_data) {
328   -// _data = [[NSMutableArray alloc] init];
329   -// }
330   -// return _data;
331   -//}
332   -#pragma mark - 监听
333   -- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
334   - if ([keyPath isEqual:@"estimatedProgress"] && object == self.webView) {
335   - [self.progressView setAlpha:1.0f];
336   - [self.progressView setProgress:self.webView.estimatedProgress animated:YES];
337   - if (self.webView.estimatedProgress >= 1.0f) {
338   - [UIView animateWithDuration:0.3 delay:0.3 options:UIViewAnimationOptionCurveEaseOut animations:^{
339   - [self.progressView setAlpha:0.0f];
340   - } completion:^(BOOL finished) {
341   - [self.progressView setProgress:0.0f animated:YES];
342   - }];
343   - }
344   - }else{
345   - [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
346   - }
347   -}
348   -
349   -- (void)dealloc{
350   - [self.webView removeObserver:self forKeyPath:@"estimatedProgress"];
351   - [self.webView setNavigationDelegate:nil];
352   - [self.webView setUIDelegate:nil];
353   -}
354   -- (CNLiveNewsDetailsView *)detailsView{
355   - if (!_detailsView) {
356   - _detailsView = [[CNLiveNewsDetailsView alloc] initWithFrame:CGRectMake(0, MainScreenHeight-TabBarHeight-NavBarHeight, MainScreenWidth, TabBarHeight)];
357   - }
358   - return _detailsView;
359   -}
360   -@end
CNLiveScioLive/Pages/Home/新闻详情/Controller/VideoDetailViewController.m
  View file @4de6d3e
... ... @@ -546,10 +546,11 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
546 546 vc.hidesBottomBarWhenPushed = YES;
547 547 [self.navigationController pushViewController:vc animated:YES];
548 548 } else if ([model.type isEqualToString:@"article"]) {
549   -// ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
550   -// vc.model = model;
551   -// vc.hidesBottomBarWhenPushed = YES;
552   -// [self.navigationController pushViewController:vc animated:YES];
  549 + NSDictionary *_dic = [model toDictionary];
  550 + OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:_dic];
  551 + vc.title = _dic[@"cmsColumnName"];
  552 + vc.hidesBottomBarWhenPushed = YES;
  553 + [self.navigationController pushViewController:vc animated:YES];
553 554 }
554 555 }
555 556 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath{
... ...
CNLiveScioLive/Pages/Home/答记者问/Controller/CNLiveReporterAskedViewController.m
  View file @4de6d3e
... ... @@ -263,32 +263,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
263 263 }
264 264 #pragma mark - Action
265 265 - (void)pushViewControllerWithModel:(CNHomeModel *)model {
266   -// if ([model.type isEqualToString:@"program"]) {
267   -// //视频
268   -// VideoDetailViewController *vc = [[VideoDetailViewController alloc] init];
269   -// vc.model = model;
270   -// vc.hidesBottomBarWhenPushed = YES;
271   -// [self.navigationController pushViewController:vc animated:YES];
272   -//
273   -// } else if ([model.type isEqualToString:@"article"]) {
274   -// //文章
275   -// ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
276   -// vc.model = model;
277   -// vc.hidesBottomBarWhenPushed = YES;
278   -// [self.navigationController pushViewController:vc animated:YES];
279   -//
280   -// } else if ([model.type isEqualToString:@"subject"]) {
281   -// // SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
282   -// // vc.title = @"国新专题";
283   -// // vc.hidesBottomBarWhenPushed = YES;
284   -//
285   -// } else if ([model.type isEqualToString:@"LK"]) {
286   -// ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
287   -// vc.model = model;
288   -// vc.hidesBottomBarWhenPushed = YES;
289   -// [self.navigationController pushViewController:vc animated:YES];
290   -//
291   -// }
292 266 NSDictionary *_dic = [model toDictionary];
293 267 if ([@"program" isEqualToString:_dic[@"type"]]) {
294 268 //视频
... ...
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
  View file @4de6d3e
... ... @@ -9,7 +9,6 @@
9 9 #import "VideoTableViewCell.h"
10 10 #import "ArticleTableViewCell.h"
11 11 #import "VideoPlayBackViewController.h"
12   -//#import "ArticleDetailViewController.h"
13 12 //#import "OldVideoDetailViewController.h"
14 13  
15 14 @interface VideoPlayBackViewController ()<CNLivePlayerControllerDelegate> {
... ...
CNLiveScioLive/Pages/My/我的收藏/Controller/CNLiveMyCollectionViewController.m
  View file @4de6d3e
... ... @@ -133,31 +133,6 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
133 133 [self.navigationController pushViewController:vc animated:YES];
134 134 }
135 135  
136   -// if ([homeModel.type isEqualToString:@"program"]) {
137   -// //视频
138   -// VideoDetailViewController *vc = [[VideoDetailViewController alloc] init];
139   -// vc.model = homeModel;
140   -// vc.hidesBottomBarWhenPushed = YES;
141   -// [self.navigationController pushViewController:vc animated:YES];
142   -//
143   -// } else if ([homeModel.type isEqualToString:@"article"]) {
144   -// //文章
145   -// ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
146   -// vc.model = homeModel;
147   -// vc.hidesBottomBarWhenPushed = YES;
148   -// [self.navigationController pushViewController:vc animated:YES];
149   -//
150   -// } else if ([homeModel.type isEqualToString:@"subject"]) {
151   -// SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
152   -// vc.title = @"国新专题";
153   -// vc.hidesBottomBarWhenPushed = YES;
154   -//
155   -// } else if ([homeModel.type isEqualToString:@"LK"]) {
156   -// ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
157   -// vc.model = homeModel;
158   -// vc.hidesBottomBarWhenPushed = YES;
159   -// [self.navigationController pushViewController:vc animated:YES];
160   -// }
161 136  
162 137 }
163 138 /*
... ...