Browse Source

adjust alpha with UISearchDisplayController

adjust alpha with UISearchDisplayController
MJLee 10 years ago
parent
commit
8adbb37994

+ 10 - 36
MJRefresh.podspec

@@ -1,39 +1,13 @@
 Pod::Spec.new do |s|
-    s.name         = "MJRefresh"
-    s.version      = "2.4.8"
-    s.summary      = "The easiest way to use pull-to-refresh"
-    s.homepage     = "https://github.com/CoderMJLee/MJRefresh"
-    s.license      = "MIT"
-    s.authors      = { 'MJ Lee' => '199109106@qq.com'}
-    s.platform     = :ios, "6.0"
-    s.source       = { :git => "https://github.com/CoderMJLee/MJRefresh.git", :tag => s.version }
-    s.source_files = "MJRefresh/*.{h,m}"
-    s.resource     = "MJRefresh/MJRefresh.bundle"
+    s.name         = 'MJRefresh'
+    s.version      = '2.4.9'
+    s.summary      = 'The easiest way to use pull-to-refresh'
+    s.homepage     = 'https://github.com/CoderMJLee/MJRefresh'
+    s.license      = 'MIT'
+    s.authors      = {'MJ Lee' => '199109106@qq.com'}
+    s.platform     = :ios, '6.0'
+    s.source       = {:git => 'https://github.com/CoderMJLee/MJRefresh.git', :tag => s.version}
+    s.source_files = 'MJRefresh/**/*.{h,m}'
+    s.resource     = 'MJRefresh/MJRefresh.bundle'
     s.requires_arc = true
-
-    s.subspec 'Base' do |Base|
-        Base.source_files = 'MJRefresh/Base/*.{h,m}'
-    end
-
-    s.subspec 'Custom' do |Custom|
-        Custom.subspec 'Footer' do |Footer|
-            Footer.subspec 'Auto' do |Auto|
-                Auto.source_files = "MJRefresh/Custom/Footer/Auto/*.{h,m}"
-            end
-
-            Footer.subspec 'Back' do |Back|
-                Back.source_files = "MJRefresh/Custom/Footer/Back/*.{h,m}"
-            end
-        end
-
-        Custom.subspec 'Header' do |Header|
-            Header.subspec 'Auto' do |Auto|
-                Auto.source_files = "MJRefresh/Custom/Header/Auto/*.{h,m}"
-            end
-
-            Header.subspec 'Back' do |Back|
-                Back.source_files = "MJRefresh/Custom/Header/Back/*.{h,m}"
-            end
-        end
-    end
 end

+ 2 - 1
MJRefresh/Base/MJRefreshHeader.m

@@ -67,7 +67,8 @@ - (void)scrollViewContentOffsetDidChange:(NSDictionary *)change
     CGFloat happenOffsetY = - self.scrollViewOriginalInset.top;
     
     // 如果是向上滚动到看不见头部控件,直接返回
-    if (offsetY >= happenOffsetY) return;
+    // >= -> >
+    if (offsetY > happenOffsetY) return;
     
     // 普通 和 即将刷新 的临界点
     CGFloat normal2pullingOffsetY = happenOffsetY - self.mj_h;

BIN
MJRefreshExample/MJRefreshExample.xcodeproj/project.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate