修改数据模型

Introduce/Aarchitecture/AppDelegate.swift

@@ -15,7 +15,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-        BFConfig.shared.styleColor = .nomal
+        BFConfig.shared.styleColor = .intrGreen
         BFConfig.shared.statusBarStyle = .light
         BFConfig.shared.styleBackGroundColor = UIColor.black
         BFConfig.shared.styleTitleColor = UIColor.white
@@ -27,7 +27,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         BFConfig.shared.hiddenMusicMask = false
         BFConfig.shared.otherTintColor = UIColor.hexColor(hexadecimal: "#333333")
         BFConfig.shared.statusBarStyle = .light
-        BFMaterialConfig.shared.choseType = .single
+//        BFMaterialConfig.shared.choseType = .single
         return true
     }
 

Introduce/Record/INIntrocudeController.swift

@@ -12,7 +12,14 @@ import BFRecordScreenKit
 
 class INIntrocudeController: BFBaseViewController {
     
-    var asset:PHAsset?
+    var assets:[PHAsset]? {
+        didSet{
+            if let ass = assets {
+                recordScreenVC.assets = ass
+            }
+        }
+    }
+    
     let recordScreenVC = BFRecordScreenController()
     
     override func viewWillAppear(_ animated: Bool) {
@@ -40,7 +47,6 @@ class INIntrocudeController: BFBaseViewController {
         }
         
         addChild(recordScreenVC)
-        recordScreenVC.asset = asset
         recordScreenVC.view.frame = self.view.frame
         view.addSubview(recordScreenVC.view)
     }
@@ -53,7 +59,7 @@ class INIntrocudeController: BFBaseViewController {
     
     @objc func exportAction(){
         let controller = INVideoExportController()
-        controller.export.voiceList = recordScreenVC.recordList
+        controller.export.voiceList = recordScreenVC.itemModels.first?.voiceStickers
         controller.export.asset = recordScreenVC.avasset
         self.navigationController?.pushViewController(controller, animated: true)
     }

Introduce/Record/INPhotoVideosController.swift

@@ -13,7 +13,7 @@ import BFRecordScreenKit
 import Photos
 
 class INPhotoVideosController: BFBaseViewController {
-    var chosedAsset:PHAsset?
+    var chosedAsset:[PHAsset]?
     lazy var albumController: BFPhotoAlbumController = {
         let albumController = BFPhotoAlbumController()
         albumController.mediaType = .video
@@ -52,14 +52,7 @@ class INPhotoVideosController: BFBaseViewController {
         vc.view.backgroundColor = .black
         vc.updateFrame(newFrame: CGRect(x: 0, y: cDevice_iPhoneNavBarAndStatusBarHei, width: cScreenWidth, height: cScreenHeigth - cDevice_iPhoneNavBarAndStatusBarHei - cDevice_iPhoneTabBarHei))
         vc.selectedMaterialHandle = { [weak self] currentMaterialData, selectedPhotoData, _, _ in
-            if currentMaterialData?.isSelected ?? false{
-                self?.chosedAsset = currentMaterialData
-                if selectedPhotoData.count == 2 {
-                    cShowHUB(superView: nil, msg: "临时：最新选择的视频是有效的视频")
-                }
-            }else{
-                self?.chosedAsset = selectedPhotoData.first
-            }
+            self?.chosedAsset = selectedPhotoData
             
         }
         return vc
@@ -129,7 +122,7 @@ class INPhotoVideosController: BFBaseViewController {
     override func rightBtnClick(sender _: UIButton) {
         if let asset = self.chosedAsset{
             let vc = INIntrocudeController()
-            vc.asset = asset
+            vc.assets = asset
             navigationController?.pushViewController(vc, animated: true)
         }else{
             cShowHUB(superView: nil, msg: "需要选择一个视频")

Podfile

@@ -42,22 +42,22 @@ target 'Introduce' do
     end
   end
   
-def remove_swift_ui(code_file)
-  code_text = File.read(code_file)
-  code_text.gsub!(/#if canImport\(SwiftUI\) && canImport\(Combine\)(\n)/,"#if canImport(SwiftUI) && canImport(Combine) && (arch(arm64) || arch(x86_64))\n")
-  system("rm -rf " + code_file)
-  aFile = File.new(code_file, 'w+')
-  aFile.syswrite(code_text)
-  aFile.close()
-end
+  def remove_swift_ui(code_file)
+    code_text = File.read(code_file)
+    code_text.gsub!(/#if canImport\(SwiftUI\) && canImport\(Combine\)(\n)/,"#if canImport(SwiftUI) && canImport(Combine) && (arch(arm64) || arch(x86_64))\n")
+    system("rm -rf " + code_file)
+    aFile = File.new(code_file, 'w+')
+    aFile.syswrite(code_text)
+    aFile.close()
+  end
 
-def remove_swift_ui_realm (code_file)
-  code_text = File.read(code_file)
-  code_text.gsub!(/#if canImport\(SwiftUI\) && canImport\(Combine\) && swif/,'#if canImport(SwiftUI) && canImport(Combine) && (arch(arm64) || arch(x86_64)) && swif')
-  system("rm -rf " + code_file)
-  aFile = File.new(code_file, 'w+')
-  aFile.syswrite(code_text)
-  aFile.close()
-end
+  def remove_swift_ui_realm (code_file)
+    code_text = File.read(code_file)
+    code_text.gsub!(/#if canImport\(SwiftUI\) && canImport\(Combine\) && swif/,'#if canImport(SwiftUI) && canImport(Combine) && (arch(arm64) || arch(x86_64)) && swif')
+    system("rm -rf " + code_file)
+    aFile = File.new(code_file, 'w+')
+    aFile.syswrite(code_text)
+    aFile.close()
+  end
 
 end