推荐跳转加类型

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -206,6 +206,7 @@
 		A76893982339C9EB00819EC3 /* StartupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76893972339C9EB00819EC3 /* StartupModel.swift */; };
 		A76893A2233A0BB000819EC3 /* DrawCircleProgressButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A76893A1233A0BB000819EC3 /* DrawCircleProgressButton.m */; };
 		A76893A7233A656A00819EC3 /* RongCloudIMModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A76893A6233A656A00819EC3 /* RongCloudIMModule.xcassets */; };
+		A76893AA233B38AA00819EC3 /* MessageRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76893A9233B38AA00819EC3 /* MessageRouterModuleType.swift */; };
 		A76B786922CE04940047EC1B /* CommunityRecommendDetailHTMLTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76B786822CE04940047EC1B /* CommunityRecommendDetailHTMLTableViewCell.swift */; };
 		A770E5DB22CED8C600CBD0A4 /* RouterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5DA22CED8C600CBD0A4 /* RouterManager.swift */; };
 		A770E5DD22CEDF4F00CBD0A4 /* OpenAppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5DC22CEDF4F00CBD0A4 /* OpenAppModel.swift */; };
@@ -867,6 +868,7 @@
 		A76893A0233A0BB000819EC3 /* DrawCircleProgressButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawCircleProgressButton.h; sourceTree = "<group>"; };
 		A76893A1233A0BB000819EC3 /* DrawCircleProgressButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DrawCircleProgressButton.m; sourceTree = "<group>"; };
 		A76893A6233A656A00819EC3 /* RongCloudIMModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = RongCloudIMModule.xcassets; sourceTree = "<group>"; };
+		A76893A9233B38AA00819EC3 /* MessageRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageRouterModuleType.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>"; };
 		A770E5DC22CEDF4F00CBD0A4 /* OpenAppModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenAppModel.swift; sourceTree = "<group>"; };
@@ -3365,6 +3367,7 @@
 				BDBC0AF322DDE9BC00CA788E /* PublishRouterModuleType.swift */,
 				A7F3069322E16A5B00DC7917 /* MineRouterModuleType.swift */,
 				A76068E622E48DC5008DF18F /* BrowsePictureRouterModuleType.swift */,
+				A76893A9233B38AA00819EC3 /* MessageRouterModuleType.swift */,
 			);
 			path = Router;
 			sourceTree = "<group>";
@@ -5721,6 +5724,7 @@
 				A7CC751A22716254003C4F38 /* SetTableViewCell.swift in Sources */,
 				A7E19FAC22BA2D01009BCCE1 /* SearchTopicListViewController.swift in Sources */,
 				A71AA52822732173008FF1A5 /* SwiftMoyaNetWorkServiceConfig.swift in Sources */,
+				A76893AA233B38AA00819EC3 /* MessageRouterModuleType.swift in Sources */,
 				A70B2C102286A3BC00B2449F /* ProductDetailModel.swift in Sources */,
 				A7A17E5F22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift in Sources */,
 				A72A72A922321DE000B21995 /* NumberKeyboard.swift in Sources */,

RainbowPlanet/RainbowPlanet/Model/PushModel/PushModel.swift

@@ -14,6 +14,7 @@ import ObjectMapper
 /// - star:  跳转到星球首页
 /// - activity:  跳转到活动详情
 /// - product:   跳转到商品详情
+///- followMessage:   跳转到关注通知消息
 enum PushActionType : String {
     case none = ""
     case post = "post"
@@ -21,8 +22,8 @@ enum PushActionType : String {
     case star = "star"
     case activity = "activity"
     case product = "product"
+    case followMessage = "follow_message"
 }
-
 class PushModel : NSObject, Mappable{
 
     

RainbowPlanet/RainbowPlanet/Router/MessageRouterModuleType.swift

@@ -0,0 +1,29 @@
+//
+//  MessageRouterModuleType.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/9/25.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import SwiftyMediator
+
+/// 消息模块路由
+///
+/// - messageListFollow: 关注通知消息
+public enum MessageRouterModuleType: MediatorTargetType {
+    case messageList(messageVCType:MessageListVCType,messageShowTypes:String)
+}
+
+extension MessageRouterModuleType: MediatorSourceType {
+    public var viewController: UIViewController? {
+        switch self {
+        case .messageList(let messageVCType,let messageShowTypes):
+            let vc = MessageListController()
+            vc.messageVCType = messageVCType
+            vc.messageShowTypes = messageShowTypes
+            return vc
+        }
+    }
+}

RainbowPlanet/RainbowPlanet/Router/RouterManager.swift

@@ -87,6 +87,11 @@ class RouterManager: NSObject {
         case .product?: //商品
             Mediator.push(H5RouterModuleType.pushDetail(id: "\(pushModel.actionId ?? 0)"))
             break
+        case .followMessage?: // 跳转到关注通知消息
+            if !UserModel.isTokenNil() {
+                Mediator.push(MessageRouterModuleType.messageList(messageVCType: MessageListVCType.follow, messageShowTypes: "12"))
+            }
+            break
         case .none?:
             break
         default: