Merge branch 'develop' into feature/jeremy

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift

@@ -256,7 +256,7 @@ extension CommunityVideoListController {
     }
     
     func playFirstVideoWhenViewDidAppeared() {
-        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(0.2 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)) { () -> Void in
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(0.4 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)) { () -> Void in
             let showCells = self.collectionView.visibleCells
             for tmpCell in showCells {
                 let videoCell = tmpCell as? CommunityVideoCoverCollectionCell

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/Controller/PublishEditController.swift

@@ -29,8 +29,6 @@ class PublishEditController: BaseViewController {
         }
     }
     
-    var majorImageUrl: String?
-    var imageUrlArray: Array<String> = []
     var imageArr: Array<UIImage>?
     
     // 选中的话题
@@ -45,10 +43,6 @@ class PublishEditController: BaseViewController {
     var pubContent: String = ""
     // 位置
     var locationStr: String = ""
-    // 视频id，当type为video时必填
-    var paraVideo: String = ""
-    
-    var uploadManager: AlivcShortVideoUploadManager?
     
     // MARK: 控制器生命周期
     override func viewDidLoad() {
@@ -56,8 +50,6 @@ class PublishEditController: BaseViewController {
         setupViews()
         setupData()
         
-        // imageUrlArray每次进入页面需置空
-        imageUrlArray = []
 //        rightButton.backgroundColor = kd8d8d8Color
         rightButton.backgroundColor = k62CC74Color
     }
@@ -151,12 +143,11 @@ extension PublishEditController : UITableViewDelegate, UITableViewDataSource {
             picCell.reloadData()
             picCell.choosePicBlock = {
                 [weak self] in
-                print("\n----选取图片")
+                self?.navigationController?.popViewController(animated: false)
             }
             picCell.delPicTransBlock = {
                 [weak self] (picIdx) in
                 self?.imageArr?.remove(at: picIdx!)
-                self?.imageUrlArray.remove(at: picIdx!)
                 self?.tableView.reloadData()
             }
             return picCell

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishManager/PublishUploadManager.swift

@@ -155,6 +155,12 @@ extension PublishUploadManager {
         SwiftMoyaNetWorkServiceConfig.shared().configUploadSingleImgWithoutHudApi(imageArray: [self.imageArr![totalTimes]]) {
             [weak self] (imgUrl) -> (Void) in
             let urlStr: String = imgUrl as! String
+            
+//            let curImage: UIImage = self!.imageArr![totalTimes]
+//            let imgWidth  = curImage.size.width
+//            let imgHeight = curImage.size.height
+//            urlStr = String(format: "%@?%f_%f", urlStr, imgWidth, imgHeight)
+            
             self?.imageUrlArray.append(urlStr)
             if curTimes == 0 {
                 // 设置主图
@@ -228,8 +234,8 @@ extension PublishUploadManager {
         
         print("\n----------发布成功！！！！！")
         isPublishFinished = true
-//        progressView?.hide()
+        progressView?.hide()
         
-        progressView?.curUploadStatus = UploadStatus.failure
+//        progressView?.curUploadStatus = UploadStatus.failure
     }
 }