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)
}
}