diff --git a/Meizi.xcodeproj/project.pbxproj b/Meizi.xcodeproj/project.pbxproj index c0b9554..242fb48 100644 --- a/Meizi.xcodeproj/project.pbxproj +++ b/Meizi.xcodeproj/project.pbxproj @@ -26,13 +26,13 @@ 7D7510B01B5672DE003CAF34 /* TopicRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D7510AF1B5672DE003CAF34 /* TopicRequest.m */; }; 7D7510B31B5673B0003CAF34 /* Topic.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D7510B21B5673B0003CAF34 /* Topic.m */; }; 7D7510B61B56767C003CAF34 /* TopicTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D7510B51B56767C003CAF34 /* TopicTableViewCell.m */; }; - 7D8A0AA41B58AA83001EDD42 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D8A0AA31B58AA83001EDD42 /* WebViewController.m */; }; 7D8A0AA81B58B482001EDD42 /* SettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D8A0AA71B58B482001EDD42 /* SettingViewController.m */; }; 7D93B84F1ACFD7CF00453452 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D93B84E1ACFD7CF00453452 /* main.m */; }; 7D93B8521ACFD7CF00453452 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D93B8511ACFD7CF00453452 /* AppDelegate.m */; }; 7D93B8581ACFD7CF00453452 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7D93B8561ACFD7CF00453452 /* Main.storyboard */; }; 7D93B85A1ACFD7CF00453452 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7D93B8591ACFD7CF00453452 /* Images.xcassets */; }; 7D93B87C1ACFDD2900453452 /* Meizi.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D93B87B1ACFDD2900453452 /* Meizi.m */; }; + 7DFF243D1B5B95800069BB4D /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DFF243C1B5B95800069BB4D /* WebViewController.m */; }; E07A9DDEC7193BA0132EB02F /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 77EACF44A594DBA190E5C5FF /* libPods.a */; }; /* End PBXBuildFile section */ @@ -79,8 +79,6 @@ 7D7510B21B5673B0003CAF34 /* Topic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Topic.m; sourceTree = ""; }; 7D7510B41B56767C003CAF34 /* TopicTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopicTableViewCell.h; sourceTree = ""; }; 7D7510B51B56767C003CAF34 /* TopicTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopicTableViewCell.m; sourceTree = ""; }; - 7D8A0AA21B58AA83001EDD42 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = ""; }; - 7D8A0AA31B58AA83001EDD42 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = ""; }; 7D8A0AA61B58B482001EDD42 /* SettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingViewController.h; sourceTree = ""; }; 7D8A0AA71B58B482001EDD42 /* SettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingViewController.m; sourceTree = ""; }; 7D93B8491ACFD7CF00453452 /* Meizi.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Meizi.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -93,6 +91,8 @@ 7D93B8761ACFDA1F00453452 /* Constant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constant.h; sourceTree = ""; }; 7D93B87A1ACFDD2900453452 /* Meizi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Meizi.h; sourceTree = ""; }; 7D93B87B1ACFDD2900453452 /* Meizi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Meizi.m; sourceTree = ""; }; + 7DFF243B1B5B95800069BB4D /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = ""; }; + 7DFF243C1B5B95800069BB4D /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -312,8 +312,8 @@ 7D8A0AAD1B58B783001EDD42 /* WebView */ = { isa = PBXGroup; children = ( - 7D8A0AA21B58AA83001EDD42 /* WebViewController.h */, - 7D8A0AA31B58AA83001EDD42 /* WebViewController.m */, + 7DFF243B1B5B95800069BB4D /* WebViewController.h */, + 7DFF243C1B5B95800069BB4D /* WebViewController.m */, ); name = WebView; sourceTree = ""; @@ -500,7 +500,7 @@ 7D7510971B5652DA003CAF34 /* Groups.m in Sources */, 7D7510B01B5672DE003CAF34 /* TopicRequest.m in Sources */, 7D4375F31B5520AF001CEBC9 /* RankRequest.m in Sources */, - 7D8A0AA41B58AA83001EDD42 /* WebViewController.m in Sources */, + 7DFF243D1B5B95800069BB4D /* WebViewController.m in Sources */, 7D4375E81B550BC6001CEBC9 /* MeiziCell.m in Sources */, 7D4375FD1B552695001CEBC9 /* GroupsViewController.m in Sources */, 7D4375E51B5508D3001CEBC9 /* MeiziRequest.m in Sources */, diff --git a/Meizi/AppDelegate.m b/Meizi/AppDelegate.m index 9d15f1c..29a160c 100644 --- a/Meizi/AppDelegate.m +++ b/Meizi/AppDelegate.m @@ -11,9 +11,22 @@ @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + + //Set Background Color self.window.backgroundColor = [UIColor whiteColor]; + + //Set Network [AFNetworkActivityIndicatorManager sharedManager].enabled = YES; [YTKNetworkConfig sharedInstance].baseUrl = BaseURL; + + //Set UserAgent + NSDictionary *userAgent = @{@"UserAgent": @"Mozilla/5.0 (iPhone; CPU iPhone OS 8_4 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12H143 Safari/600.1.4"}; + [[NSUserDefaults standardUserDefaults] registerDefaults:userAgent]; + + //Set SVProgressHUD + [SVProgressHUD setBackgroundColor:[UIColor colorWithWhite:0.0 alpha:0.9]]; + [SVProgressHUD setForegroundColor:[UIColor whiteColor]]; + return YES; } diff --git a/Meizi/Base.lproj/Main.storyboard b/Meizi/Base.lproj/Main.storyboard index 68836c1..b804dd4 100644 --- a/Meizi/Base.lproj/Main.storyboard +++ b/Meizi/Base.lproj/Main.storyboard @@ -382,7 +382,7 @@ - + @@ -390,8 +390,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -643,6 +694,8 @@ + + @@ -650,7 +703,7 @@ - + diff --git a/Meizi/Constant.h b/Meizi/Constant.h index 8d97c2a..9ff992c 100644 --- a/Meizi/Constant.h +++ b/Meizi/Constant.h @@ -12,19 +12,19 @@ #define SCREEN_WIDTH CGRectGetWidth([UIApplication sharedApplication].keyWindow.bounds) #define SCREEN_HEIGHT CGRectGetHeight([UIApplication sharedApplication].keyWindow.bounds) -static NSString * const BaseURL = @"http://api.xiaojianjian.net"; +static NSString * const BaseURL = @"http://api.xiaojianjian.net"; -static NSString * const Meizi_All = @"0"; -static NSString * const Meizi_DaXiong = @"2"; -static NSString * const Meizi_QiaoTun = @"6"; -static NSString * const Meizi_HeiSi = @"7"; -static NSString * const Meizi_MeiTui = @"3"; -static NSString * const Meizi_QingXin = @"4"; -static NSString * const Meizi_ZaHui = @"5"; +static NSString * const Meizi_All = @"0"; +static NSString * const Meizi_DaXiong = @"2"; +static NSString * const Meizi_QiaoTun = @"6"; +static NSString * const Meizi_HeiSi = @"7"; +static NSString * const Meizi_MeiTui = @"3"; +static NSString * const Meizi_QingXin = @"4"; +static NSString * const Meizi_ZaHui = @"5"; -static NSString * const DoubanGroupURL= @"http://www.douban.com/group/"; -static NSString * const DoubanTopicURL= @"http://www.douban.com/group/topic/"; -static NSString * const DBMeiNvTopicURL = @"http://www.dbmeinv.com/dbgroup/app/topic_detail.htm?id="; +static NSString * const DoubanGroupURL = @"http://www.douban.com/group/"; +static NSString * const DoubanTopicURL = @"http://www.douban.com/group/topic/"; +static NSString * const DoubanPeopleURL = @"http://www.douban.com/group/people/"; #endif @@ -43,4 +43,5 @@ static NSString * const DBMeiNvTopicURL = @"http://www.dbmeinv.com/dbgroup/app/t // //- 精选: queryType = rank & pageIndex = 1 //- 小组: m = groups -//- 搜妹: m = topic_users & key = 关键词 & pageIndex = 1 \ No newline at end of file +//- 搜妹: m = topic_users & key = 关键词 & pageIndex = 1 +//static NSString * const DBMeinvTopicURL = @"http://www.dbmeinv.com/dbgroup/app/topic_detail.htm?id="; diff --git a/Meizi/Images.xcassets/Cancel.imageset/Cancel.pdf b/Meizi/Images.xcassets/Cancel.imageset/Cancel.pdf new file mode 100644 index 0000000..027a732 Binary files /dev/null and b/Meizi/Images.xcassets/Cancel.imageset/Cancel.pdf differ diff --git a/Meizi/Images.xcassets/Cancel.imageset/Contents.json b/Meizi/Images.xcassets/Cancel.imageset/Contents.json new file mode 100644 index 0000000..9202ed2 --- /dev/null +++ b/Meizi/Images.xcassets/Cancel.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Cancel.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Meizi/Images.xcassets/GoBack.imageset/Contents.json b/Meizi/Images.xcassets/GoBack.imageset/Contents.json new file mode 100644 index 0000000..50d6ffc --- /dev/null +++ b/Meizi/Images.xcassets/GoBack.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "GoBack.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Meizi/Images.xcassets/GoBack.imageset/GoBack.pdf b/Meizi/Images.xcassets/GoBack.imageset/GoBack.pdf new file mode 100644 index 0000000..5b403a1 Binary files /dev/null and b/Meizi/Images.xcassets/GoBack.imageset/GoBack.pdf differ diff --git a/Meizi/Images.xcassets/GoForward.imageset/Contents.json b/Meizi/Images.xcassets/GoForward.imageset/Contents.json new file mode 100644 index 0000000..e6e58a7 --- /dev/null +++ b/Meizi/Images.xcassets/GoForward.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "GoForward.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Meizi/Images.xcassets/GoForward.imageset/GoForward.pdf b/Meizi/Images.xcassets/GoForward.imageset/GoForward.pdf new file mode 100644 index 0000000..70d3662 Binary files /dev/null and b/Meizi/Images.xcassets/GoForward.imageset/GoForward.pdf differ diff --git a/Meizi/Images.xcassets/PlaceholderImage.imageset/Contents.json b/Meizi/Images.xcassets/PlaceholderImage.imageset/Contents.json deleted file mode 100644 index ae4c0f4..0000000 --- a/Meizi/Images.xcassets/PlaceholderImage.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "PlaceholderImage.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "PlaceholderImage@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "PlaceholderImage@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Meizi/Images.xcassets/PlaceholderImage.imageset/PlaceholderImage.png b/Meizi/Images.xcassets/PlaceholderImage.imageset/PlaceholderImage.png deleted file mode 100644 index 60582fa..0000000 Binary files a/Meizi/Images.xcassets/PlaceholderImage.imageset/PlaceholderImage.png and /dev/null differ diff --git a/Meizi/Images.xcassets/PlaceholderImage.imageset/PlaceholderImage@2x.png b/Meizi/Images.xcassets/PlaceholderImage.imageset/PlaceholderImage@2x.png deleted file mode 100644 index d875778..0000000 Binary files a/Meizi/Images.xcassets/PlaceholderImage.imageset/PlaceholderImage@2x.png and /dev/null differ diff --git a/Meizi/Images.xcassets/PlaceholderImage.imageset/PlaceholderImage@3x.png b/Meizi/Images.xcassets/PlaceholderImage.imageset/PlaceholderImage@3x.png deleted file mode 100644 index c6058db..0000000 Binary files a/Meizi/Images.xcassets/PlaceholderImage.imageset/PlaceholderImage@3x.png and /dev/null differ diff --git a/Meizi/Images.xcassets/Refresh.imageset/Contents.json b/Meizi/Images.xcassets/Refresh.imageset/Contents.json new file mode 100644 index 0000000..e460978 --- /dev/null +++ b/Meizi/Images.xcassets/Refresh.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Refresh.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Meizi/Images.xcassets/Refresh.imageset/Refresh.pdf b/Meizi/Images.xcassets/Refresh.imageset/Refresh.pdf new file mode 100644 index 0000000..29fdeca Binary files /dev/null and b/Meizi/Images.xcassets/Refresh.imageset/Refresh.pdf differ diff --git a/Meizi/PrefixHeader.pch b/Meizi/PrefixHeader.pch index 618a756..3412e54 100644 --- a/Meizi/PrefixHeader.pch +++ b/Meizi/PrefixHeader.pch @@ -17,7 +17,6 @@ #import #import #import -#import #import #import "Constant.h" diff --git a/Meizi/SearchViewController.m b/Meizi/SearchViewController.m index 6506fca..9d48838 100644 --- a/Meizi/SearchViewController.m +++ b/Meizi/SearchViewController.m @@ -111,9 +111,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + [tableView deselectRowAtIndexPath:indexPath animated:YES]; Result *result = [self.resultArray objectAtIndex:indexPath.row]; + NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@/", DoubanPeopleURL, result.c_user_id]]; [self performSegueWithIdentifier:@"toWebViewSection" sender:@{@"title": result.c_nick_name, - @"url": [NSURL URLWithString:result.c_people_url]}]; + @"url": url}]; } #pragma mark - SearchBar Delegate diff --git a/Meizi/TopicViewController.m b/Meizi/TopicViewController.m index 83837a9..962d97b 100644 --- a/Meizi/TopicViewController.m +++ b/Meizi/TopicViewController.m @@ -113,11 +113,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; Topic *topic = [self.topicArray objectAtIndex:indexPath.row]; - NSURL *url = [NSURL URLWithString:[DBMeiNvTopicURL stringByAppendingString:@(topic.topic_id).stringValue]]; -// KINWebBrowserViewController *webViewController = [KINWebBrowserViewController webBrowser]; -// [self.navigationController pushViewController:webViewController animated:YES]; -// [webViewController loadURL:url]; + NSString *referer = [DoubanGroupURL stringByAppendingString:topic.douban_group_id]; + NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@/", DoubanTopicURL, @(topic.douban_topic_id)]]; [self performSegueWithIdentifier:@"toWebViewSection" sender:@{@"title": topic.topic_title, + @"referer": referer, @"url": url}]; } @@ -126,6 +125,7 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { WebViewController *webViewController = segue.destinationViewController; webViewController.title = sender[@"title"]; webViewController.url = sender[@"url"]; + webViewController.referer = sender[@"referer"]; } } diff --git a/Meizi/WebViewController.h b/Meizi/WebViewController.h index d64016d..af10d8a 100644 --- a/Meizi/WebViewController.h +++ b/Meizi/WebViewController.h @@ -2,14 +2,19 @@ // WebViewController.h // Meizi // -// Created by Sunnyyoung on 15/7/17. +// Created by Sunnyyoung on 15/7/19. // Copyright (c) 2015年 Sunnyyoung. All rights reserved. // -#import +#import -@interface WebViewController : KINWebBrowserViewController +@interface WebViewController : UIViewController -@property (nonatomic, copy) NSURL *url; +@property (weak, nonatomic) IBOutlet UIBarButtonItem *goBackButton; +@property (weak, nonatomic) IBOutlet UIBarButtonItem *goForwardButton; + +@property (nonatomic, strong) NSURL *url; +@property (nonatomic, copy) NSString *referer; +@property (weak, nonatomic) IBOutlet UIWebView *webView; @end diff --git a/Meizi/WebViewController.m b/Meizi/WebViewController.m index 5d34b88..b6bf7e8 100644 --- a/Meizi/WebViewController.m +++ b/Meizi/WebViewController.m @@ -2,34 +2,76 @@ // WebViewController.m // Meizi // -// Created by Sunnyyoung on 15/7/17. +// Created by Sunnyyoung on 15/7/19. // Copyright (c) 2015年 Sunnyyoung. All rights reserved. // #import "WebViewController.h" -@interface WebViewController () +@interface WebViewController () @end @implementation WebViewController -- (instancetype)initWithCoder:(NSCoder *)aDecoder { - self = [super init]; - if (self) { - self.delegate = self; +- (void)viewDidLoad { + [super viewDidLoad]; + self.webView.scrollView.contentInset = UIEdgeInsetsMake(0, 0, 44, 0); + [SVProgressHUD showWithStatus:@"加载中"]; + [self.webView loadRequest:[NSURLRequest requestWithURL:self.url]]; +} + +- (void)viewDidDisappear:(BOOL)animated { + [super viewDidDisappear:animated]; + [SVProgressHUD dismiss]; +} + +#pragma mark UIWebView Delegate +- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType { + NSLog(@"%@", request.URL.absoluteString); + NSDictionary *headers = [request allHTTPHeaderFields]; + BOOL hasReferer = [headers objectForKey:@"Referer"] != nil; + if (!hasReferer) { + // relaunch with a modified request + __weak typeof(self) weakSelf = self; + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ + NSURL *url = [request URL]; + NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:url]; + [request setHTTPMethod:@"GET"]; + [request setValue:weakSelf.referer?:@"" forHTTPHeaderField: @"Referer"]; + [weakSelf.webView loadRequest:request]; + }); + }); + return NO; + } else { + return YES; } - return self; } -- (void)viewDidLoad { - [super viewDidLoad]; - [self loadURL:self.url]; +- (void)webViewDidStartLoad:(UIWebView *)webView { + [UIApplication sharedApplication].networkActivityIndicatorVisible = YES; } -- (void)webBrowser:(KINWebBrowserViewController *)webBrowser didFinishLoadingURL:(NSURL *)URL { - if (webBrowser.wkWebView) { +- (void)webViewDidFinishLoad:(UIWebView *)webView { + [UIApplication sharedApplication].networkActivityIndicatorVisible = NO; + //Enable the ToolBar buttons + if (!self.goBackButton.isEnabled || !self.goForwardButton.isEnabled) { + self.goBackButton.enabled = YES; + self.goForwardButton.enabled = YES; + } + NSString *htmlString = [webView stringByEvaluatingJavaScriptFromString:@"document.body.innerHTML"]; + if ([htmlString containsString:@"你想要的东西不在这儿"]) { + [self.navigationController popViewControllerAnimated:YES]; + [SVProgressHUD showErrorWithStatus:@"帖子已经被删除啦~"]; + } else { + [SVProgressHUD dismiss]; } } +- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error { + [UIApplication sharedApplication].networkActivityIndicatorVisible = NO; + [SVProgressHUD showErrorWithStatus:@"加载失败"]; +} + @end diff --git a/Podfile b/Podfile index ba899e3..4912455 100644 --- a/Podfile +++ b/Podfile @@ -10,5 +10,4 @@ pod 'NHBalancedFlowLayout' pod 'UIActivityIndicator-for-SDWebImage' pod 'HMSegmentedControl' pod 'YTKNetwork' -pod 'MWPhotoBrowser' -pod 'KINWebBrowser' \ No newline at end of file +pod 'MWPhotoBrowser' \ No newline at end of file diff --git a/Podfile.lock b/Podfile.lock index 1537d7e..b480a12 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -22,15 +22,11 @@ PODS: - AFNetworking/UIKit (2.5.4): - AFNetworking/NSURLConnection - AFNetworking/NSURLSession - - ARChromeActivity (1.0.2) - DACircularProgress (2.3.1) - HMSegmentedControl (1.5.2) - - KINWebBrowser (1.2.5): - - ARChromeActivity (= 1.0.2) - - TUSafariActivity (= 1.0.2) - MBProgressHUD (0.9.1) - - MJExtension (2.5.0) - - MJRefresh (2.2.1) + - MJExtension (2.5.2) + - MJRefresh (2.3.1) - MWPhotoBrowser (2.1.1): - DACircularProgress (~> 2.3) - MBProgressHUD (~> 0.9) @@ -40,7 +36,6 @@ PODS: - SDWebImage/Core (= 3.7.3) - SDWebImage/Core (3.7.3) - SVProgressHUD (1.1.3) - - TUSafariActivity (1.0.2) - UIActivityIndicator-for-SDWebImage (1.2): - SDWebImage (~> 3.7) - YTKNetwork (0.5.0): @@ -50,7 +45,6 @@ PODS: DEPENDENCIES: - AFNetworking - HMSegmentedControl - - KINWebBrowser - MJExtension - MJRefresh - MWPhotoBrowser @@ -63,18 +57,15 @@ DEPENDENCIES: SPEC CHECKSUMS: AFDownloadRequestOperation: 748a1643423e1ddb23f2178f778087d4f0ae8ac7 AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e - ARChromeActivity: 6488aedc8dd0624b103ea8caf6218e52692aaf77 DACircularProgress: 4dd437c0fc3da5161cb289e07ac449493d41db71 HMSegmentedControl: 83b9686022d2176fb6457d2bdb61e5d6393fed7d - KINWebBrowser: 773e75882717d735cc37772cf71d5eb2b28554fe MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad - MJExtension: 002dbd55e0d66ff0808dc74e014437d25c0220ac - MJRefresh: c3fa0387e8e97a11a9666639d2f815607edd1c2f + MJExtension: 73e812aca0846e4a7b4d7aca34cfacf48d1f3310 + MJRefresh: fa22d5d753aaceb4e76232ce264cb2dca90b323f MWPhotoBrowser: ba0d0c09ffda3a7ea10093518738c502c1c7141c NHBalancedFlowLayout: fd253023c6754e605acdb180d50123e582cc62bb SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84 SVProgressHUD: 748080e4f36e603f6c02aec292664239df5279c1 - TUSafariActivity: 32e3e5dc9123e5533a42d41e1c3246d12911a4a2 UIActivityIndicator-for-SDWebImage: 7bf7ebbf0ed1747dedc0d6e949c4603a6d0f9e0c YTKNetwork: 3f163c181ce5f03d52cf88f39d6757f46894280c