Chris il y a 5 ans
Parent
commit
becf025a65

+ 24 - 0
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -405,6 +405,8 @@
 		BD108C9722A60C2100837DAB /* HGImagePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD108C9222A60C2100837DAB /* HGImagePickerController.swift */; };
 		BD108C9A22A60C3300837DAB /* HGImage.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BD108C9822A60C3200837DAB /* HGImage.xcassets */; };
 		BD108C9B22A60C3300837DAB /* HGImage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BD108C9922A60C3300837DAB /* HGImage.storyboard */; };
+		BD10CCF822BE6DF00040796E /* PublishCutVideoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD10CCF722BE6DF00040796E /* PublishCutVideoController.swift */; };
+		BD10CCFB22BE75080040796E /* PublishChooseVideoCover.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD10CCFA22BE75080040796E /* PublishChooseVideoCover.swift */; };
 		BD12203122AF4A010051C7C2 /* MessageMainItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD12203022AF4A010051C7C2 /* MessageMainItemView.swift */; };
 		BD12203622AF807C0051C7C2 /* MessagePlanetActivityController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD12203522AF807C0051C7C2 /* MessagePlanetActivityController.swift */; };
 		BD12203A22AF80AD0051C7C2 /* MessageActivityTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD12203922AF80AD0051C7C2 /* MessageActivityTableCell.swift */; };
@@ -968,6 +970,8 @@
 		BD108C9222A60C2100837DAB /* HGImagePickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HGImagePickerController.swift; sourceTree = "<group>"; };
 		BD108C9822A60C3200837DAB /* HGImage.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = HGImage.xcassets; sourceTree = "<group>"; };
 		BD108C9922A60C3300837DAB /* HGImage.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = HGImage.storyboard; sourceTree = "<group>"; };
+		BD10CCF722BE6DF00040796E /* PublishCutVideoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishCutVideoController.swift; sourceTree = "<group>"; };
+		BD10CCFA22BE75080040796E /* PublishChooseVideoCover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishChooseVideoCover.swift; sourceTree = "<group>"; };
 		BD12203022AF4A010051C7C2 /* MessageMainItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageMainItemView.swift; sourceTree = "<group>"; };
 		BD12203522AF807C0051C7C2 /* MessagePlanetActivityController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePlanetActivityController.swift; sourceTree = "<group>"; };
 		BD12203922AF80AD0051C7C2 /* MessageActivityTableCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageActivityTableCell.swift; sourceTree = "<group>"; };
@@ -3831,6 +3835,22 @@
 			path = HGImagePicker;
 			sourceTree = "<group>";
 		};
+		BD10CCF622BE6D6A0040796E /* PublishCutVideo */ = {
+			isa = PBXGroup;
+			children = (
+				BD10CCF722BE6DF00040796E /* PublishCutVideoController.swift */,
+			);
+			path = PublishCutVideo;
+			sourceTree = "<group>";
+		};
+		BD10CCF922BE74E20040796E /* PublishChooseVideoCover */ = {
+			isa = PBXGroup;
+			children = (
+				BD10CCFA22BE75080040796E /* PublishChooseVideoCover.swift */,
+			);
+			path = PublishChooseVideoCover;
+			sourceTree = "<group>";
+		};
 		BD12203222AF803A0051C7C2 /* MessagePlanetActivity */ = {
 			isa = PBXGroup;
 			children = (
@@ -3915,6 +3935,8 @@
 				BD12B67222B4E99800AEB10B /* PublishMediaPicker */,
 				BD01B1FC22BC677900CE9F36 /* PublishTakeVideo */,
 				BD01B1F722BC673900CE9F36 /* PublishTakePhoto */,
+				BD10CCF622BE6D6A0040796E /* PublishCutVideo */,
+				BD10CCF922BE74E20040796E /* PublishChooseVideoCover */,
 				BDA5F8F122BCE96E00C174B6 /* PublishEditVideo */,
 				BD13B69F22B9CE8D008BB323 /* PublishEditController */,
 				BD13B6CF22BA03BB008BB323 /* PublishAddTopic */,
@@ -4808,6 +4830,7 @@
 				A7824AFD2271EAC900ABA381 /* SelfMentionContactsListTableViewCell.swift in Sources */,
 				BD7AB83F228438290030646A /* OrderPayExpressAddInfoCell.swift in Sources */,
 				A7DF50DF22A5590200998908 /* BrowsePicturesViewController.swift in Sources */,
+				BD10CCF822BE6DF00040796E /* PublishCutVideoController.swift in Sources */,
 				A7CC74DA22702E41003C4F38 /* MineOrderTableViewCell.swift in Sources */,
 				A77F2CB92232010F001BD3F6 /* ShoppingCartViewController.swift in Sources */,
 				BD13B6C122BA034D008BB323 /* PublishEditAddPicCell.swift in Sources */,
@@ -5106,6 +5129,7 @@
 				A7E19FAE22BA2D16009BCCE1 /* SearchContentListViewController.swift in Sources */,
 				A7CC751F227190C5003C4F38 /* AccountSecurityViewController.swift in Sources */,
 				BD13B6C422BA034D008BB323 /* PublishEditDefaultCollectionCell.swift in Sources */,
+				BD10CCFB22BE75080040796E /* PublishChooseVideoCover.swift in Sources */,
 				A739121C229F75F50033177E /* JXPagingListRefreshView.swift in Sources */,
 				BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */,
 				A7284440224DFACD00F82F30 /* InfoModel.swift in Sources */,

+ 64 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishChooseVideoCover/PublishChooseVideoCover.swift

@@ -0,0 +1,64 @@
+//
+//  PublishChooseVideoCover.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/22.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  视频封面选择
+
+import UIKit
+
+class PublishChooseVideoCover: BaseViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupViews()
+        setupLayouts()
+        
+    }
+    
+    override func setupViews() {
+        navigationBar.title = "视频编辑"
+        view.backgroundColor = kf7f8faColor
+        
+        view.addSubview(topView)
+        
+        topView.addSubview(commentItemView)
+    }
+    
+    override func setupLayouts() {
+        topView.snp.makeConstraints { (make) in
+            make.top.equalToSuperview().offset(kNavBarTotalHeight + 1)
+            make.left.right.equalToSuperview().offset(0)
+            make.height.equalTo(104)
+        }
+        commentItemView.snp.makeConstraints { (make) in
+            make.top.equalTo(20)
+            make.left.equalTo(34)
+            make.size.equalTo(64)
+        }
+        
+    }
+    
+    override func setupData() {
+        
+    }
+    
+    
+    private lazy var topView: UIView = {
+        let topView = UIView()
+        topView.backgroundColor = UIColor.white
+        return topView
+    }()
+    
+    private lazy var commentItemView: MessageMainItemView = {
+        let itemView = MessageMainItemView()
+        itemView.itemViewType = ItemViewType.comment
+        itemView.msgClickClosure = {
+            [weak self] () in
+            let vc = MessageCommentController()
+            self?.navigationController?.pushViewController(vc, animated: true)
+        }
+        return itemView
+    }()
+}

