浏览代码

相册btn && uifixed

Chris 5 年之前
父节点
当前提交
8bc87c83b9

+ 2 - 2
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/Controller/AliyunEditViewController.m

@@ -283,8 +283,8 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     self.playSlider.minimumTrackTintColor = [UIColor whiteColor];
     self.playSlider.maximumTrackTintColor = rgba(0, 0, 0, 0.3);
     //
-    [self.playSlider setThumbImage:[UIImage imageNamed:@"edit_topic_delete"] forState:UIControlStateNormal];
-    [self.playSlider setThumbImage:[UIImage imageNamed:@"edit_topic_delete"] forState:UIControlStateHighlighted];
+    [self.playSlider setThumbImage:[UIImage imageNamed:@"music_btn_dot"] forState:UIControlStateNormal];
+    [self.playSlider setThumbImage:[UIImage imageNamed:@"music_btn_dot"] forState:UIControlStateHighlighted];
     [self.view addSubview:_playSlider];
 }
 

+ 27 - 2
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/Controller/KSMediaPickerController.swift

@@ -46,6 +46,8 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
     @objc public let mediaType: KSMediaPickerController.mediaType
     @objc open weak var delegate: KSMediaPickerControllerDelegate?
     
+    var curSelectCount: UInt = 0
+    
     /// 限制单一媒体类型混合显示构造函数,此函数为指定初始化器
     ///
     /// - Parameters:
@@ -198,13 +200,36 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
             _updateHighlightItem(at: indexPath!)
         }
         
+        var selCount: UInt = 0
+        var maxCount: UInt = 0
+        let assetMediaType = itemModel.asset.mediaType
+        if assetMediaType == .video {
+            maxCount = 1
+        } else if assetMediaType == .image {
+            maxCount = 9
+        }
+        
         if itemModel.index > 0 {
-            return _remove(itemModel: itemModel)
+            selCount = _remove(itemModel: itemModel)
+            curSelectCount -= 1
         } else {
-            return _add(itemModel: itemModel)
+            selCount = _add(itemModel: itemModel)
+            curSelectCount = selCount
         }
+        
+        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)
+    }
     
     private func _update(asset: PHAsset) {
         _updateHighlightedItemStatus()

+ 4 - 4
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/View/KSMediaPickerNavigationView.swift

@@ -18,9 +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(.ks_wordMain, for: .normal)
-            nextButton.setTitleColor(.ks_wordMain_2, for: .disabled)
+            nextButton.setTitle("完成(0/0)", for: .normal)
+            nextButton.setTitleColor(k333333Color, for: .normal)
+            nextButton.setTitleColor(k999999Color, for: .disabled)
             return nextButton
         }()
         
@@ -46,7 +46,7 @@ extension KSMediaPickerView {
             let viewY = UIView.statusBarSize.height
             let viewH = windowSize.height-viewY
             var viewW = viewH+30.0
-            closeButton.frame = CGRect(x: viewX, y: viewY, width: viewW, height: viewH)
+            closeButton.frame = CGRect(x: 5, y: viewY, width: 40, height: 44)
             
             viewW = nextButton.sizeThatFits(windowSize).width+30.0
             viewX = windowWidth-viewW

+ 22 - 0
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/music_btn_dot.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "music_btn_dot@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "music_btn_dot@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

二进制
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/music_btn_dot.imageset/music_btn_dot@2x.png


二进制
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/music_btn_dot.imageset/music_btn_dot@3x.png