no message

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -405,7 +405,6 @@
 		BD12B68122B4EF2600AEB10B /* KSMediaPickerViewVideoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD12B67F22B4EF2600AEB10B /* KSMediaPickerViewVideoCell.swift */; };
 		BD12B68322B4EFF000AEB10B /* KSMediaPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD12B68222B4EFF000AEB10B /* KSMediaPickerView.swift */; };
 		BD12B68822B4F28F00AEB10B /* KSExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD12B68722B4F28F00AEB10B /* KSExtension.swift */; };
-		BD12B69122B4F60300AEB10B /* KSMediaPickerScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD12B69022B4F60200AEB10B /* KSMediaPickerScrollView.m */; };
 		BD12B69422B4F68400AEB10B /* KSMediaPickerCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD12B69322B4F68400AEB10B /* KSMediaPickerCollectionView.m */; };
 		BD12B69622B4F72900AEB10B /* KSMediaPickerPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD12B69522B4F72900AEB10B /* KSMediaPickerPreviewView.swift */; };
 		BD12B69A22B4FA8400AEB10B /* KSMediaPickerSelectIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD12B69922B4FA8400AEB10B /* KSMediaPickerSelectIndicator.swift */; };
@@ -937,8 +936,6 @@
 		BD12B67F22B4EF2600AEB10B /* KSMediaPickerViewVideoCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KSMediaPickerViewVideoCell.swift; sourceTree = "<group>"; };
 		BD12B68222B4EFF000AEB10B /* KSMediaPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KSMediaPickerView.swift; sourceTree = "<group>"; };
 		BD12B68722B4F28F00AEB10B /* KSExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KSExtension.swift; sourceTree = "<group>"; };
-		BD12B68F22B4F60200AEB10B /* KSMediaPickerScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSMediaPickerScrollView.h; sourceTree = "<group>"; };
-		BD12B69022B4F60200AEB10B /* KSMediaPickerScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSMediaPickerScrollView.m; sourceTree = "<group>"; };
 		BD12B69222B4F68400AEB10B /* KSMediaPickerCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSMediaPickerCollectionView.h; sourceTree = "<group>"; };
 		BD12B69322B4F68400AEB10B /* KSMediaPickerCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSMediaPickerCollectionView.m; sourceTree = "<group>"; };
 		BD12B69522B4F72900AEB10B /* KSMediaPickerPreviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KSMediaPickerPreviewView.swift; sourceTree = "<group>"; };
@@ -3667,8 +3664,6 @@
 				BD12B69322B4F68400AEB10B /* KSMediaPickerCollectionView.m */,
 				BD12B69D22B4FAF000AEB10B /* KSMediaPickerNavigationView.swift */,
 				BD12B69522B4F72900AEB10B /* KSMediaPickerPreviewView.swift */,
-				BD12B68F22B4F60200AEB10B /* KSMediaPickerScrollView.h */,
-				BD12B69022B4F60200AEB10B /* KSMediaPickerScrollView.m */,
 				BD12B69922B4FA8400AEB10B /* KSMediaPickerSelectIndicator.swift */,
 				BD12B68222B4EFF000AEB10B /* KSMediaPickerView.swift */,
 				BD12B67E22B4EF2600AEB10B /* KSMediaPickerViewImageCell.swift */,
@@ -4655,7 +4650,6 @@
 				A7CC74D6226FF421003C4F38 /* MineNavigationBarView.swift in Sources */,
 				BDAF83AA22B388F20004BCC3 /* RecommendDefaultBackCell.swift in Sources */,
 				A71AF0BC226F099B001730FE /* ProductHBigTableViewCell.swift in Sources */,
-				BD12B69122B4F60300AEB10B /* KSMediaPickerScrollView.m in Sources */,
 				BD108C9622A60C2100837DAB /* HGImagePickerCell.swift in Sources */,
 				BD28077822B721BF002AB976 /* PublishEditController.swift in Sources */,
 				A7A98E3C228036D7005306E9 /* ShoppingMallCategoryCollectionViewCell.swift in Sources */,

RainbowPlanet/RainbowPlanet/Macro/RainbowPlanet-Bridging-Header.h

@@ -56,11 +56,8 @@
 
 
 //  KSMediaPicker所依靠的OC文件
-//#import "KSMediaViewerCell.h"
-#import "KSMediaPickerScrollView.h"
 #import "KSMediaPickerCollectionView.h"
 #import "KSVideoPlayerLiteView.h"
-//#import "KSPageControl.h"
 
 
 #import "AliyunPathManager.h"

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/View/KSMediaPickerScrollView.h

@@ -1,26 +0,0 @@
-//
-//  KSMediaPickerScrollView.h
-//  KSMediaPickerDemo
-//
-//  Created by kinsun on 2019/4/29.
-//  Copyright © 2019年 kinsun. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol KSMediaPickerScrollViewDelegate <NSObject, UIScrollViewDelegate>
-
-@optional
-- (void)scrollViewDidEndScroll:(UIScrollView *)scrollView;
-
-@end
-
-@interface KSMediaPickerScrollView : UIScrollView
-
-@property (nonatomic, weak) id<KSMediaPickerScrollViewDelegate> delegate;
-
-@end
-
-NS_ASSUME_NONNULL_END

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/View/KSMediaPickerScrollView.m

