活动完成

RainbowPlanet/RainbowPlanet/Base/BaseWebViewController/BaseJSWebBaseViewController.swift

@@ -31,6 +31,13 @@ class BaseJSWebBaseViewController: BaseViewController {
     
     override func setupViews() {
 //        removeWKWebViewCookies()
+        if #available(iOS 11.0, *) {
+            UIScrollView.appearance().contentInsetAdjustmentBehavior = .automatic
+        } else {
+            if self.responds(to: #selector(setter: self.automaticallyAdjustsScrollViewInsets)) {
+                self.automaticallyAdjustsScrollViewInsets = true
+            }
+        }
         view.addSubview(wkWebView)
         view.addSubview(progressView)
         WebViewJavascriptBridge.enableLogging()

RainbowPlanet/RainbowPlanet/Macro/EnumMacro.swift

@@ -192,12 +192,14 @@ enum CommunityType {
 /// - user: 用户
 /// - activity: 活动
 /// - topic: 话题
+/// - offlineDetail: 线下活动详情
 enum CommunityBannerType : Int {
     case none = 0
     case content = 1
     case user = 2
     case activity = 3
     case topic = 4
+    case offlineDetail = 5
 }
 
 

RainbowPlanet/RainbowPlanet/Model/PushModel/PushModel.swift

@@ -15,6 +15,7 @@ import ObjectMapper
 /// - activity:  跳转到活动详情
 /// - product:   跳转到商品详情
 ///- followMessage:   跳转到关注通知消息
+///- activityOffline:    跳转到社团活动热门列表
 enum PushActionType : String {
     case none = ""
     case post = "post"
@@ -23,6 +24,7 @@ enum PushActionType : String {
     case activity = "activity"
     case product = "product"
     case followMessage = "follow_message"
+    case activityOffline = "activity_offline"
 }
 class PushModel : NSObject, Mappable{
 

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/Banner/CommunityBannerTableViewCell.swift

@@ -150,6 +150,9 @@ extension CommunityBannerTableViewCell:FSPagerViewDataSource,FSPagerViewDelegate
         case .topic?: //话题
             Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: communityRecommendTypeDataModel?.linkContentId ?? 0))
             break
+        case .offlineDetail?: //线下活动详情
+            Mediator.push(H5RouterModuleType.pushOfflineDetail(id: "\(communityRecommendTypeDataModel?.linkContentId ?? 0)"))
+            break
         default:
             break
             

RainbowPlanet/RainbowPlanet/Modules/H5Modules/H5Common/ViewController/H5CommonViewController.swift

@@ -40,6 +40,18 @@ class H5CommonViewController: BaseJSWebBaseViewController {
         super.setupViews()
         self.wkWebView.navigationDelegate = self
         self.wkWebView.scrollView.delegate = self
+//        if #available(iOS 11.0, *) {
+//            UIScrollView.appearance().contentInsetAdjustmentBehavior = .automatic
+//        } else {
+//            if self.responds(to: #selector(setter: self.automaticallyAdjustsScrollViewInsets)) {
+//                self.automaticallyAdjustsScrollViewInsets = true
+//            }
+//        }
+//        WRNavigationBar.defaultNavBarBarTintColor = kThemeColor
+//        WRNavigationBar.defaultNavBarTitleColor = UIColor.white
+//        WRNavigationBar.defaultNavBarTintColor = UIColor.white
+//        WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kThemeColor)
+        UINavigationBar.appearance().tintColor = UIColor.black
         
     }
     /// 加载数据

RainbowPlanet/RainbowPlanet/Router/H5RouterModuleType.swift

@@ -23,6 +23,9 @@ import SwiftyMediator
 /// - pushSubject: 兑换商品专题页面
 /// - pushDetail: 兑换商品详情页面
 /// - pushActivityId: 兑换活动
+/// - pushOffline: 活动列表
+/// - pushOfflineDetail: 活动详情
+
 
 public enum H5RouterModuleType: MediatorTargetType {
     case pushWeb(URLString: String)
@@ -37,6 +40,8 @@ public enum H5RouterModuleType: MediatorTargetType {
     case pushSubject(id:String)
     case pushDetail(id:String)
     case pushActivityId(id:String)
+    case pushOffline
+    case pushOfflineDetail(id:String)
 }
 
 extension H5RouterModuleType: MediatorSourceType {
@@ -90,6 +95,14 @@ extension H5RouterModuleType: MediatorSourceType {
             let vc = H5CommonViewController()
             vc.URLString = kH5FeedbackUrl
             return vc
+        case .pushOffline: //活动列表
+            let vc = H5CommonViewController()
+            vc.URLString = kH5OfflineUrl
+            return vc
+        case .pushOfflineDetail(let id): //活动列表
+            let vc = H5CommonViewController()
+            vc.URLString = kH5OfflineDetailIdUrl + id
+            return vc
         }
     }
 }

RainbowPlanet/RainbowPlanet/Router/RouterManager.swift

@@ -92,6 +92,9 @@ class RouterManager: NSObject {
                 Mediator.push(MessageRouterModuleType.messageList(messageVCType: MessageListVCType.follow, messageShowTypes: "12"))
             }
             break
+        case .activityOffline?: // 跳转到活动列表
+            Mediator.push(H5RouterModuleType.pushOffline)
+            break
         case .none?:
             break
         default:

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkH5Manager.swift

@@ -68,3 +68,9 @@ let kH5DetailUrl = kApiH5Prefix() + "/detail?id="
 
 /// 活动只有Id
 let kH5ActivityIdUrl = kApiH5Prefix() + "/activity?id="
+
+/// 活动列表
+let kH5OfflineUrl = kApiH5Prefix() + "/offline"
+
+/// 活动详情
+let kH5OfflineDetailIdUrl = kApiH5Prefix() + "/offlineDetail?id="