diff --git a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj index d9cb803..a5292b4 100644 --- a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj +++ b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj @@ -287,6 +287,14 @@ path = CCSpatialVideoDisplayController; sourceTree = ""; }; + 009B28AE2BC2692F006D8B8E /* CCSpatialPhotoDisplayController */ = { + isa = PBXGroup; + children = ( + 1E1EA2872B9325D300A5D5D2 /* CCSpatialPhotoDisplayController.swift */, + ); + path = CCSpatialPhotoDisplayController; + sourceTree = ""; + }; 1E02C9302B89909000DD3143 /* DeviceOperation */ = { isa = PBXGroup; children = ( @@ -307,11 +315,11 @@ 1E39459C2B83837900D0F5CA /* RecordingVideo */ = { isa = PBXGroup; children = ( + 009B28AE2BC2692F006D8B8E /* CCSpatialPhotoDisplayController */, 009662582BB5527200FCA65F /* CCSpatialVideoDisplayController */, 1EE5C5F62B8F973A00EDFC2F /* CCSpatialShootController.swift */, 1E39459F2B8398B000D0F5CA /* VRVideoTransformController.swift */, 1EFAF0BF2B8B7A59002A1773 /* VRPhotoTransformController.swift */, - 1E1EA2872B9325D300A5D5D2 /* CCSpatialPhotoDisplayController.swift */, ); path = RecordingVideo; sourceTree = ""; diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 9ee078f..8d7948f 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 0e6f68c..4b893ad 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -457,54 +457,6 @@ landmarkType = "7"> - - - - - - - - - - diff --git a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift index 93a8042..58f5177 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift @@ -201,7 +201,7 @@ extension MembershipVC { let item2 = MemberShipModelItem(title: "$1.99/月", desc: "一月", rightDesc: "90%的人选择", isSelected: true, imageName_selected: NSLocalizedString("vip_product_month", comment: ""), imageName_unSelected: NSLocalizedString("vip_product_unselect_month", comment: ""), productIdentifier: MemberShipModelItem.getProductsIDs()[1]) arr.append(item2) - let item3 = MemberShipModelItem(title: "$9.99/年", desc: "一年", rightDesc: "50%的人选择", isSelected: false, imageName_selected: NSLocalizedString("vip_product_year", comment: ""), imageName_unSelected: NSLocalizedString("vip_product_unselect_year", comment: ""), productIdentifier: MemberShipModelItem.getProductsIDs()[1]) + let item3 = MemberShipModelItem(title: "$9.99/年", desc: "一年", rightDesc: "50%的人选择", isSelected: false, imageName_selected: NSLocalizedString("vip_product_year", comment: ""), imageName_unSelected: NSLocalizedString("vip_product_unselect_year", comment: ""), productIdentifier: MemberShipModelItem.getProductsIDs()[2]) arr.append(item3) // for i in 0 ..< 3 { diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift similarity index 100% rename from SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift rename to SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index 930fc82..c799341 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -130,7 +130,7 @@ class CCSpatialVideoDisplayController: BaseController { button.tag = 202 button.isSelected = false button.addTarget(self, action: #selector(navgationButtonClick2(sender:)), for: UIControl.Event.touchUpInside) - button.frame = CGRect(x: 2, y: 10, width: SCREEN_Width * 0.4, height: 36) + button.frame = CGRect(x: 2, y: 10, width: SCREEN_Width * 0.4 + 20, height: 36) button.centerY = StatuBar_Height + NavBar_Height * 0.5 button.centerX = SCREEN_Width * 0.5 button.clipsToBounds = true @@ -340,8 +340,6 @@ class CCSpatialVideoDisplayController: BaseController { playerController!.player!.allowsExternalPlayback = true //串流播放中 -// mTopCenterTypeButton.setTitle("串流播放中", for: UIControl.State.normal) - mTopCenterTypeButton.setImage(UIImage.init(named: "linked_button"), for: .normal) mTopCenterTypeButton.setTitleColor(UIColor(hexString: "#D0C0FF"), for: .normal) mTopCenterTypeButton.layer.borderColor = UIColor(hexString: "#D0C0FF").cgColor