DSIOSTeam / YBImageBrowser_DSCnliveShop · Commits

Commit ca9df4bd4570a665cce5589a95062d35dfa54deb

Authored by yinqiaojuan
1 parent c9d7cd4f

修改图片预览

Inline Side-by-side
Showing 9 changed files with 13 additions and 37 deletions
Example/Podfile.lock
  View file @ca9df4b
@@ -2,7 +2,7 @@ PODS: @@ -2,7 +2,7 @@ PODS:
2 - SDWebImage (5.2.5): 2 - SDWebImage (5.2.5):
3 - SDWebImage/Core (= 5.2.5) 3 - SDWebImage/Core (= 5.2.5)
4 - SDWebImage/Core (5.2.5) 4 - SDWebImage/Core (5.2.5)
5 - - YBImageBrowser_DSCnliveShop (3.1.2): 5 + - YBImageBrowser_DSCnliveShop (3.1.5):
6 - SDWebImage (~> 5.2.3) 6 - SDWebImage (~> 5.2.3)
7 - YYKit 7 - YYKit
8 - YYKit (1.0.9): 8 - YYKit (1.0.9):
@@ -25,9 +25,9 @@ EXTERNAL SOURCES: @@ -25,9 +25,9 @@ EXTERNAL SOURCES:
25 25
26 SPEC CHECKSUMS: 26 SPEC CHECKSUMS:
27 SDWebImage: 4eabf2fa6695c95c47724214417a9c036c965e4a 27 SDWebImage: 4eabf2fa6695c95c47724214417a9c036c965e4a
28 - YBImageBrowser_DSCnliveShop: 0c757771a976328769463a9a55e43957030941c5 28 + YBImageBrowser_DSCnliveShop: 7dd228159a7726a376d71e7936f25ef3f8888099
29 YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7 29 YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7
30 30
31 PODFILE CHECKSUM: 634c1354f9225a9c3712a8a331ac1d0e0476a483 31 PODFILE CHECKSUM: 634c1354f9225a9c3712a8a331ac1d0e0476a483
32 32
33 -COCOAPODS: 1.9.1 33 +COCOAPODS: 1.9.3
Example/Pods/Local Podspecs/YBImageBrowser_DSCnliveShop.podspec.json
  View file @ca9df4b
