推荐页面处理完成

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -222,6 +222,7 @@
 		A7636AC52268139C00374F9E /* LocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7636AC42268139C00374F9E /* LocationViewController.swift */; };
 		A7636AC822682BAF00374F9E /* LocationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7636AC722682BAF00374F9E /* LocationView.swift */; };
 		A76390EB2248E27A0067EEE0 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76390EA2248E27A0067EEE0 /* UserNotifications.framework */; };
+		A763BE6C22F173A0000CE594 /* LoginNowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A763BE6B22F173A0000CE594 /* LoginNowView.swift */; };
 		A7649B6922977A4300BCE9D1 /* ShopSectionHeaderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7649B6822977A4300BCE9D1 /* ShopSectionHeaderModel.swift */; };
 		A76B786922CE04940047EC1B /* CommunityRecommendDetailHTMLTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76B786822CE04940047EC1B /* CommunityRecommendDetailHTMLTableViewCell.swift */; };
 		A770E5DB22CED8C600CBD0A4 /* RouterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5DA22CED8C600CBD0A4 /* RouterManager.swift */; };
@@ -929,6 +930,7 @@
 		A7636AC42268139C00374F9E /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
 		A7636AC722682BAF00374F9E /* LocationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationView.swift; sourceTree = "<group>"; };
 		A76390EA2248E27A0067EEE0 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
+		A763BE6B22F173A0000CE594 /* LoginNowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginNowView.swift; sourceTree = "<group>"; };
 		A7649B6822977A4300BCE9D1 /* ShopSectionHeaderModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopSectionHeaderModel.swift; sourceTree = "<group>"; };
 		A76B786822CE04940047EC1B /* CommunityRecommendDetailHTMLTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityRecommendDetailHTMLTableViewCell.swift; sourceTree = "<group>"; };
 		A770E5DA22CED8C600CBD0A4 /* RouterManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouterManager.swift; sourceTree = "<group>"; };
@@ -2802,6 +2804,14 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		A763BE6A22F17360000CE594 /* LoginNow */ = {
+			isa = PBXGroup;
+			children = (
+				A763BE6B22F173A0000CE594 /* LoginNowView.swift */,
+			);
+			path = LoginNow;
+			sourceTree = "<group>";
+		};
 		A76B786722CE04730047EC1B /* HTMLCell */ = {
 			isa = PBXGroup;
 			children = (
@@ -3266,6 +3276,7 @@
 		A77F2CAE2232010F001BD3F6 /* RegisterLoginModule */ = {
 			isa = PBXGroup;
 			children = (
+				A763BE6A22F17360000CE594 /* LoginNow */,
 				A7778CAC2244BC2600C7C47A /* RegisterLogin */,
 				A7778CB52244E93E00C7C47A /* BindPhoneNumber */,
 				A7931E0922AF86D900297D0A /* GenderSelection */,
@@ -6283,6 +6294,7 @@
 				A7FF1557228AC3E800A85748 /* ProductAllCommentViewController.swift in Sources */,
 				A7A98E02227E8900005306E9 /* ProductSearchListModel.swift in Sources */,
 				A7A98E17227EED76005306E9 /* SpecialViewController.swift in Sources */,
+				A763BE6C22F173A0000CE594 /* LoginNowView.swift in Sources */,
 				BDF7C5D922D70B6E007F3B79 /* CommunityVideoMajorCommentCell.swift in Sources */,
 				A7778CB32244D73400C7C47A /* RegisterLoginViewController.swift in Sources */,
 				BD7AB8432284390B0030646A /* OrderPaySelfPickInfoCell.swift in Sources */,

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -53,6 +53,8 @@ extension AppDelegate {
             }
         }else {// 进入首页
             self.window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
+            //添加登录view
+            LoginNowView.initLoginNowView()
         }
     }
     

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseLottieAnimateContentView.swift

@@ -24,6 +24,7 @@ class BaseLottieAnimateContentView: ESTabBarItemContentView {
         self.init()
         
         textColor = k666666Color
+        iconColor = k333333Color
         highlightTextColor = k333333Color
 
         let animation = Animation.named(jsonStr)

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabBarItemContentView.swift

@@ -16,14 +16,10 @@ class BaseTabBarItemContentView: ESTabBarItemContentView {
     
     override init(frame: CGRect) {
         super.init(frame: frame)
-    }
-    
-    init(jsonStr:String) {
-        self.init()
-        
         textColor = k666666Color
         highlightTextColor = k333333Color
         
+        iconColor = k333333Color
     }
     public required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -117,18 +117,18 @@ class BaseTabbarViewController: NSObject {
         lottieAnimateContentView5 = BaseLottieAnimateContentView(jsonStr: "MineModuleTabbar")
         
         v1.tabBarItem = ESTabBarItem.init(lottieAnimateContentView1, title: "社区", image: UIImage(named: "tabbar_home")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
-        v2.tabBarItem = ESTabBarItem.init(lottieAnimateContentView2, title: "商城", image: UIImage(named: "tabbar_shopping"), selectedImage: nil)
+        v2.tabBarItem = ESTabBarItem.init(lottieAnimateContentView2, title: "商城", image: UIImage(named: "tabbar_shopping")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
         v3.tabBarItem = UITabBarItem(title: nil, image: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal))
         v3.tabBarItem.imageInsets =  UIEdgeInsets(top: 4, left: 0, bottom: -4, right: 0);
         
         if UserModel.isTokenNil() {
 
-            v4.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "消息", image: UIImage(named: "tabbar_massage"), selectedImage: nil)
-            v5.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "我的", image: UIImage(named: "tabbar_my"), selectedImage: nil)
+            v4.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
+            v5.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
 
         }else {
-            v4.tabBarItem = ESTabBarItem.init(lottieAnimateContentView4, title: "消息", image: UIImage(named: "tabbar_massage"), selectedImage: nil)
-            v5.tabBarItem = ESTabBarItem.init(lottieAnimateContentView5, title: "我的", image: UIImage(named: "tabbar_my"), selectedImage: nil)
+            v4.tabBarItem = ESTabBarItem.init(lottieAnimateContentView4, title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
+            v5.tabBarItem = ESTabBarItem.init(lottieAnimateContentView5, title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
         }
         
 
@@ -155,21 +155,9 @@ class BaseTabbarViewController: NSObject {
             [weak self] notification in
             self?.setBadge()
         }
-        
-//        let button = UIButton(frame: CGRect(x: 0, y: -100, width: kScreenWidth, height: 100))
-//        button.backgroundColor = UIColor.black
-//        
-//        esTabBarController.tabBar.point(inside: v2, with: UIEvent().touches(for: button))
-//        
-//        esTabBarController.tabBar.addSubview(button)
-
         return esTabBarController
     }
     
-    @objc func buttonsction() {
-        
-    }
-    
     // 设置Badge
     func setBadge() {
         //消息
@@ -238,3 +226,27 @@ class BaseTabbarViewController: NSObject {
     }
     
 }
+
+extension ESTabBar {
+    open override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        
+        let view  = super.hitTest(point, with: event)
+        if view == nil {
+            for subView in subviews {
+                if !subView.subviews.isEmpty {
+                    for subView in subView.subviews {
+                        let myPoint = subView.convert(point, from: self)
+                        if subView.bounds.contains(myPoint) {
+                            return subView
+                        }
+                    }
+                }
+                let myPoint = subView.convert(point, from: self)
+                if subView.bounds.contains(myPoint) {
+                    return subView
+                }
+            }
+        }
+        return view
+    }
+}

RainbowPlanet/RainbowPlanet/Model/UserModel/UserModel.swift

@@ -188,7 +188,7 @@ public class UserModel : NSObject, NSCoding, Mappable{
     }
     
     class func isTokenNil() -> Bool {
-        if (UserModel.shared().getModel()?.token) == nil {
+        if (UserModel.shared().getModel()?.token) == nil ||  UserModel.shared().getModel()?.token == "" {
             return true
         }else {
             return false

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift

@@ -35,17 +35,38 @@ class CommunityNavigationBarView: BaseView {
         searchBgView.addSubview(searchTextField)
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("userMemberGetTotalBean"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
             let totalBeanModel = notification.object as? TotalBeanModel
-            self?.rightButton.play()
+//            self?.rightButton.play()
             self?.scrollNumberLabel!.change(to: NSNumber(value: totalBeanModel?.todayBean ?? 0) , animated: true)
             
-            self?.scrollNumberLabel!.snp_remakeConstraints { (make) in
-                make.centerY.equalToSuperview()
-                make.size.equalTo((self?.scrollNumberLabel!.frame.size)!)
-                make.right.equalToSuperview().offset(-14)
+            if totalBeanModel?.todayBean == 0 {
+                self?.scrollNumberLabel?.isHidden  = true
+                self?.rightButton.snp.makeConstraints { (make) in
+                    make.centerY.equalToSuperview()
+                    make.right.equalTo(-14)
+                    make.size.equalTo(25)
+
+                }
+            }else {
+                self?.scrollNumberLabel!.snp_remakeConstraints { (make) in
+                    make.centerY.equalToSuperview()
+                    make.size.equalTo((self?.scrollNumberLabel!.frame.size)!)
+                    make.right.equalToSuperview().offset(-14)
+                }
+                self?.rightButton.snp.remakeConstraints { (make) in
+                    make.centerY.equalToSuperview()
+                    make.right.equalTo((self?.scrollNumberLabel!.snp_left)!).offset(-2)
+                    make.size.equalTo(25)
+
+                }
             }
         }
         UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApi()
         UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApiInterval()
+        if UserModel.isTokenNil() {
+            scrollNumberLabel?.isHidden  = true
+        }else {
+            scrollNumberLabel?.isHidden  = false
+        }
     }
     
     override func setupLayouts() {
@@ -58,9 +79,12 @@ class CommunityNavigationBarView: BaseView {
         
         rightButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.right.equalTo(scrollNumberLabel!.snp_left).offset(-2)
-            make.height.equalTo(20)
-            make.width.equalTo(20)
+            if UserModel.isTokenNil() {
+                make.right.equalTo(-14)
+            }else {
+                make.right.equalTo(scrollNumberLabel!.snp_left).offset(-2)
+            }
+            make.size.equalTo(25)
         }
         
         scrollNumberLabel!.snp_makeConstraints { (make) in
@@ -106,22 +130,29 @@ class CommunityNavigationBarView: BaseView {
         return leftButton
     }()
     
-    lazy var rightButton: AnimationView = {
-        let rightButton = AnimationView()
-        let animation = Animation.named("Skittles")
-        rightButton.animation = animation
-        rightButton.contentMode = .scaleAspectFit
-        rightButton.loopMode = .playOnce
+    lazy var rightButton: UIButton = {
+        let rightButton = UIButton()
+        rightButton.setImage(kImage(name: "ico_bean_org"), for: UIControl.State.normal)
         rightButton.addTapGesture(1, target: self, action: #selector(skittles))
         return rightButton
     }()
     
+//    lazy var rightButton: AnimationView = {
+//        let rightButton = AnimationView()
+//        let animation = Animation.named("Skittles")
+//        rightButton.animation = animation
+//        rightButton.contentMode = .scaleAspectFit
+//        rightButton.loopMode = .playOnce
+//        rightButton.addTapGesture(1, target: self, action: #selector(skittles))
+//        return rightButton
+//    }()
+    
     typealias RightButtonClosure = () -> Void
     
     var rightButtonClosure : RightButtonClosure?
     
     @objc func skittles() {
-        rightButton.play()
+//        rightButton.play()
         if let rightButtonClosure = rightButtonClosure {
             rightButtonClosure()
         }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.m

@@ -1015,6 +1015,7 @@
     self.magicCameraView.progressView.showBlink = NO;
     [self.recorder finishRecording];
     [self.magicCameraView destroy];
+    _magicCameraView.userInteractionEnabled =YES;
 }
 
 - (void)recoderError:(NSError *)error

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakePhoto/PublishTakePhotoController.swift

@@ -81,6 +81,7 @@ class PublishTakePhotoController: BaseViewController {
     
     private lazy var recorder: AliyunIRecorder = {
         let recorder = AliyunIRecorder.init(delegate: self as? AliyunIRecorderDelegate, videoSize: CGSize(width: 720, height: 1280))
+        recorder?.beautifyStatus = true
         recorder?.preview = self.view;
         return recorder!
     }()

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/LoginNow/LoginNowView.swift

@@ -0,0 +1,105 @@
+//
+//  LoginNowView.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/7/31.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import ESTabBarController_swift
+
+class LoginNowView: UIView {
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupViews()
+        setupLayouts()
+        setupData()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setupViews() {
+        backgroundColor = UIColor.init(hexString: "000000", alpha: 0.68)
+        addSubview(avatarImageView)
+        addSubview(titleLabel)
+        addSubview(subtitleLabel)
+        addSubview(loginNowButton)
+    }
+    
+    func setupLayouts() {
+        avatarImageView.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(14)
+            make.size.equalTo(34)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(avatarImageView)
+            make.left.equalTo(avatarImageView.snp.right).offset(6)
+            make.height.equalTo(17)
+        }
+        subtitleLabel.snp.makeConstraints { (make) in
+            make.bottom.equalTo(avatarImageView)
+            make.left.equalTo(avatarImageView.snp.right).offset(6)
+            make.height.equalTo(17)
+        }
+        loginNowButton.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(-14)
+            make.width.equalTo(100)
+            make.height.equalTo(32)
+        }
+    }
+    
+    func setupData() {
+        loginNowButton.addTarget(self, action: #selector(loginNowAction), for: UIControl.Event.touchUpInside)
+    }
+    
+    @objc func loginNowAction() {
+        kAppDelegate.setLogin()
+    }
+    
+    lazy var avatarImageView: UIImageView = {
+        let avatarImageView = UIImageView()
+        avatarImageView.image = kImage(name: "defaultface_login")
+        avatarImageView.cornerRadius = 17
+        avatarImageView.masksToBounds = true
+        return avatarImageView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "嗨~很高兴认识你~"
+        titleLabel.textColor = kffffffColor
+        titleLabel.font = kRegularFont13
+        return titleLabel
+    }()
+    
+    lazy var subtitleLabel: UILabel = {
+        let subtitleLabel = UILabel()
+        subtitleLabel.text = "快来登录吧，这里一切都由你！"
+        subtitleLabel.textColor = kffffffColor
+        subtitleLabel.font = kRegularFont13
+        return subtitleLabel
+    }()
+    
+    lazy var  loginNowButton : UIButton = {
+        let loginNowButton = UIButton()
+        loginNowButton.backgroundColor = kThemeColor
+        loginNowButton.setTitle("马上登录", for: UIControl.State.normal)
+        loginNowButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        loginNowButton.titleLabel?.font = kMediumFont14
+        loginNowButton.cornerRadius = 16
+        loginNowButton.masksToBounds = true
+        return loginNowButton
+    }()
+    
+    class func initLoginNowView() {
+        let loginNowView = LoginNowView(frame:CGRect(x: 0, y: -50, width: kScreenWidth, height: 50))
+        let tabbar = BaseTabbarViewController.shared.esTabBarController.tabBar as? ESTabBar
+        tabbar?.addSubview(loginNowView)
+    }
+}

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceVirus/SwiftMoyaNetWorkServiceVirus.swift

@@ -27,10 +27,14 @@ class SwiftMoyaNetWorkServiceVirus: NSObject {
     ///   - virueRecordAddParameterModel: 生成账本摩西
     ///   - completion: completion description
     func virueRecordAddApi(virueRecordAddParameterModel:VirueRecordAddParameterModel,completion: @escaping successCallBack) {
-        var parameters = Dictionary<String,Any>()
-        parameters = virueRecordAddParameterModel.toJSON()
-        SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceVirusApi.virueRecordAdd(parameters: parameters))) {(data) in
-            completion("")
+        
+        if !UserModel.isTokenNil() {
+            var parameters = Dictionary<String,Any>()
+            parameters = virueRecordAddParameterModel.toJSON()
+            SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceVirusApi.virueRecordAdd(parameters: parameters))) {(data) in
+                completion("")
+            }
         }
+        
     }
 }

RainbowPlanet/RainbowPlanet/Supporting Files/RegisterLoginModule.xcassets/defaultface_login.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "defaultface_login@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "defaultface_login@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RainbowPlanet/RainbowPlanet/ViewModel/Virus/VirusViewModel.swift

@@ -776,7 +776,7 @@ extension VirusViewModel {
                                postType:String?,
                                postCover:String?,
                                actionId:String) {
-        if !UserModel.isTokenNil() {
+        
             let virueRecordAddParameterModel = VirueRecordAddParameterModel()
             virueRecordAddParameterModel.behaviorId = (ConfigModel.shared.object()?.virus?.read ?? "")
             virueRecordAddParameterModel.behaviorFlag = BehaviorFlagType.read.rawValue
@@ -790,7 +790,6 @@ extension VirusViewModel {
             virueRecordAddParameterModel.postCover = postCover
             SwiftMoyaNetWorkServiceVirus.shared().virueRecordAddApi(virueRecordAddParameterModel: virueRecordAddParameterModel, completion: {(data) -> (Void) in
             })
-        }
     }
 }