Skip to content

Commit

Permalink
WNXHuntForCity
Browse files Browse the repository at this point in the history
添加了忽略文件
  • Loading branch information
MacBook committed Jul 20, 2015
1 parent f9ae27b commit aabb12a
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 6 deletions.
44 changes: 44 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@

# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata

## Other
*.xccheckout
*.moved-aside
*.xcuserstate
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
#Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ @interface WNXDetailViewController () <UITableViewDataSource, UITableViewDelegat

@implementation WNXDetailViewController

//懒加载数据
- (NSArray *)infoDatas
{
if (_infoDatas == nil) {
Expand Down Expand Up @@ -520,7 +521,13 @@ - (void)viewDidDisappear:(BOOL)animated
{
//防止拖动一下就出现导航条的情况
[super viewDidDisappear:animated];
// self.navigationController.navigationBarHidden = YES;
self.navigationController.navigationBarHidden = YES;
}

- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
self.navigationController.navigationBarHidden = YES;
}

//返回上个控制器
Expand Down
2 changes: 2 additions & 0 deletions WNXHuntForCity/Classes/Home/Model/WNXHomeModel.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ @implementation WNXHomeModel

+ (instancetype)homeModelWithDict:(NSDictionary *)dict
{
//便利构造方法
WNXHomeModel *home = [[WNXHomeModel alloc] init];

[home setKeyValues:dict];

return home;
Expand Down
13 changes: 8 additions & 5 deletions WNXHuntForCity/Classes/Main/Controller/WNXShowViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@ @implementation WNXShowViewController

- (void)viewDidLoad {
[super viewDidLoad];

//初始化UI
[self setUpUI];

//设置上拉刷新
[self setHeadRefresh];
}

//懒加载数据
- (NSMutableArray *)datas
{
if (_datas == nil) {
Expand Down Expand Up @@ -71,7 +72,7 @@ - (void)setHeadRefresh
- (void)loadNewData
{
//模拟1秒后刷新表格UI
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// 拿到当前的下拉刷新控件,结束刷新状态
[self.tableView.header endRefreshing];
});
Expand Down Expand Up @@ -149,11 +150,11 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
#pragma mark - WNXConditionViewDelegate
- (void)conditionView:(WNXConditionView *)view didButtonClickFrom:(WNXConditionButtonType)from to:(WNXConditionButtonType)to
{
// //渲染当前的tableView的图片,并且模糊
// //渲染当前的tableView的图片,并且模糊
if (self.blurImageView == nil) {
self.blurImageView = [WNXRenderBlurView renderBlurViewWithImage:[UIImage imageWithCaputureView:self.tableView]];
self.blurImageView.delegate = self;

CGFloat blurY = self.view.bounds.size.height == WNXAppHeight ? 64 : 0;

self.blurImageView.frame = CGRectMake(0, blurY, WNXAppWidth, WNXAppHeight - 64);
Expand Down Expand Up @@ -200,9 +201,11 @@ - (void)hideBlurView
//重新定义导航条的状态
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];

[self.navigationController setNavigationBarHidden:NO animated:YES];
[self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"recomend_btn_gone"] forBarMetrics:UIBarMetricsDefault];
[super viewWillAppear:animated];

}

- (void)scrollViewDidScroll:(UIScrollView *)scrollView
Expand Down

0 comments on commit aabb12a

Please sign in to comment.