Преглед изворни кода

crop fixed -- to be continued

Chris пре 5 година
родитељ
комит
fd47b80edd

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoCrop/Controller/AliyunCropViewController.m

@@ -136,7 +136,7 @@ typedef NS_ENUM(NSInteger, AliyunCropPlayerStatus) {
     [self.previewScrollView addGestureRecognizer:tapGesture];
     
     if (!_cutInfo.phAsset) {
-        self.thumbnailView = [[AliyunCropThumbnailView alloc] initWithFrame:CGRectMake(0, ScreenHeight - 20 - 110 - SafeBottom, ScreenWidth, 110) withCutInfo:_cutInfo];
+        self.thumbnailView = [[AliyunCropThumbnailView alloc] initWithFrame:CGRectMake(14, ScreenHeight - 20 - 110 - SafeBottom, ScreenWidth-28, 110) withCutInfo:_cutInfo];
         self.thumbnailView.delegate = (id<AliyunCutThumbnailViewDelegate>)self;
         [self.view addSubview:self.thumbnailView];
     }

+ 5 - 5
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoCrop/View/AliyunCropThumbnailView.m

@@ -68,9 +68,9 @@
 
 - (void)setupSubviews {
     
-    _progressView = [[UIImageView alloc] initWithImage:[AliyunImage imageNamed:@"progress"]];
-    _progressView.bounds = CGRectMake(0, 0, ScreenWidth / 8.0, 72);
-    _progressView.center = CGPointMake(0, CGRectGetMidY(self.bounds) + 6);
+    _progressView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"video_edit_progressbar"]];
+    _progressView.bounds = CGRectMake(0, 0, 4, 80);
+    _progressView.center = CGPointMake(0, CGRectGetMidY(self.bounds) + 19);
     [self addSubview:_progressView];
     
     _durationLabel = [[UILabel alloc] initWithFrame:CGRectMake(14, 0, ScreenWidth - 200, 18)];
@@ -81,10 +81,10 @@
     
     _imageViewWith = ScreenWidth / 8.0 * 0.35;
     _imageViewLeft = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"video_edit_left"]];
-    _imageViewLeft.frame = CGRectMake(0, 38, _imageViewWith, 72);
+    _imageViewLeft.frame = CGRectMake(0, 38, 15, 72);
     _imageViewLeft.userInteractionEnabled = YES;
     _imageViewRight = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"video_edit_right"]];
-    _imageViewRight.frame = CGRectMake(ScreenWidth - _imageViewWith, 38, _imageViewWith, 72);
+    _imageViewRight.frame = CGRectMake(ScreenWidth-28-15, 38, 15, 72);
     _imageViewRight.userInteractionEnabled = YES;
     
     

BIN
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoResource/QPSDK.bundle/progress@2x.png


+ 22 - 0
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/video_edit_progressbar.imageset/Contents.json

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

BIN
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/video_edit_progressbar.imageset/video_edit_progressbar@2x.png


BIN
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/video_edit_progressbar.imageset/video_edit_progressbar@3x.png