iOS Team / CNLiveImagePickerController · Commits

Commit 04dac49eaa5959c0a978b45f79f699d2c330c4a6

Authored by 梁星国
1 parent fe3c8243

提交0.0.8

Inline Side-by-side
Showing 5 changed files with 22 additions and 52 deletions
.gitignore
  View file @04dac49
1 -# OS X 1 +*~
2 .DS_Store 2 .DS_Store
3 -  
4 -# Xcode  
5 -build/  
6 -Products/  
7 -*.pbxuser  
8 -!default.pbxuser  
9 -*.mode1v3  
10 -!default.mode1v3  
11 -*.mode2v3  
12 -!default.mode2v3  
13 -*.perspectivev3  
14 -!default.perspectivev3  
15 -xcuserdata/  
16 -*.xccheckout  
17 -profile  
18 -*.moved-aside  
19 -DerivedData  
20 -*.hmap  
21 -*.ipa  
22 -  
23 -# Bundler  
24 -.bundle  
25 -  
26 -# Add this line if you want to avoid checking in source code from Carthage dependencies.  
27 -# Carthage/Checkouts  
28 -  
29 -Carthage/Build  
30 -  
31 -# We recommend against adding the Pods directory to your .gitignore. However  
32 -# you should judge for yourself, the pros and cons are mentioned at:  
33 -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control  
34 -#  
35 -# Note: if you ignore the Pods directory, make sure to uncomment  
36 -# `pod install` in .travis.yml  
37 -#  
38 -# Pods/ 3 +*.xcuserstate
  4 +*.xcworkspace
  5 +xcuserdata
  6 +*.lock
  7 +Pods
CNLiveImagePickerController.podspec
  View file @04dac49
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveImagePickerController' 10 s.name = 'CNLiveImagePickerController'
11 - s.version = '0.0.7' 11 + s.version = '0.0.8'
12 s.summary = '相册' 12 s.summary = '相册'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveImagePickerController/Classes/TZAssetCell.m
  View file @04dac49
@@ -283,7 +283,7 @@ @@ -283,7 +283,7 @@
283 [weakSelf hideProgressView]; 283 [weakSelf hideProgressView];
284 } 284 }
285 } else { 285 } else {
286 - *stop = YES; 286 +// *stop = YES;
287 [UIApplication sharedApplication].networkActivityIndicatorVisible = NO; 287 [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
288 [weakSelf cancelBigImageRequest]; 288 [weakSelf cancelBigImageRequest];
289 } 289 }
CNLiveImagePickerController/Classes/TZPhotoPreviewController.m
  View file @04dac49
@@ -90,6 +90,11 @@ @@ -90,6 +90,11 @@
90 90
91 - (void)viewWillAppear:(BOOL)animated { 91 - (void)viewWillAppear:(BOOL)animated {
92 [super viewWillAppear:animated]; 92 [super viewWillAppear:animated];
  93 +
  94 + if (_collectionView) {
  95 + [_collectionView reloadData];
  96 + }
  97 +
93 [self.navigationController setNavigationBarHidden:YES animated:YES]; 98 [self.navigationController setNavigationBarHidden:YES animated:YES];
94 if (iOS7Later) [UIApplication sharedApplication].statusBarHidden = YES; 99 if (iOS7Later) [UIApplication sharedApplication].statusBarHidden = YES;
95 if (_currentIndex) [_collectionView setContentOffset:CGPointMake((self.view.tz_width + 20) * _currentIndex, 0) animated:NO]; 100 if (_currentIndex) [_collectionView setContentOffset:CGPointMake((self.view.tz_width + 20) * _currentIndex, 0) animated:NO];
Example/CNLiveImagePickerController.xcodeproj/xcshareddata/xcschemes/CNLiveImagePickerController-Example.xcscheme
  View file @04dac49
@@ -27,6 +27,15 @@ @@ -27,6 +27,15 @@
27 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" 27 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" 28 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29 shouldUseLaunchSchemeArgsEnv = "YES"> 29 shouldUseLaunchSchemeArgsEnv = "YES">
  30 + <MacroExpansion>
  31 + <BuildableReference
  32 + BuildableIdentifier = "primary"
  33 + BlueprintIdentifier = "6003F589195388D20070C39A"
  34 + BuildableName = "CNLiveImagePickerController_Example.app"
  35 + BlueprintName = "CNLiveImagePickerController_Example"
  36 + ReferencedContainer = "container:CNLiveImagePickerController.xcodeproj">
  37 + </BuildableReference>
  38 + </MacroExpansion>
30 <Testables> 39 <Testables>
31 <TestableReference 40 <TestableReference
32 skipped = "NO"> 41 skipped = "NO">
@@ -39,17 +48,6 @@ @@ -39,17 +48,6 @@
39 </BuildableReference> 48 </BuildableReference>
40 </TestableReference> 49 </TestableReference>
41 </Testables> 50 </Testables>
42 - <MacroExpansion>  
43 - <BuildableReference  
44 - BuildableIdentifier = "primary"  
45 - BlueprintIdentifier = "6003F589195388D20070C39A"  
46 - BuildableName = "CNLiveImagePickerController_Example.app"  
47 - BlueprintName = "CNLiveImagePickerController_Example"  
48 - ReferencedContainer = "container:CNLiveImagePickerController.xcodeproj">  
49 - </BuildableReference>  
50 - </MacroExpansion>  
51 - <AdditionalOptions>  
52 - </AdditionalOptions>  
53 </TestAction> 51 </TestAction>
54 <LaunchAction 52 <LaunchAction
55 buildConfiguration = "Debug" 53 buildConfiguration = "Debug"
@@ -71,8 +69,6 @@ @@ -71,8 +69,6 @@
71 ReferencedContainer = "container:CNLiveImagePickerController.xcodeproj"> 69 ReferencedContainer = "container:CNLiveImagePickerController.xcodeproj">
72 </BuildableReference> 70 </BuildableReference>
73 </BuildableProductRunnable> 71 </BuildableProductRunnable>
74 - <AdditionalOptions>  
75 - </AdditionalOptions>  
76 </LaunchAction> 72 </LaunchAction>
77 <ProfileAction 73 <ProfileAction
78 buildConfiguration = "Release" 74 buildConfiguration = "Release"