一个视频也走merge

chunzhiying · Oct 22, 2015 · 597ba65 · 597ba65
1 parent 0ec6c7b
commit 597ba65
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/...roj/project.xcworkspace/xcuserdata/chenzhiying.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/chenzhiying.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MeiPaiDemo/MeiPaiDemo/RecordModel.swift b/MeiPaiDemo/MeiPaiDemo/RecordModel.swift
@@ -40,7 +40,7 @@ class RecordModel {
 
         func mergeVideo() {
 
-            guard outputFileUrlAry.count > 1 else {
+            guard outputFileUrlAry.count > 0 else {
                 saveVideo(outputFileUrlAry.first!)
                 return }
 

diff --git a/MeiPaiDemo/MeiPaiDemo/RecordViewController.swift b/MeiPaiDemo/MeiPaiDemo/RecordViewController.swift
@@ -208,7 +208,7 @@ class RecordViewController: UIViewController {
         canRecord = false
         loadingBox?.showInView(view, withText: "处理视频中..")
 
-//        recordVideoView.resetRecordVideoUIAndHandleEndingImageByUrl(model.outputFileUrl)
+        recordVideoView.resetRecordVideoUIAndHandleEndingImageByUrl(model.outputFileUrl)
 //        model.addNewVideoFilePath()
 
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) { [weak self] in