Ver código fonte

修复了视频不能删除的问题

南鑫林 5 anos atrás
pai
commit
d45cbe0256

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishTopicItemCell.swift

@@ -67,8 +67,8 @@ class PublishTopicItemCell: UITableViewCell {
         titleLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalTo(14)
-            make.width.lessThanOrEqualTo(225 * kScaleWidth)
             make.height.equalTo(21)
+            make.right.lessThanOrEqualTo(joinLabel.snp.left).offset(-15)
         }
         joinLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()

+ 1 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/Controller/PublishEditController.swift

@@ -144,6 +144,7 @@ extension PublishEditController : UITableViewDelegate, UITableViewDataSource {
         case 0:
             let picCell = PublishEditAddPicCell.cellWith(tableView: tableView, indexPath: indexPath)
             picCell.pubImageArr = imageArr
+            picCell.mediaType = mediaType
             if mediaType == .video {
                 picCell.maxImageCount = 1
             }

+ 10 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditAddImgCollectionCell.swift

@@ -13,6 +13,16 @@ class PublishEditAddImgCollectionCell: UICollectionViewCell {
     
     let disposeBag = DisposeBag()
     
+    var mediaType : PublishMediaType? {
+        didSet {
+            if mediaType == .video {
+                delButton.isHidden = true
+            }else {
+                delButton.isHidden = false
+            }
+        }
+    }
+    
     var showImage: UIImage? {
         didSet {
             if self.showImage != nil {

+ 4 - 5
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditAddPicCell.swift

@@ -18,6 +18,9 @@ class PublishEditAddPicCell: UITableViewCell {
     typealias DelPicTransBlock = (_ idxRow:Int?) -> Void
     var delPicTransBlock : DelPicTransBlock?
     
+    var mediaType : PublishMediaType?
+    
+    
     var imgCount: Int = 0
     var pubImageArr: Array<UIImage>? {
         didSet {
@@ -111,16 +114,12 @@ extension PublishEditAddPicCell: UICollectionViewDelegateFlowLayout,UICollection
         } else {
             // 展示图片
             let pCell = PublishEditAddImgCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+            pCell.mediaType = mediaType
             if indexPath.row < imgCount {
                 pCell.showImage = self.pubImageArr![indexPath.row]
             }
             pCell.delPicBlock = {
                 [weak self] (idxRow) in
-//                if self?.imgCount == 1 {
-//                    SwiftProgressHUD.shared().showText("请保留至少1张图片")
-//                    return
-//                }
-                
                 if let delPicTransBlock = self?.delPicTransBlock {
                     delPicTransBlock(idxRow)
                 }