+ 64 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishCutVideo/PublishCutVideoController.swift

@@ -0,0 +1,64 @@
+//
+//  PublishCutVideoController.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/22.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  视频裁剪
+
+import UIKit
+
+class PublishCutVideoController: BaseViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupViews()
+        setupLayouts()
+        
+    }
+    
+    override func setupViews() {
+        navigationBar.title = "视频编辑"
+        view.backgroundColor = kf7f8faColor
+        
+        view.addSubview(topView)
+        
+        topView.addSubview(commentItemView)
+    }
+    
+    override func setupLayouts() {
+        topView.snp.makeConstraints { (make) in
+            make.top.equalToSuperview().offset(kNavBarTotalHeight + 1)
+            make.left.right.equalToSuperview().offset(0)
+            make.height.equalTo(104)
+        }
+        commentItemView.snp.makeConstraints { (make) in
+            make.top.equalTo(20)
+            make.left.equalTo(34)
+            make.size.equalTo(64)
+        }
+        
+    }
+    
+    override func setupData() {
+        
+    }
+    
+    
+    private lazy var topView: UIView = {
+        let topView = UIView()
+        topView.backgroundColor = UIColor.white
+        return topView
+    }()
+    
+    private lazy var commentItemView: MessageMainItemView = {
+        let itemView = MessageMainItemView()
+        itemView.itemViewType = ItemViewType.comment
+        itemView.msgClickClosure = {
+            [weak self] () in
+            let vc = MessageCommentController()
+            self?.navigationController?.pushViewController(vc, animated: true)
+        }
+        return itemView
+    }()
+}

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditVideo/PublishEditVideoController.swift

@@ -4,7 +4,7 @@
 //
 //  Created by Christopher on 2019/6/21.
 //  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
+//  视频编辑
 
 import UIKit
 

+ 0 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakeVideo/PublishVideoView.swift

@@ -167,7 +167,6 @@ class PublishVideoView: BaseView {
     
     // 刷新进度条进度
     func recordingPercent(percent: CGFloat) {
-        print("----updates - \(percent)")
         progressView.updateProgress(percent)
         
 //        if recording {