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

合并代码

Introduce/Record/INIntroduceController.swift

@@ -118,10 +118,11 @@ class INIntroduceController: BFBaseViewController {
     }
 
     @objc func exportAction() {
-        if recordScreenVC.itemModels.count == 1
-            && recordScreenVC.itemModels[0].mediaType == .IMAGE
-            && recordScreenVC.itemModels[0].voiceStickers.count == 0{
-            cShowHUB(superView: nil, msg: "开局一张图也要编些话吧:)")
+        let count = recordScreenVC.itemModels.reduce(0, { partialResult, model in
+            model.voiceStickers.count + partialResult
+        })
+        if count == 0 {
+            cShowHUB(superView: nil, msg: "需要添加录制才能合成")
             return
         }
         

Introduce/Record/INPhotoVideosController.swift

@@ -25,6 +25,7 @@ class INPhotoVideosController: BFBaseViewController {
     lazy var albumController: BFPhotoAlbumController = {
         let albumController = BFPhotoAlbumController()
         albumController.mediaType = .all
+        albumController.showGIF = false
         albumController.isTopShow = true
         albumController.categoryH = cDefaultMargin * 40
         addChild(albumController)
@@ -104,6 +105,7 @@ class INPhotoVideosController: BFBaseViewController {
         let vc = BFPhotosMaterialController()
         vc.maxChoseNum = 20
         vc.msgType = .all
+        vc.showGIF = false
         vc.view.backgroundColor = .black
         vc.updateFrame(newFrame: CGRect(x: 0, y: navHeadImageView?.bottomY ?? 0, width: cScreenWidth, height: cScreenHeigth - cDevice_iPhoneTabBarHei - (navHeadImageView?.bottomY ?? 0)))
         vc.selectedMaterialHandle = { [weak self] _, selectedPhotoData, _, _ in
@@ -206,7 +208,7 @@ class INPhotoVideosController: BFBaseViewController {
         if seletedData != nil {
             changeCollecBtn.setTitle(seletedData?.title ?? "全部", for: .normal)
             changeCollecBtn.imagePosition(at: PQButtonImageEdgeInsetsStyle.right, space: cDefaultMargin / 2)
-            photoMaterialVc.assetCollection = seletedData?.assetCollection
+            photoMaterialVc.assetCollection = seletedData!.assetCollection
         }
     }