@@ -1,67 +0,0 @@
-//
-//  KSMediaPickerScrollView.m
-//  KSMediaPickerDemo
-//
-//  Created by kinsun on 2019/4/29.
-//  Copyright © 2019年 kinsun. All rights reserved.
-//
-
-#import "KSMediaPickerScrollView.h"
-
-@interface UIScrollView ()
-
-- (void)_scrollViewDidEndDeceleratingForDelegate;
-- (void)_scrollViewDidEndDraggingForDelegateWithDeceleration:(BOOL)deceleration;
-- (void)_delegateScrollViewAnimationEnded;
-
-@end
-
-@implementation KSMediaPickerScrollView
-@dynamic delegate;
-
-- (void)_scrollViewDidEndDeceleratingForDelegate {
-    [super _scrollViewDidEndDeceleratingForDelegate];
-    __weak id<KSMediaPickerScrollViewDelegate> delegate = self.delegate;
-    if (delegate != nil) {
-        SEL selector = @selector(scrollViewDidEndScroll:);
-        if ([delegate respondsToSelector:selector]) {
-            BOOL scrollToScrollStop = !self.tracking && !self.dragging && !self.decelerating;
-            if (scrollToScrollStop) {
-#pragma clang diagnostic ignored"-Warc-performSelector-leaks"
-                [delegate performSelector:selector withObject:self];
-            }
-        }
-    }
-}
-
-- (void)_scrollViewDidEndDraggingForDelegateWithDeceleration:(BOOL)decelerate {
-    [super _scrollViewDidEndDraggingForDelegateWithDeceleration:decelerate];
-    if (!decelerate) {
-        __weak id<KSMediaPickerScrollViewDelegate> delegate = self.delegate;
-        if (delegate != nil) {
-            SEL selector = @selector(scrollViewDidEndScroll:);
-            if ([delegate respondsToSelector:selector]) {
-                BOOL dragToDragStop = self.tracking && !self.dragging && !self.decelerating;
-                if (dragToDragStop) {
-#pragma clang diagnostic ignored"-Warc-performSelector-leaks"
-                    [delegate performSelector:selector withObject:self];
-                }
-            }
-        }
-    }
-}
-
-- (void)_delegateScrollViewAnimationEnded {
-    [super _delegateScrollViewAnimationEnded];
-    __weak id<KSMediaPickerScrollViewDelegate> delegate = self.delegate;
-    if (delegate != nil) {
-        SEL selector = @selector(scrollViewDidEndScroll:);
-        if ([delegate respondsToSelector:selector]) {
-#pragma clang diagnostic ignored"-Warc-performSelector-leaks"
-            [delegate performSelector:selector withObject:self];
-        }
-    }
-}
-
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/View/KSMediaPickerView.swift

@@ -7,23 +7,12 @@
 
 import UIKit
 
-open class KSMediaPickerView: UIView, KSMediaPickerScrollViewDelegate {
+open class KSMediaPickerView: UIView {
     
     required public init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
     
-    public let scrollView = {() -> KSMediaPickerScrollView in
-        let scrollView = KSMediaPickerScrollView()
-        scrollView.showsHorizontalScrollIndicator = false
-        scrollView.isPagingEnabled = true
-        scrollView.bounces = false
-        if #available(iOS 11.0, *) {
-            scrollView.contentInsetAdjustmentBehavior = .never
-        }
-        return scrollView
-    }()
-    
     public let albumNavigationView = KSMediaPickerView.navigationView()
     
     public let collectionView = {() -> KSMediaPickerCollectionView in
@@ -61,14 +50,10 @@ open class KSMediaPickerView: UIView, KSMediaPickerScrollViewDelegate {
         backgroundColor = .ks_white
         layer.addSublayer(_blackBackgroundLayer)
         
-        scrollView.addSubview(collectionView)
-        scrollView.addSubview(previewView)
+        addSubview(collectionView)
+        addSubview(previewView)
         albumNavigationView.nextButton.isEnabled = false
-        scrollView.addSubview(albumNavigationView)
-                
-        
-        scrollView.delegate = self
-        addSubview(scrollView)
+        addSubview(albumNavigationView)
         
         collectionView.handlePanCallback = {[weak self] (pan) in
             self?._collectionView(did: pan)
@@ -89,17 +74,13 @@ open class KSMediaPickerView: UIView, KSMediaPickerScrollViewDelegate {
     override open func layoutSubviews() {
         super.layoutSubviews()
         let bounds = self.bounds
-        scrollView.frame = bounds
-        
         let safeArea = UIEdgeInsets.safeAreaInsets
         
         let windowSize = bounds.size
         let windowWidth = windowSize.width
         let windowHeight = windowSize.height
         let floatZore = CGFloat(0.0)
-        let safeBottomMargin = safeArea.bottom
-        
-        scrollView.contentSize = CGSize(width: windowWidth*2.0, height: 0.0)
+        let safeBottomMargin = safeArea.bottom        
         
         var viewW = windowWidth
         var viewH = safeBottomMargin+48.0

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_flashlight_auto.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_auto@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_auto@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_flashlight_auto_b.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_auto_b@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_auto_b@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_flashlight_off.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_flashlight_off_b.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_off_b@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_off_b@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_flashlight_on.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_flashlight_on_b.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_on_b@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_flashlight_on_b@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_rectangle.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_rectangle@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_rectangle@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_rectangle_16_9.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_rectangle_16_9@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_rectangle_16_9@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_square.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_square@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_square@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_square_b.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_square_b@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_square_b@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_switch.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_switch@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_switch@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/icon_mediaPicker_camera_switch_b.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_switch_b@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "icon_mediaPicker_camera_switch_b@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}