|
@@ -108,13 +108,14 @@ class INPhotoVideosController: BFBaseViewController {
|
|
|
lazy var photoMaterialVc: BFPhotosMaterialController = {
|
|
|
let vc = BFPhotosMaterialController()
|
|
|
vc.maxChoseNum = maxMaterialNum
|
|
|
-// vc.msgType = .all
|
|
|
+ vc.msgType = .all
|
|
|
vc.showGIF = false
|
|
|
vc.view.backgroundColor = .black
|
|
|
vc.updateFrame(newFrame: CGRect(x: 0, y: navHeadImageView?.bottomY ?? 0, width: cScreenWidth, height: cScreenHeigth - cDevice_iPhoneTabBarHei - (navHeadImageView?.bottomY ?? 0)))
|
|
|
vc.selectedMaterialHandle = { [weak self] materialData, selectedPhotoData, _, _ in
|
|
|
self?.chosedAsset = selectedPhotoData
|
|
|
}
|
|
|
+
|
|
|
vc.detailMaterialHandle = { [weak self] _, currentMaterialData in
|
|
|
guard let wself = self else { return }
|
|
|
|
|
@@ -138,7 +139,13 @@ class INPhotoVideosController: BFBaseViewController {
|
|
|
currentMaterialData?.selectedIndex = (self?.chosedAsset?.count ?? 0) + 1
|
|
|
}
|
|
|
detailVc.materialData = currentMaterialData
|
|
|
- wself.navigationController?.pushViewController(detailVc, animated: true)
|
|
|
+// wself.navigationController?.pushViewController(detailVc, animated: true)
|
|
|
+ if let nav = wself.navigationController {
|
|
|
+ nav.pushViewController(detailVc, animated: true)
|
|
|
+ }else{
|
|
|
+ detailVc.modalPresentationStyle = .fullScreen
|
|
|
+ wself.present(detailVc, animated: true, completion: nil)
|
|
|
+ }
|
|
|
}
|
|
|
vc.emptyRefreshHandle = {[weak self] msgType in
|
|
|
if msgType == .image {
|
|
@@ -257,7 +264,17 @@ class INPhotoVideosController: BFBaseViewController {
|
|
|
//
|
|
|
if presentingViewController != nil {
|
|
|
nextBtnCallBack?(assets)
|
|
|
- dismiss(animated: true, completion: nil)
|
|
|
+ if self.presentedViewController is BFMaterialDetailController {
|
|
|
+ dismiss(animated: false) {[weak self] in
|
|
|
+ guard let wself = self else { return }
|
|
|
+
|
|
|
+ if wself.presentingViewController != nil{
|
|
|
+ wself.dismiss(animated: true, completion: nil)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ dismiss(animated: true, completion: nil)
|
|
|
+ }
|
|
|
}else {
|
|
|
let vc = INIntroduceController()
|
|
|
vc.assets = assets
|