Skip to content

GMRefresh
GMRefresh
Commit 3c28aa22 authored by 汪洋's avatar 汪洋
Browse files
Options

优化当导航栏透明时会看到下拉动画图片的问题

parent 5067ddc5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 79 deletions
Example/GMRefresh.xcodeproj/project.pbxproj
View file @ 3c28aa22
......@@ -23,6 +23,7 @@
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
D31270951CE0792D00BDD01D /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D31270941CE0792D00BDD01D /* Launch Screen.storyboard */; };
D332B1CD1CD8BDB400A72482 /* GMTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D332B1CC1CD8BDB400A72482 /* GMTableViewController.m */; };
/* End PBXBuildFile section */
......@@ -62,6 +63,7 @@
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
89D16B3F0E0ABE381CF4A274 /* Pods_GMRefresh_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMRefresh_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A1A85ED1362F0742068438E9 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
D31270941CE0792D00BDD01D /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
D332B1CB1CD8BDB400A72482 /* GMTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GMTableViewController.h; sourceTree = "<group>"; };
D332B1CC1CD8BDB400A72482 /* GMTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GMTableViewController.m; sourceTree = "<group>"; };
D3F45DAD77E81DBF7176F558 /* Pods_GMRefresh_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMRefresh_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -165,6 +167,7 @@
6003F596195388D20070C39A /* InfoPlist.strings */,
6003F599195388D20070C39A /* main.m */,
6003F59B195388D20070C39A /* GMRefresh-Prefix.pch */,
D31270941CE0792D00BDD01D /* Launch Screen.storyboard */,
);
name = "Supporting Files";
sourceTree = "<group>";
......@@ -283,6 +286,7 @@
files = (
873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */,
6003F5A9195388D20070C39A /* Images.xcassets in Resources */,
D31270951CE0792D00BDD01D /* Launch Screen.storyboard in Resources */,
6003F598195388D20070C39A /* InfoPlist.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -525,6 +529,7 @@
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1;
WRAPPER_EXTENSION = app;
};
name = Debug;
......@@ -541,6 +546,7 @@
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1;
WRAPPER_EXTENSION = app;
};
name = Release;
......
Example/GMRefresh/GMRefresh-Info.plist
View file @ 3c28aa22
......@@ -24,6 +24,8 @@
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>Launch Screen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
......
Example/GMRefresh/GMTableViewController.m
View file @ 3c28aa22
......@@ -25,6 +25,9 @@
}
- (void)loadNewData {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self.tableView.mj_header endRefreshing];
[self.tableView.mj_footer endRefreshing];
});
}
@end
Example/GMRefresh/GMViewController.m
View file @ 3c28aa22
......@@ -17,7 +17,9 @@
- (void)viewDidLoad
{
[super viewDidLoad];
// Do any additional setup after loading the view, typically from a nib.
[self.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
}
- (void)didReceiveMemoryWarning
......
Example/GMRefresh/Images.xcassets/AppIcon.appiconset/Contents.json
View file @ 3c28aa22
......@@ -7,47 +7,32 @@
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"idiom" : "iphone",
"size" : "40x40",
"scale" : "1x"
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
}
\ No newline at end of file
Example/GMRefresh/Images.xcassets/LaunchImage.launchimage/Contents.json
View file @ 3c28aa22
......@@ -4,43 +4,31 @@
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
"minimum-system-version" : "8.0",
"subtype" : "736h",
"scale" : "3x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"subtype" : "retina4",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"minimum-system-version" : "8.0",
"subtype" : "667h",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"subtype" : "retina4",
"scale" : "2x"
}
],
......@@ -48,4 +36,4 @@
"version" : 1,
"author" : "xcode"
}
}
}
\ No newline at end of file
Example/GMRefresh/Launch Screen.storyboard 0 → 100644
View file @ 3c28aa22
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright © 2016年 北京更美互动信息科技有限公司. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
<rect key="frame" x="20" y="559" width="560" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GMRefresh" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<rect key="frame" x="20" y="180" width="560" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
<constraint firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
<constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
<constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
<constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="428" y="407"/>
</scene>
</scenes>
</document>
Example/GMRefresh/Main.storyboard
View file @ 3c28aa22
......@@ -18,10 +18,17 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<navigationItem key="navigationItem" id="90s-4r-WMz">
<barButtonItem key="rightBarButtonItem" title="push" id="vkf-iL-5w3">
<connections>
<segue destination="a5A-5V-0K1" kind="show" id="aky-Ou-68K"/>
</connections>
</barButtonItem>
</navigationItem>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="293" y="334"/>
<point key="canvasLocation" x="198" y="672"/>
</scene>
<!--Root View Controller-->
<scene sceneID="srq-Bt-RHG">
......@@ -126,7 +133,7 @@
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="02j-iz-loj" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="892" y="714"/>
<point key="canvasLocation" x="913" y="672"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="P2X-D0-55b">
......@@ -137,12 +144,12 @@
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="a5A-5V-0K1" kind="relationship" relationship="rootViewController" id="9sh-PP-Gqd"/>
<segue destination="whP-gf-Uak" kind="relationship" relationship="rootViewController" id="GbN-ch-EEP"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="2Jh-Hj-0k1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="72" y="714"/>
<point key="canvasLocation" x="-473" y="672"/>
</scene>
</scenes>
</document>
Example/Pods/Pods.xcodeproj/project.pbxproj
View file @ 3c28aa22
This diff is collapsed.
GMRefresh.podspec
View file @ 3c28aa22
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = "GMRefresh"
s.version = "0.1.1"
s.version = "0.1.2"
s.summary = "基于MJRefresh做的下拉刷新，自动加载更多"
s.homepage = "http://git.gengmei.cc/gengmeiios/GMLibrary/GMRefresh"
s.license = 'MIT'
......
GMRefresh/Classes/GMRefresh.h deleted 100644 → 0
View file @ 5067ddc5
//
// GMRefresh.h
// Pods
//
// Created by wangyang on 16/5/4.
//
//
#ifndef GMRefresh_h
#define GMRefresh_h
#import "GMRefreshFooter.h"
#import "GMRefreshHeader.h"
#endif /* GMRefresh_h */
GMRefresh/Classes/GMRefreshConstant.h
View file @ 3c28aa22
......@@ -8,7 +8,7 @@
#ifndef GMRefreshConstant_h
#define GMRefreshConstant_h
#define GMRefreshImageName(file) [@"Frameworks/GMRefresh.framework/GMRefresh.bundle" stringByAppendingPathComponent:file]
#define GMRefreshImageName(file) [@"Frameworks/GMRefresh.framework/GMRefresh.bundle" stringByAppendingPathComponent:file]
#endif /* GMRefreshConstant_h */
GMRefresh/Classes/GMRefreshFooter.m
View file @ 3c28aa22
......@@ -30,5 +30,4 @@
}
[self setImages:refreshingImages forState:MJRefreshStateRefreshing];
}
@end
GMRefresh/Classes/GMRefreshHeader.m
View file @ 3c28aa22
......@@ -83,4 +83,14 @@
}
}
- (void)endRefreshing {
[super endRefreshing];
// 如果导航栏有透明效果，在下拉刷新后，会看到有动画图片在导航栏下面，通过reveal检查发现，其实_prepareImageView 和 gifView都是显示状态，所以两个都需要隐藏
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(MJRefreshFastAnimationDuration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
_prepareImageView.hidden = YES;
self.gifView.hidden = YES;
});
}
@end
fastlane/report.xml
View file @ 3c28aa22
......@@ -3,44 +3,52 @@
<testsuite name="fastlane.lanes">
<testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000562">
<testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000558">
</testcase>
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000198">
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000186">
</testcase>
<testcase classname="fastlane.lanes" name="2: ensure_git_branch" time="0.005881">
<testcase classname="fastlane.lanes" name="2: ensure_git_branch" time="0.00595">
</testcase>
<testcase classname="fastlane.lanes" name="3: pod_install" time="97.431928">
<testcase classname="fastlane.lanes" name="3: pod_install" time="84.386173">
</testcase>
<testcase classname="fastlane.lanes" name="4: pod_lib_lint" time="4.400628">
<testcase classname="fastlane.lanes" name="4: pod_lib_lint" time="5.982161">
</testcase>
<testcase classname="fastlane.lanes" name="5: version_bump_podspec" time="0.001425">
<testcase classname="fastlane.lanes" name="5: version_bump_podspec" time="0.001042">
</testcase>
<testcase classname="fastlane.lanes" name="6: git_commit_all" time="0.020832">
<testcase classname="fastlane.lanes" name="6: git_commit_all" time="0.020969">
</testcase>
<testcase classname="fastlane.lanes" name="7: add_git_tag" time="0.006713">
<testcase classname="fastlane.lanes" name="7: add_git_tag" time="0.009317">
<failure message="/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/actions/actions_helper.rb:33:in `execute_action'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/runner.rb:158:in `block in execute_action'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/runner.rb:157:in `chdir'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/runner.rb:157:in `execute_action'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/runner.rb:111:in `trigger_action_by_name'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/fast_file.rb:130:in `method_missing'&#10;Fastfile:38:in `block (2 levels) in parsing_binding'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/lane.rb:33:in `call'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/lane.rb:33:in `call'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/runner.rb:52:in `block in execute'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/runner.rb:46:in `chdir'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/runner.rb:46:in `execute'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/lane_manager.rb:46:in `cruise_lane'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/command_line_handler.rb:30:in `handle'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/commands_generator.rb:42:in `block (2 levels) in run'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/commander-4.3.5/lib/commander/command.rb:178:in `call'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/commander-4.3.5/lib/commander/command.rb:178:in `call'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/commander-4.3.5/lib/commander/command.rb:153:in `run'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/commander-4.3.5/lib/commander/runner.rb:428:in `run_active_command'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane_core-0.43.1/lib/fastlane_core/ui/fastlane_runner.rb:26:in `run!'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/commander-4.3.5/lib/commander/delegates.rb:15:in `run!'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/commands_generator.rb:172:in `run'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/commands_generator.rb:13:in `start'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/lib/fastlane/cli_tools_distributor.rb:47:in `take_off'&#10;/Users/wangyang/.rvm/gems/ruby-head@global/gems/fastlane-1.86.1/bin/fastlane:5:in `&lt;top (required)&gt;'&#10;/Users/wangyang/.rvm/rubies/ruby-head/bin/fastlane:23:in `load'&#10;/Users/wangyang/.rvm/rubies/ruby-head/bin/fastlane:23:in `&lt;main&gt;'&#10;/Users/wangyang/.rvm/gems/ruby-head/bin/ruby_executable_hooks:15:in `eval'&#10;/Users/wangyang/.rvm/gems/ruby-head/bin/ruby_executable_hooks:15:in `&lt;main&gt;'&#10;&#10;Exit status of command 'git tag -am 0.1.1\ \(fastlane\) '0.1.1'' was 128 instead of 0.&#10;fatal: tag '0.1.1' already exists&#10;" />
</testcase>
<testcase classname="fastlane.lanes" name="8: push_to_git_remote" time="1.860167">
</testcase>
<testcase classname="fastlane.lanes" name="9: pod_push" time="38.876443">
</testcase>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment