2.5.4版本

ProductApp/Podfile

@@ -49,7 +49,7 @@ pod 'GYSDK'
 pod 'GTSDK'
 pod 'GTExtensionSDK'
 
-pod 'ICGVideoTrimmer'
+#pod 'ICGVideoTrimmer'
 
 
 post_install do |installer|

ProductApp/Podfile.lock

@@ -22,7 +22,6 @@ PODS:
     - GTCommonSDK (> 3.0.9.0)
   - GYSDK (3.0.5.0):
     - GTCommonSDK (>= 3.0.0.0)
-  - ICGVideoTrimmer (1.1)
   - IQKeyboardManager (6.5.11)
   - libpag (4.3.57)
   - LSTTimer (0.2.10)
@@ -57,7 +56,6 @@ DEPENDENCIES:
   - GTExtensionSDK
   - GTSDK
   - GYSDK
-  - ICGVideoTrimmer
   - IQKeyboardManager
   - libpag
   - LSTTimer
@@ -88,7 +86,6 @@ SPEC REPOS:
     - GTExtensionSDK
     - GTSDK
     - GYSDK
-    - ICGVideoTrimmer
     - IQKeyboardManager
     - libpag
     - LSTTimer
@@ -119,7 +116,6 @@ SPEC CHECKSUMS:
   GTExtensionSDK: 9a5008e262732a2d3f58f3aee1a3e5a91ee20e1d
   GTSDK: b002384999146d5b86f1c9b56e20882ffbfd2796
   GYSDK: ca742e929db8e65c5a20d4beb4288f23003f898e
-  ICGVideoTrimmer: 1f54de0595af56af2a406f20cdb33c1c440d15cd
   IQKeyboardManager: ef43ce1ba1e5aaf4adf222c0a46f39761f246879
   libpag: 4bae06b191f85d9d17c47332151e819673191a2b
   LSTTimer: caf8f02ff366ca175cf4c1778d26c166183c1b6f
@@ -143,6 +139,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZXSDK: 414bed508b670437a9bdf7c75d49816b8cb7b2d4
 
-PODFILE CHECKSUM: bdc7cf09c0fc5aac17abd7adc84468998a8a9a6d
+PODFILE CHECKSUM: 5c554b2ac74246029e7b40e041a8ae7b0dedb632
 
 COCOAPODS: 1.16.2

ProductApp/Pods/ICGVideoTrimmer/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 itsmeichigo
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

ProductApp/Pods/ICGVideoTrimmer/README.md

@@ -1,62 +0,0 @@
-# ICGVideoTrimmer
-A library for quick video trimming based on `SAVideoRangeSlider`, mimicking the behavior of Instagram's.
-
-![Screenshot](https://raw.githubusercontent.com/itsmeichigo/ICGVideoTrimmer/master/trimmer.gif)
-
-## Note
-I've made this very quickly so here's a list of things to do for improvements (pull requests are very much appreciated!):
-- ~~Make panning thumb views smoother~~
-- ~~Make ruller view more customizable~~
-- ~~Added video tracker, mimicking the behaviour of Instagram's~~ - [@FabKremer](https://github.com/FabKremer)
-- Bug fixes if any
-- More and more, can't remember right now hahha.
-
-## Getting started
-
-#### Using CocoaPods:
-  Just add the following line in to your pod file:
-  
-	pod 'ICGVideoTrimmer'
-
-#### Manually add ICGVideoTrimmer as a library:
-  Drag and drop the subfolder named `Source` in your project and you are done.
-
-### Usage
-Create an instance of `ICGVideoTrimmer` using interface builder or programmatically. Give it an asset and set the delegate. You can select theme color for the trimmer view and decide whether to show the ruler view by setting the properties. Finally, don't forget to call `resetSubviews`!
- ```objective-C
-  [self.trimmerView setThemeColor:[UIColor lightGrayColor]];
-  [self.trimmerView setAsset:self.asset];
-  [self.trimmerView setShowsRulerView:YES];
-  [self.trimmerView setTrackerColor:[UIColor cyanColor]];
-  [self.trimmerView setShowsTracker:YES];
-  [self.trimmerView setDelegate:self];
-  [self.trimmerView resetSubviews];
- ```
-If necessary, you can also set your desired minimum and maximum length for your trimmed video by setting the properties `minLength` and `maxLength` for the trimmer view. By default, these properties are 3 and 15 (seconds) respectively.
-
-You can also customize your thumb views by setting images for the left and right thumbs:
-```objective-C
-  [self.trimmerView setLeftThumbImage:[UIImage imageNamed:@"left-thumb"]];
-  [self.trimmerView setRightThumbImage:[UIImage imageNamed:@"right-thumb"]];
-```
-See the project example to see how to manage the tracker on a video. 
-
-## Requirements
-
-ICGVideoTrimmer requires iOS 7 and `MobileCoreServices` and `AVFoundation` frameworks. Honestly I haven't tested it with iOS 6 and below so I can't be too sure if it's compatible.
-
-### ARC
-
-ICGVideoTrimmer uses ARC. If you are using ICGVideoTrimmer in a non-arc project, you
-will need to set a `-fobjc-arc` compiler flag on every ICGVideoTrimmer source files. To set a
-compiler flag in Xcode, go to your active target and select the "Build Phases" tab. Then select
-ICGVideoTrimmer source files, press Enter, insert -fobjc-arc and then "Done" to enable ARC
-for ICGVideoTrimmer.
-
-## Contributing
-
-Contributions for bug fixing or improvements are welcome. Feel free to submit a pull request.
-
-## Licence
-
-ICGVideoTrimmer is available under the MIT license. See the LICENSE file for more info.

ProductApp/Pods/ICGVideoTrimmer/Source/ICGRulerView.h

@@ -1,18 +0,0 @@
-//
-//  ICGRulerView.h
-//  ICGVideoTrimmer
-//
-//  Created by Huong Do on 1/25/15.
-//  Copyright (c) 2015 ichigo. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface ICGRulerView : UIView
-
-@property (assign, nonatomic) CGFloat widthPerSecond;
-@property (strong, nonatomic) UIColor *themeColor;
-
-- (instancetype)initWithFrame:(CGRect)frame widthPerSecond:(CGFloat)width themeColor:(UIColor *)color;
-
-@end

ProductApp/Pods/ICGVideoTrimmer/Source/ICGRulerView.m

@@ -1,78 +0,0 @@
-//
-//  ICGRulerView.m
-//  ICGVideoTrimmer
-//
-//  Created by Huong Do on 1/25/15.
-//  Copyright (c) 2015 ichigo. All rights reserved.
-//
-
-#import "ICGRulerView.h"
-
-@implementation ICGRulerView
-
-- (instancetype)initWithFrame:(CGRect)frame widthPerSecond:(CGFloat)width themeColor:(UIColor *)color
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        _widthPerSecond = width;
-        _themeColor = color;
-    }
-    return self;
-}
-
-
-- (void)drawRect:(CGRect)rect
-{
-    // Drawing code
-    CGContextRef context = UIGraphicsGetCurrentContext();
-    
-    CGFloat leftMargin = 10;
-    CGFloat topMargin = 0;
-    CGFloat height = CGRectGetHeight(self.frame);
-    CGFloat width = CGRectGetWidth(self.frame);
-    CGFloat minorTickSpace = self.widthPerSecond;
-    NSInteger multiple = 5;
-    CGFloat majorTickLength = 12;
-    CGFloat minorTickLength = 7;
-    
-    CGFloat baseY = topMargin + height;
-    CGFloat minorY = baseY - minorTickLength;
-    CGFloat majorY = baseY - majorTickLength;
-    
-    NSInteger step = 0;
-    for (CGFloat x = leftMargin; x <= (leftMargin + width); x += minorTickSpace) {
-        CGContextMoveToPoint(context, x, baseY);
-        
-        CGContextSetFillColorWithColor(context, self.themeColor.CGColor);
-        if (step % multiple == 0) {
-            CGContextFillRect(context, CGRectMake(x, majorY, 1.75, majorTickLength));
-            
-            UIFont *font = [UIFont systemFontOfSize:11];
-            UIColor *textColor = self.themeColor;
-            NSDictionary *stringAttrs = @{NSFontAttributeName:font, NSForegroundColorAttributeName:textColor};
-            
-            NSInteger minutes = step / 60;
-            NSInteger seconds = step % 60;
-            
-            NSAttributedString* attrStr;
-            
-            if (minutes > 0) {
-                attrStr = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld:%02ld", (long) minutes, (long) seconds] attributes:stringAttrs];
-            }
-            else {
-                attrStr = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@":%02ld", (long) seconds] attributes:stringAttrs];
-            }
-            
-            [attrStr drawAtPoint:CGPointMake(x-7, majorY - 15)];
-            
-            
-        } else {
-            CGContextFillRect(context, CGRectMake(x, minorY, 1.0, minorTickLength));
-        }
-        
-        step++;
-    }
-    
-}
-
-@end

ProductApp/Pods/ICGVideoTrimmer/Source/ICGThumbView.h

@@ -1,19 +0,0 @@
-//
-//  ICGVideoTrimmerLeftOverlay.h
-//  ICGVideoTrimmer
-//
-//  Created by Huong Do on 1/19/15.
-//  Copyright (c) 2015 ichigo. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface ICGThumbView : UIView
-
-@property (strong, nonatomic) UIColor *color;
-
-- (instancetype)initWithFrame:(CGRect)frame color:(UIColor *)color right:(BOOL)flag;
-
-- (instancetype)initWithFrame:(CGRect)frame thumbImage:(UIImage *)image;
-
-@end

ProductApp/Pods/ICGVideoTrimmer/Source/ICGThumbView.m

@@ -1,81 +0,0 @@
-//
-//  ICGVideoTrimmerLeftOverlay.m
-//  ICGVideoTrimmer
-//
-//  Created by Huong Do on 1/19/15.
-//  Copyright (c) 2015 ichigo. All rights reserved.
-//
-
-#import "ICGThumbView.h"
-
-@interface ICGThumbView()
-
-@property (nonatomic) BOOL isRight;
-@property (strong, nonatomic) UIImage *thumbImage;
-
-@end
-
-@implementation ICGThumbView
-
-- (instancetype)initWithFrame:(CGRect)frame color:(UIColor *)color right:(BOOL)flag
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        _color = color;
-        _isRight = flag;
-    }
-    return self;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame thumbImage:(UIImage *)image
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        self.thumbImage = image;
-    }
-    return self;
-}
-
-- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
-{
-    CGRect relativeFrame = self.bounds;
-    UIEdgeInsets hitTestEdgeInsets = UIEdgeInsetsMake(0, -30, 0, -30);
-    CGRect hitFrame = UIEdgeInsetsInsetRect(relativeFrame, hitTestEdgeInsets);
-    return CGRectContainsPoint(hitFrame, point);
-}
-
-- (void)drawRect:(CGRect)rect
-{
-    // Drawing code
-    
-    if (self.thumbImage) {
-        [self.thumbImage drawInRect:rect];
-    } else {
-        //// Frames
-        CGRect bubbleFrame = self.bounds;
-        
-        //// Rounded Rectangle Drawing
-        CGRect roundedRectangleRect = CGRectMake(CGRectGetMinX(bubbleFrame), CGRectGetMinY(bubbleFrame), CGRectGetWidth(bubbleFrame), CGRectGetHeight(bubbleFrame));
-        UIBezierPath *roundedRectanglePath = [UIBezierPath bezierPathWithRoundedRect: roundedRectangleRect byRoundingCorners: UIRectCornerTopLeft | UIRectCornerBottomLeft cornerRadii: CGSizeMake(3, 3)];
-        if (self.isRight) {
-            roundedRectanglePath = [UIBezierPath bezierPathWithRoundedRect: roundedRectangleRect byRoundingCorners: UIRectCornerTopRight | UIRectCornerBottomRight cornerRadii: CGSizeMake(3, 3)];
-        }
-        [roundedRectanglePath closePath];
-        [self.color setFill];
-        [roundedRectanglePath fill];
-        
-        
-        CGRect decoratingRect = CGRectMake(CGRectGetMinX(bubbleFrame)+CGRectGetWidth(bubbleFrame)/2.5, CGRectGetMinY(bubbleFrame)+CGRectGetHeight(bubbleFrame)/4, 1.5, CGRectGetHeight(bubbleFrame)/2);
-        UIBezierPath *decoratingPath = [UIBezierPath bezierPathWithRoundedRect:decoratingRect byRoundingCorners: UIRectCornerTopLeft | UIRectCornerBottomLeft | UIRectCornerBottomRight | UIRectCornerTopRight cornerRadii: CGSizeMake(1, 1)];
-        [decoratingPath closePath];
-        [[UIColor colorWithWhite:1 alpha:0.5] setFill];
-        [decoratingPath fill];
-
-    }
-    
-    
-    
-}
-
-
-@end

ProductApp/Pods/ICGVideoTrimmer/Source/ICGVideoTrimmer.h

@@ -1,16 +0,0 @@
-//
-//  ICGVideoTrimmer.h
-//  ICGVideoTrimmer
-//
-//  Created by Huong Do on 1/29/15.
-//  Copyright (c) 2015 ichigo. All rights reserved.
-//
-
-#ifndef ICGVideoTrimmer_ICGVideoTrimmer_h
-#define ICGVideoTrimmer_ICGVideoTrimmer_h
-
-#import "ICGVideoTrimmerView.h"
-#import "ICGThumbView.h"
-#import "ICGRulerView.h"
-
-#endif

ProductApp/Pods/ICGVideoTrimmer/Source/ICGVideoTrimmerView.h

@@ -1,64 +0,0 @@
-//
-//  ICGVideoTrimmerView.h
-//  ICGVideoTrimmer
-//
-//  Created by Huong Do on 1/18/15.
-//  Copyright (c) 2015 ichigo. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <AVFoundation/AVFoundation.h>
-
-@protocol ICGVideoTrimmerDelegate;
-
-@interface ICGVideoTrimmerView : UIView
-
-// Video to be trimmed
-@property (strong, nonatomic) AVAsset *asset;
-
-// Theme color for the trimmer view
-@property (strong, nonatomic) UIColor *themeColor;
-
-// Maximum length for the trimmed video
-@property (assign, nonatomic) CGFloat maxLength;
-
-// Minimum length for the trimmed video
-@property (assign, nonatomic) CGFloat minLength;
-
-// Show ruler view on the trimmer view or not
-@property (assign, nonatomic) BOOL showsRulerView;
-
-// Customize color for tracker
-@property (assign, nonatomic) UIColor *trackerColor;
-
-// Custom image for the left thumb
-@property (strong, nonatomic) UIImage *leftThumbImage;
-
-// Custom image for the right thumb
-@property (strong, nonatomic) UIImage *rightThumbImage;
-
-// Custom width for the top and bottom borders
-@property (assign, nonatomic) CGFloat borderWidth;
-
-// Custom width for thumb
-@property (assign, nonatomic) CGFloat thumbWidth;
-
-@property (weak, nonatomic) IBOutlet id<ICGVideoTrimmerDelegate> delegate;
-
-- (instancetype)initWithAsset:(AVAsset *)asset;
-
-- (instancetype)initWithFrame:(CGRect)frame asset:(AVAsset *)asset;
-
-- (void)resetSubviews;
-
-- (void)seekToTime:(CGFloat)startTime;
-
-- (void)hideTracker:(BOOL)flag;
-
-@end
-
-@protocol ICGVideoTrimmerDelegate <NSObject>
-
-- (void)trimmerView:(ICGVideoTrimmerView *)trimmerView didChangeLeftPosition:(CGFloat)startTime rightPosition:(CGFloat)endTime;
-
-@end

ProductApp/Pods/ICGVideoTrimmer/Source/ICGVideoTrimmerView.m

@@ -1,383 +0,0 @@
-//
-//  ICGVideoTrimmerView.m
-//  ICGVideoTrimmer
-//
-//  Created by Huong Do on 1/18/15.
-//  Copyright (c) 2015 ichigo. All rights reserved.
-//
-
-#import "ICGVideoTrimmerView.h"
-#import "ICGThumbView.h"
-#import "ICGRulerView.h"
-
-@interface ICGVideoTrimmerView() <UIScrollViewDelegate>
-
-@property (strong, nonatomic) UIView *contentView;
-@property (strong, nonatomic) UIView *frameView;
-@property (strong, nonatomic) UIScrollView *scrollView;
-@property (strong, nonatomic) AVAssetImageGenerator *imageGenerator;
-
-@property (strong, nonatomic) UIView *leftOverlayView;
-@property (strong, nonatomic) UIView *rightOverlayView;
-@property (strong, nonatomic) ICGThumbView *leftThumbView;
-@property (strong, nonatomic) ICGThumbView *rightThumbView;
-
-@property (strong, nonatomic) UIView *trackerView;
-@property (strong, nonatomic) UIView *topBorder;
-@property (strong, nonatomic) UIView *bottomBorder;
-
-@property (nonatomic) CGFloat startTime;
-@property (nonatomic) CGFloat endTime;
-
-@property (nonatomic) CGFloat widthPerSecond;
-
-@property (nonatomic) CGPoint leftStartPoint;
-@property (nonatomic) CGPoint rightStartPoint;
-@property (nonatomic) CGFloat overlayWidth;
-
-@end
-
-@implementation ICGVideoTrimmerView
-
-#pragma mark - Initiation
-
-- (instancetype)initWithAsset:(AVAsset *)asset
-{
-    return [self initWithFrame:CGRectZero asset:asset];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame asset:(AVAsset *)asset
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        _asset = asset;
-        [self resetSubviews];
-    }
-    return self;
-}
-
-
-#pragma mark - Private methods
-
-- (CGFloat)thumbWidth
-{
-    return _thumbWidth ?: 10;
-}
-
-- (CGFloat)maxLength
-{
-    return _maxLength ?: 15;
-}
-
-- (CGFloat)minLength
-{
-    return _minLength ?: 3;
-}
-
-- (void)resetSubviews
-{
-    [self setBackgroundColor:[UIColor blackColor]];
-
-    [self.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-    
-    self.scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.frame), CGRectGetHeight(self.frame))];
-    [self addSubview:self.scrollView];
-    [self.scrollView setDelegate:self];
-    [self.scrollView setShowsHorizontalScrollIndicator:NO];
-    
-    self.contentView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.scrollView.frame), CGRectGetHeight(self.scrollView.frame))];
-    [self.scrollView setContentSize:self.contentView.frame.size];
-    [self.scrollView addSubview:self.contentView];
-    
-    CGFloat ratio = self.showsRulerView ? 0.7 : 1.0;
-    self.frameView = [[UIView alloc] initWithFrame:CGRectMake(self.thumbWidth, 0, CGRectGetWidth(self.contentView.frame)-2*self.thumbWidth, CGRectGetHeight(self.contentView.frame)*ratio)];
-    [self.frameView.layer setMasksToBounds:YES];
-    [self.contentView addSubview:self.frameView];
-    
-    [self addFrames];
-    
-    if (self.showsRulerView) {
-        CGRect rulerFrame = CGRectMake(0, CGRectGetHeight(self.contentView.frame)*0.7, CGRectGetWidth(self.contentView.frame)+self.thumbWidth, CGRectGetHeight(self.contentView.frame)*0.3);
-        ICGRulerView *rulerView = [[ICGRulerView alloc] initWithFrame:rulerFrame widthPerSecond:self.widthPerSecond themeColor:self.themeColor];
-        [self.contentView addSubview:rulerView];
-    }
-    
-    // add borders
-    self.topBorder = [[UIView alloc] init];
-    [self.topBorder setBackgroundColor:self.themeColor];
-    [self addSubview:self.topBorder];
-    
-    self.bottomBorder = [[UIView alloc] init];
-    [self.bottomBorder setBackgroundColor:self.themeColor];
-    [self addSubview:self.bottomBorder];
-    
-    // width for left and right overlay views
-    self.overlayWidth =  CGRectGetWidth(self.frame) - (self.minLength * self.widthPerSecond);
-
-    // add left overlay view
-    self.leftOverlayView = [[UIView alloc] initWithFrame:CGRectMake(self.thumbWidth - self.overlayWidth, 0, self.overlayWidth, CGRectGetHeight(self.frameView.frame))];
-    CGRect leftThumbFrame = CGRectMake(self.overlayWidth-self.thumbWidth, 0, self.thumbWidth, CGRectGetHeight(self.frameView.frame));
-    if (self.leftThumbImage) {
-        self.leftThumbView = [[ICGThumbView alloc] initWithFrame:leftThumbFrame thumbImage:self.leftThumbImage];
-    } else {
-        self.leftThumbView = [[ICGThumbView alloc] initWithFrame:leftThumbFrame color:self.themeColor right:NO];
-    }
-    
-    self.trackerView = [[UIView alloc] initWithFrame:CGRectMake(self.thumbWidth, -5, 3, CGRectGetHeight(self.frameView.frame) + 10)];
-    self.trackerView.backgroundColor = self.trackerColor ? self.trackerColor : [UIColor whiteColor];
-    self.trackerView.layer.masksToBounds = true;
-    self.trackerView.layer.cornerRadius = 2;
-    [self addSubview:self.trackerView];
-
-    [self.leftThumbView.layer setMasksToBounds:YES];
-    [self.leftOverlayView addSubview:self.leftThumbView];
-    [self.leftOverlayView setUserInteractionEnabled:YES];
-    UIPanGestureRecognizer *leftPanGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(moveLeftOverlayView:)];
-    [self.leftOverlayView addGestureRecognizer:leftPanGestureRecognizer];
-    [self.leftOverlayView setBackgroundColor:[UIColor colorWithWhite:0 alpha:0.8]];
-    [self addSubview:self.leftOverlayView];
-
-    // add right overlay view
-    CGFloat rightViewFrameX = CGRectGetWidth(self.frameView.frame) < CGRectGetWidth(self.frame) ? CGRectGetMaxX(self.frameView.frame) : CGRectGetWidth(self.frame) - self.thumbWidth;
-    self.rightOverlayView = [[UIView alloc] initWithFrame:CGRectMake(rightViewFrameX, 0, self.overlayWidth, CGRectGetHeight(self.frameView.frame))];
-    if (self.rightThumbImage) {
-        self.rightThumbView = [[ICGThumbView alloc] initWithFrame:CGRectMake(0, 0, self.thumbWidth, CGRectGetHeight(self.frameView.frame)) thumbImage:self.rightThumbImage];
-    } else {
-        self.rightThumbView = [[ICGThumbView alloc] initWithFrame:CGRectMake(0, 0, self.thumbWidth, CGRectGetHeight(self.frameView.frame)) color:self.themeColor right:YES];
-    }
-    [self.rightThumbView.layer setMasksToBounds:YES];
-    [self.rightOverlayView addSubview:self.rightThumbView];
-    [self.rightOverlayView setUserInteractionEnabled:YES];
-    UIPanGestureRecognizer *rightPanGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(moveRightOverlayView:)];
-    [self.rightOverlayView addGestureRecognizer:rightPanGestureRecognizer];
-    [self.rightOverlayView setBackgroundColor:[UIColor colorWithWhite:0 alpha:0.8]];
-    [self addSubview:self.rightOverlayView];
-    
-    [self updateBorderFrames];
-    [self notifyDelegate];
-}
-
-- (void)updateBorderFrames
-{
-    CGFloat height = self.borderWidth ? self.borderWidth : 1;
-    [self.topBorder setFrame:CGRectMake(CGRectGetMaxX(self.leftOverlayView.frame), 0, CGRectGetMinX(self.rightOverlayView.frame)-CGRectGetMaxX(self.leftOverlayView.frame), height)];
-    [self.bottomBorder setFrame:CGRectMake(CGRectGetMaxX(self.leftOverlayView.frame), CGRectGetHeight(self.frameView.frame)-height, CGRectGetMinX(self.rightOverlayView.frame)-CGRectGetMaxX(self.leftOverlayView.frame), height)];
-}
-
-- (void)moveLeftOverlayView:(UIPanGestureRecognizer *)gesture
-{
-    switch (gesture.state) {
-        case UIGestureRecognizerStateBegan:
-            self.leftStartPoint = [gesture locationInView:self];
-            break;
-        case UIGestureRecognizerStateChanged:
-        {
-            CGPoint point = [gesture locationInView:self];
-            
-            int deltaX = point.x - self.leftStartPoint.x;
-            
-            CGPoint center = self.leftOverlayView.center;
-            
-            CGFloat newLeftViewMidX = center.x += deltaX;;
-            CGFloat maxWidth = CGRectGetMinX(self.rightOverlayView.frame) - (self.minLength * self.widthPerSecond);
-            CGFloat newLeftViewMinX = newLeftViewMidX - self.overlayWidth/2;
-            if (newLeftViewMinX < self.thumbWidth - self.overlayWidth) {
-                newLeftViewMidX = self.thumbWidth - self.overlayWidth + self.overlayWidth/2;
-            } else if (newLeftViewMinX + self.overlayWidth > maxWidth) {
-                newLeftViewMidX = maxWidth - self.overlayWidth / 2;
-            }
-            
-            self.leftOverlayView.center = CGPointMake(newLeftViewMidX, self.leftOverlayView.center.y);
-            self.leftStartPoint = point;
-            [self updateBorderFrames];
-            [self notifyDelegate];
-            
-            break;
-        }
-            
-        default:
-            break;
-    }
-    
-    
-}
-
-- (void)moveRightOverlayView:(UIPanGestureRecognizer *)gesture
-{
-    switch (gesture.state) {
-        case UIGestureRecognizerStateBegan:
-            self.rightStartPoint = [gesture locationInView:self];
-            break;
-        case UIGestureRecognizerStateChanged:
-        {
-            CGPoint point = [gesture locationInView:self];
-            
-            int deltaX = point.x - self.rightStartPoint.x;
-            
-            CGPoint center = self.rightOverlayView.center;
-            
-            CGFloat newRightViewMidX = center.x += deltaX;
-            CGFloat minX = CGRectGetMaxX(self.leftOverlayView.frame) + self.minLength * self.widthPerSecond;
-            CGFloat maxX = CMTimeGetSeconds([self.asset duration]) <= self.maxLength + 0.5 ? CGRectGetMaxX(self.frameView.frame) : CGRectGetWidth(self.frame) - self.thumbWidth;
-            if (newRightViewMidX - self.overlayWidth/2 < minX) {
-                newRightViewMidX = minX + self.overlayWidth/2;
-            } else if (newRightViewMidX - self.overlayWidth/2 > maxX) {
-                newRightViewMidX = maxX + self.overlayWidth/2;
-            }
-            
-            self.rightOverlayView.center = CGPointMake(newRightViewMidX, self.rightOverlayView.center.y);
-            self.rightStartPoint = point;
-            [self updateBorderFrames];
-            [self notifyDelegate];
-            
-            break;
-        }
-            
-        default:
-            break;
-    }
-}
-
-- (void)seekToTime:(CGFloat) time
-{    
-    CGFloat posToMove = time * self.widthPerSecond + self.thumbWidth - self.scrollView.contentOffset.x;
-    
-    CGRect trackerFrame = self.trackerView.frame;
-    trackerFrame.origin.x = posToMove;
-    self.trackerView.frame = trackerFrame;
-    
-}
-
-- (void)hideTracker:(BOOL)flag
-{
-    self.trackerView.hidden = flag;
-}
-
-- (void)notifyDelegate
-{
-    CGFloat start = CGRectGetMaxX(self.leftOverlayView.frame) / self.widthPerSecond + (self.scrollView.contentOffset.x -self.thumbWidth) / self.widthPerSecond;
-    if (!self.trackerView.hidden && start != self.startTime) {
-        [self seekToTime:start];
-    }
-    self.startTime = start;
-    self.endTime = CGRectGetMinX(self.rightOverlayView.frame) / self.widthPerSecond + (self.scrollView.contentOffset.x - self.thumbWidth) / self.widthPerSecond;
-    [self.delegate trimmerView:self didChangeLeftPosition:self.startTime rightPosition:self.endTime];
-}
-
-- (void)addFrames
-{
-    self.imageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:self.asset];
-    self.imageGenerator.appliesPreferredTrackTransform = YES;
-    if ([self isRetina]){
-        self.imageGenerator.maximumSize = CGSizeMake(CGRectGetWidth(self.frameView.frame)*2, CGRectGetHeight(self.frameView.frame)*2);
-    } else {
-        self.imageGenerator.maximumSize = CGSizeMake(CGRectGetWidth(self.frameView.frame), CGRectGetHeight(self.frameView.frame));
-    }
-    
-    CGFloat picWidth = 0;
-    
-    // First image
-    NSError *error;
-    CMTime actualTime;
-    CGImageRef halfWayImage = [self.imageGenerator copyCGImageAtTime:kCMTimeZero actualTime:&actualTime error:&error];
-    UIImage *videoScreen;
-    if ([self isRetina]){
-        videoScreen = [[UIImage alloc] initWithCGImage:halfWayImage scale:2.0 orientation:UIImageOrientationUp];
-    } else {
-        videoScreen = [[UIImage alloc] initWithCGImage:halfWayImage];
-    }
-    if (halfWayImage != NULL) {
-        UIImageView *tmp = [[UIImageView alloc] initWithImage:videoScreen];
-        CGRect rect = tmp.frame;
-        rect.size.width = videoScreen.size.width;
-        tmp.frame = rect;
-        [self.frameView addSubview:tmp];
-        picWidth = tmp.frame.size.width;
-        CGImageRelease(halfWayImage);
-    }
-    
-    Float64 duration = CMTimeGetSeconds([self.asset duration]);
-    CGFloat screenWidth = CGRectGetWidth(self.frame) - 2*self.thumbWidth; // quick fix to make up for the width of thumb views
-    NSInteger actualFramesNeeded;
-    
-    CGFloat frameViewFrameWidth = (duration / self.maxLength) * screenWidth;
-    [self.frameView setFrame:CGRectMake(self.thumbWidth, 0, frameViewFrameWidth, CGRectGetHeight(self.frameView.frame))];
-    CGFloat contentViewFrameWidth = CMTimeGetSeconds([self.asset duration]) <= self.maxLength + 0.5 ? screenWidth + 30 : frameViewFrameWidth;
-    [self.contentView setFrame:CGRectMake(0, 0, contentViewFrameWidth, CGRectGetHeight(self.contentView.frame))];
-    [self.scrollView setContentSize:self.contentView.frame.size];
-    NSInteger minFramesNeeded = screenWidth / picWidth + 1;
-    actualFramesNeeded =  (duration / self.maxLength) * minFramesNeeded + 1;
-    
-    Float64 durationPerFrame = duration / (actualFramesNeeded*1.0);
-    self.widthPerSecond = frameViewFrameWidth / duration;
-    
-    int preferredWidth = 0;
-    NSMutableArray *times = [[NSMutableArray alloc] init];
-    for (int i=1; i<actualFramesNeeded; i++){
-        
-        CMTime time = CMTimeMakeWithSeconds(i*durationPerFrame, 600);
-        [times addObject:[NSValue valueWithCMTime:time]];
-        
-        UIImageView *tmp = [[UIImageView alloc] initWithImage:videoScreen];
-        tmp.tag = i;
-        
-        CGRect currentFrame = tmp.frame;
-        currentFrame.origin.x = i*picWidth;
-        
-        currentFrame.size.width = picWidth;
-        preferredWidth += currentFrame.size.width;
-        
-        if( i == actualFramesNeeded-1){
-            currentFrame.size.width-=6;
-        }
-        tmp.frame = currentFrame;
-        
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [self.frameView addSubview:tmp];
-        });
-        
-        
-    }
-    
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        for (int i=1; i<=[times count]; i++) {
-            CMTime time = [((NSValue *)[times objectAtIndex:i-1]) CMTimeValue];
-            
-            CGImageRef halfWayImage = [self.imageGenerator copyCGImageAtTime:time actualTime:NULL error:NULL];
-            
-            UIImage *videoScreen;
-            if ([self isRetina]){
-                videoScreen = [[UIImage alloc] initWithCGImage:halfWayImage scale:2.0 orientation:UIImageOrientationUp];
-            } else {
-                videoScreen = [[UIImage alloc] initWithCGImage:halfWayImage];
-            }
-            
-            CGImageRelease(halfWayImage);
-            dispatch_async(dispatch_get_main_queue(), ^{
-                UIImageView *imageView = (UIImageView *)[self.frameView viewWithTag:i];
-                [imageView setImage:videoScreen];
-                
-            });
-        }
-    });
-}
-
-- (BOOL)isRetina
-{
-    return ([[UIScreen mainScreen] respondsToSelector:@selector(displayLinkWithTarget:selector:)] &&
-            ([UIScreen mainScreen].scale > 1.0));
-}
-
-#pragma mark - UIScrollViewDelegate
-
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
-{
-    if (CMTimeGetSeconds([self.asset duration]) <= self.maxLength + 0.5) {
-        [UIView animateWithDuration:0.3 animations:^{
-            [scrollView setContentOffset:CGPointZero];
-        }];
-    }
-    [self notifyDelegate];
-}
-
-@end

ProductApp/Pods/Manifest.lock

@@ -22,7 +22,6 @@ PODS:
     - GTCommonSDK (> 3.0.9.0)
   - GYSDK (3.0.5.0):
     - GTCommonSDK (>= 3.0.0.0)
-  - ICGVideoTrimmer (1.1)
   - IQKeyboardManager (6.5.11)
   - libpag (4.3.57)
   - LSTTimer (0.2.10)
@@ -57,7 +56,6 @@ DEPENDENCIES:
   - GTExtensionSDK
   - GTSDK
   - GYSDK
-  - ICGVideoTrimmer
   - IQKeyboardManager
   - libpag
   - LSTTimer
@@ -88,7 +86,6 @@ SPEC REPOS:
     - GTExtensionSDK
     - GTSDK
     - GYSDK
-    - ICGVideoTrimmer
     - IQKeyboardManager
     - libpag
     - LSTTimer
@@ -119,7 +116,6 @@ SPEC CHECKSUMS:
   GTExtensionSDK: 9a5008e262732a2d3f58f3aee1a3e5a91ee20e1d
   GTSDK: b002384999146d5b86f1c9b56e20882ffbfd2796
   GYSDK: ca742e929db8e65c5a20d4beb4288f23003f898e
-  ICGVideoTrimmer: 1f54de0595af56af2a406f20cdb33c1c440d15cd
   IQKeyboardManager: ef43ce1ba1e5aaf4adf222c0a46f39761f246879
   libpag: 4bae06b191f85d9d17c47332151e819673191a2b
   LSTTimer: caf8f02ff366ca175cf4c1778d26c166183c1b6f
@@ -143,6 +139,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZXSDK: 414bed508b670437a9bdf7c75d49816b8cb7b2d4
 
-PODFILE CHECKSUM: bdc7cf09c0fc5aac17abd7adc84468998a8a9a6d
+PODFILE CHECKSUM: 5c554b2ac74246029e7b40e041a8ae7b0dedb632
 
 COCOAPODS: 1.16.2

ProductApp/Pods/Pods.xcodeproj/xcuserdata/gongzuo.xcuserdatad/xcschemes/ICGVideoTrimmer.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ED35DBC4444F7F4FCFEA05DA40769B50"
-               BuildableName = "ICGVideoTrimmer.framework"
-               BlueprintName = "ICGVideoTrimmer"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

ProductApp/Pods/Pods.xcodeproj/xcuserdata/gongzuo.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -34,11 +34,6 @@
 			<key>isShown</key>
 			<false/>
 		</dict>
-		<key>ICGVideoTrimmer.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
 		<key>IQKeyboardManager.xcscheme</key>
 		<dict>
 			<key>isShown</key>

ProductApp/Pods/Target Support Files/ICGVideoTrimmer/ICGVideoTrimmer-Info.plist

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>${PODS_DEVELOPMENT_LANGUAGE}</string>
-  <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
-  <key>CFBundleIdentifier</key>
-  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>${CURRENT_PROJECT_VERSION}</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
-</dict>
-</plist>

ProductApp/Pods/Target Support Files/ICGVideoTrimmer/ICGVideoTrimmer-dummy.m

@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_ICGVideoTrimmer : NSObject
-@end
-@implementation PodsDummy_ICGVideoTrimmer
-@end

ProductApp/Pods/Target Support Files/ICGVideoTrimmer/ICGVideoTrimmer-prefix.pch

@@ -1,12 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-

ProductApp/Pods/Target Support Files/ICGVideoTrimmer/ICGVideoTrimmer-umbrella.h

@@ -1,20 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-
-#import "ICGRulerView.h"
-#import "ICGThumbView.h"
-#import "ICGVideoTrimmer.h"
-#import "ICGVideoTrimmerView.h"
-
-FOUNDATION_EXPORT double ICGVideoTrimmerVersionNumber;
-FOUNDATION_EXPORT const unsigned char ICGVideoTrimmerVersionString[];
-

ProductApp/Pods/Target Support Files/ICGVideoTrimmer/ICGVideoTrimmer.debug.xcconfig

@@ -1,13 +0,0 @@
-CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/ICGVideoTrimmer
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "MobileCoreServices" -framework "UIKit"
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/ICGVideoTrimmer
-PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

ProductApp/Pods/Target Support Files/ICGVideoTrimmer/ICGVideoTrimmer.modulemap

@@ -1,6 +0,0 @@
-framework module ICGVideoTrimmer {
-  umbrella header "ICGVideoTrimmer-umbrella.h"
-
-  export *
-  module * { export * }
-}

ProductApp/Pods/Target Support Files/ICGVideoTrimmer/ICGVideoTrimmer.release.xcconfig

@@ -1,13 +0,0 @@
-CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/ICGVideoTrimmer
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "MobileCoreServices" -framework "UIKit"
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/ICGVideoTrimmer
-PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

ProductApp/Pods/Target Support Files/Pods-ProductApp/Pods-ProductApp-acknowledgements.markdown

@@ -458,30 +458,6 @@ Public License instead of this License.
 
 
 
-## ICGVideoTrimmer
-
-The MIT License (MIT)
-
-Copyright (c) 2014 itsmeichigo
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ## IQKeyboardManager
 
 MIT License

ProductApp/Pods/Target Support Files/Pods-ProductApp/Pods-ProductApp-acknowledgements.plist

@@ -505,36 +505,6 @@ Public License instead of this License.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>The MIT License (MIT)
-
-Copyright (c) 2014 itsmeichigo
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.</string>
-			<key>License</key>
-			<string>MIT</string>
-			<key>Title</key>
-			<string>ICGVideoTrimmer</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>MIT License

ProductApp/Pods/Target Support Files/Pods-ProductApp/Pods-ProductApp-frameworks-Debug-input-files.xcfilelist

