diff --git a/MJRefresh.podspec b/MJRefresh.podspec index e676c619..01fcc651 100644 --- a/MJRefresh.podspec +++ b/MJRefresh.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'MJRefresh' - s.version = '3.1.12' + s.version = '3.1.13' s.summary = 'An easy way to use pull-to-refresh' s.homepage = 'https://github.com/CoderMJLee/MJRefresh' s.license = 'MIT' diff --git a/MJRefreshExample/Base.lproj/Main.storyboard b/MJRefreshExample/Base.lproj/Main.storyboard index 882f7c49..004cab9c 100644 --- a/MJRefreshExample/Base.lproj/Main.storyboard +++ b/MJRefreshExample/Base.lproj/Main.storyboard @@ -1,8 +1,12 @@ - - + + + + + - - + + + @@ -13,7 +17,7 @@ - + @@ -29,9 +33,9 @@ - + - + @@ -49,7 +53,6 @@ - @@ -65,9 +68,9 @@ - + - + @@ -83,7 +86,7 @@ - + @@ -99,29 +102,29 @@ - + - + - + - + @@ -146,9 +149,9 @@ - + - + @@ -166,7 +169,6 @@ - diff --git a/MJRefreshExample/Classes/First/MJExampleWindow.m b/MJRefreshExample/Classes/First/MJExampleWindow.m index a6463724..9799c876 100644 --- a/MJRefreshExample/Classes/First/MJExampleWindow.m +++ b/MJRefreshExample/Classes/First/MJExampleWindow.m @@ -17,7 +17,11 @@ + (void)show window_ = [[UIWindow alloc] init]; CGFloat width = 150; CGFloat x = [UIScreen mainScreen].bounds.size.width - width - 10; - window_.frame = CGRectMake(x, 0, width, 25); + CGFloat y = 0; + if ([UIScreen mainScreen].bounds.size.height == 812) { + y = 33; + } + window_.frame = CGRectMake(x, y, width, 25); window_.windowLevel = UIWindowLevelAlert; window_.hidden = NO; window_.alpha = 0.5; diff --git a/MJRefreshExample/Classes/Second/MJTestViewController.xib b/MJRefreshExample/Classes/Second/MJTestViewController.xib index f95cd194..464e7f8d 100644 --- a/MJRefreshExample/Classes/Second/MJTestViewController.xib +++ b/MJRefreshExample/Classes/Second/MJTestViewController.xib @@ -1,8 +1,12 @@ - - + + + + + - - + + + @@ -14,7 +18,7 @@ - + diff --git a/MJRefreshExample/Classes/Second/MJWebViewViewController.xib b/MJRefreshExample/Classes/Second/MJWebViewViewController.xib index dcc206da..86b01d60 100644 --- a/MJRefreshExample/Classes/Second/MJWebViewViewController.xib +++ b/MJRefreshExample/Classes/Second/MJWebViewViewController.xib @@ -1,8 +1,12 @@ - - + + + + + - - + + + @@ -18,19 +22,17 @@ - - + - - + @@ -60,7 +60,6 @@ -