Browse Source

no message

Chris 5 years ago
parent
commit
a71bbf4b03

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

@@ -459,7 +459,6 @@
 		BD7AB841228438C80030646A /* OrderPaySelfPickAddressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB840228438C80030646A /* OrderPaySelfPickAddressCell.swift */; };
 		BD7AB8432284390B0030646A /* OrderPaySelfPickInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB8422284390B0030646A /* OrderPaySelfPickInfoCell.swift */; };
 		BD7AB8452284398A0030646A /* OrderPaySelfPickAddInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB8442284398A0030646A /* OrderPaySelfPickAddInfoCell.swift */; };
-		BD929CC222B8C3A50098C139 /* testVideoRecordVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD929CC122B8C3A50098C139 /* testVideoRecordVc.swift */; };
 		BD929CCA22B8CFB10098C139 /* AliyunPathManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BD929CC822B8CFB10098C139 /* AliyunPathManager.m */; };
 		BD929CCE22B904A30098C139 /* PublishViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD929CCD22B904A30098C139 /* PublishViewController.swift */; };
 		BD929CD222B906AA0098C139 /* PublishMediaPickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD929CD122B906AA0098C139 /* PublishMediaPickerController.swift */; };
@@ -1001,7 +1000,6 @@
 		BD7AB8422284390B0030646A /* OrderPaySelfPickInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPaySelfPickInfoCell.swift; sourceTree = "<group>"; };
 		BD7AB8442284398A0030646A /* OrderPaySelfPickAddInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPaySelfPickAddInfoCell.swift; sourceTree = "<group>"; };
 		BD9052C044FD3AE4E62D3929 /* Pods-RainbowPlanet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RainbowPlanet.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet.debug.xcconfig"; sourceTree = "<group>"; };
-		BD929CC122B8C3A50098C139 /* testVideoRecordVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = testVideoRecordVc.swift; sourceTree = "<group>"; };
 		BD929CC822B8CFB10098C139 /* AliyunPathManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunPathManager.m; sourceTree = "<group>"; };
 		BD929CC922B8CFB10098C139 /* AliyunPathManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunPathManager.h; sourceTree = "<group>"; };
 		BD929CCD22B904A30098C139 /* PublishViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishViewController.swift; sourceTree = "<group>"; };
@@ -3907,7 +3905,6 @@
 				BD3AA45722AE63EC00EF4F20 /* MessageMainViewController.swift */,
 				BD929CC922B8CFB10098C139 /* AliyunPathManager.h */,
 				BD929CC822B8CFB10098C139 /* AliyunPathManager.m */,
-				BD929CC122B8C3A50098C139 /* testVideoRecordVc.swift */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -4425,7 +4422,6 @@
 				A70B2C35228815F700B2449F /* ProductDetailProductSkuLabelCollectionViewCell.swift in Sources */,
 				A7931E0522AF827600297D0A /* ESTabBarItemContainer.swift in Sources */,
 				A70B2C60228870CE00B2449F /* ShopSectionHeaderView.swift in Sources */,
-				BD929CC222B8C3A50098C139 /* testVideoRecordVc.swift in Sources */,
 				A7CC7528227196C4003C4F38 /* AccountSecuritySetTableViewCell.swift in Sources */,
 				A7F2D6E122B25EF30093000B /* CardContentPicVideoModel.swift in Sources */,
 				A70B2C292286D77200B2449F /* ProductDetailProductInfoTableViewCell.swift in Sources */,

+ 0 - 103
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/ViewController/testVideoRecordVc.swift

@@ -1,103 +0,0 @@
-//
-//  testVideoRecordVc.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/18.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-import AliyunVideoSDKPro
-
-class testVideoRecordVc: BaseViewController {
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        
-        
-        
-        recorder.startPreview()
-        // 开始预览,cameraPosition 摄像头位置(前置、后置)
-//        recorder.startPreview(withPositon: AliyunIRecorderCameraPosition.back)
-    }
-    
-    override func viewWillDisappear(_ animated: Bool) {
-        recorder.stopPreview()
-        recorder.destroy()
-    }
-    
-    
-    private lazy var recorder: AliyunIRecorder = {
-        //清除之前生成的录制路径
-        let recordDir: String = AliyunPathManager.createRecrodDir()
-        AliyunPathManager.clearDir(recordDir)
-        //生成这次的存储路径
-        let taskPath: String = recordDir.appending(AliyunPathManager.randomString())
-        //视频存储路径
-        let videoSavePath: String = taskPath.appending(AliyunPathManager.randomString()).appending("mp4")
-        
-        
-        let recorder = AliyunIRecorder.init(delegate: self as? AliyunIRecorderDelegate, videoSize: CGSize(width: 720, height: 1280))
-        
-        // 预览视图,必须设置
-        recorder?.preview = self.view;
-        
-        // 摄像头角度
-        recorder?.cameraRotate = 270;
-        
-        /*
-         视频的输出路径
-         注意:若上一次录制的 outputPath 路径的视频存在沙盒里没有删除,并且与本次录制的视频路径且相同重名的话,录制将会失败
-         */
-        recorder?.outputPath = videoSavePath
-        
-        // 视频的输出类型
-        recorder?.outputType = AliyunIRecorderVideoOutputPixelFormatType.type420f
-        
-        /*
-         文件配置路径
-         注意:若上一次录制的 taskPath  路径的视频存在沙盒里没有删除,并且与本次录制的视频路径相且同重名的话,录制将会失败
-         */
-        recorder?.taskPath = taskPath;
-        
-        // 美颜状态
-        recorder?.beautifyStatus = true;
-        
-        // 设置美颜度 [0,100]
-        recorder?.beautifyValue = 0;
-        
-        // 后置摄像头采集分辨率 默认:AVCaptureSessionPreset640x480
-        recorder?.backCaptureSessionPreset = AVCaptureSession.Preset.hd1280x720.rawValue
-        
-        // 前置摄像头采集分辨率 默认:AVCaptureSessionPreset640x480
-        recorder?.frontCaptureSessionPreset = AVCaptureSession.Preset.hd1280x720.rawValue
-        
-        // 设置视频最大时长 默认8
-        recorder?.clipManager.maxDuration = 30;
-        
-        return recorder!
-    }()
-    
-//    func recordButtonTouchesBegin {
-//    // 点击录制button开始录制
-//    [self.recorder startRecording];
-//    }
-//    func recordButtonTouchesEnd {
-//    // 点击录制button停止录制
-//    [self.recorder stopRecording];
-//    }
-//    func recorderDidStopRecording {
-//    // 收到录制停止回调,调用完成录制
-//    [self.recorder finishRecording];
-//    }
-//    func recorderDidStopWithMaxDuration {
-//    // 收到录制达到最大时长回调,调用完成录制
-//    [self.recorder finishRecording];
-//    }
-//    func recorderDidFinishRecording {
-//    // 收到完成录制回调,视频已经保存到初始化设置的`视频输出沙盒路径`路径下
-//    }
-    
-}
-

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishViewController.swift

@@ -161,7 +161,7 @@ extension PublishViewController :JXSegmentedListContainerViewDataSource {
     func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
         switch index {
         case 0:
-            let mediaVc = PublishMediaPickerController()
+            let mediaVc = PublishTakePhotoController()
             return mediaVc
         case 1:
             let videoVc = PublishVideoRecorderController()