Merge branch 'dev'

Introduce.xcodeproj/project.pbxproj

@@ -483,7 +483,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -507,7 +507,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.piaoquan.introduce;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -530,7 +530,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -554,7 +554,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.piaoquan.introduce;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Introduce/Record/INIntroduceController.swift

@@ -82,6 +82,11 @@ class INIntroduceController: BFBaseViewController {
         if let ass = assets {
             recordScreenVC.fetchMaterial(ass)
         }
+        
+        recordScreenVC.cleanScreen = {[weak self] ishiddenNav in
+            guard let wself = self else { return }
+            wself.navHeadImageView?.isHidden = ishiddenNav
+        }
         recordScreenVC.changeItemHandle = { [weak self] index in
             
             guard let wself = self else { return }
@@ -301,8 +306,10 @@ class INIntroduceController: BFBaseViewController {
 
         let controller = INVideoExportController()
         controller.export.data = recordScreenVC.itemModels
-        controller.export.originSoundVolumn = recordScreenVC.noSpeakVolume
-        controller.export.originSoundInRecordVolumn = recordScreenVC.haveSpeakVolume
+        //背景音乐
+        controller.export.bgmModel =  recordScreenVC.bgmModel
+        controller.export.originSoundVolumn = recordScreenVC.originalVolume
+        controller.export.originSoundInRecordVolumn = recordScreenVC.originalVolume * 0.6
         controller.recordUid = recordUid
         controller.coverIV.image = recordScreenVC.itemModels.first?.coverImg
         navigationController?.pushViewController(controller, animated: true)