瀏覽代碼

no message

南鑫林 5 年之前
父節點
當前提交
06b24df6f3

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

@@ -39,10 +39,7 @@ class CardContentPicVideoTableViewCell: UITableViewCell {
         addSubview(collectionView)
     }
     
-    private func setupLayouts() {
-       
-        
-    }
+    private func setupLayouts() {}
     private lazy var collectionView: UICollectionView = {
         let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
         collectionView.backgroundColor = .white

+ 1 - 3
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/User/CardContentUserTableViewCell.swift

@@ -158,10 +158,8 @@ class CardContentUserTableViewCell: UITableViewCell {
     
     var communityRecommendDataModel: CommunityRecommendDataModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendDataModel?.avatar ?? "", size: avatarButton.size), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendDataModel?.avatar ?? "", size: kSize40x40Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             ImageCache.default.clearMemoryCache()
-
-
             titleButton.setTitle(communityRecommendDataModel?.username, for: UIControl.State.normal)
             timeLabel.text = communityRecommendDataModel?.createdAt
             CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: communityRecommendDataModel?.isFollow ?? 0))

+ 6 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendMajorCommentCell.swift

@@ -9,6 +9,7 @@
 import UIKit
 import RxSwift
 import Kingfisher
+import SwiftyMediator
 
 class RecommendMajorCommentCell: UITableViewCell {
     
@@ -90,6 +91,11 @@ class RecommendMajorCommentCell: UITableViewCell {
         iconButton.setImage(kImage(name: "default_avatar"), for: UIControl.State.normal)
         iconButton.cornerRadius = 12
         iconButton.masksToBounds = true
+        iconButton.rx.tap.subscribe(onNext: { [weak self] in
+            if UserModel.shared().getModel()?.uid != self?.communityPostCommentModel?.uid {
+                Mediator.push(MineRouterModuleType.pushOtherPersonalCenter(uid: self?.communityPostCommentModel?.uid ?? 0))
+            }
+        }).disposed(by: disposeBag)
         return iconButton
     }()
     

+ 6 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendSubCommentTableViewCell.swift

@@ -9,6 +9,7 @@
 import UIKit
 import RxSwift
 import Kingfisher
+import SwiftyMediator
 
 class RecommendSubCommentTableViewCell: UITableViewCell {
     
@@ -85,6 +86,11 @@ class RecommendSubCommentTableViewCell: UITableViewCell {
         iconButton.setImage(kImage(name: "default_avatar"), for: UIControl.State.normal)
         iconButton.cornerRadius = 12
         iconButton.masksToBounds = true
+        iconButton.rx.tap.subscribe(onNext: { [weak self] in
+            if UserModel.shared().getModel()?.uid != self?.communityPostReplyModel?.uid {
+                Mediator.push(MineRouterModuleType.pushOtherPersonalCenter(uid: self?.communityPostReplyModel?.uid ?? 0))
+            }
+        }).disposed(by: disposeBag)
         return iconButton
     }()
     

+ 0 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendSimilarCell.swift

@@ -14,7 +14,6 @@ class RecommendSimilarCell: UITableViewCell {
         NXLLog("deinit")
 
     }
-    
     class func cellWith(tableView:UITableView,indexPath:IndexPath) -> RecommendSimilarCell {
         let ID = "RecommendSimilarCell"
         tableView.register(RecommendSimilarCell.self, forCellReuseIdentifier: ID)

+ 6 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoMajorCommentCell.swift

@@ -9,6 +9,7 @@
 import UIKit
 import RxSwift
 import Kingfisher
+import SwiftyMediator
 
 class CommunityVideoMajorCommentCell: UITableViewCell {
     
@@ -90,8 +91,11 @@ class CommunityVideoMajorCommentCell: UITableViewCell {
         iconButton.setImage(kImage(name: "default_avatar"), for: UIControl.State.normal)
         iconButton.cornerRadius = 12
         iconButton.masksToBounds = true
-        iconButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            
+        
+        iconButton.rx.tap.subscribe(onNext: { [weak self] in
+            if UserModel.shared().getModel()?.uid != self?.communityPostCommentModel?.uid {
+                Mediator.push(MineRouterModuleType.pushOtherPersonalCenter(uid: self?.communityPostCommentModel?.uid ?? 0))
+            }
         }).disposed(by: disposeBag)
         return iconButton
     }()

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift

@@ -13,6 +13,9 @@ import SwiftyMediator
 import Kingfisher
 
 class OtherPersonalCenterViewController: BaseViewController {
+    deinit {
+        NXLLog("deinit")
+    }
 
     let JXTableHeaderViewHeight: Int = Int(140 + kNavBarTotalHeight)
     let JXheightForHeaderInSection: Int = 44
@@ -21,6 +24,7 @@ class OtherPersonalCenterViewController: BaseViewController {
     var uid : Int = 0
     var userDetailModel : UserDetailModel?
     
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()

+ 2 - 3
RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherHeaderView.swift

@@ -180,14 +180,13 @@ class PersonViewUserAndOtherHeaderView: BaseView {
         followButton.isHidden = true
         followButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            followButton.isEnabled = false
             if self?.userDetailModel?.isFollowStatus == 0 {
-                self?.userFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { (isFollowStatus) in
+                self?.userFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { [weak followButton] (isFollowStatus) in
                     self?.userDetailModel?.isFollowStatus = isFollowStatus
                     CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0))
                 })
             }else {
-                self?.userCancelFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { (isFollowStatus) in
+                self?.userCancelFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { [weak followButton] (isFollowStatus) in
                     self?.userDetailModel?.isFollowStatus = isFollowStatus
                     CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0))
                 })

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherListView.swift

@@ -27,7 +27,7 @@ class PersonViewUserAndOtherListView: BaseView {
                 if jumpModeType == JumpModeType.none {
                     make.height.equalTo(kScreenHeight-kNavBarTotalHeight-kTabBarTotalHeight-44)
                 }else {
-                    make.height.equalTo(kScreenHeight-kNavBarTotalHeight-kSafeTabBarHeight-44)
+                    make.height.equalTo(kScreenHeight-kNavBarTotalHeight-44)
                 }
             }
         }