Merge branch 'master' of https://git.yishihui.com/iOS/Introduce

Introduce/Assets.xcassets/Export/play_0.imageset/Contents.json

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

Introduce/Assets.xcassets/Export/play_1.imageset/Contents.json

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

Introduce/Record/INVideoExportController.swift

@@ -435,8 +435,9 @@ class INVideoExportController: BFBaseViewController {
         }
 
         completeBtn.snp.makeConstraints { make in
-            make.left.equalTo(16)
-            make.right.equalTo(-16)
+//            make.left.equalTo(16)
+//            make.right.equalTo(-16)
+            make.centerX.equalToSuperview()
             make.bottom.equalToSuperview().offset(-7)
             make.height.equalTo(20)
         }
@@ -451,12 +452,15 @@ class INVideoExportController: BFBaseViewController {
             make.left.equalTo(completeBtn)
             make.bottom.equalTo(saveToPhotoBtn.snp.top).offset(-15)
             make.height.equalTo(70)
+            make.width.equalTo(164)
             make.top.equalTo(28)
+            make.centerX.equalToSuperview().offset(-82 - 6.5)
         }
 
         saveOnlyBtn.snp.makeConstraints { make in
 //            make.left.equalTo(saveAllBtn.snp.right).offset(16)
             make.top.height.width.equalTo(saveAllBtn)
+            make.left.equalTo(saveAllBtn.snp.right).offset(13)
             make.right.equalTo(completeBtn)
         }
 
@@ -476,6 +480,8 @@ class INVideoExportController: BFBaseViewController {
     func addVideoSliderView() {
         if sliderView == nil {
             sliderView = BFVideoPlayerSliderView(frame: CGRect(x: (backV.frame.width - playerLayer.frame.width) / 2, y: backV.frame.height - 60, width: playerLayer.frame.width, height: 50),isShowFullScreen: false)
+            sliderView?.playerBtn.setImage(UIImage(named: "play_0"), for: .normal)
+            sliderView?.playerBtn.setImage(UIImage(named: "play_1"), for: .selected)
             sliderView?.valueChangeBloc = { [weak self,weak sliderView] sender in
                 let cmtime = CMTime(value: CMTimeValue(Float64(sender.value) * Float64(self?.avplayer.currentItem?.asset.duration.seconds ?? 0) * 1000.0), timescale: CMTimeScale(1000.0))
                 BFLog(message: "cmtime == \(cmtime)，\(cmtime.seconds)")
@@ -518,7 +524,11 @@ class INVideoExportController: BFBaseViewController {
         completeBtn.isEnabled = true
 
         progressView.isHidden = true
+        progressView.snp.updateConstraints { make in
+            make.width.equalTo(0)
+        }
         progressL.isHidden = true
+        progressL.text = "0%"
     }
     // MARK: - 按钮事件
     @objc func retryAction(sender:UIButton){