Quellcode durchsuchen

更新分享内容文案

南鑫林 vor 5 Jahren
Ursprung
Commit
6ba2998f92

+ 10 - 15
RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -234,39 +234,34 @@ class BaseTabbarViewController: NSObject {
     func reloadTabbar(index:Int) {
         
         if index == 0 && lastIndex == 0  {
-            self.lottieAnimateContentView1.animationView.stop()
-            self.lottieAnimateContentView1.animationView.play()
+//            self.lottieAnimateContentView1.animationView.stop()
+//            self.lottieAnimateContentView1.animationView.play()
 
             if communityModuleTopType == .communityModuleFollowTop {
                 NotificationCenter.default.post(name: NSNotification.Name("CommunityModuleFollowTop"), object: nil)
                 
             }
             if communityModuleTopType == .communityModuleRecommendTop {
-//                    NotificationCenter.default.post(name: NSNotification.Name("CommunityModuleRecommendTop"), object: nil)
-                
-            }
-            if communityModuleTopType == .communityModulePlanetTop {
-                NotificationCenter.default.post(name: NSNotification.Name("CommunityModulePlanetTop"), object: nil)
+                    NotificationCenter.default.post(name: NSNotification.Name("CommunityModuleRecommendTop"), object: nil)
                 
             }
             
         }
         if index == 1 && lastIndex == 1  {
-            self.lottieAnimateContentView2.animationView.stop()
-            self.lottieAnimateContentView2.animationView.play()
-//            NotificationCenter.default.post(name: NSNotification.Name("ShoppingMallModuleTop"), object: nil)
-            NotificationCenter.default.post(name: NSNotification.Name("RedemptionAreaModuleTop"), object: nil)
+//            self.lottieAnimateContentView2.animationView.stop()
+//            self.lottieAnimateContentView2.animationView.play()
+            NotificationCenter.default.post(name: NSNotification.Name("BackyardViewModuleTop"), object: nil)
             
         }
         if index == 3 && lastIndex == 3  {
-            self.lottieAnimateContentView4.animationView.stop()
-            self.lottieAnimateContentView4.animationView.play()
+//            self.lottieAnimateContentView4.animationView.stop()
+//            self.lottieAnimateContentView4.animationView.play()
             NotificationCenter.default.post(name: NSNotification.Name("MessageModuleTop"), object: nil)
             
         }
         if index == 4 && lastIndex == 4  {
-            self.lottieAnimateContentView5.animationView.stop()
-            self.lottieAnimateContentView5.animationView.play()
+//            self.lottieAnimateContentView5.animationView.stop()
+//            self.lottieAnimateContentView5.animationView.play()
             NotificationCenter.default.post(name: NSNotification.Name("MineModuleTop"), object: nil)
         }
     }

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/BackyardModule/Backyard/ViewController/BackyardViewController.swift

@@ -79,7 +79,7 @@ class BackyardViewController: BaseJSWebViewController {
 
         })
 
-        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityModulePlanetTop"), object: nil, queue: OperationQueue.main, using: {
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("BackyardViewModuleTop"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
             var silent = notification.object as? Int
             if silent == nil {

+ 8 - 8
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -183,14 +183,14 @@ class CommunityFollowViewController: BaseViewController {
             }
         }
         
-        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityModuleFollowTop"), object: nil, queue: OperationQueue.main, using: {
-            [weak self] (notification) in
-            if self?.tableView.contentOffset == CGPoint(x: 0, y: 0) {
-                self?.tableView.mj_header.beginRefreshing()
-            }else {
-                self?.tableView.scrollToTop()
-            }
-        })
+//        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityModuleFollowTop"), object: nil, queue: OperationQueue.main, using: {
+//            [weak self] (notification) in
+//            if self?.tableView.contentOffset == CGPoint(x: 0, y: 0) {
+//                self?.tableView.mj_header.beginRefreshing()
+//            }else {
+//                self?.tableView.scrollToTop()
+//            }
+//        })
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("PublishPostSuccess"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in

+ 2 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -505,13 +505,13 @@ extension CommunityViewController :JXSegmentedListContainerViewDataSource {
     func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
         if index == 0 {
             let vc = CommunityFollowViewController()
-//            communityModuleTopType = .communityModuleFollowTop
+            communityModuleTopType = .communityModuleFollowTop
 
             return vc
         }else {
             let vc = CommunityRecommnendViewController()
             vc.communityRecommendCategoryModel = communityRecommendCategorysModel?.categoryList?[index-1]
-//            communityModuleTopType = .communityModuleRecommendTop
+            communityModuleTopType = .communityModuleRecommendTop
             return vc
         }
     }

+ 12 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -157,6 +157,18 @@ class CommunityRecommnendViewController: UIViewController {
                 self?.tableView.reloadData()
             }
         }
+        
+//        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityModuleRecommendTop"), object: nil, queue: OperationQueue.main, using: {
+//            [weak self] (notification) in
+//            if self?.isViewLoaded ?? true && ((self?.view.window) != nil) {
+//                if self?.tableView.contentOffset == CGPoint(x: 0, y: 0) {
+//                    self?.tableView.mj_header.beginRefreshing()
+//                }else {
+//                    self?.tableView.scrollToTop()
+//                }
+//            }
+//        })
+        
     }
     
     private lazy var tableView: UITableView = {

+ 3 - 12
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareContent/CommunityShareContentViewController.swift

@@ -79,7 +79,7 @@ class CommunityShareContentViewController: BaseViewController {
             make.left.equalTo(27*kScaleWidth)
         }
         topicLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(logoImageView.snp.bottom).offset(66*kScaleWidth)
+            make.top.equalTo(logoImageView.snp.bottom).offset(53*kScaleWidth)
             make.left.equalTo(27*kScaleWidth)
             make.right.equalTo(-14*kScaleWidth)
         }
@@ -128,18 +128,9 @@ class CommunityShareContentViewController: BaseViewController {
     override func setupData() {
         topicLabel.text = "#\(topicStr)#"
         titleLabel.text = titleStr
-
         nameLable.text = nameStr ?? ""
-        
-//        if let tryImage = EFQRCode.generate(
-//            content: H5UrlStr ?? "",
-//            size: EFIntSize(width: Int(90*kScaleWidth), height: Int(90*kScaleWidth))
-//        ) {
-//            QRCodeImageView.image = UIImage(cgImage: tryImage)
-//        } else {
-//        }
         QRCodeImageView.image = QRCode.createQRForString(qrString: H5UrlStr, qrImageName: "")
-        scanLabel.text = "扫码查看内容 领取\(bean ?? 0)U米"
+        scanLabel.text = "扫码查看内容  开启国风之旅"
         
         avatarImageView.kf.setImage(with: kURLImage(name: avatarStr ?? ""), placeholder: kImage(name: "default_pic"),completionHandler:{ [weak self] (image, error, cacheType, url) in
             self?.bgImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.imgUrl ?? "",size: CGSize(width: kScreenWidth, height: 481*kScaleWidth)), placeholder: kImage(name: "default_pic"),completionHandler: { [weak self] (image, error, cacheType, url) in
@@ -238,7 +229,7 @@ class CommunityShareContentViewController: BaseViewController {
         let nickLable = UILabel()
         nickLable.textColor = k333333Color
         nickLable.font = kMediumFont18
-        nickLable.text = "你的价值 · 由你创造"
+        nickLable.text = "国风价值·由你创造"
         return nickLable
     }()
     

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


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