From c097a269950ba9ba255b8fc2d72d71852cfe0e53 Mon Sep 17 00:00:00 2001
From: bluesea <307723040@qq.com>
Date: Thu, 7 Mar 2024 13:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=AC=E7=A0=81=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SwiftProject/CCKit/Config/CCEnumFile.swift |  4 ++++
 .../VRPhotoTransformController.swift           | 18 ++++++++----------
 .../VRVideoTransformController.swift           |  3 ++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/SwiftProject/SwiftProject/CCKit/Config/CCEnumFile.swift b/SwiftProject/SwiftProject/CCKit/Config/CCEnumFile.swift
index 55dc8c6..ad8503b 100644
--- a/SwiftProject/SwiftProject/CCKit/Config/CCEnumFile.swift
+++ b/SwiftProject/SwiftProject/CCKit/Config/CCEnumFile.swift
@@ -37,4 +37,8 @@ enum CCTransformParameterType : Int
     case bitRate = 3 //比特率
     case formatVideoEncoding = 4//视频编码格式
     case horizontalDialogueAdjustment = 5//水平视差调整
+    case hsbs_3D = 6 //hsbs格式 半宽左右格式
+    case fsbs_3D = 7 //fsbs格式 全宽左右格式
+    case hou_3d = 8 //hou格式 半高上下格式
+    case fou_3D = 9 //fou格式 全高上下格式
 }
diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRPhotoTransformController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRPhotoTransformController.swift
index c69dba5..6162fe9 100644
--- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRPhotoTransformController.swift
+++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRPhotoTransformController.swift
@@ -204,11 +204,7 @@ class VRPhotoTransformController: BaseController {
     
     func setSpatialParametersListData() {
         let popData = [
-            (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D HSBS")/*,
-                                                                                  (type:CCTransformParameterType.resolution,title:"分辨率",name:"1080P"),
-                                                                                  (type:CCTransformParameterType.bitRate,title:"比特率",name:"最佳"),
-                                                                                  (type:CCTransformParameterType.formatVideoEncoding,title:"视频编码格式",name:"H.265"),
-                                                                                  (type:CCTransformParameterType.horizontalDialogueAdjustment,title:"水平视差调整",name:"0")*/]
+            (type:CCTransformParameterType.hsbs_3D,title:"3D 格式",name:"3D HSBS")]
         
         mTabView?.setSpatialParametersData(data: popData)
     }
@@ -250,7 +246,9 @@ class VRPhotoTransformController: BaseController {
         switch model.type {
         case .format3D:
             print("3D 格式")
-            
+       
+        case .hsbs_3D ,.fsbs_3D,.hou_3d,.fou_3D:
+            print("3D 格式")
             /*
              3D HSBS（半宽左右格式）
              3D FSBS（全款左右格式）
@@ -262,25 +260,25 @@ class VRPhotoTransformController: BaseController {
                 print("3D HSBS（半宽左右格式）")
                 
                 let popData = [
-                    (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D HSBS")]
+                    (type:CCTransformParameterType.hsbs_3D,title:"3D 格式",name:"3D HSBS")]
                 mTabView?.setSpatialParametersData(data: popData)
             }
             let action2 = UIAlertAction(title: "3D FSBS（全宽左右格式）" , style: .default) { [self] (action:UIAlertAction) in
                 print("3D FSBS（全宽左右格式）")
                 let popData = [
-                    (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D FSBS")]
+                    (type:CCTransformParameterType.fsbs_3D,title:"3D 格式",name:"3D FSBS")]
                 mTabView?.setSpatialParametersData(data: popData)
             }
             let action3 = UIAlertAction(title: "3D HOU（半高上下格式）" , style: .default) { [self] (action:UIAlertAction) in
                 print("3D HOU（半高上下格式）")
                 let popData = [
-                    (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D HOU")]
+                    (type:CCTransformParameterType.hou_3d,title:"3D 格式",name:"3D HOU")]
                 mTabView?.setSpatialParametersData(data: popData)
             }
             let action4 = UIAlertAction(title: "3D FOU（全高上下格式）" , style: .default) { [self] (action:UIAlertAction) in
                 print("3D FOU（全高上下格式）")
                 let popData = [
-                    (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D FOU")]
+                    (type:CCTransformParameterType.fou_3D,title:"3D 格式",name:"3D FOU")]
                 mTabView?.setSpatialParametersData(data: popData)
             }
             
diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift
index e34218b..c5153ec 100644
--- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift
+++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift
@@ -404,7 +404,8 @@ class VRVideoTransformController: BaseController {
         switch model.type {
         case .format3D:
             print("3D 格式")
-            
+        case .hsbs_3D ,.fsbs_3D,.hou_3d,.fou_3D:
+            print("3D 格式")
             /*
              3D HSBS（半宽左右格式）
              3D FSBS（全款左右格式）