From e2e16046ef765c0ad5e510621047a64c33a364f4 Mon Sep 17 00:00:00 2001 From: bluesea <307723040@qq.com> Date: Thu, 7 Mar 2024 09:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E7=A9=BA=E9=97=B4=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=ADimage=E7=9A=84=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=EF=BC=9B=202.=E5=8E=BB=E6=8E=89=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?playerlayer=E7=9A=84=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=EF=BC=9B=203.=E8=AE=BE=E7=BD=AE=E8=A7=86=E9=A2=91=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E7=95=8C=E9=9D=A2=E4=B8=AD=EF=BC=8C=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=A8=A1=E5=BC=8F=E5=90=8E=EF=BC=8C=E9=A1=B6?= =?UTF-8?q?=E9=83=A8=E7=9A=84=E6=96=87=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E8=AE=BE=E7=BD=AE=EF=BC=9B=204.=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=AA=92=E4=BD=93=E8=BF=87=E6=BB=A4=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E5=B7=A6=E4=B8=8A=E8=A7=92=E7=9A=84=E5=8F=96=E6=B6=88=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=96=87=E6=9C=AC=E9=A2=9C=E8=89=B2=E4=B8=8E=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E7=A8=BF=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecordingVideo/CCSpatialPhotoDisplayController.swift | 3 ++- .../RecordingVideo/CCSpatialVideoDisplayController.swift | 4 ++++ .../CCSpaceAlbumFliterPopView/CCSpaceAlbumFliterPopView.swift | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift index 349b897..03b2e5b 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift @@ -95,7 +95,8 @@ class CCSpatialPhotoDisplayController: BaseController { let imageView = UIImageView() imageView.frame = CGRect.init(x: 0, y: 250, width: self.view.frame.size.width, height: 240) imageView.contentMode = .scaleAspectFit - imageView.backgroundColor = UIColor.hexStringToColor(hexString: "#383739") +// imageView.backgroundColor = UIColor.hexStringToColor(hexString: "#383739") + imageView.backgroundColor = UIColor.clear // let image = UIImage(contentsOfFile: photoOriginalURL!.path) diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController.swift index 424ee70..30ad05c 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController.swift @@ -311,6 +311,7 @@ class CCSpatialVideoDisplayController: BaseController { let playerItem = AVPlayerItem(asset: videoTempAsset!) playerLay.player = AVPlayer(playerItem: playerItem) playerLay.player!.play() + playerLay.backgroundColor = UIColor.clear.cgColor } @@ -349,6 +350,9 @@ class CCSpatialVideoDisplayController: BaseController { print("block select \(index)") self?.mTopCenterTypeButton.setImage(UIImage.init(named: "type_button_arrow_down"), for: .normal) self?.selectedSpatialType(selectedIndex: index) + + let title = self?.typeData[index].title + self?.mTopCenterTypeButton.setTitle(title, for: UIControl.State.normal) } //tap diff --git a/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFliterPopView.swift b/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFliterPopView.swift index 7bf43c5..462c980 100644 --- a/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFliterPopView.swift +++ b/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFliterPopView.swift @@ -70,7 +70,8 @@ class CCSpaceAlbumFliterPopView: UIView { lazy var cancelButton: UIButton = { let button = UIButton.init() button.setTitle("取消", for: .normal) - button.setTitleColor(KMain_Color, for: .normal) +// button.setTitleColor(KMain_Color, for: .normal) + button.setTitleColor(UIColor(red: 165.0/255, green: 137.0/255, blue: 1, alpha: 1), for: .normal) button.titleLabel?.font = KFont_Medium(16) button.titleLabel?.adjustsFontSizeToFitWidth = true button.contentHorizontalAlignment = .center