局部调整代码

Author: gyjzh

LLWeChat/General/ImagePicker/LLAssetManager.m

@@ -459,7 +459,9 @@ - (void)fetchImageFromAssetModel_PhotoKit:(LLAssetModel *)assetModel asyncBlock:
 
         [_imageManager requestImageForAsset:assetModel.asset_PH targetSize:pixSize contentMode:PHImageContentModeAspectFill options:_requestOptions resultHandler:^(UIImage *image, NSDictionary *info) {
             assetModel.isAssetInLocalAlbum = (image != nil);
-            asyncCallback(image, assetModel);
+            dispatch_async(dispatch_get_main_queue(), ^{
+                asyncCallback(image, assetModel);
+            });
         }];
 
     }

LLWeChat/General/ImagePicker/View/LLImageScrollView.m

@@ -48,7 +48,6 @@ - (void)setContentWithImage:(UIImage *)image {
     }
 
     _isImageExist = YES;
-    [self hideLoadingIndicator];
 
     _imageSize = CGSizeMake(SCREEN_WIDTH, SCREEN_WIDTH/image.size.width * image.size.height);
     CGFloat _y = (SCREEN_HEIGHT > _imageSize.height) ? (SCREEN_HEIGHT - _imageSize.height)/2 : 0;

LLWeChat/General/ImagePicker/ViewController/LLImageShowController.m

@@ -156,7 +156,7 @@ - (void)viewWillAppear:(BOOL)animated {
 - (void)fillScrollView:(LLImageScrollView *)scrollView withAssetIndex:(NSInteger)assetIndex {
     scrollView.assetIndex = assetIndex;
     scrollView.assetModel = _allAssets[assetIndex];
-    
+
     LLFetchImageSyncCallbackBlock syncCallback = ^(UIImage *_Nullable image, BOOL needBackgroundLoading) {
         [scrollView setContentWithImage:image];
     };
@@ -166,6 +166,9 @@ - (void)fillScrollView:(LLImageScrollView *)scrollView withAssetIndex:(NSInteger
         for (LLImageScrollView *scrollView in weakSelf.innerScrollViews) {
             if (scrollView.assetModel == assetModel) {
                 [scrollView setContentWithImage:image];
+                if (assetModel == weakSelf.curShowAsset) {
+                    [weakSelf setImageSelectStatus];
+                }
                 break;
             }
         }
@@ -177,6 +180,8 @@ - (void)fillScrollView:(LLImageScrollView *)scrollView withAssetIndex:(NSInteger
         [scrollView setContentWithImage:nil];
     }
 
+    [scrollView setContentWithImage:[UIImage imageNamed:@"ff_IconShake"]];
+    
     scrollView.frame = CGRectMake(scroll_width * assetIndex, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 }
 
@@ -201,10 +206,20 @@ - (void)showAllImage {
 
 }
 
+- (void)setImageSelectStatus {
+    if (_curShowScrollView.isImageExist) {
+        self.bigSelectView.hidden = NO;
+        self.bigSelectView.selected = [self.allSelectdAssets containsObject:self.curShowAsset];
+    }else {
+        self.bigSelectView.hidden = YES;
+    }
+}
 
 #pragma mark - 处理左右拖动
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
+    NSLog(@"scrollWillBeginDragging");
+    
     if (scrollView != self.scrollView) {
         for (LLImageScrollView *scrollView in self.innerScrollViews) {
             scrollView.hidden = YES;
@@ -245,12 +260,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
             //判断当前显示照片是否已被选择
             NSInteger assetIndex = innerScrollView.assetIndex;
             self.curShowAsset = self.allAssets[assetIndex];
-            if (_curShowScrollView.isImageExist) {
-                self.bigSelectView.hidden = NO;
-                self.bigSelectView.selected = [self.allSelectdAssets containsObject:self.curShowAsset];
-            }else {
-                self.bigSelectView.hidden = YES;
-            }
+            [self setImageSelectStatus];
 
             //移动前后照片
             if (assetIndex + 1 < _allAssets.count && [self scrollViewWithAssetIndex:assetIndex + 1] == nil) {
@@ -312,6 +322,8 @@ - (void)scrollViewDidZoom:(LLImageScrollView *)scrollView {
 #pragma mark - 其他
 
 - (void)handleTapGesture:(UITapGestureRecognizer *)tap {
+    NSLog(@"TapTp");
+    
     self.toolbar.hidden = !self.toolbar.isHidden;
     self.navigationController.navigationBar.hidden = !self.navigationController.navigationBar.isHidden;
 }