1 { 1 {
2 "name": "YBImageBrowser_DSCnliveShop", 2 "name": "YBImageBrowser_DSCnliveShop",
3 - "version": "3.1.2", 3 + "version": "3.1.5",
4 "summary": "YBImageBrowser改依赖为YYKit", 4 "summary": "YBImageBrowser改依赖为YYKit",
5 "homepage": "http://bj.gitlab.cnlive.com/DSIOSTeam", 5 "homepage": "http://bj.gitlab.cnlive.com/DSIOSTeam",
6 "authors": { 6 "authors": {
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 "license": "MIT", 9 "license": "MIT",
10 "source": { 10 "source": {
11 "git": "http://bj.gitlab.cnlive.com/DSIOSTeam/YBImageBrowser_DSCnliveShop.git", 11 "git": "http://bj.gitlab.cnlive.com/DSIOSTeam/YBImageBrowser_DSCnliveShop.git",
12 - "tag": "3.1.2" 12 + "tag": "3.1.5"
13 }, 13 },
14 "platforms": { 14 "platforms": {
15 "ios": "9.0" 15 "ios": "9.0"
Example/Pods/Manifest.lock
  View file @ca9df4b
@@ -2,7 +2,7 @@ PODS: @@ -2,7 +2,7 @@ PODS:
2 - SDWebImage (5.2.5): 2 - SDWebImage (5.2.5):
3 - SDWebImage/Core (= 5.2.5) 3 - SDWebImage/Core (= 5.2.5)
4 - SDWebImage/Core (5.2.5) 4 - SDWebImage/Core (5.2.5)
5 - - YBImageBrowser_DSCnliveShop (3.1.2): 5 + - YBImageBrowser_DSCnliveShop (3.1.5):
6 - SDWebImage (~> 5.2.3) 6 - SDWebImage (~> 5.2.3)
7 - YYKit 7 - YYKit
8 - YYKit (1.0.9): 8 - YYKit (1.0.9):
@@ -25,9 +25,9 @@ EXTERNAL SOURCES: @@ -25,9 +25,9 @@ EXTERNAL SOURCES:
25 25
26 SPEC CHECKSUMS: 26 SPEC CHECKSUMS:
27 SDWebImage: 4eabf2fa6695c95c47724214417a9c036c965e4a 27 SDWebImage: 4eabf2fa6695c95c47724214417a9c036c965e4a
28 - YBImageBrowser_DSCnliveShop: 0c757771a976328769463a9a55e43957030941c5 28 + YBImageBrowser_DSCnliveShop: 7dd228159a7726a376d71e7936f25ef3f8888099
29 YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7 29 YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7
30 30
31 PODFILE CHECKSUM: 634c1354f9225a9c3712a8a331ac1d0e0476a483 31 PODFILE CHECKSUM: 634c1354f9225a9c3712a8a331ac1d0e0476a483
32 32
33 -COCOAPODS: 1.9.1 33 +COCOAPODS: 1.9.3
Example/Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig deleted 100644 → 0
  View file @c9d7cd4
1 -CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage  
2 -DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO  
3 -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1  
4 -OTHER_LDFLAGS = $(inherited) -framework "ImageIO"  
5 -PODS_BUILD_DIR = ${BUILD_DIR}  
6 -PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)  
7 -PODS_ROOT = ${SRCROOT}  
8 -PODS_TARGET_SRCROOT = ${PODS_ROOT}/SDWebImage  
9 -PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}  
10 -SKIP_INSTALL = YES  
11 -SUPPORTS_MACCATALYST = YES  
12 -USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES  
Example/Pods/Target Support Files/YBImageBrowser_DSCnliveShop/YBImageBrowser_DSCnliveShop-Info.plist
  View file @ca9df4b
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <key>CFBundlePackageType</key> 15 <key>CFBundlePackageType</key>
16 <string>FMWK</string> 16 <string>FMWK</string>
17 <key>CFBundleShortVersionString</key> 17 <key>CFBundleShortVersionString</key>
18 - <string>3.1.2</string> 18 + <string>3.1.5</string>
19 <key>CFBundleSignature</key> 19 <key>CFBundleSignature</key>
20 <string>????</string> 20 <string>????</string>
21 <key>CFBundleVersion</key> 21 <key>CFBundleVersion</key>
Example/Pods/Target Support Files/YYKit/YYKit.xcconfig deleted 100644 → 0
  View file @c9d7cd4
1 -CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/YYKit  
2 -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/YYKit/Vendor"  
3 -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1  
4 -OTHER_LDFLAGS = $(inherited) -l"sqlite3" -l"z" -framework "Accelerate" -framework "AssetsLibrary" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreImage" -framework "CoreText" -framework "ImageIO" -framework "MobileCoreServices" -framework "QuartzCore" -framework "SystemConfiguration" -framework "UIKit" -framework "WebP"  
5 -PODS_BUILD_DIR = ${BUILD_DIR}  
6 -PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)  
7 -PODS_ROOT = ${SRCROOT}  
8 -PODS_TARGET_SRCROOT = ${PODS_ROOT}/YYKit  
9 -PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}  
10 -SKIP_INSTALL = YES  
11 -USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES  
Example/YBImageBrowser_DSCnliveShop.xcodeproj/project.pbxproj
  View file @ca9df4b
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 6003F5AA195388D20070C39A /* Sources */, 226 6003F5AA195388D20070C39A /* Sources */,
227 6003F5AB195388D20070C39A /* Frameworks */, 227 6003F5AB195388D20070C39A /* Frameworks */,
228 6003F5AC195388D20070C39A /* Resources */, 228 6003F5AC195388D20070C39A /* Resources */,
229 - 34F8E58789455B439FF8B22A /* [CP] Embed Pods Frameworks */, 229 + 189527955A68060CAF6FC6D8 /* [CP] Embed Pods Frameworks */,
230 ); 230 );
231 buildRules = ( 231 buildRules = (
232 ); 232 );
@@ -321,7 +321,7 @@ @@ -321,7 +321,7 @@
321 shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; 321 shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
322 showEnvVarsInLog = 0; 322 showEnvVarsInLog = 0;
323 }; 323 };
324 - 34F8E58789455B439FF8B22A /* [CP] Embed Pods Frameworks */ = { 324 + 189527955A68060CAF6FC6D8 /* [CP] Embed Pods Frameworks */ = {
325 isa = PBXShellScriptBuildPhase; 325 isa = PBXShellScriptBuildPhase;
326 buildActionMask = 2147483647; 326 buildActionMask = 2147483647;
327 files = ( 327 files = (
YBImageBrowser_DSCnliveShop.podspec
  View file @ca9df4b
1 Pod::Spec.new do |s| 1 Pod::Spec.new do |s|
2 s.name = "YBImageBrowser_DSCnliveShop" 2 s.name = "YBImageBrowser_DSCnliveShop"
3 - s.version = "3.1.5" 3 + s.version = "3.1.7"
4 s.summary = "YBImageBrowser改依赖为YYKit" 4 s.summary = "YBImageBrowser改依赖为YYKit"
5 s.homepage = "http://bj.gitlab.cnlive.com/DSIOSTeam" 5 s.homepage = "http://bj.gitlab.cnlive.com/DSIOSTeam"
6 s.author = { "DSIOSTeam" => "694092596@qq.com" } 6 s.author = { "DSIOSTeam" => "694092596@qq.com" }
YBImageBrowser_DSCnliveShop/Classes/YBImageBrowser/Image/YBIBImageCell.m
  View file @ca9df4b
@@ -301,7 +301,6 @@ @@ -301,7 +301,6 @@
301 [tapSingle requireGestureRecognizerToFail:tapDouble]; 301 [tapSingle requireGestureRecognizerToFail:tapDouble];
302 [tapSingle requireGestureRecognizerToFail:pan]; 302 [tapSingle requireGestureRecognizerToFail:pan];
303 [tapDouble requireGestureRecognizerToFail:pan]; 303 [tapDouble requireGestureRecognizerToFail:pan];
304 -  
305 [self addGestureRecognizer:tapSingle]; 304 [self addGestureRecognizer:tapSingle];
306 [self addGestureRecognizer:tapDouble]; 305 [self addGestureRecognizer:tapDouble];
307 [self addGestureRecognizer:pan]; 306 [self addGestureRecognizer:pan];
@@ -366,8 +365,8 @@ @@ -366,8 +365,8 @@
366 } 365 }
367 366
368 } else if (pan.state == UIGestureRecognizerStateChanged) { 367 } else if (pan.state == UIGestureRecognizerStateChanged) {
  368 + [self commitTranslation:[pan translationInView:self.imageScrollView]];
369 if (_interacting) { 369 if (_interacting) {
370 -  
371 // Change. 370 // Change.
372 self.imageScrollView.center = point; 371 self.imageScrollView.center = point;
373 CGFloat scale = 1 - ABS(point.y - _interactStartPoint.y) / (containerSize.height * 1.2); 372 CGFloat scale = 1 - ABS(point.y - _interactStartPoint.y) / (containerSize.height * 1.2);