Parcourir la source

查看图片完成

南鑫林 il y a 5 ans
Parent
commit
a7fff11ed4
16 fichiers modifiés avec 53 ajouts et 2 suppressions
  1. 1 1
      RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj
  2. 52 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoTableViewCell.swift
  3. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaBannerCollectionViewCell.swift
  4. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaBannerTableViewCell.swift
  5. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaFSPagerViewCell.swift
  6. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorCell/RedemptionAreaFloorTableViewCell.swift
  7. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorCell/RedemptionAreaProductCollectionViewCell.swift
  8. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorHeader/FloorHeaderViewFloorHeaderView.swift
  9. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/RedemptionAreaSpecialOneTableViewCell.swift
  10. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/RedemptionAreaSpecialTwoTableViewCell.swift
  11. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/SpecialOneTypeCollectionViewCell.swift
  12. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/SpecialTwoTypeCollectionViewCell.swift
  13. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialLayout/SepcialOneTypeLayout.swift
  14. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialLayout/SepcialTwoTypeLayout.swift
  15. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/ViewController/RedemptionAreaViewController.swift
  16. 0 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/ViewModel/RedemptionAreaViewModel.swift

+ 1 - 1
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -2323,7 +2323,6 @@
 		A7464B6E233894B9003CE3A0 /* BackyardModule */ = {
 			isa = PBXGroup;
 			children = (
-				A701454022F9813A0090E1BD /* RedemptionArea */,
 				A7D5F21B22BB1F0100F8E9AF /* Backyard */,
 			);
 			path = BackyardModule;
@@ -2332,6 +2331,7 @@
 		A7464B732338AD6E003CE3A0 /* RedemptionAreaModule */ = {
 			isa = PBXGroup;
 			children = (
+				A701454022F9813A0090E1BD /* RedemptionArea */,
 			);
 			path = RedemptionAreaModule;
 			sourceTree = "<group>";

+ 52 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoTableViewCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 class CardContentPicVideoTableViewCell: UITableViewCell {
     
@@ -49,7 +50,6 @@ class CardContentPicVideoTableViewCell: UITableViewCell {
         collectionView.showsVerticalScrollIndicator = false
         collectionView.showsHorizontalScrollIndicator = false
         collectionView.isScrollEnabled = false
-        collectionView.isUserInteractionEnabled = false
         return collectionView
     }()
     
@@ -87,6 +87,12 @@ class CardContentPicVideoTableViewCell: UITableViewCell {
                     self.cardContentPicVideoModel = cardContentPicVideoModel
                 }
             }
+            
+            if (PostType(rawValue: (communityRecommendDataModel?.type)!)) == .image {
+                collectionView.isUserInteractionEnabled = true
+            }else {
+                collectionView.isUserInteractionEnabled = false
+            }
         }
     }
     
@@ -119,6 +125,11 @@ class CardContentPicVideoTableViewCell: UITableViewCell {
                 }
                 
             }
+            if (PostType(rawValue: (communityFollowDataModel?.relateData?.type)!)) == .image {
+                collectionView.isUserInteractionEnabled = true
+            }else {
+                collectionView.isUserInteractionEnabled = false
+            }
         }
     }
     
