Chris 5 vuotta sitten
vanhempi
commit
4744db9dac

+ 16 - 16
RainbowPlanet/Podfile.lock

@@ -15,12 +15,12 @@ PODS:
   - AFNetworking/UIKit (3.2.1):
     - AFNetworking/NSURLSession
   - Alamofire (4.8.2)
-  - AlivcConan (0.9.4):
-    - AlivcConan/AlivcConan (= 0.9.4)
-  - AlivcConan/AlivcConan (0.9.4)
+  - AlivcConan (0.9.5):
+    - AlivcConan/AlivcConan (= 0.9.5)
+  - AlivcConan/AlivcConan (0.9.5)
   - AliyunOSSiOS (2.10.7)
-  - AliyunVideoSDKStd (3.10.0)
-  - BaiduMapKit (4.3.2)
+  - AliyunVideoSDKStd (3.10.5)
+  - BaiduMapKit (4.4.0)
   - BMKLocationKit (1.5.0)
   - Cache (5.2.0)
   - DeviceKit (2.0.0)
@@ -34,10 +34,10 @@ PODS:
     - SnapKit
   - IQKeyboardManagerSwift (6.4.0)
   - JSONModel (1.7.0)
-  - JXSegmentedView (0.0.18)
+  - JXSegmentedView (0.0.19)
   - KeychainAccess (3.2.0)
   - Kingfisher (4.10.1)
-  - LYEmptyView (1.2.3)
+  - LYEmptyView (1.2.4)
   - MBProgressHUD (1.1.0)
   - MJRefresh (3.2.0)
   - Moya/Core (13.0.1):
@@ -46,10 +46,10 @@ PODS:
   - Moya/RxSwift (13.0.1):
     - Moya/Core
     - RxSwift (~> 4.0)
-  - ObjectMapper (3.5.0)
+  - ObjectMapper (3.5.1)
   - pop (1.0.12)
   - PPBadgeViewSwift (3.1.0)
-  - QuCore-ThirdParty (3.8.0)
+  - QuCore-ThirdParty (3.10.0)
   - Result (4.1.0)
   - RxCocoa (4.5.0):
     - RxSwift (>= 4.4.2, ~> 4.4)
@@ -179,10 +179,10 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
   Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
-  AlivcConan: f75de70ee0c260cfcfc7885a7ee9c1efb877c974
+  AlivcConan: 9dccc32986024768bb5f50e14ad54490123903c7
   AliyunOSSiOS: 602b6a4e70e62a5f0a6431c20496343141d7e66f
-  AliyunVideoSDKStd: 78851704275fb308448d30c0225ee65b2309cfc7
-  BaiduMapKit: a5d9580553355d39a91b24c5eb91ebf298c64038
+  AliyunVideoSDKStd: dce7bdd2d7fb0e8f6960ce0b94533ae50c068468
+  BaiduMapKit: 19a568e238d6d5a91b93daf7819b868d39cb2206
   BMKLocationKit: 40d267478acd8704ddebd0e9deaddc727b13df9f
   Cache: 807c5d86d01a177f06ede9865add3aea269bbfd4
   DeviceKit: 72d36709552d4b3582abd76a53949148acad9811
@@ -193,17 +193,17 @@ SPEC CHECKSUMS:
   FWPopupView: c1dbb33fbe4d223f619f28a7e5e5a00f08c10342
   IQKeyboardManagerSwift: ed9b04ee0e3067ffba543283462d619f944b05e5
   JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d
-  JXSegmentedView: 2358f1335409659c7e7e79d6ff7532c014e21fe1
+  JXSegmentedView: 6e22381bd1e6f0767fc078bef1947b13b2d337a1
   KeychainAccess: 3b1bf8a77eb4c6ea1ce9404c292e48f948954c6b
   Kingfisher: c148cd7b47ebde9989f6bc7c27dcaa79d81279a0
-  LYEmptyView: ea5827f3f81fcbec427f990005501991477bdae8
+  LYEmptyView: 38491c9e22775da8870f5e29a37f9eb5116533b7
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   Moya: f4a4b80ff2f8a4ffc208dfb31cd91636622fee6e
-  ObjectMapper: 078b564ed25c6578b62588e306bf1da3924636d4
+  ObjectMapper: 70187b8941977c62ccfb423caf6b50be405cabf0
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
   PPBadgeViewSwift: 18a219a9897f418342c22dd1a54f7b18ac56546b
-  QuCore-ThirdParty: 4856aa9d5b642fc6ae9375c5c8f9c760f5051142
+  QuCore-ThirdParty: 60a6f08864631569569fa1e2c6208a7746698923
   Result: bd966fac789cc6c1563440b348ab2598cc24d5c7
   RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
   RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575

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

@@ -76,6 +76,7 @@ extension PublishEditController : UITableViewDelegate, UITableViewDataSource {
         switch indexPath.row {
         case 0:
             let picCell = PublishEditAddPicCell.cellWith(tableView: tableView, indexPath: indexPath)
+            picCell.pubImageArr = imageArr
             return picCell
         case 1:
             let titleCell = PublishEditTitleCell.cellWith(tableView: tableView, indexPath: indexPath)

+ 3 - 3
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/View/PublishEditAddPicCell.swift

@@ -19,9 +19,9 @@ class PublishEditAddPicCell: UITableViewCell {
     var delPicTransBlock : DelPicTransBlock?
     
     var imgCount: Int = 0
-    var goodsImageArr: Array<UIImage>? {
+    var pubImageArr: Array<UIImage>? {
         didSet {
-            imgCount = self.goodsImageArr?.count ?? 0
+            imgCount = self.pubImageArr?.count ?? 0
         }
     }
     
@@ -110,7 +110,7 @@ extension PublishEditAddPicCell: UICollectionViewDelegateFlowLayout,UICollection
             // 展示图片
             let pCell = PublishEditAddImgCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
             if indexPath.row < imgCount {
-                pCell.showImage = self.goodsImageArr![indexPath.row]
+                pCell.showImage = self.pubImageArr![indexPath.row]
             }
             pCell.delPicBlock = {
                 [weak self] (idxRow) in