处理空间相册筛选页面在选择资产之后的不进行隐藏的业务逻辑
This commit is contained in:
parent
b834ecf8dd
commit
22b946b41e
@ -14,10 +14,10 @@
|
|||||||
filePath = "SwiftProject/Project/Controller/CCHomeController.swift"
|
filePath = "SwiftProject/Project/Controller/CCHomeController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "495"
|
startingLineNumber = "502"
|
||||||
endingLineNumber = "495"
|
endingLineNumber = "502"
|
||||||
landmarkName = "CCHomeController"
|
landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)"
|
||||||
landmarkType = "21">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
<BreakpointProxy
|
<BreakpointProxy
|
||||||
@ -30,10 +30,10 @@
|
|||||||
filePath = "SwiftProject/Project/Controller/CCHomeController.swift"
|
filePath = "SwiftProject/Project/Controller/CCHomeController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "487"
|
startingLineNumber = "494"
|
||||||
endingLineNumber = "487"
|
endingLineNumber = "494"
|
||||||
landmarkName = "photoLibrary()"
|
landmarkName = "CCHomeController"
|
||||||
landmarkType = "7">
|
landmarkType = "21">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
<BreakpointProxy
|
<BreakpointProxy
|
||||||
@ -94,9 +94,9 @@
|
|||||||
filePath = "SwiftProject/Project/Controller/CCHomeController.swift"
|
filePath = "SwiftProject/Project/Controller/CCHomeController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "451"
|
startingLineNumber = "458"
|
||||||
endingLineNumber = "451"
|
endingLineNumber = "458"
|
||||||
landmarkName = "gotoPhotoTransformVC(data:url:asset:)"
|
landmarkName = "gotoVideoTransformVC(url:asset:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
@ -575,5 +575,53 @@
|
|||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "184677B1-247B-4BB5-8D53-06DC9DE818F4"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFliterPopView.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "213"
|
||||||
|
endingLineNumber = "213"
|
||||||
|
landmarkName = "hide()"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "20C43C8E-49D1-47F6-8C9E-05ABF9748606"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "SwiftProject/Project/View/MenuPop/CCPopMenuView.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "232"
|
||||||
|
endingLineNumber = "232"
|
||||||
|
landmarkName = "dismiss()"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "B6CB45F5-9412-4974-82AF-865A3BD603EB"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "SwiftProject/Project/View/Album/CCSpaceAlbumPopView.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "208"
|
||||||
|
endingLineNumber = "208"
|
||||||
|
landmarkName = "hide()"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
</Breakpoints>
|
</Breakpoints>
|
||||||
</Bucket>
|
</Bucket>
|
||||||
|
|||||||
@ -317,7 +317,7 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV
|
|||||||
//VR预览
|
//VR预览
|
||||||
|
|
||||||
let view = CCSpaceAlbumFilterPopView2.init(frame: CGRectMake(0, 0, KScreenWidth, KScreenHeight))
|
let view = CCSpaceAlbumFilterPopView2.init(frame: CGRectMake(0, 0, KScreenWidth, KScreenHeight))
|
||||||
KWindow?.addSubview(view)
|
self.view.addSubview(view)
|
||||||
view.show()
|
view.show()
|
||||||
|
|
||||||
//选择图片
|
//选择图片
|
||||||
@ -429,7 +429,7 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV
|
|||||||
extension CCHomeController: TZImagePickerControllerDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate{
|
extension CCHomeController: TZImagePickerControllerDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate{
|
||||||
|
|
||||||
func spaceAlbum() {
|
func spaceAlbum() {
|
||||||
KWindow?.addSubview(spaceAlbumPopView)
|
self.view.addSubview(spaceAlbumPopView)
|
||||||
spaceAlbumPopView.show()
|
spaceAlbumPopView.show()
|
||||||
|
|
||||||
//选择图片
|
//选择图片
|
||||||
|
|||||||
@ -553,7 +553,7 @@ class CCSpatialShootController: BaseController {
|
|||||||
@objc func albumButtonAction() {
|
@objc func albumButtonAction() {
|
||||||
// let vc:CCSpaceAlbumController = CCSpaceAlbumController()
|
// let vc:CCSpaceAlbumController = CCSpaceAlbumController()
|
||||||
// self.present(vc, animated: true, completion: nil)
|
// self.present(vc, animated: true, completion: nil)
|
||||||
KWindow?.addSubview(spaceAlbumPopView)
|
self.view.addSubview(spaceAlbumPopView)
|
||||||
spaceAlbumPopView.show()
|
spaceAlbumPopView.show()
|
||||||
|
|
||||||
//选择图片
|
//选择图片
|
||||||
|
|||||||
@ -378,13 +378,13 @@ extension CCSpaceAlbumFilterPopView2:UICollectionViewDataSource, UICollectionVie
|
|||||||
|
|
||||||
// 关闭
|
// 关闭
|
||||||
if Thread.isMainThread {
|
if Thread.isMainThread {
|
||||||
self.hide()
|
// self.hide()
|
||||||
if let imageData = imageData {
|
if let imageData = imageData {
|
||||||
self.selectedImageHandler?(imageData,asset)
|
self.selectedImageHandler?(imageData,asset)
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
self.hide()
|
// self.hide()
|
||||||
if let imageData = imageData {
|
if let imageData = imageData {
|
||||||
self.selectedImageHandler?(imageData,asset)
|
self.selectedImageHandler?(imageData,asset)
|
||||||
}
|
}
|
||||||
@ -395,12 +395,12 @@ extension CCSpaceAlbumFilterPopView2:UICollectionViewDataSource, UICollectionVie
|
|||||||
self.getVideoURL(from: asset) { url,avasset in
|
self.getVideoURL(from: asset) { url,avasset in
|
||||||
|
|
||||||
if Thread.isMainThread {
|
if Thread.isMainThread {
|
||||||
self.hide()
|
// self.hide()
|
||||||
self.selectedVideoHandler?(url,asset)
|
self.selectedVideoHandler?(url,asset)
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
self.hide()
|
// self.hide()
|
||||||
self.selectedVideoHandler?(url,asset)
|
self.selectedVideoHandler?(url,asset)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user