@@ -211,6 +222,46 @@ extension CardContentPicVideoTableViewCell: UICollectionViewDelegateFlowLayout,U
     
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        if type == .recommend {
+            if (PostType(rawValue: (communityRecommendDataModel?.type)!)) == .image {
+                var postDesc : String?
+                if self.communityRecommendDataModel?.title == nil ||  communityRecommendDataModel?.title == "" {
+                    postDesc = "\(communityRecommendDataModel?.content?.prefix(20) ?? "")"
+                }else {
+                    postDesc = communityRecommendDataModel?.title
+                }
+                VirusViewModel.shared.readVirueRecordAddApi(postId: communityRecommendDataModel?.id, postAuthorUid: "\(communityRecommendDataModel?.uid ?? 0)", postDesc: postDesc, postType: communityRecommendDataModel?.type, postCover: communityRecommendDataModel?.img, actionId: "\(communityRecommendDataModel?.id ?? 0)")
+                if communityRecommendDataModel?.imgs?.isEmpty ?? true {
+                    if communityRecommendDataModel?.img != "" || communityRecommendDataModel?.img != nil {
+                        Mediator.push(BrowsePictureRouterModuleType.pushBrowsePictureImageStrs(imageStrs: [(communityRecommendDataModel?.img ?? "")], index: indexPath.row), animated: true)
+                    }
+                }else {
+                    Mediator.push(BrowsePictureRouterModuleType.pushBrowsePictureImageStrs(imageStrs: communityRecommendDataModel?.imgs ?? [(communityRecommendDataModel?.img ?? "")], index: indexPath.row), animated: true)
+                    
+                }
+                
+            }
+        } else if type == .follow {
+            if (PostType(rawValue: (communityFollowDataModel?.relateData?.type)!)) == .image {
+                var postDesc : String?
+                if self.communityFollowDataModel?.relateData?.title == nil ||  communityFollowDataModel?.relateData?.title == "" {
+                    postDesc = "\(communityFollowDataModel?.relateData?.content?.prefix(20) ?? "")"
+                }else {
+                    postDesc = communityFollowDataModel?.relateData?.title
+                }
+                VirusViewModel.shared.readVirueRecordAddApi(postId: communityFollowDataModel?.relateData?.id, postAuthorUid: "\(communityFollowDataModel?.relateData?.uid ?? 0)", postDesc: postDesc, postType: communityFollowDataModel?.relateData?.type, postCover: communityFollowDataModel?.relateData?.img, actionId: "\(communityFollowDataModel?.relateData?.id ?? 0)")
+                
+                if communityFollowDataModel?.relateData?.imgs?.isEmpty ?? true {
+                    if communityFollowDataModel?.relateData?.img != "" || communityFollowDataModel?.relateData?.img != nil {
+                        Mediator.push(BrowsePictureRouterModuleType.pushBrowsePictureImageStrs(imageStrs: [(communityFollowDataModel?.relateData?.img ?? "")], index: indexPath.row), animated: true)
+                    }
+                }else {
+                    Mediator.push(BrowsePictureRouterModuleType.pushBrowsePictureImageStrs(imageStrs: communityFollowDataModel?.relateData?.imgs ?? [(communityFollowDataModel?.relateData?.img ?? "")], index: indexPath.row), animated: true)
+
+                }
+                
+            }
+        }
         
     }
     

RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/Banner/RedemptionAreaBannerCollectionViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaBannerCollectionViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/Banner/RedemptionAreaBannerTableViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaBannerTableViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/Banner/RedemptionAreaFSPagerViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaFSPagerViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/FloorCell/RedemptionAreaFloorTableViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorCell/RedemptionAreaFloorTableViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/FloorCell/RedemptionAreaProductCollectionViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorCell/RedemptionAreaProductCollectionViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/FloorHeader/FloorHeaderViewFloorHeaderView.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorHeader/FloorHeaderViewFloorHeaderView.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/SpecialCell/RedemptionAreaSpecialOneTableViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/RedemptionAreaSpecialOneTableViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/SpecialCell/RedemptionAreaSpecialTwoTableViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/RedemptionAreaSpecialTwoTableViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/SpecialCell/SpecialOneTypeCollectionViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/SpecialOneTypeCollectionViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/SpecialCell/SpecialTwoTypeCollectionViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/SpecialTwoTypeCollectionViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/SpecialLayout/SepcialOneTypeLayout.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialLayout/SepcialOneTypeLayout.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/View/SpecialLayout/SepcialTwoTypeLayout.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialLayout/SepcialTwoTypeLayout.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/ViewController/RedemptionAreaViewController.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/ViewController/RedemptionAreaViewController.swift


RainbowPlanet/RainbowPlanet/Modules/BackyardModule/RedemptionArea/ViewModel/RedemptionAreaViewModel.swift → RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/ViewModel/RedemptionAreaViewModel.swift