@@ -1,7 +1,6 @@
 ${PODS_ROOT}/Target Support Files/Pods-ProductApp/Pods-ProductApp-frameworks.sh
 ${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework
 ${BUILT_PRODUCTS_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework
-${BUILT_PRODUCTS_DIR}/ICGVideoTrimmer/ICGVideoTrimmer.framework
 ${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework
 ${BUILT_PRODUCTS_DIR}/LSTTimer/LSTTimer.framework
 ${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework

ProductApp/Pods/Target Support Files/Pods-ProductApp/Pods-ProductApp-frameworks-Debug-output-files.xcfilelist

@@ -1,6 +1,5 @@
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DZNEmptyDataSet.framework
-${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ICGVideoTrimmer.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LSTTimer.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework

ProductApp/Pods/Target Support Files/Pods-ProductApp/Pods-ProductApp-frameworks-Release-input-files.xcfilelist

@@ -1,7 +1,6 @@
 ${PODS_ROOT}/Target Support Files/Pods-ProductApp/Pods-ProductApp-frameworks.sh
 ${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework
 ${BUILT_PRODUCTS_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework
-${BUILT_PRODUCTS_DIR}/ICGVideoTrimmer/ICGVideoTrimmer.framework
 ${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework
 ${BUILT_PRODUCTS_DIR}/LSTTimer/LSTTimer.framework
 ${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework

ProductApp/Pods/Target Support Files/Pods-ProductApp/Pods-ProductApp-frameworks-Release-output-files.xcfilelist

@@ -1,6 +1,5 @@
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DZNEmptyDataSet.framework
-${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ICGVideoTrimmer.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LSTTimer.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework

ProductApp/Pods/Target Support Files/Pods-ProductApp/Pods-ProductApp-frameworks.sh

@@ -178,7 +178,6 @@ code_sign_if_enabled() {
 if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework"
-  install_framework "${BUILT_PRODUCTS_DIR}/ICGVideoTrimmer/ICGVideoTrimmer.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/LSTTimer/LSTTimer.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework"
@@ -198,7 +197,6 @@ fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework"
-  install_framework "${BUILT_PRODUCTS_DIR}/ICGVideoTrimmer/ICGVideoTrimmer.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/LSTTimer/LSTTimer.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework"

ProductApp/Pods/Target Support Files/Pods-ProductApp/Pods-ProductApp.debug.xcconfig

@@ -1,13 +1,13 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet" "${PODS_CONFIGURATION_BUILD_DIR}/ICGVideoTrimmer" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell" "${PODS_CONFIGURATION_BUILD_DIR}/YYModel" "${PODS_CONFIGURATION_BUILD_DIR}/YYText" "${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor" "${PODS_ROOT}/GTCommonSDK" "${PODS_ROOT}/GTExtensionSDK" "${PODS_ROOT}/GTSDK" "${PODS_ROOT}/GYSDK" "${PODS_ROOT}/UMAPM/UMAPM_1.9.1" "${PODS_ROOT}/UMCCommonLog/UMCommonLog" "${PODS_ROOT}/UMCommon/UMCommon_7.4.7" "${PODS_ROOT}/UMDevice/UMDevice_3.4.0" "${PODS_ROOT}/UMLink" "${PODS_ROOT}/ZXSDK" "${PODS_ROOT}/libpag/framework" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTCommonSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTExtensionSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/UMCommon" "${PODS_XCFRAMEWORKS_BUILD_DIR}/UMDevice" "${PODS_XCFRAMEWORKS_BUILD_DIR}/libpag"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell" "${PODS_CONFIGURATION_BUILD_DIR}/YYModel" "${PODS_CONFIGURATION_BUILD_DIR}/YYText" "${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor" "${PODS_ROOT}/GTCommonSDK" "${PODS_ROOT}/GTExtensionSDK" "${PODS_ROOT}/GTSDK" "${PODS_ROOT}/GYSDK" "${PODS_ROOT}/UMAPM/UMAPM_1.9.1" "${PODS_ROOT}/UMCCommonLog/UMCommonLog" "${PODS_ROOT}/UMCommon/UMCommon_7.4.7" "${PODS_ROOT}/UMDevice/UMDevice_3.4.0" "${PODS_ROOT}/UMLink" "${PODS_ROOT}/ZXSDK" "${PODS_ROOT}/libpag/framework" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTCommonSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTExtensionSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/UMCommon" "${PODS_XCFRAMEWORKS_BUILD_DIR}/UMDevice" "${PODS_XCFRAMEWORKS_BUILD_DIR}/libpag"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ICGVideoTrimmer/ICGVideoTrimmer.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager/IQKeyboardManager.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer/LSTTimer.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD/MBProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager/MOFSPickerManager.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout/SDAutoLayout.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView/SDCycleScrollView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell/UITableView_FDTemplateLayoutCell.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YYModel/YYModel.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YYText/YYText.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor/YiVideoEditor.framework/Headers" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager/IQKeyboardManager.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer/LSTTimer.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD/MBProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager/MOFSPickerManager.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout/SDAutoLayout.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView/SDCycleScrollView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell/UITableView_FDTemplateLayoutCell.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YYModel/YYModel.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YYText/YYText.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor/YiVideoEditor.framework/Headers" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
 LD_RUNPATH_SEARCH_PATHS = $(inherited) /usr/lib/swift '@executable_path/Frameworks' '@loader_path/Frameworks'
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/WechatOpenSDK/OpenSDK2.0.4" "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift
-OTHER_LDFLAGS = $(inherited) -ObjC -l"WechatOpenSDK" -l"c++" -l"resolv" -l"sqlite3" -l"sqlite3.0" -l"z" -framework "AFNetworking" -framework "AVFoundation" -framework "Accelerate" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "DZNEmptyDataSet" -framework "Foundation" -framework "GTCommonSDK" -framework "GTExtensionSDK" -framework "GTSDK" -framework "GeYanSdk" -framework "ICGVideoTrimmer" -framework "IQKeyboardManager" -framework "ImageIO" -framework "LSTTimer" -framework "MBProgressHUD" -framework "MJRefresh" -framework "MOFSPickerManager" -framework "Masonry" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Reachability" -framework "SDAutoLayout" -framework "SDCycleScrollView" -framework "SDWebImage" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "UITableView_FDTemplateLayoutCell" -framework "UMAPM" -framework "UMCommon" -framework "UMCommonLog" -framework "UMDevice" -framework "UMLink" -framework "VideoToolbox" -framework "WebKit" -framework "YYModel" -framework "YYText" -framework "YiVideoEditor" -framework "ZXSDK" -framework "libpag" -weak_framework "AppTrackingTransparency" -weak_framework "Network" -weak_framework "UserNotifications"
-OTHER_MODULE_VERIFIER_FLAGS = $(inherited) "-F${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "-F${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTCommonSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTExtensionSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GYSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/ICGVideoTrimmer" "-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "-F${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer" "-F${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "-F${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "-F${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager" "-F${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "-F${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "-F${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMAPM" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMCCommonLog" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMCommon" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMDevice" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMLink" "-F${PODS_CONFIGURATION_BUILD_DIR}/WechatOpenSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/YYModel" "-F${PODS_CONFIGURATION_BUILD_DIR}/YYText" "-F${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor" "-F${PODS_CONFIGURATION_BUILD_DIR}/ZXSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/libpag"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"WechatOpenSDK" -l"c++" -l"resolv" -l"sqlite3" -l"sqlite3.0" -l"z" -framework "AFNetworking" -framework "AVFoundation" -framework "Accelerate" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "DZNEmptyDataSet" -framework "Foundation" -framework "GTCommonSDK" -framework "GTExtensionSDK" -framework "GTSDK" -framework "GeYanSdk" -framework "IQKeyboardManager" -framework "ImageIO" -framework "LSTTimer" -framework "MBProgressHUD" -framework "MJRefresh" -framework "MOFSPickerManager" -framework "Masonry" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Reachability" -framework "SDAutoLayout" -framework "SDCycleScrollView" -framework "SDWebImage" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "UITableView_FDTemplateLayoutCell" -framework "UMAPM" -framework "UMCommon" -framework "UMCommonLog" -framework "UMDevice" -framework "UMLink" -framework "VideoToolbox" -framework "WebKit" -framework "YYModel" -framework "YYText" -framework "YiVideoEditor" -framework "ZXSDK" -framework "libpag" -weak_framework "AppTrackingTransparency" -weak_framework "Network" -weak_framework "UserNotifications"
+OTHER_MODULE_VERIFIER_FLAGS = $(inherited) "-F${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "-F${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTCommonSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTExtensionSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GYSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "-F${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer" "-F${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "-F${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "-F${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager" "-F${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "-F${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "-F${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMAPM" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMCCommonLog" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMCommon" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMDevice" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMLink" "-F${PODS_CONFIGURATION_BUILD_DIR}/WechatOpenSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/YYModel" "-F${PODS_CONFIGURATION_BUILD_DIR}/YYText" "-F${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor" "-F${PODS_CONFIGURATION_BUILD_DIR}/ZXSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/libpag"
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)

ProductApp/Pods/Target Support Files/Pods-ProductApp/Pods-ProductApp.release.xcconfig

@@ -1,13 +1,13 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet" "${PODS_CONFIGURATION_BUILD_DIR}/ICGVideoTrimmer" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell" "${PODS_CONFIGURATION_BUILD_DIR}/YYModel" "${PODS_CONFIGURATION_BUILD_DIR}/YYText" "${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor" "${PODS_ROOT}/GTCommonSDK" "${PODS_ROOT}/GTExtensionSDK" "${PODS_ROOT}/GTSDK" "${PODS_ROOT}/GYSDK" "${PODS_ROOT}/UMAPM/UMAPM_1.9.1" "${PODS_ROOT}/UMCCommonLog/UMCommonLog" "${PODS_ROOT}/UMCommon/UMCommon_7.4.7" "${PODS_ROOT}/UMDevice/UMDevice_3.4.0" "${PODS_ROOT}/UMLink" "${PODS_ROOT}/ZXSDK" "${PODS_ROOT}/libpag/framework" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTCommonSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTExtensionSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/UMCommon" "${PODS_XCFRAMEWORKS_BUILD_DIR}/UMDevice" "${PODS_XCFRAMEWORKS_BUILD_DIR}/libpag"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell" "${PODS_CONFIGURATION_BUILD_DIR}/YYModel" "${PODS_CONFIGURATION_BUILD_DIR}/YYText" "${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor" "${PODS_ROOT}/GTCommonSDK" "${PODS_ROOT}/GTExtensionSDK" "${PODS_ROOT}/GTSDK" "${PODS_ROOT}/GYSDK" "${PODS_ROOT}/UMAPM/UMAPM_1.9.1" "${PODS_ROOT}/UMCCommonLog/UMCommonLog" "${PODS_ROOT}/UMCommon/UMCommon_7.4.7" "${PODS_ROOT}/UMDevice/UMDevice_3.4.0" "${PODS_ROOT}/UMLink" "${PODS_ROOT}/ZXSDK" "${PODS_ROOT}/libpag/framework" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTCommonSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTExtensionSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GTSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/UMCommon" "${PODS_XCFRAMEWORKS_BUILD_DIR}/UMDevice" "${PODS_XCFRAMEWORKS_BUILD_DIR}/libpag"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ICGVideoTrimmer/ICGVideoTrimmer.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager/IQKeyboardManager.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer/LSTTimer.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD/MBProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager/MOFSPickerManager.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout/SDAutoLayout.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView/SDCycleScrollView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell/UITableView_FDTemplateLayoutCell.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YYModel/YYModel.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YYText/YYText.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor/YiVideoEditor.framework/Headers" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager/IQKeyboardManager.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer/LSTTimer.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD/MBProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager/MOFSPickerManager.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout/SDAutoLayout.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView/SDCycleScrollView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell/UITableView_FDTemplateLayoutCell.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YYModel/YYModel.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YYText/YYText.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor/YiVideoEditor.framework/Headers" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
 LD_RUNPATH_SEARCH_PATHS = $(inherited) /usr/lib/swift '@executable_path/Frameworks' '@loader_path/Frameworks'
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/WechatOpenSDK/OpenSDK2.0.4" "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift
-OTHER_LDFLAGS = $(inherited) -ObjC -l"WechatOpenSDK" -l"c++" -l"resolv" -l"sqlite3" -l"sqlite3.0" -l"z" -framework "AFNetworking" -framework "AVFoundation" -framework "Accelerate" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "DZNEmptyDataSet" -framework "Foundation" -framework "GTCommonSDK" -framework "GTExtensionSDK" -framework "GTSDK" -framework "GeYanSdk" -framework "ICGVideoTrimmer" -framework "IQKeyboardManager" -framework "ImageIO" -framework "LSTTimer" -framework "MBProgressHUD" -framework "MJRefresh" -framework "MOFSPickerManager" -framework "Masonry" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Reachability" -framework "SDAutoLayout" -framework "SDCycleScrollView" -framework "SDWebImage" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "UITableView_FDTemplateLayoutCell" -framework "UMAPM" -framework "UMCommon" -framework "UMCommonLog" -framework "UMDevice" -framework "UMLink" -framework "VideoToolbox" -framework "WebKit" -framework "YYModel" -framework "YYText" -framework "YiVideoEditor" -framework "ZXSDK" -framework "libpag" -weak_framework "AppTrackingTransparency" -weak_framework "Network" -weak_framework "UserNotifications"
-OTHER_MODULE_VERIFIER_FLAGS = $(inherited) "-F${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "-F${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTCommonSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTExtensionSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GYSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/ICGVideoTrimmer" "-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "-F${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer" "-F${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "-F${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "-F${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager" "-F${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "-F${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "-F${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMAPM" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMCCommonLog" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMCommon" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMDevice" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMLink" "-F${PODS_CONFIGURATION_BUILD_DIR}/WechatOpenSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/YYModel" "-F${PODS_CONFIGURATION_BUILD_DIR}/YYText" "-F${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor" "-F${PODS_CONFIGURATION_BUILD_DIR}/ZXSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/libpag"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"WechatOpenSDK" -l"c++" -l"resolv" -l"sqlite3" -l"sqlite3.0" -l"z" -framework "AFNetworking" -framework "AVFoundation" -framework "Accelerate" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "DZNEmptyDataSet" -framework "Foundation" -framework "GTCommonSDK" -framework "GTExtensionSDK" -framework "GTSDK" -framework "GeYanSdk" -framework "IQKeyboardManager" -framework "ImageIO" -framework "LSTTimer" -framework "MBProgressHUD" -framework "MJRefresh" -framework "MOFSPickerManager" -framework "Masonry" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Reachability" -framework "SDAutoLayout" -framework "SDCycleScrollView" -framework "SDWebImage" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "UITableView_FDTemplateLayoutCell" -framework "UMAPM" -framework "UMCommon" -framework "UMCommonLog" -framework "UMDevice" -framework "UMLink" -framework "VideoToolbox" -framework "WebKit" -framework "YYModel" -framework "YYText" -framework "YiVideoEditor" -framework "ZXSDK" -framework "libpag" -weak_framework "AppTrackingTransparency" -weak_framework "Network" -weak_framework "UserNotifications"
+OTHER_MODULE_VERIFIER_FLAGS = $(inherited) "-F${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "-F${PODS_CONFIGURATION_BUILD_DIR}/DZNEmptyDataSet" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTCommonSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTExtensionSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GTSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/GYSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "-F${PODS_CONFIGURATION_BUILD_DIR}/LSTTimer" "-F${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "-F${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "-F${PODS_CONFIGURATION_BUILD_DIR}/MOFSPickerManager" "-F${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "-F${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDAutoLayout" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "-F${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "-F${PODS_CONFIGURATION_BUILD_DIR}/UITableView+FDTemplateLayoutCell" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMAPM" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMCCommonLog" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMCommon" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMDevice" "-F${PODS_CONFIGURATION_BUILD_DIR}/UMLink" "-F${PODS_CONFIGURATION_BUILD_DIR}/WechatOpenSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/YYModel" "-F${PODS_CONFIGURATION_BUILD_DIR}/YYText" "-F${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor" "-F${PODS_CONFIGURATION_BUILD_DIR}/ZXSDK" "-F${PODS_CONFIGURATION_BUILD_DIR}/libpag"
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)

ProductApp/ProductApp.xcodeproj/project.pbxproj

@@ -101,6 +101,7 @@
 		CA4401892DA3C4BD00DFD65C /* HuiYuanZXGoodsView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA4401882DA3C4BD00DFD65C /* HuiYuanZXGoodsView.m */; };
 		CA44018C2DA3C4C900DFD65C /* HuiYuanZXGoodsCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA44018B2DA3C4C900DFD65C /* HuiYuanZXGoodsCollectionViewCell.m */; };
 		CA44018E2DA3C76E00DFD65C /* D-DIN-PRO-700-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CA44018D2DA3C76E00DFD65C /* D-DIN-PRO-700-Bold.otf */; };
+		CA4B05D92DA7B36800647953 /* GengXinAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA4B05D82DA7B36800647953 /* GengXinAlterView.m */; };
 		CA87E1A22DA621C100005681 /* ShiPingEditJGViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA87E1A12DA621C100005681 /* ShiPingEditJGViewController.m */; };
 		CA87E1A62DA621F800005681 /* ShiPingEditJGView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA87E1A52DA621F800005681 /* ShiPingEditJGView.m */; };
 		CA87E1AA2DA6421C00005681 /* ShiPingEditShuiYinView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA87E1A92DA6421C00005681 /* ShiPingEditShuiYinView.m */; };
@@ -522,6 +523,8 @@
 		CA44018A2DA3C4C900DFD65C /* HuiYuanZXGoodsCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HuiYuanZXGoodsCollectionViewCell.h; sourceTree = "<group>"; };
 		CA44018B2DA3C4C900DFD65C /* HuiYuanZXGoodsCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HuiYuanZXGoodsCollectionViewCell.m; sourceTree = "<group>"; };
 		CA44018D2DA3C76E00DFD65C /* D-DIN-PRO-700-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "D-DIN-PRO-700-Bold.otf"; sourceTree = "<group>"; };
+		CA4B05D72DA7B36800647953 /* GengXinAlterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GengXinAlterView.h; sourceTree = "<group>"; };
+		CA4B05D82DA7B36800647953 /* GengXinAlterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GengXinAlterView.m; sourceTree = "<group>"; };
 		CA87E1A02DA621C100005681 /* ShiPingEditJGViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShiPingEditJGViewController.h; sourceTree = "<group>"; };
 		CA87E1A12DA621C100005681 /* ShiPingEditJGViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShiPingEditJGViewController.m; sourceTree = "<group>"; };
 		CA87E1A42DA621F800005681 /* ShiPingEditJGView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShiPingEditJGView.h; sourceTree = "<group>"; };
@@ -1699,6 +1702,8 @@
 				CAAD73BD2DA4EE5E00927BA5 /* TongYiXieYiAlterView.m */,
 				CAAD73BF2DA4F89700927BA5 /* GuiZheAlterView.h */,
 				CAAD73C02DA4F89700927BA5 /* GuiZheAlterView.m */,
+				CA4B05D72DA7B36800647953 /* GengXinAlterView.h */,
+				CA4B05D82DA7B36800647953 /* GengXinAlterView.m */,
 			);
 			path = alters;
 			sourceTree = "<group>";
@@ -3371,6 +3376,7 @@
 				CA87E1A22DA621C100005681 /* ShiPingEditJGViewController.m in Sources */,
 				CAC347042D9E5FEC00E7E3D6 /* ShiPingTiQuYinPingView.m in Sources */,
 				CA3CD5AB2D913D27002707C1 /* UserConfigModel.m in Sources */,
+				CA4B05D92DA7B36800647953 /* GengXinAlterView.m in Sources */,
 				CA3CD5AC2D913D27002707C1 /* M3u8Model.m in Sources */,
 				CA3CD5AD2D913D27002707C1 /* UserAccountModel.m in Sources */,
 				CA3CD5AE2D913D27002707C1 /* UserShareModel.m in Sources */,
@@ -3697,7 +3703,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ProductApp/ProductApp.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B8MTNU3W9A;
@@ -3729,6 +3735,7 @@
 				INFOPLIST_KEY_CFBundleDisplayName = "快存视频";
 				INFOPLIST_KEY_NSCalendarsUsageDescription = "快存视频需要使用日历功能";
 				INFOPLIST_KEY_NSCameraUsageDescription = "快存视频图片处理和意见反馈需要使用相机拍摄照片";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "快存视频友盟SDK需要使用您的位置信息";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "快存视频保存图片、处理图片和意见反馈需要使用相册";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "快存视频保存图片、处理图片和意见反馈需要使用相册";
 				INFOPLIST_KEY_NSUserTrackingUsageDescription = "快存视频用于向您推荐个性化广告";
@@ -3749,7 +3756,7 @@
 					"$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib",
 					"$(PROJECT_DIR)/ProductApp/FFmpeg-iOS/lib",
 				);
-				MARKETING_VERSION = 2.6.2;
+				MARKETING_VERSION = 2.5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.devcon.video;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -3769,7 +3776,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ProductApp/ProductApp.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B8MTNU3W9A;
@@ -3801,6 +3808,7 @@
 				INFOPLIST_KEY_CFBundleDisplayName = "快存视频";
 				INFOPLIST_KEY_NSCalendarsUsageDescription = "快存视频需要使用日历功能";
 				INFOPLIST_KEY_NSCameraUsageDescription = "快存视频图片处理和意见反馈需要使用相机拍摄照片";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "快存视频友盟SDK需要使用您的位置信息";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "快存视频保存图片、处理图片和意见反馈需要使用相册";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "快存视频保存图片、处理图片和意见反馈需要使用相册";
 				INFOPLIST_KEY_NSUserTrackingUsageDescription = "快存视频用于向您推荐个性化广告";
@@ -3821,7 +3829,7 @@
 					"$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib",
 					"$(PROJECT_DIR)/ProductApp/FFmpeg-iOS/lib",
 				);
-				MARKETING_VERSION = 2.6.2;
+				MARKETING_VERSION = 2.5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.devcon.video;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array/>
+</plist>

ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,22 +3,4 @@
    uuid = "6AEAF809-1B13-42F7-A877-B42EF509916A"
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "7B13E51E-1DDF-43EE-B23C-699F8D33898F"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x89c6;&#x9891;&#x53f7;/ShiPingHaoViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "177"
-            endingLineNumber = "177"
-            landmarkName = "-goAction"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,91 +1,109 @@
 {
   "images" : [
     {
+      "filename" : "512直角@1x_副本 15.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "512直角@1x_副本 10.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
+      "filename" : "512直角@1x_副本 11.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "512直角@1x_副本 6.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
+      "filename" : "512直角@1x_副本 7.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "512直角@1x_副本 4.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
+      "filename" : "512直角@1x_副本 5.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
+      "filename" : "512直角@1x_副本 1.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
+      "filename" : "512直角@1x_副本 17.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
+      "filename" : "512直角@1x_副本 14.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "512直角@1x_副本 16.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
+      "filename" : "512直角@1x_副本 12.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "512直角@1x_副本 13.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
+      "filename" : "512直角@1x_副本 8.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "512直角@1x_副本 9.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
+      "filename" : "512直角@1x_副本 3.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
+      "filename" : "512直角@1x_副本 2.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
+      "filename" : "512直角@1x_副本.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

ProductApp/ProductApp/Assets.xcassets/log_log.imageset/Contents.json

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

ProductApp/ProductApp/Assets.xcassets/我的/my_bj_pt.imageset/Contents.json

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

ProductApp/ProductApp/Base.lproj/LaunchScreen.storyboard

@@ -16,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="RKX-RS-9uW">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="log_log" translatesAutoresizingMaskIntoConstraints="NO" id="RKX-RS-9uW">
                                 <rect key="frame" x="156.66666666666666" y="209" width="80" height="80"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="80" id="ghX-qd-5f1"/>
@@ -45,4 +45,7 @@
             <point key="canvasLocation" x="53" y="375"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="log_log" width="200" height="200"/>
+    </resources>
 </document>

ProductApp/ProductApp/BaseControl/AFNetworking/YSAPIClient.m

@@ -69,7 +69,7 @@ static NSTimeInterval af_timeout = 30.0f;
     ///检测当前网络是否可用
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         completeBlock(nil,nil);
     }else {
@@ -188,7 +188,7 @@ static NSTimeInterval af_timeout = 30.0f;
     ///检测当前网络是否可用
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         completeBlock(nil,nil);
@@ -257,7 +257,7 @@ static NSTimeInterval af_timeout = 30.0f;
             {
                 [dicheadertemp setDictionary:Headers];
             }
-            [dicheadertemp setObject:@"com.devcon.audi" forKey:@"x-package"];
+            [dicheadertemp setObject:@"com.devcon.video" forKey:@"x-package"];
             
             NSArray *arrkeys = [dicheadertemp allKeys];
             for(NSString *key in arrkeys)
@@ -409,7 +409,7 @@ static NSTimeInterval af_timeout = 30.0f;
     ///检测当前网络是否可用
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         completeBlock(nil,nil);
@@ -446,7 +446,7 @@ static NSTimeInterval af_timeout = 30.0f;
         {
             [dicheadertemp setDictionary:Headers];
         }
-        [dicheadertemp setObject:@"com.devcon.audi" forKey:@"x-package"];
+        [dicheadertemp setObject:@"com.devcon.video" forKey:@"x-package"];
         
         NSArray *arrkeys = [dicheadertemp allKeys];
         for(NSString *key in arrkeys)
@@ -488,7 +488,7 @@ static NSTimeInterval af_timeout = 30.0f;
     ///检测当前网络是否可用
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         completeBlock(nil,nil);
     }else {
@@ -585,7 +585,7 @@ static NSTimeInterval af_timeout = 30.0f;
     ///检测当前网络是否可用
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         completeBlock(nil,nil);
     }else {
@@ -689,7 +689,7 @@ static NSTimeInterval af_timeout = 30.0f;
     ///检测当前网络是否可用
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         completeBlock(nil,nil);
     }else {
@@ -750,7 +750,7 @@ static NSTimeInterval af_timeout = 30.0f;
     ///检测当前网络是否可用
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         completeBlock(nil,nil);
     }else {
@@ -829,7 +829,7 @@ static NSTimeInterval af_timeout = 30.0f;
     ///检测当前网络是否可用
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         completeBlock(nil,nil);
     }else {
@@ -857,7 +857,7 @@ static NSTimeInterval af_timeout = 30.0f;
     ///检测当前网络是否可用
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         completeBlock(nil,nil);
     }else {
@@ -982,7 +982,7 @@ static NSTimeInterval af_timeout = 30.0f;
 //    ![AFNetworkReachabilityManager sharedManager].reachable
     NSInteger networkState =  [[[NSUserDefaults standardUserDefaults] objectForKey:@"networkstatus"] integerValue];
     if (networkState==-1) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [HXHud showMessage:@"当前网络不可用" afterDelayType:0];
         return NO;
     }else {

ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.m

@@ -22,7 +22,8 @@
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:YES animated:animated];
     [self showNaviGationView:YES];
-    [self.navigationView setBackImg:@"返回"];
+//    [self.navigationView setBackImg:[Tools imageWithImageName:[UIImage imageNamed:@"返回"] imageColor:RGBCOLOR(20, 20, 20)]];
+    [self.navigationView.backButton setImage:[Tools imageWithImageName:[UIImage imageNamed:@"返回"] imageColor:RGBCOLOR(20, 20, 20)] forState:UIControlStateNormal];
     self. navigationController. interactivePopGestureRecognizer.enabled = NO;
     if(self.strtitle.length>0)
     {
@@ -45,7 +46,7 @@
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    [self.view setBackgroundColor:[UIColor whiteColor]];
     WKWebViewConfiguration *wkWebConfig = [[WKWebViewConfiguration alloc] init];
     NSString *jSString = [NSString stringWithFormat:@"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=%f'); document.getElementsByTagName('head')[0].appendChild(meta);",UISCREEN_WIDTH-10];
     WKUserScript *wkUserScript = [[WKUserScript alloc] initWithSource:jSString injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES];
@@ -87,7 +88,7 @@
     
     //进度条初始化
     self.progressView = [[UIProgressView alloc] initWithFrame:CGRectMake(0, NavHeight, [[UIScreen mainScreen] bounds].size.width, 2)];
-    self.progressView.backgroundColor = [UIColor blueColor];
+    self.progressView.backgroundColor = RGBCOLOR(202, 200, 200);
     //设置进度条的高度，下面这句代码表示进度条的宽度变为原来的1倍，高度变为原来的1.5倍.
     self.progressView.transform = CGAffineTransformMakeScale(1.0f, 0.5f);
     [self.view addSubview:self.progressView];

ProductApp/ProductApp/BaseControl/baseImageUrl/BaseRequestDataController.m

@@ -86,14 +86,14 @@ images:(UIImage *)image
                      mimeType:(NSString *)mimeType
                      showView:(UIView *)showView
                      Callback:(completeModeBlock)callback {
-    [HXLoadingHUD showWithStatus:@"" maskType:KKPromptHUDMaskTypeDefault];
+    [LoadAlterView showView];
     NSMutableDictionary *paraments=[Tools nosessionIDDic];
     [paraments setObject:file forKey:@"file"];
 //    [paraments setObject:@"2" forKey:@"type"];
     
     [YSAPIClient uploadAudioWithUrl:[NSString stringWithFormat:@"%@systemApi/commonApi/common/uploadAudio",BaseUrl] paraments:paraments imageData:file fileName:@"file" mimeType:mimeType completeBlock:^(id  _Nullable responseObject, NSError * _Nullable error) {
         BOOL state = NO;
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         NSString *describle = @"";
         if (responseObject==nil) {
             describle = @"网络错误";

ProductApp/ProductApp/Configure/ConfigireSetting.h

@@ -126,6 +126,8 @@ alpha:alphaValue]
 ///隐私政策
 #define UserYinSiUrl @"https://kct4.batiao8.com/static/policy2/provacy.html"
 
+#define AppstoreUrl @"itms-apps://itunes.apple.com/cn/app/id6744357775?mt=8"
+
 @end
 
 NS_ASSUME_NONNULL_END

ProductApp/ProductApp/Other/地址弹窗/AddressListUrlAlterView.m

@@ -214,9 +214,9 @@
 {
     self.arrdata = [NSMutableArray new];
     
-    [HXLoadingHUD showWithStatus:@"" maskType:1];
+    [LoadAlterView showView];
     [BaseRequestDataController requestcommonApiareaprovinceListData:self pid:@"" Callback:^(BOOL state, AreaprovinceListModel *responseObject, NSString * _Nullable describle) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         if(state)
         {
             ///省
@@ -234,9 +234,9 @@
 ///获取下一级数据
 -(void)getLastData:(NSString *)strid
 {
-    [HXLoadingHUD showWithStatus:@"" maskType:1];
+    [LoadAlterView showView];
     [BaseRequestDataController requestcommonApiareaprovinceListData:self pid:strid Callback:^(BOOL state, AreaprovinceListModel *responseObject, NSString * _Nullable describle) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         [self.arrdata removeAllObjects];
         if(state)
         {

ProductApp/ProductApp/ProductMain/LoadAlter/LoadAlterView.m

@@ -50,7 +50,7 @@ static LoadAlterView *viewAlter;
         [self addSubview:viewback];
         [viewback mas_makeConstraints:^(MASConstraintMaker *make) {
             make.center.equalTo(self);
-            make.width.offset(280);
+            make.width.offset(200);
             make.height.offset(200);
         }];
         [viewback.layer setMasksToBounds:YES];
@@ -79,10 +79,10 @@ static LoadAlterView *viewAlter;
         
         
         NSString *strpath = [[NSBundle mainBundle] pathForResource:@"load_start" ofType:@"pag"];
-        PAGView *pagView = [[PAGView alloc] initWithFrame:CGRectMake(0, 0, 115, 115)];
+        PAGView *pagView = [[PAGView alloc] initWithFrame:CGRectMake(0, 0, 60, 60)];
         [viewback addSubview:pagView];
         [pagView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.width.height.offset(115);
+            make.width.height.offset(60);
             make.center.equalTo(viewback);
         }];
         PAGFile* pagFile = [PAGFile Load:strpath];

ProductApp/ProductApp/ProductMain/NetWorkManager/NetWorkManager.m

@@ -174,7 +174,7 @@
     
     NSMutableDictionary *dicHeader = [NSMutableDictionary new];
     [dicHeader setObject:@"ios" forKey:@"x-platform"];
-    [dicHeader setObject:@"ios" forKey:@"x-channel"];
+    [dicHeader setObject:@"sp_ios" forKey:@"x-channel"];
     [dicHeader setObject:[Tools applicationVersion] forKey:@"x-version"];
     [dicHeader setObject:[TimeTools getMD5ID] forKey:@"x-device-id"];
     [dicHeader setObject:@"ios" forKey:@"x-mobile-brand"];

ProductApp/ProductApp/ProductMain/NetWorkManager/PublicNetWorkManager.m

@@ -32,7 +32,7 @@
     
     NSMutableDictionary *dicHeader = [NSMutableDictionary new];
     [dicHeader setObject:@"ios" forKey:@"x-platform"];
-    [dicHeader setObject:@"ios" forKey:@"x-channel"];
+    [dicHeader setObject:@"sp_ios" forKey:@"x-channel"];
     [dicHeader setObject:[Tools applicationVersion] forKey:@"x-version"];
     [dicHeader setObject:[TimeTools getMD5ID] forKey:@"x-device-id"];
     [dicHeader setObject:@"ios" forKey:@"x-mobile-brand"];
@@ -254,7 +254,7 @@
     
     NSMutableDictionary *dicHeader = [NSMutableDictionary new];
     [dicHeader setObject:@"ios" forKey:@"x-platform"];
-    [dicHeader setObject:@"ios" forKey:@"x-channel"];
+    [dicHeader setObject:@"sp_ios" forKey:@"x-channel"];
     [dicHeader setObject:[Tools applicationVersion] forKey:@"x-version"];
     [dicHeader setObject:[TimeTools getMD5ID] forKey:@"x-device-id"];
     [dicHeader setObject:@"ios" forKey:@"x-mobile-brand"];
@@ -296,7 +296,7 @@
     
     NSMutableDictionary *dicHeader = [NSMutableDictionary new];
     [dicHeader setObject:@"ios" forKey:@"x-platform"];
-    [dicHeader setObject:@"ios" forKey:@"x-channel"];
+    [dicHeader setObject:@"sp_ios" forKey:@"x-channel"];
     [dicHeader setObject:[Tools applicationVersion] forKey:@"x-version"];
     [dicHeader setObject:[TimeTools getMD5ID] forKey:@"x-device-id"];
     [dicHeader setObject:@"ios" forKey:@"x-mobile-brand"];
@@ -573,7 +573,7 @@
     
     NSMutableDictionary *dicHeader = [NSMutableDictionary new];
     [dicHeader setObject:@"ios" forKey:@"x-platform"];
-    [dicHeader setObject:@"ios" forKey:@"x-channel"];
+    [dicHeader setObject:@"sp_ios" forKey:@"x-channel"];
     [dicHeader setObject:[Tools applicationVersion] forKey:@"x-version"];
     [dicHeader setObject:[TimeTools getMD5ID] forKey:@"x-device-id"];
     [dicHeader setObject:@"ios" forKey:@"x-mobile-brand"];

ProductApp/ProductApp/ProductMain/NetWorkManager/download/LFDownloadPGJNetwork.m

@@ -226,16 +226,11 @@
     BOOL isfenpian = NO;
     if(model.threading.intValue == 1)
     {
-        model.isspeed = YES;
+//        model.isspeed = YES;
         strurl = model.url;
         isfenpian = YES;
     }
     
-//    if(DEBUG)
-//    {
-//        strurl = @"https://kct3.batiao8.com/api/weixin/video/download?url=http%3A%2F%2Fwxapp.tc.qq.com%2F251%2F20302%2Fstodownload%3Fencfilekey%3DCvvj5Ix3eewK0tHtibORqcsqchXNh0Gf3sJcaYqC2rQD7LxiaPibwYEEiaVGQIBNxHt19lNSlEosYO7UBvia6HWAciam5jOrjaBQmicVIdxgdy3licRzSLCcCX9Lf4oeFNAMmoIib%26bizid%3D1023%26dotrans%3D0%26hy%3DSH%26idx%3D1%26m%3D%26upid%3D0%26token%3DcztXnd9GyrHdiasRBNhkiaAt3OoGQxkNsHEAAL9T5XNmpBOIX5vO8Rr3ianmJjNxllHjTxicnbOJUY9mUe8fMib1vufXbHvoazewDMP5AvaTMsrjg971ntrN8DyGWJhE0Q8vIHAFLp9G3QM8Ivkia2GRq2Y16MkkW5uwAI3CEBefkq6bw%26ctsc%3D9488890%26extg%3D8f0000%26ftype%3D621%26svrbypass%3DAAuL%252FQsFAAABAAAAAACy3iWBlWFdjZ9N5ki8ZxAAAADnaHZTnGbFfAj9RgZXfw6VSy%252BKiHSpveeztbftNXhbU9KeXtJEhDe3cDcWcQmQtNSOt1szbuGhF1A%253D%26svrnonce%3D1740392678&decodeKey=1237113872&wechatDecode=batiao";
-//    }
-    
     self.datakeywx = nil;
     self.modelDown = model;
     self.downloadSuccessBlock = success;

ProductApp/ProductApp/ProductMain/alters/GengXinAlterView.h

@@ -0,0 +1,16 @@
+//
+//  GengXinAlterView.h
+//  ProductApp
+//
+//  Created by 工作 on 2025/4/10.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GengXinAlterView : UIView
++(void)showName:(NSString *)name strversion:(NSString *)strversion isforce:(BOOL)isforce;
+@end
+
+NS_ASSUME_NONNULL_END

ProductApp/ProductApp/ProductMain/alters/GengXinAlterView.m

@@ -0,0 +1,188 @@
+//
+//  GengXinAlterView.m
+//  ProductApp
+//
+//  Created by 工作 on 2025/4/10.
+//
+
+#import "GengXinAlterView.h"
+#import "AppDelegate.h"
+@interface GengXinAlterView ()
+@property (nonatomic , strong) UILabel *lbname;
+///
+@property (nonatomic , strong) UIButton *btdis;
+
+///
+@property (nonatomic , strong) UIView *viewV;
+@property (nonatomic , strong) UILabel *lbV;
+
+
+///
+@property (nonatomic , strong) NSString *strtitle;
+@property (nonatomic , strong) NSString *strversion;
+@property (nonatomic , assign) BOOL isforce;
+@end
+@implementation GengXinAlterView
+
+-(id)initWithFrame:(CGRect)frame
+{
+    if(self = [super initWithFrame:frame])
+    {
+        [self setBackgroundColor:RGBACOLOR(0, 0, 0, 0.4)];
+        
+        UIView *viewback = [[UIView alloc] init];
+        [viewback setBackgroundColor:RGBCOLOR(45, 45, 45)];
+        [self addSubview:viewback];
+        [viewback mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.offset(40);
+            make.right.equalTo(self).offset(-40);
+            make.center.equalTo(self);
+        }];
+        [viewback.layer setMasksToBounds:YES];
+        [viewback.layer setCornerRadius:40];
+        [viewback setUserInteractionEnabled:YES];
+        
+        
+        UILabel *lbtitle = [[UILabel alloc] init];
+        [lbtitle setText:@"发现\n新版本"];
+        [lbtitle setTextColor:[UIColor whiteColor]];
+        [lbtitle setTextAlignment:NSTextAlignmentLeft];
+        [lbtitle setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:36]];
+        [lbtitle setNumberOfLines:2];
+        [viewback addSubview:lbtitle];
+        [lbtitle mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.offset(44);
+            make.top.offset(43);
+        }];
+        
+        UIView *viewV = [[UIView alloc] init];
+        [viewV setBackgroundColor:[UIColor clearColor]];
+        [viewback addSubview:viewV];
+        [viewV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(lbtitle).offset(4);
+            make.left.equalTo(lbtitle.mas_right).offset(-20);
+            make.height.offset(20);
+        }];
+        [viewV.layer setMasksToBounds:YES];
+        [viewV.layer setCornerRadius:5];
+        _viewV = viewV;
+        
+        UILabel *lbV = [[UILabel alloc] init];
+        [lbV setText:@"V2.0.0"];
+        [lbV setTextColor:[UIColor whiteColor]];
+        [lbV setTextAlignment:NSTextAlignmentLeft];
+        [lbV setFont:[UIFont systemFontOfSize:14]];
+        [viewV addSubview:lbV];
+        [lbV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.offset(5);
+            make.centerY.equalTo(viewV);
+        }];
+        _lbV = lbV;
+        [viewV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.right.equalTo(lbV).offset(5);
+        }];
+        
+        
+        UILabel *lbname = [[UILabel alloc] init];
+        [lbname setText:@"1、新版本"];
+        [lbname setTextColor:RGBACOLOR(255, 255, 255, 0.6)];
+        [lbname setTextAlignment:NSTextAlignmentLeft];
+        [lbname setFont:[UIFont systemFontOfSize:14]];
+        [lbname setNumberOfLines:0];
+        [viewback addSubview:lbname];
+        [lbname mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.offset(217);
+            make.left.offset(60);
+            make.right.equalTo(viewback).offset(-50);
+        }];
+        _lbname = lbname;
+        
+        
+        UIButton *btok = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-210, 40)];
+        [btok setTitle:@"立即更新" forState:UIControlStateNormal];
+        [btok setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [btok.titleLabel setFont:[UIFont systemFontOfSize:16]];
+        [btok.layer setMasksToBounds:YES];
+        [btok.layer setCornerRadius:10];
+        [viewback addSubview:btok];
+        [btok mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.offset(65);
+            make.right.equalTo(viewback).offset(-65);
+            make.top.equalTo(lbname.mas_bottom).offset(38);
+            make.height.offset(40);
+        }];
+        [btok addTarget:self action:@selector(updataAction) forControlEvents:UIControlEventTouchUpInside];
+        [btok.layer setMasksToBounds:YES];
+        [btok.layer setCornerRadius:6];
+        [Tools changedView:btok colors:@[(id)RGBCOLOR(246, 44, 108).CGColor,(id)RGBCOLOR(252, 79, 84).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+        
+        UIButton *btdis = [[UIButton alloc] init];
+        [btdis setTitle:@"稍后再说" forState:UIControlStateNormal];
+        [btdis setTitleColor:RGBCOLOR(102, 102, 102) forState:UIControlStateNormal];
+        [btdis.titleLabel setFont:[UIFont systemFontOfSize:12]];
+        [viewback addSubview:btdis];
+        [btdis mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.equalTo(btok);
+            make.top.equalTo(btok.mas_bottom);
+            make.height.offset(42);
+        }];
+        [btdis setHidden:YES];
+        [btdis addTarget:self action:@selector(disAction) forControlEvents:UIControlEventTouchUpInside];
+        _btdis = btdis;
+        
+        [viewback mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.bottom.equalTo(btdis);
+        }];
+        
+    }
+    return self;
+}
+-(void)setStrtitle:(NSString *)strtitle
+{
+    self.lbname.text = strtitle;
+    ///行间距
+    NSMutableParagraphStyle *style = [NSMutableParagraphStyle new];
+    style.lineSpacing = 11;
+    style.lineBreakMode = NSLineBreakByTruncatingTail;
+
+    NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:self.lbname.text];
+    [attrString addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, self.lbname.text.length)];
+    self.lbname.attributedText = attrString;
+    
+}
+-(void)setStrversion:(NSString *)strversion
+{
+    self.lbV.text = strversion;
+//    [self.viewV setHidden:YES];
+//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//        [Tools changedView:self.viewV colors:@[(id)RGBCOLOR(255, 213, 108).CGColor,(id)RGBCOLOR(254, 122, 133).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+//        [self.viewV setHidden:NO];
+//    });
+}
+-(void)setIsforce:(BOOL)isforce
+{
+    self.btdis.hidden = isforce;
+}
+//更新 跳转App Store
+-(void)updataAction
+{
+    [UserInfoModel shijianShangBao:0 key:@"client.pkg.update" value:@"" extra:@""];
+    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:AppstoreUrl] options:@{} completionHandler:nil];
+}
+
+-(void)disAction
+{
+    [UserInfoModel shijianShangBao:0 key:@"client.pkg.cancel" value:@"" extra:@""];
+    [self removeFromSuperview];
+}
++(void)showName:(NSString *)name strversion:(NSString *)strversion isforce:(BOOL)isforce
+{
+    GengXinAlterView *view = [[GengXinAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
+    AppDelegate *app = (AppDelegate *)[UIApplication sharedApplication].delegate;
+    view.strtitle = name;
+    view.strversion = strversion;
+    view.isforce = isforce;
+    [app.window addSubview:view];
+}
+
+@end

ProductApp/ProductApp/ProductMain/alters/ZhuanShiAlterView.m

@@ -149,7 +149,7 @@
     }
     self.modelSelect = modelSelect;
     
-    if([UserInfoModel getSyetemPay])
+    if([UserInfoModel PayWXQuanXian])
     {
         [UIAlertController showActionSheetInViewController:[UIApplication sharedApplication].delegate.window.rootViewController withTitle:@"支付方式" message:nil cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:@[@"微信",@"苹果"] popoverPresentationControllerBlock:^(UIPopoverPresentationController * _Nonnull popover) {
             

ProductApp/ProductApp/ProductMain/login/LoginViewController.m

@@ -14,6 +14,7 @@
 #import "UIAlertController+Blocks.h"
 
 #import "PublicNetWorkManager.h"
+#import "AppDelegate.h"
 
 @interface LoginViewController ()
 @property(nonatomic, strong) UIView *contentView;
@@ -32,14 +33,14 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     
-    [self.navigationController setNavigationBarHidden:YES animated:animated];
-    [self showNaviGationView:YES];
-    [self.navigationView setTitle:@" " titleColor:RGBACOLOR(255, 255, 255, 0.9)];
-    [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)];
-    
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
+    [self.navigationController setNavigationBarHidden:YES animated:NO];
+    [self showNaviGationView:YES];
+    [self.navigationView setTitle:@" " titleColor:RGBACOLOR(255, 255, 255, 0.9)];
+    [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)];
 //    [self.navigationController setNavigationBarHidden:YES animated:NO];
 //    [self.navigationView setHidden:YES];
     
@@ -59,7 +60,7 @@
     {
         ///0.5
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//            [self laqiyijian];
+            [self laqiyijian];
         });
     }
     
@@ -158,7 +159,7 @@
 }
 -(void)telloginPush:(NSDictionary *)dic
 {
-    [HXLoadingHUD showWithStatus:@"" maskType:0];
+    [LoadAlterView showView];
     [PublicNetWorkManager requestUserLoginData:self.view login_type:@"onekey" phone:dic weixin:@{} apple:@{} device:@{} onekey:dic bind:[NSNumber numberWithBool:self.isbind] unbind:[NSNumber numberWithBool:NO] Callback:^(BOOL state, UserLoginModel *responseObject, NSString * _Nullable describle) {
         if(state)
         {
@@ -172,7 +173,7 @@
         }
         else
         {
-            [HXLoadingHUD dismiss];
+            [LoadAlterView dismis];
             [HXHud showMessage:responseObject.message afterDelayType:1];
             [UserInfoModel shijianShangBao:0 key:@"client.login.err" value:@"onekey" extra:responseObject.message];
         }
@@ -183,7 +184,7 @@
 {
     NSString *stridfa = [[NSUserDefaults standardUserDefaults] objectForKey:UserIDFA];
     [PublicNetWorkManager requestUserConfigData:self.view idfa:stridfa Callback:^(BOOL state, UserConfigModel *responseObject, NSString * _Nullable describle) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         if(state)
         {
             [UserInfoModel setToken:responseObject.data.token];
@@ -205,14 +206,23 @@
 {
     [GeYanSdk closeAuthVC:NO completion:^{
         ///跳转页面
-        [self.navigationController popViewControllerAnimated:YES];
+        NSArray *arrtemp = self.navigationController.viewControllers;
+        if([arrtemp.firstObject isKindOfClass:[LoginViewController class]])
+        {
+            AppDelegate *appd = (AppDelegate *)[UIApplication sharedApplication].delegate;
+            [appd.window setRootViewController:[TabBarController new]];
+        }
+        else
+        {
+            [self.navigationController popViewControllerAnimated:YES];
+        }
     }];
 }
 
 //MARK: - Model
 - (GyAuthViewModel *)customModel {
     GyAuthViewModel *viewModel = [GyAuthViewModel new];
-    viewModel.statusBarStyle = UIStatusBarStyleDefault;
+    viewModel.statusBarStyle = UIStatusBarStyleLightContent;
     viewModel.pullAnimate = NO;
     //暗黑模式
     viewModel.userInterfaceStyle = @(0);

ProductApp/ProductApp/ProductMain/login/view/LoginAppleView.m

@@ -13,6 +13,9 @@
 #import<AuthenticationServices/AuthenticationServices.h>
 #import "TongYiXieYiAlterView.h"
 
+#import "AppDelegate.h"
+#import "LoginViewController.h"
+
 @interface LoginAppleView ()<ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding>
 ///
 @property (nonatomic , strong) UIView *viewother;
@@ -27,7 +30,7 @@
     if(self = [super initWithFrame:frame])
     {
         UIImageView *imgvlog = [[UIImageView alloc] init];
-        [imgvlog setImage:[UIImage imageNamed:@""]];
+        [imgvlog setImage:[UIImage imageNamed:@"log_log"]];
         [self addSubview:imgvlog];
         [imgvlog mas_makeConstraints:^(MASConstraintMaker *make) {
             make.width.height.offset(80);
@@ -156,10 +159,9 @@
 -(void)drawOtherView:(UIView *)view
 {
     NSArray *arrpz = [[UserInfoModel shareModel].config objectForKey:@"client.login.type"];
-    if(DEBUG)
-    {
-        arrpz = @[@"weixin",@"phone"];
-    }
+    
+    arrpz = @[@"weixin",@"phone"];
+    
     if(arrpz.count==0)return;
    
     
@@ -355,7 +357,16 @@
             [UserInfoModel setConfig:responseObject.data.config];
             [UserInfoModel shareModel].isloadconfig = YES;
             
-            [self.viewController.navigationController popViewControllerAnimated:YES];
+            NSArray *arrtemp = self.viewController.navigationController.viewControllers;
+            if([arrtemp.firstObject isKindOfClass:[LoginViewController class]])
+            {
+                AppDelegate *appd = (AppDelegate *)[UIApplication sharedApplication].delegate;
+                [appd.window setRootViewController:[TabBarController new]];
+            }
+            else
+            {
+                [self.viewController.navigationController popViewControllerAnimated:YES];
+            }
             
             [UserInfoModel getUserData];
         }

ProductApp/ProductApp/ProductMain/login/view/LoginTelView.m

@@ -48,7 +48,7 @@ typedef NS_ENUM(NSInteger, Mode) {
     if(self = [super initWithFrame:frame])
     {
         UIImageView *imgvlog = [[UIImageView alloc] init];
-        [imgvlog setImage:[UIImage imageNamed:@""]];
+        [imgvlog setImage:[UIImage imageNamed:@"log_log"]];
         [self addSubview:imgvlog];
         [imgvlog mas_makeConstraints:^(MASConstraintMaker *make) {
             make.width.height.offset(80);

ProductApp/ProductApp/ProductMain/login/view/LoginView.m

@@ -16,6 +16,10 @@
 #import "LoginAppleView.h"
 #import "TongYiXieYiAlterView.h"
 
+#import "AppDelegate.h"
+#import "LoginViewController.h"
+
+
 @interface LoginView ()
 ///
 @property (nonatomic , strong) UITextField *fieldPhone;
@@ -41,7 +45,7 @@
     if(self = [super initWithFrame:frame])
     {
         UIImageView *imgvlog = [[UIImageView alloc] init];
-        [imgvlog setImage:[UIImage imageNamed:@""]];
+        [imgvlog setImage:[UIImage imageNamed:@"log_log"]];
         [self addSubview:imgvlog];
         [imgvlog mas_makeConstraints:^(MASConstraintMaker *make) {
             make.width.height.offset(80);
@@ -212,10 +216,7 @@
 -(void)drawOtherView:(UIView *)view
 {
     NSArray *arrpz = [[UserInfoModel shareModel].config objectForKey:@"client.login.type"];
-    if(DEBUG)
-    {
-        arrpz = @[@"weixin",@"apple"];
-    }
+    arrpz = @[@"weixin",@"apple"];
     if(arrpz.count==0)return;
    
     
@@ -508,7 +509,17 @@
             [UserInfoModel setConfig:responseObject.data.config];
             [UserInfoModel shareModel].isloadconfig = YES;
             
-            [self.viewController.navigationController popViewControllerAnimated:YES];
+            
+            NSArray *arrtemp = self.viewController.navigationController.viewControllers;
+            if([arrtemp.firstObject isKindOfClass:[LoginViewController class]])
+            {
+                AppDelegate *appd = (AppDelegate *)[UIApplication sharedApplication].delegate;
+                [appd.window setRootViewController:[TabBarController new]];
+            }
+            else
+            {
+                [self.viewController.navigationController popViewControllerAnimated:YES];
+            }
             
             [UserInfoModel getUserData];
         }

ProductApp/ProductApp/ProductMain/login/view/LoginWXView.m

@@ -13,6 +13,9 @@
 #import <WXApi.h>
 #import "TongYiXieYiAlterView.h"
 
+#import "AppDelegate.h"
+#import "LoginViewController.h"
+
 @interface LoginWXView ()
 ///
 @property (nonatomic , strong) UIView *viewother;
@@ -29,7 +32,7 @@
     {
 
         UIImageView *imgvlog = [[UIImageView alloc] init];
-        [imgvlog setImage:[UIImage imageNamed:@""]];
+        [imgvlog setImage:[UIImage imageNamed:@"log_log"]];
         [self addSubview:imgvlog];
         [imgvlog mas_makeConstraints:^(MASConstraintMaker *make) {
             make.width.height.offset(80);
@@ -144,10 +147,7 @@
 -(void)drawOtherView:(UIView *)view
 {
     NSArray *arrpz = [[UserInfoModel shareModel].config objectForKey:@"client.login.type"];
-    if(DEBUG)
-    {
-        arrpz = @[@"phone",@"apple"];
-    }
+    arrpz = @[@"phone",@"apple"];
     if(arrpz.count==0)return;
    
     
@@ -356,7 +356,16 @@
             [UserInfoModel setConfig:responseObject.data.config];
             [UserInfoModel shareModel].isloadconfig = YES;
             
-            [self.viewController.navigationController popViewControllerAnimated:YES];
+            NSArray *arrtemp = self.viewController.navigationController.viewControllers;
+            if([arrtemp.firstObject isKindOfClass:[LoginViewController class]])
+            {
+                AppDelegate *appd = (AppDelegate *)[UIApplication sharedApplication].delegate;
+                [appd.window setRootViewController:[TabBarController new]];
+            }
+            else
+            {
+                [self.viewController.navigationController popViewControllerAnimated:YES];
+            }
             
             [UserInfoModel getUserData];
         }

ProductApp/ProductApp/ProductMain/我的/view/WoDeView.m

@@ -17,6 +17,10 @@
 
 @interface WoDeView ()<UITableViewDelegate,UITableViewDataSource>
 ///
+@property (nonatomic , strong) UIImageView *imgvback;
+///
+@property (nonatomic , strong) UIView *viewtsdl;
+///
 @property (nonatomic , strong) UITableView *tableView;
 ///
 @property (nonatomic , strong) UIImageView *imgvhd;
@@ -50,7 +54,7 @@
         }else{
             self.viewController.automaticallyAdjustsScrollViewInsets =NO;
         }
-        UIImage *imagebc = [UIImage imageNamed:@"my_bj"];
+        UIImage *imagebc = [UIImage imageNamed:@"my_bj"];///my_bj_pt
         UIImageView *imgvback = [[UIImageView alloc] init];
         [imgvback setImage:imagebc];
         [scvback addSubview:imgvback];
@@ -58,6 +62,8 @@
             make.left.top.width.equalTo(scvback);
             make.height.offset(UISCREEN_WIDTH*imagebc.size.height/imagebc.size.width);
         }];
+        [imgvback setHidden:YES];
+        _imgvback = imgvback;
         
         UIImageView *imgvhd = [[UIImageView alloc] init];
         [imgvhd setImage:[UIImage imageNamed:@"my_headnomo"]];
@@ -71,6 +77,38 @@
         [imgvhd.layer setCornerRadius:45];
         _imgvhd = imgvhd;
         
+        UIView *viewtsdl = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 68, 24)];
+        [viewtsdl setBackgroundColor:[UIColor whiteColor]];
+        [scvback addSubview:viewtsdl];
+        [viewtsdl mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(imgvhd).offset(64);
+            make.top.equalTo(imgvhd).offset(-12);
+            make.size.sizeOffset(CGSizeMake(68, 24));
+        }];
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect: viewtsdl.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight | UIRectCornerBottomRight  cornerRadii:CGSizeMake(6,6)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = viewtsdl.bounds;
+        maskLayer.path = maskPath.CGPath;
+        viewtsdl.layer.mask = maskLayer;
+        [Tools changedView:viewtsdl colors:@[(id)RGBCOLOR(246, 44, 108).CGColor,(id)RGBCOLOR(252, 79, 84).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+        _viewtsdl = viewtsdl;
+        [viewtsdl setHidden:YES];
+        if([UserInfoModel shareModel].temp.intValue==1)
+        {
+            [viewtsdl setHidden:NO];
+        }
+        
+        UILabel *lbtsdl = [[UILabel alloc] init];
+        [lbtsdl setText:@"Hi! 快登录"];
+        [lbtsdl setTextColor:[UIColor whiteColor]];
+        [lbtsdl setTextAlignment:NSTextAlignmentCenter];
+        [lbtsdl setFont:[UIFont systemFontOfSize:12]];
+        [viewtsdl addSubview:lbtsdl];
+        [lbtsdl mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.edges.equalTo(viewtsdl);
+        }];
+        
+        
         UIButton *btdenglu = [[UIButton alloc] init];
         [scvback addSubview:btdenglu];
         [btdenglu mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -202,15 +240,27 @@
     [self.lbID setText:[NSString stringWithFormat:@"ID:%@",modelDetail.user_id]];
     self.lbname.text = [Tools isStringnilkong:modelDetail.name];
     
-    
+    if([UserInfoModel shareModel].temp.intValue==1)
+    {
+        [self.viewtsdl setHidden:NO];
+    }
+    else
+    {
+        [self.viewtsdl setHidden:YES];
+    }
     [self.btkt setHidden:NO];
+    [self.imgvback setHidden:YES];
     if([UserInfoModel shareModel].vip.intValue==2)
     {
+        [self.imgvback setHidden:NO];
+        [self.imgvback setImage:[UIImage imageNamed:@"my_bj_pt"]];
         [self.lbnameHY setText:@"普通会员"];
         [self.lbinfoHY setText:[NSString stringWithFormat:@"%@ 会员到期",modelDetail.vip_expire]];
     }
     else if([UserInfoModel shareModel].vip.intValue==3)
     {
+        [self.imgvback setHidden:NO];
+        [self.imgvback setImage:[UIImage imageNamed:@"my_bj"]];
         [self.lbnameHY setText:@"终身会员"];
         [self.lbinfoHY setText:@"享受永久会员专属权益"];
         [self.btkt setHidden:YES];

ProductApp/ProductApp/ProductMain/我的/会员中心/view/HuiYuanZXGoodsView.m

@@ -173,8 +173,19 @@
 -(void)setArrGoods:(NSArray *)arrGoods
 {
     _arrGoods = arrGoods;
-    
-    if(arrGoods.count>1)
+    if([UserInfoModel PayWXQuanXian]==NO)
+    {
+        NSMutableArray *arrtmep = [NSMutableArray new];
+        for(OrderGoodsModelData *model in arrGoods)
+        {
+            if([Tools isStringnil:model.apple_goods_id].length>0)
+            {
+                [arrtmep addObject:model];
+            }
+        }
+        _arrGoods = arrtmep;
+    }
+    if(self.arrGoods.count>1)
     {
         OrderGoodsModelData *model = self.arrGoods[1];
         model.select = YES;

ProductApp/ProductApp/ProductMain/我的/会员中心/view/HuiYuanZXView.m

@@ -219,7 +219,7 @@
 
 -(void)pushData
 {
-    if([UserInfoModel getSyetemPay])
+    if([UserInfoModel PayWXQuanXian])
     {
         [UIAlertController showActionSheetInViewController:self.viewController withTitle:@"支付方式" message:nil cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:@[@"微信",@"苹果"] popoverPresentationControllerBlock:^(UIPopoverPresentationController * _Nonnull popover) {
             

ProductApp/ProductApp/ProductMain/我的/兑换钻石/view/DuiHuanZSView.m

@@ -337,7 +337,7 @@
     }
     self.modelSelect = modelSelect;
     
-    if([UserInfoModel getSyetemPay])
+    if([UserInfoModel PayWXQuanXian])
     {
         [UIAlertController showActionSheetInViewController:self.viewController withTitle:@"支付方式" message:nil cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:@[@"微信",@"苹果"] popoverPresentationControllerBlock:^(UIPopoverPresentationController * _Nonnull popover) {
             

ProductApp/ProductApp/ProductMain/我的/分享/ShareAlterView.m

@@ -95,7 +95,7 @@
 
 -(void)itemAction:(UIButton *)sender
 {
-    ///快存图一键保存高清素材
+    ///
     NSDictionary *dic = [[UserInfoModel shareModel].config objectForKey:@"client.weixin.share"];
     if(dic==nil)return;
     

ProductApp/ProductApp/ProductMain/我的/设置/SheZhiViewController.m

@@ -31,7 +31,7 @@
 @implementation SheZhiViewController
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-    return UIStatusBarStyleDefault;
+    return UIStatusBarStyleLightContent;
 }
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];

ProductApp/ProductApp/ProductMain/我的/设置/关于我们/GuanYuWoMenViewController.m

@@ -25,7 +25,7 @@
 @implementation GuanYuWoMenViewController
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-    return UIStatusBarStyleDefault;
+    return UIStatusBarStyleLightContent;
 }
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
@@ -38,7 +38,7 @@
     [super viewDidLoad];
     
     UIImageView *imgvback = [[UIImageView alloc] init];
-    [imgvback setImage:[UIImage imageNamed:@"hb_log"]];
+    [imgvback setImage:[UIImage imageNamed:@"log_log"]];
     [self.view addSubview:imgvback];
     [imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.height.offset(100);

ProductApp/ProductApp/ProductMain/我的/设置/意见反馈/YiJianFanKuiController.m

@@ -15,7 +15,7 @@
 
 @implementation YiJianFanKuiController
 - (UIStatusBarStyle)preferredStatusBarStyle {
-    return UIStatusBarStyleDefault;
+    return UIStatusBarStyleLightContent;
 }
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];

ProductApp/ProductApp/ProductMain/我的/设置/意见反馈/view/YiJianFanKuiView.m

@@ -311,9 +311,9 @@
     }
     [UserInfoModel shijianShangBao:0 key:@"client.feedback" value:@"" extra:@""];
     
-    [HXLoadingHUD showWithStatus:@"" maskType:0];
+    [LoadAlterView showView];
     [PublicNetWorkManager requestUserFeedbackData:self type:self.btitemSelect.titleLabel.text contact:self.fieldshoujihao.text images:self.imageIDArray content:self.textview.text Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         if(state)
         {
             [self.viewController.navigationController popViewControllerAnimated:YES];
@@ -418,9 +418,9 @@
     
 }
 - (void)uploadImgData:(UIImage *)image {
-    [HXLoadingHUD showWithStatus:@"" maskType:0];
+    [LoadAlterView showView];
     [PublicNetWorkManager requestUserUploadData:self scene:@"feedback" image:image Callback:^(BOOL state, UserUploadModel *responseObject, NSString * _Nullable describle) {
-        [HXLoadingHUD dismiss];
+        [LoadAlterView dismis];
         if(state)
         {
             [self.imageArray addObject:image];

ProductApp/ProductApp/ProductMain/我的/设置/账号绑定/ZhangHaoBDViewController.m

@@ -25,7 +25,7 @@
 
 @implementation ZhangHaoBDViewController
 - (UIStatusBarStyle)preferredStatusBarStyle {
-    return UIStatusBarStyleDefault;
+    return UIStatusBarStyleLightContent;
 }
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];

ProductApp/ProductApp/ProductMain/我的/设置/账户管理/ZhangHuGuanLiViewController.m

@@ -24,7 +24,7 @@
 
 @implementation ZhangHuGuanLiViewController
 - (UIStatusBarStyle)preferredStatusBarStyle {
-    return UIStatusBarStyleDefault;
+    return UIStatusBarStyleLightContent;
 }
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
@@ -75,7 +75,10 @@
                 }
             }
             [self.arrdata addObject:arrnow];
-            [self.arrdata addObject:arrother];
+            if(arrother.count>0)
+            {
+                [self.arrdata addObject:arrother];
+            }
             [self.tableView reloadData];
         }
         else
@@ -158,7 +161,8 @@
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    __block UserAccountModelData *model = self.arrdata[indexPath.section];
+    NSArray *arr = self.arrdata[indexPath.section];
+    UserAccountModelData *model = arr[indexPath.row];
     if([model.temp intValue] != 1)
     {
         if(![model.user_id isEqualToString:[UserInfoModel shareModel].userid])

ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m

@@ -23,6 +23,10 @@
 #import <UMLink/UMLink.h>
 #import "UrlXiaZaiViewController.h"
 
+#import "GengXinAlterView.h"
+#import "TabBarController.h"
+#import "NavgationController.h"
+
 @interface ShouYeViewController ()
 @property (nonatomic , assign) BOOL isnetwork;
 @property (nonatomic , assign) BOOL isgedata;
@@ -40,6 +44,12 @@
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
+    
+    //第一次进入程序 手动检查一下是否有粘贴的信息
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self pauseNotifi];
+    });
+    
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -59,11 +69,27 @@
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pauseNotifi) name:@"pauseNotifi" object:nil];
     
-    //第一次进入程序 手动检查一下是否有粘贴的信息
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self pauseNotifi];
-    });
+}
+
+-(void)showUpDataAltre:(NSDictionary *)dic
+{
+    NSString *strfw = [[dic objectForKey:@"version"] stringByReplacingOccurrencesOfString:@"." withString:@""];
+    NSString *strbd = [[Tools applicationVersion] stringByReplacingOccurrencesOfString:@"." withString:@""];
     
+    NSString *strbig = [[dic objectForKey:@"last_version_force"] stringByReplacingOccurrencesOfString:@"." withString:@""];
+    
+    if(strfw.intValue>strbd.intValue)
+    {
+
+        BOOL isforce = [[dic objectForKey:@"force"] boolValue];
+        
+        if(strbd.intValue<=strbig.intValue)
+        {
+            isforce = YES;
+        }
+        
+        [GengXinAlterView showName:[Tools isStringnil:[dic objectForKey:@"description"]] strversion:[NSString stringWithFormat:@"V%@",[dic objectForKey:@"version"]] isforce:isforce];
+    }
 }
 
 -(void)getAllData
@@ -85,6 +111,10 @@
     ///同意了协议再注册友盟
     [UMConfigure initWithAppkey:YouMengAppKey channel:@"App Store"];
     [UMCommonLogManager setUpUMCommonLogManager];
+    if(self.isnetwork)
+    {
+        [self pauseNotifi];
+    }
 }
 
 -(void)network
@@ -149,6 +179,11 @@
             [self.viewShow refShowBanner];
             [self getUmenLink];
             [self getUserData];
+            
+            ///版本信息 version title description force
+            NSDictionary *dic = [[UserInfoModel shareModel].config objectForKey:@"client.version.upgrade"];
+            [self showUpDataAltre:dic];
+            
         }
         else
         {
@@ -255,22 +290,40 @@
 ///去获取粘贴板的信息
 -(void)pauseNotifi
 {
-    NSString *strpas = [self getpasteInfo];
-    if([strpas containsString:@"http://"]||[strpas containsString:@"https://"])
+    if([[[NSUserDefaults standardUserDefaults] objectForKey:UserXieYiOk] intValue] !=1)return;
+    AppDelegate *del = (AppDelegate *)[UIApplication sharedApplication].delegate;
+    
+    if([del.window.rootViewController isKindOfClass:[TabBarController class]])
     {
-        [CopyAlterView disMis];
-        [CopyAlterView showTitle:@"您已复制链接，是否粘贴" info:strpas back:^(NSInteger selectTag) {
-            if(selectTag==1)
+        TabBarController *tabbartemp = (TabBarController *)del.window.rootViewController;
+        NavgationController *nvctemp = tabbartemp.selectedViewController;
+        NSArray *arrtemp = nvctemp.viewControllers;
+        if([arrtemp.lastObject isKindOfClass:[UrlXiaZaiViewController class]]||[arrtemp.lastObject isKindOfClass:[ShouYeViewController class]])
+        {
+            NSString *strpas = [self getpasteInfo];
+            if([strpas containsString:@"http://"]||[strpas containsString:@"https://"])
             {
-                UrlXiaZaiViewController *vc = [UrlXiaZaiViewController new];
-                vc.content = strpas;
-                [self.navigationController pushViewController:vc animated:YES];
+                [CopyAlterView disMis];
+                [CopyAlterView showTitle:@"您已复制链接，是否粘贴" info:strpas back:^(NSInteger selectTag) {
+                    if(selectTag==1)
+                    {
+                        NSArray *arr = self.navigationController.viewControllers;
+                        if([arr.lastObject isKindOfClass:[UrlXiaZaiViewController class]])
+                        {
+                            UrlXiaZaiViewController *vc = arr.lastObject;
+                            vc.content = strpas;
+                            [vc refContent];
+                        }
+                        else if([arr.lastObject isKindOfClass:[ShouYeViewController class]])
+                        {
+                            UrlXiaZaiViewController *vc = [UrlXiaZaiViewController new];
+                            vc.content = strpas;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }
+                    }
+                }];
             }
-            else
-            {
-                
-            }
-        }];
+        }
     }
 }
 

ProductApp/ProductApp/ProductMain/首页/view/ShouYeView.m

@@ -163,7 +163,7 @@
                     [arrurl addObject:[Tools isStringnil:[dic objectForKey:@"image"]]];
                 }
             }
-            else if([[dic objectForKey:@"page"] containsString:@"recharge11"])
+            else if([[dic objectForKey:@"page"] containsString:@"recharge"])
             {
                 NSString *str = [[UserInfoModel shareModel].config objectForKey:@"client.pay.enable"];
                 if([str intValue] != 0 && [UserInfoModel shareModel].vip.intValue != 3)
@@ -187,8 +187,6 @@
 -(void)getdata
 {
     self.arrdata = [NSMutableArray new];
-//    NSArray *arr = @[@"视频修复",@"视频加水印",@"MD5去重",@"视频倒放",@"视频镜像",@"视频裁剪",@"去背景音乐",@"加背景音乐",@"视频转音频",@"视频滤镜"];
-//    NSArray *arrinfo = @[@"轻松修复视频",@"快捷留下专属标记",@"专业去重工具",@"趣味视频生成",@"感受不一样的世界",@"留下一切美好瞬间",@"无声世界更有意境",@"赋予不同的声音",@"提取视频中的音频",@"去除世间杂质"];
     
     NSArray *arr = @[@"视频加水印",@"MD5去重",@"视频裁剪",@"视频转音频",@"去背景音乐",@"视频时长剪切"];
     NSArray *arrinfo = @[@"快捷留下专属标记",@"专业去重工具",@"留下一切美好瞬间",@"提取视频中的音频",@"无声世界更有意境",@"裁剪时长"];
@@ -240,7 +238,7 @@
 {
     NSArray *arrbanner = [[UserInfoModel shareModel].config objectForKey:@"client.banner.urls"];
     NSDictionary *dic = arrbanner[index];
-    if([[dic objectForKey:@"page"] containsString:@"recharge11"])
+    if([[dic objectForKey:@"page"] containsString:@"recharge"])
     {
         NSString *str = [[UserInfoModel shareModel].config objectForKey:@"client.pay.enable"];
         if([str intValue] == 0 || [UserInfoModel shareModel].vip.intValue == 3)

ProductApp/ProductApp/ProductMain/首页/直播回放/ZhiBoHuiFangViewController.m

@@ -40,6 +40,9 @@
     [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)];
     [self.navigationView setTitle:@"直播回放" titleColor:RGBACOLOR(255, 255, 255, 0.9)];
     [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+    
+    [self getData];
+    
 }
 -(void)viewDidDisappear:(BOOL)animated
 {
@@ -105,11 +108,13 @@
         make.top.width.height.equalTo(scvback);
         make.left.offset(UISCREEN_WIDTH);
     }];
+    [viewImage setBackRef:^{
+        [self getData];
+    }];
     _viewImage = viewImage;
     
     [self drawQianWang];
     
-    [self getData];
 }
 
 -(void)drawQianWang

ProductApp/ProductApp/ProductMain/首页/直播回放/view/ShiPingTopSelectView.m

@@ -59,7 +59,7 @@
         [btjc setIconInLeft];
         [btjc setTag:10];
         [btjc addTarget:self action:@selector(jcAction:) forControlEvents:UIControlEventTouchUpInside];
-        
+        [btjc setHidden:YES];
     }
     return self;
 }

ProductApp/ProductApp/ProductMain/首页/直播回放/view/ShiPingZBHFVideoView.m

@@ -52,6 +52,11 @@
         [collect setEmptyDataSetDelegate:self];
         [collect setEmptyDataSetSource:self];
         _collect = collect;
+        collect.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+            
+            self.backRef();
+            [self.collect.mj_header endRefreshing];
+        }];
         
         UIView *viewbottom = [[UIView alloc] init];
         [viewbottom setBackgroundColor:RGBCOLOR(34, 34, 34)];

ProductApp/ProductApp/ProductMain/首页/直播回放/视频查看器/DynamicVideoViewController.m

@@ -34,7 +34,7 @@
 @implementation DynamicVideoViewController
 -(UIStatusBarStyle)preferredStatusBarStyle{
     ///这里设置白色
-    return UIStatusBarStyleDefault;
+    return UIStatusBarStyleLightContent;
 }
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];

ProductApp/ProductApp/ProductMain/首页/视频号/ShiPingHaoViewController.m

@@ -41,6 +41,8 @@
     [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)];
     [self.navigationView setTitle:@"视频号" titleColor:RGBACOLOR(255, 255, 255, 0.9)];
     [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+    
+    [self getData];
 }
 -(void)viewDidDisappear:(BOOL)animated
 {
@@ -106,12 +108,13 @@
         make.top.width.height.equalTo(scvback);
         make.left.offset(UISCREEN_WIDTH);
     }];
+    [viewImage setBackRef:^{
+        [self getData];
+    }];
     _viewImage = viewImage;
     
     [self drawQianWang];
     
-    [self getData];
-    
 }
 
 -(void)drawQianWang

ProductApp/ProductApp/ProductMain/首页/视频号/view/ShiPingHaoSPView.m

@@ -52,6 +52,11 @@
         [collect setEmptyDataSetDelegate:self];
         [collect setEmptyDataSetSource:self];
         _collect = collect;
+        collect.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+            
+            self.backRef();
+            [self.collect.mj_header endRefreshing];
+        }];
         
         UIView *viewbottom = [[UIView alloc] init];
         [viewbottom setBackgroundColor:RGBCOLOR(34, 34, 34)];
@@ -335,7 +340,7 @@
     }];
     
     UILabel *lbthree = [[UILabel alloc] init];
-    [lbthree setText:@"3、返回【快存图APP】微信视频号页面，下拉刷新即可下载微信号视频。"];
+    [lbthree setText:@"3、返回【快存视频APP】微信视频号页面，下拉刷新即可下载微信号视频。"];
     [lbthree setTextColor:RGBACOLOR(255, 255, 255, 0.6)];
     [lbthree setTextAlignment:NSTextAlignmentLeft];
     [lbthree setFont:[UIFont systemFontOfSize:12]];

ProductApp/ProductApp/ProductMain/首页/链接下载/UrlXiaZaiViewController.h

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic , strong) NSString *strlogid;
 ///
 @property (nonatomic , strong) NSString *content;
+-(void)refContent;
 @end
 
 NS_ASSUME_NONNULL_END

ProductApp/ProductApp/ProductMain/首页/链接下载/UrlXiaZaiViewController.m

@@ -153,6 +153,11 @@
     [UserInfoModel shijianShangBao:0 key:@"client.get.material" value:@"main-button" extra:self.content];
     
 }
+-(void)refContent
+{
+    self.fieldUrl.text = self.content;
+    [self getdata];
+}
 #pragma mark - custom delegate - 自定义或者第三方控件的delegate
 - (NSInteger)numberOfChildViewControllers {
     return 3;
@@ -307,12 +312,6 @@
         [self.arrvideos addObjectsFromArray:modelDetail.video];
     }
     
-    
-    if(self.arrvideos.count>0)
-    {
-        [self.scrollPageView setSelectedIndex:1 animated:YES];
-    }
-    
     if([Tools isStringnil:modelDetail.desc].length>0)
     {
         baseInfoModel *model = [baseInfoModel new];
@@ -321,7 +320,11 @@
         self.arrtexts = [NSMutableArray arrayWithObject:model];
     }
     
-    [self.scrollPageView reloadInputViews];
+    [self.scrollPageView reloadWithNewTitles:@[@"图片",@"视频",@"文本"]];
+    if(self.arrvideos.count>0)
+    {
+        [self.scrollPageView setSelectedIndex:1 animated:YES];
+    }
 }
 
 

ProductApp/ProductApp/ProductMain/首页/链接下载/图片/UrlXiaZaiTPViewController.m

@@ -62,6 +62,10 @@
     [viewbottom setHidden:YES];
     [self drawbottomView:viewbottom];
     _viewbottom = viewbottom;
+    if(self.arrdata.count>0)
+    {
+        [viewbottom setHidden:NO];
+    }
 }
 -(void)drawbottomView:(UIView *)view
 {
@@ -268,7 +272,7 @@
 }
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
-    NSString *strimg = @"record_暂无图片";
+    NSString *strimg = @"jl_暂无图片";
     return [UIImage imageNamed:strimg];
 }
 

ProductApp/ProductApp/ProductMain/首页/链接下载/文本/UrlXiaZaiWBViewController.m

@@ -51,6 +51,10 @@
     [viewbottom setHidden:YES];
     [self drawbottomView:viewbottom];
     _viewbottom = viewbottom;
+    if(self.arrdata.count>0)
+    {
+        [viewbottom setHidden:NO];
+    }
 }
 -(void)drawbottomView:(UIView *)view
 {
@@ -207,7 +211,7 @@
 }
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
-    NSString *strimg = @"record_暂无图片";
+    NSString *strimg = @"jl_暂无图片";
     return [UIImage imageNamed:strimg];
 }
 @end