Преглед изворни кода

pod 'Kingfisher', '~> 5.7.1'

南鑫林 пре 5 година
родитељ
комит
aae2f2df5b

+ 1 - 1
RainbowPlanet/NotificationService/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>17</string>
+	<string>${CURRENT_PROJECT_VERSION}</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

+ 1 - 1
RainbowPlanet/Podfile

@@ -19,7 +19,7 @@ target 'RainbowPlanet' do
   pod 'Cache'
   pod 'FMDB'
   # 图片加载
-  pod 'Kingfisher'
+  pod 'Kingfisher', '~> 5.7.1'
   # gif动画
 #  pod 'Gifu'
   # josn动画

+ 6 - 8
RainbowPlanet/Podfile.lock

@@ -48,10 +48,8 @@ PODS:
   - JSONModel (1.7.0)
   - JXPagingView/Paging (1.1.18)
   - JXSegmentedView (1.0.0)
-  - KeychainAccess (3.2.0)
-  - Kingfisher (5.8.3):
-    - Kingfisher/Core (= 5.8.3)
-  - Kingfisher/Core (5.8.3)
+  - KeychainAccess (3.2.1)
+  - Kingfisher (5.7.1)
   - lottie-ios (3.1.3)
   - LYEmptyView (1.3.1)
   - Masonry (1.1.0)
@@ -131,7 +129,7 @@ DEPENDENCIES:
   - JXPagingView/Paging
   - JXSegmentedView
   - KeychainAccess
-  - Kingfisher
+  - Kingfisher (~> 5.7.1)
   - lottie-ios
   - LYEmptyView
   - Masonry
@@ -241,8 +239,8 @@ SPEC CHECKSUMS:
   JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d
   JXPagingView: 34bc70f962404e1a0b092ef643e5ccf6882119b2
   JXSegmentedView: 257773dde0c65f86c9d873c5cf93d15c76e170cc
-  KeychainAccess: 3b1bf8a77eb4c6ea1ce9404c292e48f948954c6b
-  Kingfisher: b7e4cb65ff24c264bd2a1284b75b974d907afd94
+  KeychainAccess: d5470352939ced6d6f7fb51cb2e67aae51fc294f
+  Kingfisher: 176d377ad339113c99ad4980cbae687f807e20fe
   lottie-ios: 496ac5cea1bbf1a7bd1f1f472f3232eb1b8d744b
   LYEmptyView: b6d418cfa38b78df0cf243f9a9c25ccbdc399922
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
@@ -272,6 +270,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: 8a3b411d851fed0a44acd1ee7cd403aafed9cb8b
+PODFILE CHECKSUM: c6b8869b909c4599d66ad5baf9af737dfa21e983
 
 COCOAPODS: 1.8.3

+ 0 - 1
RainbowPlanet/RainbowPlanet/Model/UserModel/UserModel.swift

@@ -190,7 +190,6 @@ public class UserModel : NSObject, NSCoding, Mappable{
         UserDefaults.standard.removeObject(forKey: "UserModel")
         MessageIndexModel.shared.removeObject()
         //清除缓存
-        
         KingfisherManager.shared.cache.clearDiskCache()
     }
     

+ 1 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoCollectionViewCell.swift

@@ -67,8 +67,7 @@ class CardContentPicVideoCollectionViewCell: UICollectionViewCell {
     
     var imgStr: String? {
         didSet {
-            let imageResource = ImageResource(downloadURL: kURLThumbnailsImage(name: imgStr ?? "",size: self.size)!)
-            iconImageView.kf.setImage(with: imageResource, placeholder: kImage(name: "default_pic"))
+            iconImageView.kf.setImage(with: kURLThumbnailsImage(name: imgStr ?? "",size: self.size)!, placeholder: kImage(name: "default_pic"))
         }
     }