Commit 9b23744d authored by CZ1004's avatar CZ1004

【修复】闪退BUG

parent 36283345
...@@ -354,8 +354,8 @@ class HomePhotosDetailViewController : BaseViewController { ...@@ -354,8 +354,8 @@ class HomePhotosDetailViewController : BaseViewController {
DispatchQueue.main.async { DispatchQueue.main.async {
self.collectionView.reloadData() self.collectionView.reloadData()
} }
self.setDefaultPage()
} }
addTrashView()
} }
......
...@@ -326,8 +326,8 @@ class HomeVideoDetailController :BaseViewController { ...@@ -326,8 +326,8 @@ class HomeVideoDetailController :BaseViewController {
DispatchQueue.main.async { DispatchQueue.main.async {
self.collectionView.reloadData() self.collectionView.reloadData()
} }
self.setDefaultPage()
} }
addTrashView()
} }
func showTipsVC(){ func showTipsVC(){
......
...@@ -20,7 +20,7 @@ class SecretShowImgDetailView: UIView { ...@@ -20,7 +20,7 @@ class SecretShowImgDetailView: UIView {
make.left.top.bottom.equalToSuperview().inset(16) make.left.top.bottom.equalToSuperview().inset(16)
make.right.equalTo(self.snp.centerX).offset(-7.5) make.right.equalTo(self.snp.centerX).offset(-7.5)
} }
delBtn.snp.makeConstraints { make in self.delBtn.snp.makeConstraints { make in
make.right.top.bottom.equalToSuperview().inset(16) make.right.top.bottom.equalToSuperview().inset(16)
make.left.equalTo(self.snp.centerX).offset(7.5) make.left.equalTo(self.snp.centerX).offset(7.5)
} }
......
...@@ -15,7 +15,16 @@ class TrashViewController: BaseViewController { ...@@ -15,7 +15,16 @@ class TrashViewController: BaseViewController {
var source:[TrashTypeEnum] = [.video,.other,.shot] var source:[TrashTypeEnum] = [.video,.other,.shot]
var contentH:CGFloat = 0 var contentH:CGFloat = 0
var contentScrollView:UIScrollView! var contentScrollView:UIScrollView!
var delBtn:UIButton! lazy var delBtn : UIButton = {
let button = UIButton()
button.setTitle("Delete", for: .normal)
button.setTitleColor(.white, for: .normal)
button.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .semibold)
button.backgroundColor = UIColor.colorWithHex(hexStr: "#0082FF")
button.layer.cornerRadius = 20
button.addTarget(self, action: #selector(delBtnAction), for: .touchUpInside)
return button
}()
var currentType:TrashTypeEnum = .other var currentType:TrashTypeEnum = .other
let pageCount = 3 // 总页数 let pageCount = 3 // 总页数
...@@ -70,16 +79,10 @@ class TrashViewController: BaseViewController { ...@@ -70,16 +79,10 @@ class TrashViewController: BaseViewController {
contentScrollView.backgroundColor = UIColor.white contentScrollView.backgroundColor = UIColor.white
view.addSubview(contentScrollView) view.addSubview(contentScrollView)
delBtn = UIButton()
delBtn.setTitle("Delete", for: .normal)
delBtn.setTitleColor(.white, for: .normal)
delBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .semibold)
delBtn.backgroundColor = UIColor.colorWithHex(hexStr: "#0082FF")
delBtn.layer.cornerRadius = 20
delBtn.addTarget(self, action: #selector(delBtnAction), for: .touchUpInside)
view.addSubview(delBtn)
delBtn.snp.makeConstraints { make in view.addSubview(self.delBtn)
self.delBtn.snp.makeConstraints { make in
make.bottom.equalTo(-17) make.bottom.equalTo(-17)
make.left.right.equalToSuperview().inset(55) make.left.right.equalToSuperview().inset(55)
make.height.equalTo(40) make.height.equalTo(40)
...@@ -100,9 +103,9 @@ class TrashViewController: BaseViewController { ...@@ -100,9 +103,9 @@ class TrashViewController: BaseViewController {
contentScrollView.addSubview(shotView) contentScrollView.addSubview(shotView)
videoView.deleteButton = delBtn videoView.deleteButton = self.delBtn
otherView.deleteButton = delBtn otherView.deleteButton = self.delBtn
shotView.deleteButton = delBtn shotView.deleteButton = self.delBtn
} }
override func viewWillLayoutSubviews() { override func viewWillLayoutSubviews() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment