南鑫林 5 lat temu
rodzic
commit
7ee54dee20

+ 2 - 0
RainbowPlanet/Podfile

@@ -62,6 +62,8 @@ target 'RainbowPlanet' do
   pod 'EFQRCode'
   
   pod 'ESTabBarController-swift'
+  # 内存泄露
+  pod 'MLeaksFinder'
 
 
   #======================第三方平台===========

+ 9 - 1
RainbowPlanet/Podfile.lock

@@ -28,6 +28,7 @@ PODS:
   - EFQRCode (5.0.0):
     - swift_qrcodejs (~> 1.1.1)
   - ESTabBarController-swift (2.7)
+  - FBRetainCycleDetector (0.1.4)
   - FlickerNumber (1.1)
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
@@ -44,6 +45,8 @@ PODS:
   - LYEmptyView (1.2.5)
   - MBProgressHUD (1.1.0)
   - MJRefresh (3.2.0)
+  - MLeaksFinder (1.0.0):
+    - FBRetainCycleDetector
   - Moya/Core (13.0.1):
     - Alamofire (~> 4.1)
     - Result (~> 4.1)
@@ -117,6 +120,7 @@ DEPENDENCIES:
   - LYEmptyView
   - MBProgressHUD
   - MJRefresh
+  - MLeaksFinder
   - Moya/RxSwift
   - ObjectMapper
   - pop
@@ -155,6 +159,7 @@ SPEC REPOS:
     - DPScrollNumberLabel
     - EFQRCode
     - ESTabBarController-swift
+    - FBRetainCycleDetector
     - FlickerNumber
     - FMDB
     - FSPagerView
@@ -168,6 +173,7 @@ SPEC REPOS:
     - LYEmptyView
     - MBProgressHUD
     - MJRefresh
+    - MLeaksFinder
     - Moya
     - ObjectMapper
     - pop
@@ -204,6 +210,7 @@ SPEC CHECKSUMS:
   DPScrollNumberLabel: 5124eaccf3029bb84116de391e1273cba676f4f5
   EFQRCode: 07437cfbce3a1e497397a4f3d766c980d8972608
   ESTabBarController-swift: 4fb52ad03d94d0717ef97bc9eb09a5abfdded0a2
+  FBRetainCycleDetector: 46f8179bbb1c587deee3ea838a1a3ee02acf5015
   FlickerNumber: bce41da51904d533393d69e9734df6281ab1c646
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   FSPagerView: 816a18842306973cc7cc6df8a5332272f7815c30
@@ -217,6 +224,7 @@ SPEC CHECKSUMS:
   LYEmptyView: b17adfc2dd9ad2988ecaf7c9606efa916e24c767
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
+  MLeaksFinder: 8c435bd2f6d070af18cff082b503b21adc130fc0
   Moya: f4a4b80ff2f8a4ffc208dfb31cd91636622fee6e
   ObjectMapper: 70187b8941977c62ccfb423caf6b50be405cabf0
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
@@ -240,6 +248,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: a683ae249b5230efda703d124f5b0a2e42caae45
+PODFILE CHECKSUM: 623f202e502f85c661ea8455a208967e916c0ad1
 
 COCOAPODS: 1.7.4

+ 0 - 1
RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -53,7 +53,6 @@ extension AppDelegate {
         
         /// 引导页
         setGuidePageView()
-        
     }
     
     /// 设置Tabbar

+ 5 - 5
RainbowPlanet/RainbowPlanet/Base/BaseWebViewController/BaseJSWebBaseViewController.swift

@@ -26,7 +26,6 @@ class BaseJSWebBaseViewController: BaseViewController {
         super.viewDidLoad()
         setupViews()
         
-        
     }
     
     override func setupViews() {
@@ -48,11 +47,12 @@ class BaseJSWebBaseViewController: BaseViewController {
         }
         
         navigationBar.onClickLeftButton = {
-            self.wkWebView.stopLoading()
-            if self.wkWebView.canGoBack {
-                self.goBack()
+            [weak self] in
+            self?.wkWebView.stopLoading()
+            if (self?.wkWebView.canGoBack)! {
+                self?.goBack()
             }else {
-                self.navigationController?.popViewController(animated: true)
+                self?.navigationController?.popViewController(animated: true)
             }
         }
     }

+ 9 - 3
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift

@@ -472,9 +472,15 @@ extension CommunityFeaturedTopicsViewController : UITableViewDelegate,UITableVie
             break
         //图片视频/内容标题/评论列表
         case 1,2,4:
-            let vc = CommunityRecommendController()
-            vc.id = communityRecommendDataModel.id ?? 0
-            self.navigationController?.pushViewController(vc, animated: true)
+            if PostType(rawValue: communityRecommendDataModel.type ?? "video") == .video {
+                let vc = CommunityVideoListController()
+                vc.contentId = communityRecommendDataModel.id ?? 0
+                self.navigationController?.pushViewController(vc, animated: true)
+            }else {
+                let vc = CommunityRecommendController()
+                vc.id = communityRecommendDataModel.id ?? 0
+                self.navigationController?.pushViewController(vc, animated: true)
+            }
             break
         //点赞,收藏,分享
         case 3:

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -350,6 +350,7 @@ extension CommunityRecommendController {
             }
             CommunityFollowUserViewModel.shared.setFollowType(followButton: (self?.followButton)!, followType: FollowType(rawValue: self?.communityPostDetailModel?.isFollow ?? 0) ?? .futureFollow)
             self?.commentView.communityPostDetailModel = self?.communityPostDetailModel
+            self?.count = self?.communityPostDetailModel?.commentCount ?? 0
 
             if PostType(rawValue: self?.communityPostDetailModel?.type ?? "html") == .html {
                 self?.avatarButton.isHidden = true
@@ -373,7 +374,6 @@ extension CommunityRecommendController {
                     self?.communityPostDetailTableViewHeaderView.tableView = self?.tableView
                     self?.tableView.tableHeaderView = self?.communityPostDetailTableViewHeaderView
 
-                    
                 }else {
                     if self?.communityPostDetailModel?.img != nil ||  self?.communityPostDetailModel?.img != "" {
                         let height = getImageHeight(imgStr: (self?.communityPostDetailModel?.img)!)

+ 5 - 0
RainbowPlanet/RainbowPlanet/Modules/H5Modules/H5Common/ViewController/H5CommonViewController.swift

@@ -13,6 +13,11 @@ import SwiftyMediator
 
 
 class H5CommonViewController: BaseJSWebBaseViewController {
+    
+    deinit {
+        NXLLog("deinit")
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()