引入友盟分享SDK

MobileProject/Vender/TPKeyboardAvoiding/TPKeyboardAvoidingCollectionView.m

@@ -16,6 +16,8 @@ @implementation TPKeyboardAvoidingCollectionView
 #pragma mark - Setup/Teardown
 
 - (void)setup {
+    if ( [self hasAutomaticKeyboardAvoidingBehaviour] ) return;
+
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(TPKeyboardAvoiding_keyboardWillShow:) name:UIKeyboardWillChangeFrameNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(TPKeyboardAvoiding_keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollToActiveTextField) name:UITextViewTextDidBeginEditingNotification object:nil];
@@ -45,6 +47,18 @@ -(void)dealloc {
 #endif
 }
 
+
+-(BOOL)hasAutomaticKeyboardAvoidingBehaviour {
+    if ( [[[UIDevice currentDevice] systemVersion] integerValue] >= 9
+            && [self.delegate isKindOfClass:[UICollectionViewController class]] ) {
+        // Theory: It looks like iOS 9's collection views automatically avoid the keyboard. As usual
+        // Apple have totally failed to document this anywhere, so this is just a guess.
+        return YES;
+    }
+
+    return NO;
+}
+
 -(void)setFrame:(CGRect)frame {
     [super setFrame:frame];
     [self TPKeyboardAvoiding_updateContentInset];

MobileProject/Vender/TPKeyboardAvoiding/UIScrollView+TPKeyboardAvoidingAdditions.m

@@ -23,9 +23,9 @@ @interface TPKeyboardAvoidingState : NSObject
 @property (nonatomic, assign) BOOL         keyboardVisible;
 @property (nonatomic, assign) CGRect       keyboardRect;
 @property (nonatomic, assign) CGSize       priorContentSize;
-
-
-@property (nonatomic) BOOL priorPagingEnabled;
+@property (nonatomic, assign) BOOL         priorPagingEnabled;
+@property (nonatomic, assign) BOOL         ignoringNotifications;
+@property(nonatomic, assign) BOOL keyboardAnimationInProgress;
 @end
 
 @implementation UIScrollView (TPKeyboardAvoidingAdditions)
@@ -50,9 +50,7 @@ - (void)TPKeyboardAvoiding_keyboardWillShow:(NSNotification*)notification {
 
     TPKeyboardAvoidingState *state = self.keyboardAvoidingState;
 
-    UIView *firstResponder = [self TPKeyboardAvoiding_findFirstResponderBeneathView:self];
-
-    if ( !firstResponder ) {
+    if ( state.ignoringNotifications ) {
         return;
     }
 
@@ -79,31 +77,53 @@ - (void)TPKeyboardAvoiding_keyboardWillShow:(NSNotification*)notification {
 
     // Shrink view's inset by the keyboard's height, and scroll to show the text field/view being edited
     [UIView beginAnimations:nil context:NULL];
+
+    [UIView setAnimationDelegate:self];
+    [UIView setAnimationWillStartSelector:@selector(keyboardViewAppear:context:)];
+    [UIView setAnimationDidStopSelector:@selector(keyboardViewDisappear:finished:context:)];
+
     [UIView setAnimationCurve:[[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] intValue]];
     [UIView setAnimationDuration:[[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] floatValue]];
 
     self.contentInset = [self TPKeyboardAvoiding_contentInsetForKeyboard];
 
-    CGFloat viewableHeight = self.bounds.size.height - self.contentInset.top - self.contentInset.bottom;
-    [self setContentOffset:CGPointMake(self.contentOffset.x,
-                                       [self TPKeyboardAvoiding_idealOffsetForView:firstResponder
-                                                             withViewingAreaHeight:viewableHeight])
-                  animated:NO];
+    UIView *firstResponder = [self TPKeyboardAvoiding_findFirstResponderBeneathView:self];
+    if ( firstResponder ) {
+        CGFloat viewableHeight = self.bounds.size.height - self.contentInset.top - self.contentInset.bottom;
+        [self setContentOffset:CGPointMake(self.contentOffset.x,
+                                           [self TPKeyboardAvoiding_idealOffsetForView:firstResponder
+                                                                 withViewingAreaHeight:viewableHeight])
+                      animated:NO];
+    }
 
     self.scrollIndicatorInsets = self.contentInset;
     [self layoutIfNeeded];
 
     [UIView commitAnimations];
 }
 
+- (void)keyboardViewAppear:(NSString *)animationID context:(void *)context {
+    self.keyboardAvoidingState.keyboardAnimationInProgress = true;
+}
+
+- (void)keyboardViewDisappear:(NSString *)animationID finished:(BOOL)finished context:(void *)context {
+    if (finished) {
+        self.keyboardAvoidingState.keyboardAnimationInProgress = false;
+    }
+}
+
 - (void)TPKeyboardAvoiding_keyboardWillHide:(NSNotification*)notification {
     CGRect keyboardRect = [self convertRect:[[[notification userInfo] objectForKey:_UIKeyboardFrameEndUserInfoKey] CGRectValue] fromView:nil];
-    if (CGRectIsEmpty(keyboardRect)) {
+    if (CGRectIsEmpty(keyboardRect) && !self.keyboardAvoidingState.keyboardAnimationInProgress) {
         return;
     }
 
     TPKeyboardAvoidingState *state = self.keyboardAvoidingState;
 
+    if ( state.ignoringNotifications ) {
+        return;
+    }
+
     if ( !state.keyboardVisible ) {
         return;
     }
@@ -153,7 +173,12 @@ - (BOOL)TPKeyboardAvoiding_focusNextTextField {
     UIView *view = [self TPKeyboardAvoiding_findNextInputViewAfterView:firstResponder beneathView:self];
 
     if ( view ) {
-        [view performSelector:@selector(becomeFirstResponder) withObject:nil afterDelay:0.0];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0), dispatch_get_main_queue(), ^{
+            TPKeyboardAvoidingState *state = self.keyboardAvoidingState;
+            state.ignoringNotifications = YES;
+            [view becomeFirstResponder];
+            state.ignoringNotifications = NO;
+        });
         return YES;
     }
 
@@ -165,15 +190,27 @@ -(void)TPKeyboardAvoiding_scrollToActiveTextField {
 
     if ( !state.keyboardVisible ) return;
 
+    UIView *firstResponder = [self TPKeyboardAvoiding_findFirstResponderBeneathView:self];
+    if ( !firstResponder ) {
+        return;
+    }
+    // Ignore any keyboard notification that occur while we scroll
+    //  (seems to be an iOS 9 bug that causes jumping text in UITextField)
+    state.ignoringNotifications = YES;
+
     CGFloat visibleSpace = self.bounds.size.height - self.contentInset.top - self.contentInset.bottom;
 
-    CGPoint idealOffset = CGPointMake(self.contentOffset.x, [self TPKeyboardAvoiding_idealOffsetForView:[self TPKeyboardAvoiding_findFirstResponderBeneathView:self]
-                                                               withViewingAreaHeight:visibleSpace]);
+    CGPoint idealOffset
+        = CGPointMake(self.contentOffset.x,
+                      [self TPKeyboardAvoiding_idealOffsetForView:firstResponder
+                                            withViewingAreaHeight:visibleSpace]);
 
     // Ordinarily we'd use -setContentOffset:animated:YES here, but it interferes with UIScrollView
     // behavior which automatically ensures that the first responder is within its bounds
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self setContentOffset:idealOffset animated:YES];
+
+        state.ignoringNotifications = NO;
     });
 }
 
@@ -228,8 +265,18 @@ - (CGFloat)TPKeyboardAvoiding_nextInputViewHeuristicForViewFrame:(CGRect)frame {
           + (-frame.origin.x);         // Prefer elements closest to left
 }
 
+- (BOOL)TPKeyboardAvoiding_viewHiddenOrUserInteractionNotEnabled:(UIView *)view {
+    while ( view ) {
+        if ( view.hidden || !view.userInteractionEnabled ) {
+            return YES;
+        }
+        view = view.superview;
+    }
+    return NO;
+}
+
 - (BOOL)TPKeyboardAvoiding_viewIsValidKeyViewCandidate:(UIView *)view {
-    if ( view.hidden || !view.userInteractionEnabled ) return NO;
+    if ( [self TPKeyboardAvoiding_viewHiddenOrUserInteractionNotEnabled:view] ) return NO;
 
     if ( [view isKindOfClass:[UITextField class]] && ((UITextField*)view).enabled ) {
         return YES;

Podfile

@@ -8,4 +8,5 @@ pod 'FMDB/SQLCipher', '~>2.5'
 pod 'CocoaLumberjack', '~> 2.0.0-rc'
 pod 'BaiduMapKit' #百度地图SDK
 pod 'UMengAnalytics-NO-IDFA'#友盟统计无IDFA版SDK
-pod 'GTSDK'  #个推SDK
+pod 'GTSDK'  #个推SDK
+pod 'UMengSocial', '~> 4.3'  #友盟社会化分享及第三方登录

Podfile.lock

@@ -45,6 +45,7 @@ PODS:
   - SQLCipher/standard (3.1.0):
     - SQLCipher/common
   - UMengAnalytics-NO-IDFA (3.6.7)
+  - UMengSocial (4.4)
 
 DEPENDENCIES:
   - AFNetworking (~> 2.6.0)
@@ -57,6 +58,7 @@ DEPENDENCIES:
   - Masonry (~> 0.6.1)
   - SDWebImage (~> 3.7)
   - UMengAnalytics-NO-IDFA
+  - UMengSocial (~> 4.3)
 
 SPEC CHECKSUMS:
   AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
@@ -69,5 +71,6 @@ SPEC CHECKSUMS:
   SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
   SQLCipher: 4684434d5791db86512cd7e02172aefba575849e
   UMengAnalytics-NO-IDFA: 6d02561a00579b2e37718f204eb81347df5d7b8b
+  UMengSocial: aba7296602310385114d82c255539a7bef3b7ab0
 
 COCOAPODS: 0.38.2