1.清理冗余代码

创维盒子/双子星云手机/Class/Set/uploadFile/PhotoPreviewViewController.m

@@ -38,6 +38,8 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear: animated];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
+    
     //[self.photoPreviewCollectionV reloadData];
     
     if (_currentIndex) {
@@ -50,6 +52,13 @@
     [self refreshNaviBarAndBottomBarState];
 }
 
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    ///黑色
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
+}
+
 #pragma mark 点击选中按钮
 - (void)didClickButtonFun:(UIButton*)but
 {

创维盒子/双子星云手机/Class/Set/uploadFile/uploadImageOrVideoViewController.h

@@ -11,42 +11,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class uploadImageOrVideoViewController;
-@protocol AJPhotoPickerProtocol <NSObject>
-@optional
-//选择完成
-- (void)photoPicker:(uploadImageOrVideoViewController *)picker didSelectAssets:(NSArray *)assets;
-
-//点击选中
-- (void)photoPicker:(uploadImageOrVideoViewController *)picker didSelectAsset:(ALAsset*)asset;
-
-//取消选中
-- (void)photoPicker:(uploadImageOrVideoViewController *)picker didDeselectAsset:(ALAsset*)asset;
-
-//点击相机按钮相关操作
-- (void)photoPickerTapCameraAction:(uploadImageOrVideoViewController *)picker;
-
-//取消
-- (void)photoPickerDidCancel:(uploadImageOrVideoViewController *)picker;
-
-//超过最大选择项时
-- (void)photoPickerDidMaximum:(uploadImageOrVideoViewController *)picker;
-
-//低于最低选择项时
-- (void)photoPickerDidMinimum:(uploadImageOrVideoViewController *)picker;
-
-//选择过滤
-- (void)photoPickerDidSelectionFilter:(uploadImageOrVideoViewController *)picker;
-
-@end
-
 @interface uploadImageOrVideoViewController : BaseViewController
 
-@property (weak, nonatomic) id <AJPhotoPickerProtocol> delegate;
 //选择过滤
 @property (nonatomic, strong) NSPredicate *selectionFilter;
-//资源过滤
-@property (nonatomic, strong) ALAssetsFilter *assetsFilter;
 
 //选中的项
 @property (nonatomic, strong) NSMutableArray *indexPathsForSelectedItems;

创维盒子/双子星云手机/Class/Set/uploadFile/uploadImageOrVideoViewController.m

@@ -195,7 +195,6 @@
  */
 - (void)setupGroupView {
     AJPhotoGroupView *photoGroupView = [[AJPhotoGroupView alloc] init];
-    //photoGroupView.assetsFilter = self.assetsFilter;
     photoGroupView.my_delegate = self;
     [self.view insertSubview:photoGroupView belowSubview:self.navBarBGView];
     self.photoGroupView = photoGroupView;
@@ -415,38 +414,38 @@
 #pragma mark 处理点击选中相关
 - (void)handlCellSelectFunBy:(NSIndexPath *)indexPath
 {
-    AJPhotoListCell *cell = (AJPhotoListCell *)[self.photoListView cellForItemAtIndexPath:indexPath];
-    ALAsset *asset = self.assets[indexPath.row];
-    
-    //超出最大限制
-    if (self.indexPathsForSelectedItems.count >= self.maximumNumberOfSelection && ![self.indexPathsForSelectedItems containsObject:asset]) {
-        if (_delegate && [_delegate respondsToSelector:@selector(photoPickerDidMaximum:)])
-            [_delegate photoPickerDidMaximum:self];
-        return;
-    }
-    
-    //选择过滤
-    BOOL selectable = [self.selectionFilter evaluateWithObject:asset];
-    if (!selectable) {
-        if (_delegate && [_delegate respondsToSelector:@selector(photoPickerDidSelectionFilter:)])
-            [_delegate photoPickerDidSelectionFilter:self];
-        return;
-    }
-    
-    //取消选中
-    if ([self.indexPathsForSelectedItems containsObject:asset]) {
-        [self.indexPathsForSelectedItems removeObject:asset];
-        [cell isSelected:NO];
-        if (_delegate && [_delegate respondsToSelector:@selector(photoPicker:didDeselectAsset:)])
-            [_delegate photoPicker:self didDeselectAsset:asset];
-        return;
-    }
-    
-    //选中
-    [self.indexPathsForSelectedItems addObject:asset];
-    [cell isSelected:YES];
-    if (_delegate && [_delegate respondsToSelector:@selector(photoPicker:didSelectAsset:)])
-        [_delegate photoPicker:self didSelectAsset:asset];
+//    AJPhotoListCell *cell = (AJPhotoListCell *)[self.photoListView cellForItemAtIndexPath:indexPath];
+//    ALAsset *asset = self.assets[indexPath.row];
+//    
+//    //超出最大限制
+//    if (self.indexPathsForSelectedItems.count >= self.maximumNumberOfSelection && ![self.indexPathsForSelectedItems containsObject:asset]) {
+//        if (_delegate && [_delegate respondsToSelector:@selector(photoPickerDidMaximum:)])
+//            [_delegate photoPickerDidMaximum:self];
+//        return;
+//    }
+//    
+//    //选择过滤
+//    BOOL selectable = [self.selectionFilter evaluateWithObject:asset];
+//    if (!selectable) {
+//        if (_delegate && [_delegate respondsToSelector:@selector(photoPickerDidSelectionFilter:)])
+//            [_delegate photoPickerDidSelectionFilter:self];
+//        return;
+//    }
+//    
+//    //取消选中
+//    if ([self.indexPathsForSelectedItems containsObject:asset]) {
+//        [self.indexPathsForSelectedItems removeObject:asset];
+//        [cell isSelected:NO];
+//        if (_delegate && [_delegate respondsToSelector:@selector(photoPicker:didDeselectAsset:)])
+//            [_delegate photoPicker:self didDeselectAsset:asset];
+//        return;
+//    }
+//    
+//    //选中
+//    [self.indexPathsForSelectedItems addObject:asset];
+//    [cell isSelected:YES];
+//    if (_delegate && [_delegate respondsToSelector:@selector(photoPicker:didSelectAsset:)])
+//        [_delegate photoPicker:self didSelectAsset:asset];
 }
 
 #pragma mark - getter/setter