南鑫林 лет назад: 5
Родитель
Сommit
cc46e71391

+ 9 - 9
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FollowStatus/CommunityFollowStatusTableViewCell.swift

@@ -280,7 +280,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     
     private lazy var skittlesImageView: UIImageView = {
         let skittlesImageView = UIImageView()
-        skittlesImageView.image = kImage(name: "ico_bean_white")
+        skittlesImageView.image = kImage(name: "ico_bean_org_40px")
         skittlesImageView.cornerRadius = 8
         skittlesImageView.masksToBounds = true
         return skittlesImageView
@@ -335,8 +335,8 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
                 threeCardView.isHidden = true
                 
                 if communityFollowDataModel?.content?.beans == nil || communityFollowDataModel?.content?.beans ?? 0 <= 0 {
-                    skittlesImageView.isHidden = false
-                    skittlesTitleLabel.isHidden = false
+                    skittlesImageView.isHidden = true
+                    skittlesTitleLabel.isHidden = true
                 }else {
                     skittlesImageView.isHidden = false
                     skittlesTitleLabel.isHidden = false
@@ -361,8 +361,8 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
                 threeCardView.isHidden = false
                 
                 if communityFollowDataModel?.content?.beans == nil || communityFollowDataModel?.content?.beans ?? 0 <= 0 {
-                    skittlesImageView.isHidden = false
-                    skittlesTitleLabel.isHidden = false
+                    skittlesImageView.isHidden = true
+                    skittlesTitleLabel.isHidden = true
                 }else {
                     skittlesImageView.isHidden = false
                     skittlesTitleLabel.isHidden = false
@@ -386,8 +386,8 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
                 threeCardView.isHidden = false
                 
                 if communityFollowDataModel?.content?.beans == nil || communityFollowDataModel?.content?.beans ?? 0 <= 0 {
-                    skittlesImageView.isHidden = false
-                    skittlesTitleLabel.isHidden = false
+                    skittlesImageView.isHidden = true
+                    skittlesTitleLabel.isHidden = true
                 }else {
                     skittlesImageView.isHidden = false
                     skittlesTitleLabel.isHidden = false
@@ -411,8 +411,8 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
                 threeCardView.isHidden = false
                 
                 if communityFollowDataModel?.content?.beans == nil || communityFollowDataModel?.content?.beans ?? 0 <= 0 {
-                    skittlesImageView.isHidden = false
-                    skittlesTitleLabel.isHidden = false
+                    skittlesImageView.isHidden = true
+                    skittlesTitleLabel.isHidden = true
                 }else {
                     skittlesImageView.isHidden = false
                     skittlesTitleLabel.isHidden = false

+ 5 - 6
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/Controller/KSMediaPickerController.swift

@@ -6,6 +6,8 @@
 //
 
 import UIKit
+import Photos
+import JXSegmentedView
 
 open class KSNavigationController: UINavigationController {
     
@@ -15,9 +17,6 @@ open class KSNavigationController: UINavigationController {
     }
 }
 
-import Photos
-import JXSegmentedView
-
 @objc public protocol KSMediaPickerControllerDelegate: NSObjectProtocol {
     
     @objc optional func mediaPicker(_ mediaPicker: KSMediaPickerController, didFinishSelected outputArray: [KSMediaPickerOutputModel])
@@ -201,7 +200,7 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
         }
         let indexPath = (view as! KSMediaPickerView).collectionView.indexPath(for: collectionViewCell)
         if indexPath != nil {
-            _updateHighlightItem(at: indexPath!)
+            updateHighlightItem(at: indexPath!)
         }
         
         var selCount: UInt = 0
@@ -428,10 +427,10 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
     
     public func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         collectionView.deselectItem(at: indexPath, animated: true)
-        _updateHighlightItem(at: indexPath)
+        updateHighlightItem(at: indexPath)
     }
     
-    private func _updateHighlightItem(at indexPath: IndexPath) {
+    private func updateHighlightItem(at indexPath: IndexPath) {
         let view = self.view as! KSMediaPickerView
         guard indexPath != _highlightedItemIndexPath,
             let cell = view.collectionView.cellForItem(at: indexPath) as? KSMediaPickerViewImageCell,

+ 0 - 22
RainbowPlanet/RainbowPlanet/Supporting Files/CommunityModule.xcassets/ico_bean_white.imageset/Contents.json

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

BIN
RainbowPlanet/RainbowPlanet/Supporting Files/CommunityModule.xcassets/ico_bean_white.imageset/ico_bean_white@2x.png


BIN
RainbowPlanet/RainbowPlanet/Supporting Files/CommunityModule.xcassets/ico_bean_white.imageset/ico_bean_white@3x.png