Commit 0e4d0021 authored by 翟国钧's avatar 翟国钧

update

parent c722a15c
...@@ -18,7 +18,7 @@ profile ...@@ -18,7 +18,7 @@ profile
DerivedData DerivedData
*.hmap *.hmap
*.ipa *.ipa
Example/Podfile.lock
# Bundler # Bundler
.bundle .bundle
......
...@@ -28,7 +28,7 @@ PODS: ...@@ -28,7 +28,7 @@ PODS:
- AFNetworking (= 3.1.0) - AFNetworking (= 3.1.0)
- GMPhobos (0.2.12): - GMPhobos (0.2.12):
- GMCache (~> 0.1.0) - GMCache (~> 0.1.0)
- GMRefresh (0.1.3): - GMRefresh (0.1.4):
- MJRefresh (~> 3.1.0) - MJRefresh (~> 3.1.0)
- JSONModel (1.2.0) - JSONModel (1.2.0)
- Masonry (1.0.1) - Masonry (1.0.1)
...@@ -50,7 +50,7 @@ SPEC CHECKSUMS: ...@@ -50,7 +50,7 @@ SPEC CHECKSUMS:
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMNetService: 2eb74ed62512078e9f00bc7006227a93c2acdf32 GMNetService: 2eb74ed62512078e9f00bc7006227a93c2acdf32
GMPhobos: b3b192ddedfb35c580abc8843545889aba9eb7e7 GMPhobos: b3b192ddedfb35c580abc8843545889aba9eb7e7
GMRefresh: a37fb054e758805ec2a6f9b632cf3dc861bb3cf9 GMRefresh: 8d6ef25dbd38c2687fee713cc520012d47c7261e
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
......
...@@ -76,9 +76,10 @@ ...@@ -76,9 +76,10 @@
// pullingPercent 超过 1 时,位置固定 // pullingPercent 超过 1 时,位置固定
self.gifView.hidden = NO; self.gifView.hidden = NO;
CGFloat translation = self.mj_h * 1 / 2; CGFloat translation = self.mj_h * 1 / 2;
CGFloat scale = MIN(1.0, pullingPercent);
_prepareImageView.transform = CGAffineTransformMakeTranslation(0, -translation); _prepareImageView.transform = CGAffineTransformMakeTranslation(0, -translation);
_prepareImageView.transform = CGAffineTransformScale(_prepareImageView.transform, pullingPercent, pullingPercent); _prepareImageView.transform = CGAffineTransformScale(_prepareImageView.transform, scale, scale);
} }
} }
} }
......
...@@ -28,7 +28,7 @@ PODS: ...@@ -28,7 +28,7 @@ PODS:
- AFNetworking (= 3.1.0) - AFNetworking (= 3.1.0)
- GMPhobos (0.2.12): - GMPhobos (0.2.12):
- GMCache (~> 0.1.0) - GMCache (~> 0.1.0)
- GMRefresh (0.1.3): - GMRefresh (0.1.4):
- MJRefresh (~> 3.1.0) - MJRefresh (~> 3.1.0)
- JSONModel (1.2.0) - JSONModel (1.2.0)
- Masonry (1.0.1) - Masonry (1.0.1)
...@@ -50,7 +50,7 @@ SPEC CHECKSUMS: ...@@ -50,7 +50,7 @@ SPEC CHECKSUMS:
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMNetService: 2eb74ed62512078e9f00bc7006227a93c2acdf32 GMNetService: 2eb74ed62512078e9f00bc7006227a93c2acdf32
GMPhobos: b3b192ddedfb35c580abc8843545889aba9eb7e7 GMPhobos: b3b192ddedfb35c580abc8843545889aba9eb7e7
GMRefresh: a37fb054e758805ec2a6f9b632cf3dc861bb3cf9 GMRefresh: 8d6ef25dbd38c2687fee713cc520012d47c7261e
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.1.3</string> <string>0.1.4</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>BNDL</string> <string>BNDL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.1.3</string> <string>0.1.4</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
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