Merge branch 'develop' into feature/publishNew

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/Controller/KSMediaPickerController.swift

@@ -265,6 +265,12 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
         }
         
         var selCount: UInt = 0
+        var maxCount : UInt?
+        if itemModel.asset.mediaType == .video {
+            maxCount = maxVideoItemCount
+        }else {
+            maxCount = maxPictureItemCount
+        }
         if itemModel.index > 0 {
             selCount = _remove(itemModel: itemModel)
             curSelectCount -= 1
@@ -273,17 +279,17 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
             curSelectCount = UInt(_selectedAssetArray.count)
         }
         (view as! KSMediaPickerView).albumTableView.reloadRows(at: [IndexPath(row: 0, section: 0)], with: UITableView.RowAnimation.none)
-//        updateFinishBtnStatus(curSelectCount, maxCount)
+        updateFinishBtnStatus(curSelectCount, maxCount!)
         
         return selCount
     }
     
     // 更新
     func updateFinishBtnStatus(_ selCount: UInt, _ maxCount: UInt) {
-//        let showMaxCount = selCount == 0 ? 0 : maxCount
-//        let view = self.view as! KSMediaPickerView
-//        let nav = view.albumNavigationView
-//        nav.nextButton.setTitle("完成(\(selCount)/\(showMaxCount))", for: .normal)
+        let showMaxCount = selCount == 0 ? 0 : maxCount
+        let view = self.view as! KSMediaPickerView
+        let nav = view.albumNavigationView
+        nav.nextButton.setTitle("完成(\(selCount)/\(showMaxCount))", for: .normal)
     }
     
     private func _update(asset: PHAsset) {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/View/KSMediaPickerNavigationView.swift

@@ -18,13 +18,9 @@ extension KSMediaPickerView {
         public let nextButton = {() -> UIButton in
             let nextButton = UIButton(type: .custom)
             nextButton.titleLabel?.font = .systemFont(ofSize: 14.0)
-            nextButton.setTitle("下一步", for: .normal)
-            nextButton.setTitleColor(kEnabledTitleColor, for: .normal)
-             nextButton.setTitleColor(kEnabledTitleColor, for: .disabled)
-            nextButton.setBackgroundImage(UIImage.imageWithColor(color: kDisabledButtonColor), for: .disabled)
-            nextButton.setBackgroundImage(UIImage.imageWithColor(color: kEnabledButtonColor), for: .normal)
-            nextButton.cornerRadius = 13
-            nextButton.masksToBounds = true
+            nextButton.setTitle("完成", for: .normal)
+            nextButton.setTitleColor(kThemeColor, for: .normal)
+            nextButton.setTitleColor(k999999Color, for: .disabled)
             return nextButton
         }()
         
@@ -56,8 +52,7 @@ extension KSMediaPickerView {
             nextButton.snp.makeConstraints { (make) in
                 make.right.equalTo(-14)
                 make.centerY.equalTo(closeButton)
-                make.width.equalTo(64)
-                make.height.equalTo(26)
+
             }
             centerButton.snp.makeConstraints { (make) in
                 make.centerY.equalTo(closeButton)