From 22b946b41ecac484aa5355dbbec4c244cbe9e28f Mon Sep 17 00:00:00 2001 From: bluesea <307723040@qq.com> Date: Fri, 22 Mar 2024 21:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A9=BA=E9=97=B4=E7=9B=B8?= =?UTF-8?q?=E5=86=8C=E7=AD=9B=E9=80=89=E9=A1=B5=E9=9D=A2=E5=9C=A8=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=B5=84=E4=BA=A7=E4=B9=8B=E5=90=8E=E7=9A=84=E4=B8=8D?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=9A=90=E8=97=8F=E7=9A=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcdebugger/Breakpoints_v2.xcbkptlist | 70 ++++++++++++++++--- .../Project/Controller/CCHomeController.swift | 4 +- .../CCSpatialShootController.swift | 2 +- .../CCSpaceAlbumFilterPopView2.swift | 8 +-- 4 files changed, 66 insertions(+), 18 deletions(-) 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 64dcf29..22066e0 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -14,10 +14,10 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "495" - endingLineNumber = "495" - landmarkName = "CCHomeController" - landmarkType = "21"> + startingLineNumber = "502" + endingLineNumber = "502" + landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)" + landmarkType = "7"> + startingLineNumber = "494" + endingLineNumber = "494" + landmarkName = "CCHomeController" + landmarkType = "21"> @@ -575,5 +575,53 @@ landmarkType = "7"> + + + + + + + + + + + + diff --git a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift index d76577a..cef6f38 100644 --- a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift @@ -317,7 +317,7 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV //VR预览 let view = CCSpaceAlbumFilterPopView2.init(frame: CGRectMake(0, 0, KScreenWidth, KScreenHeight)) - KWindow?.addSubview(view) + self.view.addSubview(view) view.show() //选择图片 @@ -429,7 +429,7 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV extension CCHomeController: TZImagePickerControllerDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate{ func spaceAlbum() { - KWindow?.addSubview(spaceAlbumPopView) + self.view.addSubview(spaceAlbumPopView) spaceAlbumPopView.show() //选择图片 diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift index 3307c7f..023f302 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift @@ -553,7 +553,7 @@ class CCSpatialShootController: BaseController { @objc func albumButtonAction() { // let vc:CCSpaceAlbumController = CCSpaceAlbumController() // self.present(vc, animated: true, completion: nil) - KWindow?.addSubview(spaceAlbumPopView) + self.view.addSubview(spaceAlbumPopView) spaceAlbumPopView.show() //选择图片 diff --git a/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift b/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift index e71e989..7a74b04 100644 --- a/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift +++ b/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift @@ -378,13 +378,13 @@ extension CCSpaceAlbumFilterPopView2:UICollectionViewDataSource, UICollectionVie // 关闭 if Thread.isMainThread { - self.hide() +// self.hide() if let imageData = imageData { self.selectedImageHandler?(imageData,asset) } }else{ DispatchQueue.main.async { - self.hide() +// self.hide() if let imageData = imageData { self.selectedImageHandler?(imageData,asset) } @@ -395,12 +395,12 @@ extension CCSpaceAlbumFilterPopView2:UICollectionViewDataSource, UICollectionVie self.getVideoURL(from: asset) { url,avasset in if Thread.isMainThread { - self.hide() +// self.hide() self.selectedVideoHandler?(url,asset) }else{ DispatchQueue.main.async { - self.hide() +// self.hide() self.selectedVideoHandler?(url,asset) } }