no message

RainbowPlanet/RainbowPlanet.xcodeproj/xcshareddata/xcschemes/RainbowPlanet.xcscheme

@@ -82,6 +82,13 @@
             ReferencedContainer = "container:RainbowPlanet.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -17,7 +17,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         //初始化窗口
         initWindow()
         //版本更新
-//        _ = UpdateVersionManager.shared
+        _ = UpdateVersionManager.shared
+        //网络监听
+        AlamofireReachabilityManager.shared.reachability()
         //初始化百度地图
         BaiduMapManager.shared.initBaiduMap()
         //百度定位

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -77,10 +77,12 @@ class BaseTabbarViewController: UITabBarController {
  */
 
 
-class BaseTabbarViewController: ESTabBarController {
+class BaseTabbarViewController: NSObject {
 
     static let shared : BaseTabbarViewController = BaseTabbarViewController()
     
+    var esTabBarController : ESTabBarController!
+    
     /// 社区
     var v1 : CommunityViewController!
     /// 商城
@@ -111,10 +113,10 @@ class BaseTabbarViewController: ESTabBarController {
     var lastIndex : Int = 0
 
     func tabBarViewController() -> ESTabBarController {
-        let tabBarViewController = ESTabBarController()
+        esTabBarController = ESTabBarController()
 
-        tabBarViewController.tabBar.shadowImage = UIImage(named: "tab_top_line")
-        tabBarViewController.shouldHijackHandler = {
+        esTabBarController.tabBar.shadowImage = UIImage(named: "tab_top_line")
+        esTabBarController.shouldHijackHandler = {
            [weak self] (tabbarController, viewController, index) in
             if index == 2 {
                 self?.lastIndex = index
@@ -126,7 +128,7 @@ class BaseTabbarViewController: ESTabBarController {
             }
         }
 
-        tabBarViewController.didHijackHandler = {
+        esTabBarController.didHijackHandler = {
             tabbarController, viewController, index in
             let isUploadFinish: Bool = PublishUploadManager.shared().isPublishFinished
             if isUploadFinish {
@@ -176,7 +178,7 @@ class BaseTabbarViewController: ESTabBarController {
         let n4 = BaseNavigationViewController.init(rootViewController: v4)
         let n5 = BaseNavigationViewController.init(rootViewController: v5)
 
-        tabBarViewController.viewControllers = [n1, n2, n3, n4, n5]
+        esTabBarController.viewControllers = [n1, n2, n3, n4, n5]
         //将要进入前台的时候
         setBadge()
         NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil, queue: OperationQueue.main, using: {
@@ -190,7 +192,7 @@ class BaseTabbarViewController: ESTabBarController {
             [weak self] notification in
             self?.setBadge()
         }
-        return tabBarViewController
+        return esTabBarController
     }
     
     // 设置Badge

RainbowPlanet/RainbowPlanet/Manager/AlamofireReachabilityManager/AlamofireReachabilityManager.swift

@@ -15,8 +15,13 @@ class AlamofireReachabilityManager: NSObject {
     static let shared : AlamofireReachabilityManager = AlamofireReachabilityManager()
     
     /// 初始化对象
-    private var reachabilityManager = NetworkReachabilityManager(host: kApiDataPrefix())!
     private var manager = NetworkReachabilityManager()!
+    
+    /// 初始化对象
+    lazy var reachabilityManager: NetworkReachabilityManager = {
+        let reachabilityManager = NetworkReachabilityManager(host: kApiDataPrefix())!
+        return reachabilityManager
+    }()
 
     
     /// 网络监听
@@ -51,27 +56,28 @@ class AlamofireReachabilityManager: NSObject {
     
     /// 判断是否连接网络
     public func isNetworkConnect() -> Bool {
+        
         if manager.isReachable {
             return true
         }else {
-            AlamofireReachabilityManager.shared.alert()
             return false
         }
-        
     }
     
-    /// 弹框跳转设置页面
-    public func alert(){
-        AlertSheetView.alert(title: "网络连接失败", detailTitle: "检测到网络权限可能未开启\n您可以在\"设置>无线数据>WLAN或WLAN与蜂窝移动网\"开启一下吧", cancelTitle: "取消", sureTitle: "设置", cancelBlock:nil, confirmBlock: { (popupView, index, str) in
-            DispatchQueue.main.async(execute: {() -> Void in
-                let url = URL(string: UIApplication.openSettingsURLString)
-                if let url = url, UIApplication.shared.canOpenURL(url) {            if #available(iOS 10.0, *) {
-                    UIApplication.shared.open(url, options: [:],completionHandler: {(success) in})
-                }else {
-                    UIApplication.shared.openURL(url)
-                    }
-                }
-            })
-        })
-    }
+//    /// 弹框跳转设置页面
+//    public func alert(){
+//        
+//        DispatchQueue.main.async(execute: {() -> Void in
+//            AlertSheetView.alert(title: "网络连接失败", detailTitle: "检测到网络权限可能未开启\n您可以在\"设置>无线数据>WLAN或WLAN与蜂窝移动网\"开启一下吧", cancelTitle: "取消", sureTitle: "设置", cancelBlock:nil, confirmBlock: { (popupView, index, str) in
+//                let url = URL(string: UIApplication.openSettingsURLString)
+//                if let url = url, UIApplication.shared.canOpenURL(url) {
+//                    if #available(iOS 10.0, *) {
+//                        UIApplication.shared.open(url, options: [:],completionHandler: {(success) in})
+//                    }else {
+//                        UIApplication.shared.openURL(url)
+//                    }
+//                }
+//            })
+//        })
+//    }
 }

RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -51,7 +51,7 @@ public extension UMManager {
     func common() -> Void {
 
         //将自动采集页面信息
-        //        MobClick.setAutoPageEnabled(true)
+        MobClick.setAutoPageEnabled(true)
         //开发者需要显式的调用此函数，日志系统才能工作
         UMCommonLogManager.setUp()
         //打开加密传输
@@ -322,9 +322,8 @@ public extension UMManager {
             if error != nil {
                 SwiftProgressHUD.shared().showText("分享失败")
             } else {
-                if data != nil {
-                    completion?()
-                }
+                SwiftProgressHUD.shared().showText("分享成功")
+                completion?()
             }
         }
     }
@@ -355,9 +354,8 @@ public extension UMManager {
             if error != nil {
                 SwiftProgressHUD.shared().showText("分享失败")
             } else {
-                if data != nil {
-                    completion?()
-                }
+                SwiftProgressHUD.shared().showText("分享成功")
+                completion?()
             }
         }
     }

RainbowPlanet/RainbowPlanet/Manager/WebViewJavascriptBridgeManager/WebViewJavascriptBridgeManager.swift

@@ -41,12 +41,17 @@ class WebViewJavascriptBridgeManager: NSObject {
         })
     }
     
-    func notification(notification:Notification,viewController:UIViewController? = nil) {
-        let wvjbModel = notification.object as? WVJBModel
+    func jump(wvjbModel:WVJBModel?,viewController:UIViewController? = nil) {
         // 链接
         if wvjbModel?.modelType == .link {
             Mediator.push(H5RouterModuleType.pushWeb(URLString: wvjbModel!.params!.url!))
         }
+        // 邀请
+        if wvjbModel?.modelType  == .share {
+            if wvjbModel?.params?.paramsModelType == .invite {
+                ShareCommunityView.inviteGoodFriends()
+            }
+        }
         // 复制邀请码
         if wvjbModel?.modelType  == .copy {
             commonCopy(string: wvjbModel!.params!.content!)
@@ -57,17 +62,30 @@ class WebViewJavascriptBridgeManager: NSObject {
             if wvjbModel?.params?.paramsModelPage == .publist {
                 let pickVc = PublishViewController()
                 let nav = BaseNavigationViewController.init(rootViewController: pickVc)
-                kAppDelegate.window?.rootViewController?.present(nav, animated: true, completion: nil)
+                BaseTabbarViewController.shared.esTabBarController.present(nav, animated: true, completion: nil)
             }
             // 推荐
             if wvjbModel?.params?.paramsModelPage == .join {
-                let viewController = viewController as? CommunityViewController
-                viewController?.reloadSegmentedView()
+                BaseTabbarViewController.shared.esTabBarController.selectedIndex = 0
+                BaseTabbarViewController.shared.v1.reloadSegmentedView()
+                if viewController != nil {
+                    viewController?.navigationController?.popToRootViewController(animated: true)
+                }
             }
             // 兑换商城
             if wvjbModel?.params?.paramsModelPage == .exchange {
-                let viewController = viewController as? CommunityViewController
-                viewController?.tabBarController?.selectedIndex = 1
+                BaseTabbarViewController.shared.esTabBarController.selectedIndex = 1
+                if viewController != nil {
+                    viewController?.navigationController?.popToRootViewController(animated: true)
+                }
+            }
+            // 去星球
+            if wvjbModel?.params?.paramsModelPage == .planet{
+                BaseTabbarViewController.shared.esTabBarController.selectedIndex = 0
+                BaseTabbarViewController.shared.v1.reloadSegmentedStarView()
+                if viewController != nil {
+                    viewController?.navigationController?.popToRootViewController(animated: true)
+                }
             }
         }
         // 跳转原生
@@ -77,5 +95,12 @@ class WebViewJavascriptBridgeManager: NSObject {
             followStatusModel.isFollowStatus = wvjbModel!.params?.status ?? 0
             NotificationCenter.default.post(name: NSNotification.Name(rawValue: "followApi"), object: followStatusModel, userInfo: ["isPlanet":true])
         }
+        
+        // 跳转预览图
+        if wvjbModel?.modelType  == .preview {
+            if !(wvjbModel!.params?.list?.isEmpty ?? true) {
+                Mediator.push(BrowsePictureRouterModuleType.pushBrowsePictureImageStrs(imageStrs: (wvjbModel!.params?.list)!, index: wvjbModel!.params?.current ?? 0))
+            }
+        }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/SelfRecommendation/View/SelfRecommendationView.swift

@@ -29,7 +29,7 @@ class SelfRecommendationView: BaseView {
     var selfMentionAddressArray : Array<SelfMentionAddressModel>?{
         didSet {
             if selfMentionAddressArray?.isEmpty ?? true {
-                collectionView.isHiddenFooter(true)
+                collectionView.endFooterNoMoreData()
             }else {
                 collectionView.isHiddenFooter(false)
             }

RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/SelfRecommendation/ViewController/SelfRecommendationViewController.swift

@@ -118,6 +118,8 @@ class SelfRecommendationViewController: BaseViewController {
             if selfMentionAddressListModel?.pagination?.currentPage ?? 1  <= selfMentionAddressListModel?.pagination?.totalPages ?? 1 {
                 if selfMentionAddressListModel?.pagination?.currentPage == 1{
                     self?.selfMentionAddressArray.removeAll()
+                    self?.selfRecommendationView.collectionView.resetNoMoreData()
+
                 }
                 self?.selfMentionAddressArray = (self?.selfMentionAddressArray)! + (selfMentionAddressListModel?.data!)!
                 self?.selfRecommendationView.selfMentionAddressArray = self?.selfMentionAddressArray

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -216,6 +216,7 @@ extension CommunityFollowViewController {
             if communityFollowFeedModel?.pagination?.currentPage ?? 1  <= communityFollowFeedModel?.pagination?.totalPages ?? 1 {
                 if communityFollowFeedModel?.pagination?.currentPage == 1{
                     self?.communityFollowDataModels.removeAll()
+                    self?.tableView.resetNoMoreData()
                 }
                 self?.communityFollowDataModels = (self?.communityFollowDataModels)! + (communityFollowFeedModel?.data!)!
                 if (self?.communityFollowDataModels.isEmpty)! {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -223,12 +223,6 @@ class CommunityViewController: BaseViewController {
                 
             }
         }
-
-        
-        // 星球H5
-        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityPlanetH5"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
-            WebViewJavascriptBridgeManager.shared.notification(notification: notification,viewController: self)
-        }
         
         // 待发布
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("DismissFromPublishEditVc"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Planet/CommunityPlanet/CommunityPlanetViewController.swift

@@ -47,7 +47,7 @@ class CommunityPlanetViewController: BaseJSWebViewController {
             WebViewJavascriptBridgeManager.shared.callHandlerH5(bridge: self?.bridge)
         }
         WebViewJavascriptBridgeManager.shared.registerHandlerApp(bridge: bridge) { (wvjbModel) in
-            NotificationCenter.default.post(name: NSNotification.Name("CommunityPlanetH5"), object: wvjbModel)
+            WebViewJavascriptBridgeManager.shared.jump(wvjbModel: wvjbModel)
         }
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("followApi"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in
             if notification.userInfo == nil {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -180,6 +180,7 @@ extension CommunityRecommnendViewController {
             if communityRecommendFeedModel?.pagination?.currentPage ?? 1  <= communityRecommendFeedModel?.pagination?.totalPages ?? 1 {
                 if communityRecommendFeedModel?.pagination?.currentPage == 1{
                     self?.communityRecommendDataModels.removeAll()
+                    self?.tableView.resetNoMoreData()
                 }
                 self?.communityRecommendDataModels = (self?.communityRecommendDataModels)! + (communityRecommendFeedModel?.data!)!
                 self?.tableView.reloadData()

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift

@@ -334,6 +334,7 @@ extension CommunityFeaturedTopicsViewController {
             if communityRecommendFeedModel?.pagination?.currentPage ?? 1  <= communityRecommendFeedModel?.pagination?.totalPages ?? 1 {
                 if communityRecommendFeedModel?.pagination?.currentPage == 1{
                     self?.communityRecommendDataModels.removeAll()
+                    self?.tableView.resetNoMoreData()
                 }
                 self?.communityRecommendDataModels = (self?.communityRecommendDataModels)! + (communityRecommendFeedModel?.data!)!
                 self?.tableView.reloadData()

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityMyFollowTopic/ViewController/CommunityMyFollowTopicController.swift

@@ -87,6 +87,7 @@ extension CommunityMyFollowTopicController {
             if communityMemberFollowTopicListModel?.pagination?.currentPage ?? 1  <= communityMemberFollowTopicListModel?.pagination?.totalPages ?? 1 {
                 if communityMemberFollowTopicListModel?.pagination?.currentPage == 1{
                     self?.communityMemberFollowTopicListDataModels.removeAll()
+                    self?.tableView.resetNoMoreData()
                 }
                 self?.communityMemberFollowTopicListDataModels = (self?.communityMemberFollowTopicListDataModels)! + (communityMemberFollowTopicListModel?.data!)!
                 self?.tableView.reloadData()

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -434,6 +434,7 @@ extension CommunityRecommendController {
             if communityPostsModel?.pagination?.currentPage ?? 1  <= communityPostsModel?.pagination?.totalPages ?? 1 {
                 if communityPostsModel?.pagination?.currentPage == 1{
                     self?.communityPostDataModels.removeAll()
+                    self?.tableView.resetNoMoreData()
                 }
                 self?.communityPostDataModels = (self?.communityPostDataModels)! + (communityPostsModel?.data!)!
                 self?.heightList()

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/ViewController/CommunitySubCommentController.swift

@@ -113,6 +113,7 @@ extension CommunitySubCommentController {
             if communityPostReplysModel?.pagination?.currentPage ?? 1  <= communityPostReplysModel?.pagination?.totalPages ?? 1 {
                 if communityPostReplysModel?.pagination?.currentPage == 1{
                     self?.communityPostReplyModels.removeAll()
+                    self?.tableView.resetNoMoreData()
                 }
                 self?.communityPostReplyModels = (self?.communityPostReplyModels)! + (communityPostReplysModel?.data!)!
                 self?.tableView.reloadData()

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityAllCommentView.swift

@@ -251,6 +251,8 @@ extension CommunityAllCommentView {
             if self?.communityPostCommentsModel?.pagination?.currentPage ?? 1  <= self?.communityPostCommentsModel?.pagination?.totalPages ?? 1 {
                 if self?.communityPostCommentsModel?.pagination?.currentPage == 1{
                     self?.communityPostCommentModels.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.communityPostCommentModels = (self?.communityPostCommentModels)! + (self?.communityPostCommentsModel?.data!)!
                 self?.tableView.reloadData()

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoSubCommentController/CommunityVideoSubCommentController.swift

@@ -111,6 +111,7 @@ extension CommunityVideoSubCommentController {
             if communityPostReplysModel?.pagination?.currentPage ?? 1  <= communityPostReplysModel?.pagination?.totalPages ?? 1 {
                 if communityPostReplysModel?.pagination?.currentPage == 1{
                     self?.communityPostReplyModels.removeAll()
+                    self?.tableView.resetNoMoreData()
                 }
                 self?.communityPostReplyModels = (self?.communityPostReplyModels)! + (communityPostReplysModel?.data!)!
                 self?.navigationBar.title = "\(communityPostReplysModel?.pagination?.total ?? 0)条评论"

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

@@ -43,24 +43,7 @@ class H5CommonViewController: BaseJSWebBaseViewController {
         }
         WebViewJavascriptBridgeManager.shared.registerHandlerApp(bridge: bridge) {
            [weak self] (wvjbModel) in
-            // 链接
-            if WVJBModelType(rawValue: wvjbModel.type!)  == .link {
-                let vc = H5CommonViewController()
-                let URLString = wvjbModel.params!.url!
-                vc.URLString = URLString
-                self?.navigationController?.pushViewController(vc, animated: true)
-            }
-            // 复制邀请码
-            if WVJBModelType(rawValue: wvjbModel.type!)  == .copy {
-                commonCopy(string: wvjbModel.params!.content!)
-            }
-            
-            // 邀请
-            if WVJBModelType(rawValue: wvjbModel.type!)  == .share {
-                if WVJBParamsModelType(rawValue: wvjbModel.params!.type ?? "") == .invite {
-                    ShareCommunityView.inviteGoodFriends()
-                }
-            }
+            WebViewJavascriptBridgeManager.shared.jump(wvjbModel: wvjbModel,viewController: self)
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/View/MessageListTableCell.swift

@@ -136,7 +136,7 @@ class MessageListTableCell: UITableViewCell {
             //6评论消息
             if MessageShowType.postComment == MessageShowType(rawValue: messageDataModel?.messageShowType ?? 6) {
                 typeImageView.image = kImage(name: "news_comment")
-                setTitleLabel(oneStr: (messageDataModel?.param?.userName ?? ""), twoStr: " 评论了 ", Three: "你的评论")
+                setTitleLabel(oneStr: (messageDataModel?.param?.userName ?? ""), twoStr: " 评论了 ", Three: "你的作品")
                 contentLabel.text = "“\(messageDataModel?.param?.content ?? "")”"
                 contentImageViewConstraint(size: 60, cornerRadius: 4)
 

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/ViewController/MessageListController.swift

@@ -87,11 +87,13 @@ extension MessageListController {
             if messageListModel?.pagination?.currentPage ?? 1  <= messageListModel?.pagination?.totalPages ?? 1 {
                 if messageListModel?.pagination?.currentPage == 1{
                     self?.messageDataModels.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.messageDataModels = (self?.messageDataModels)! + (messageListModel?.data!)!
                 self?.tableView.reloadData()
                 if  self?.messageDataModels.count ?? 0 >= messageListModel?.pagination?.total ?? 0 {
-                    self?.tableView.isHiddenFooter(true)
+                    self?.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.tableView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/Controller/MessagePlanetActivityController.swift

@@ -78,12 +78,14 @@ extension MessagePlanetActivityController {
             if messageListModel?.pagination?.currentPage ?? 1  <= messageListModel?.pagination?.totalPages ?? 1 {
                 if messageListModel?.pagination?.currentPage == 1{
                     self?.messageDataModels.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.messageDataModels = (self?.messageDataModels)! + (messageListModel?.data!)!
-                self?.tableView.reloadData()
-                if  self?.messageDataModels.count ?? 0 >= messageListModel?.pagination?.total ?? 0 {
+                if  messageListModel?.pagination?.currentPage ?? 1 >= messageListModel?.pagination?.totalPages ?? 1 {
                     self?.tableView.endFooterNoMoreData()
                 }
+                self?.tableView.reloadData()
             }else {
                 self?.tableView.endFooterNoMoreData()
             }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetNotification/Controller/MessagePlanetNotiController.swift

@@ -68,12 +68,15 @@ extension MessagePlanetNotiController {
             if messageListModel?.pagination?.currentPage ?? 1  <= messageListModel?.pagination?.totalPages ?? 1 {
                 if messageListModel?.pagination?.currentPage == 1{
                     self?.messageDataModels.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.messageDataModels = (self?.messageDataModels)! + (messageListModel?.data!)!
-                self?.tableView.reloadData()
-                if  self?.messageDataModels.count ?? 0 >= messageListModel?.pagination?.total ?? 0 {
-                    self?.tableView.isHiddenFooter(true)
+                if  messageListModel?.pagination?.currentPage ?? 1 >= messageListModel?.pagination?.totalPages ?? 1 {
+                    self?.tableView.endFooterNoMoreData()
                 }
+                self?.tableView.reloadData()
+                
             }else {
                 self?.tableView.endFooterNoMoreData()
             }

RainbowPlanet/RainbowPlanet/Modules/MineModule/MyFollowAndFan/ViewController/MyFollowAndFanViewController.swift

@@ -146,7 +146,7 @@ extension MyFollowAndFanViewController {
                 self?.userFollowModels = (self?.userFollowModels)! + (userFollowsModel?.data!)!
                 self?.tableView.reloadData()
                 if  self?.userFollowModels.count ?? 0 >= userFollowsModel?.pagination?.total ?? 0 {
-                    self?.tableView.isHiddenFooter(true)
+                    self?.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.tableView.endFooterNoMoreData()
@@ -161,11 +161,13 @@ extension MyFollowAndFanViewController {
             if userFansModel?.pagination?.currentPage ?? 1  <= userFansModel?.pagination?.totalPages ?? 1 {
                 if userFansModel?.pagination?.currentPage == 1{
                     self?.userFanModels.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.userFanModels = (self?.userFanModels)! + (userFansModel?.data!)!
                 self?.tableView.reloadData()
                 if  self?.userFanModels.count ?? 0 >= userFansModel?.pagination?.total ?? 0 {
-                    self?.tableView.isHiddenFooter(true)
+                    self?.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.tableView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherListView.swift

@@ -106,12 +106,14 @@ extension PersonViewUserAndOtherListView {
             if communityPostMyModel?.pagination?.currentPage ?? 1  <= communityPostMyModel?.pagination?.totalPages ?? 1 {
                 if communityPostMyModel?.pagination?.currentPage == 1{
                     self?.postMyModels.removeAll()
+                    self?.collectionView.resetNoMoreData()
+
                 }
                 self?.postMyModels = (self?.postMyModels)! + (communityPostMyModel?.data!)!
                 self?.collectionView.reloadData()
                 if  self?.postMyModels.count ?? 0 >= communityPostMyModel?.pagination?.total ?? 0 {
                     
-                    self?.collectionView.isHiddenFooter(true)
+                    self?.collectionView.endFooterNoMoreData()
                 }
             }else {
                 self?.collectionView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderListViewController.swift

@@ -98,7 +98,7 @@ class OrderListViewController: UIViewController {
                 self?.orderModelArray = (self?.orderModelArray)! + (orderListModel?.data!)!
                 self?.orderListView.tableView.reloadData()
                 if self?.orderModelArray.isEmpty ?? true {
-                    self?.orderListView.tableView.isHiddenFooter(true)
+                    self?.orderListView.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.orderListView.tableView.endFooterNoMoreData()
@@ -418,7 +418,7 @@ extension OrderListViewController : JXSegmentedListContainerViewListDelegate {
                 self?.orderModelArray = (self?.orderModelArray)! + (orderListModel?.data!)!
                 self?.orderListView.tableView.reloadData()
                 if self?.orderModelArray.isEmpty ?? true {
-                    self?.orderListView.tableView.isHiddenFooter(true)
+                    self?.orderListView.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.orderListView.tableView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/Controller/PublishAddTopicController.swift

@@ -216,10 +216,12 @@ extension PublishAddTopicController {
                 self?.communityTopicModels = (self?.communityTopicModels)! + (topicCategoryModel?.data!)!
                 self?.tableView.reloadData()
                 if  self?.communityTopicModels.count ?? 0 >= topicCategoryModel?.pagination?.total ?? 0 {
-//                    self?.collectionView.isHiddenFooter(true)
+
+//                    self?.collectionView.endFooterNoMoreData()
                 }
             }else {
 //                self?.collectionView.endFooterNoMoreData()
+
             }
         }
     }
@@ -234,13 +236,15 @@ extension PublishAddTopicController {
             if communityTopicsModel?.pagination?.currentPage ?? 1  <= communityTopicsModel?.pagination?.totalPages ?? 1 {
                 if communityTopicsModel?.pagination?.currentPage == 1{
                     self?.topicListModels.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.topicListModels = (self?.topicListModels)! + (communityTopicsModel?.data!)!
                 // 更新选中状态
                 self?.fixTopicSelectedStatus()
                 self?.tableView.reloadData()
                 if  self?.topicListModels.count ?? 0 >= communityTopicsModel?.pagination?.total ?? 0 {
-                    self?.tableView.isHiddenFooter(true)
+                    self?.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.tableView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicListController.swift

@@ -160,6 +160,8 @@ extension PublishMusicListController {
                 
                 if recommendMusicListModel?.pagination?.currentPage == 1 {
                     self?.musicItemMdlArr.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.createDisableMusicItem()
                 self?.musicItemMdlArr = (self?.musicItemMdlArr)! + (recommendMusicListModel?.data!)!
@@ -182,6 +184,8 @@ extension PublishMusicListController {
             if categoryMusicListModel?.pagination?.currentPage ?? 1 <= categoryMusicListModel?.pagination?.totalPages ?? 1 {
                 if categoryMusicListModel?.pagination?.currentPage == 1 {
                     self?.musicItemMdlArr.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.createDisableMusicItem()
                 self?.musicItemMdlArr = (self?.musicItemMdlArr)! + (categoryMusicListModel?.data!)!

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/TopicSelection/ViewController/TopicSelectionViewController.swift

@@ -130,11 +130,12 @@ extension TopicSelectionViewController {
             if communityTCopicCategoryModel?.pagination?.currentPage ?? 1  <= communityTCopicCategoryModel?.pagination?.totalPages ?? 1 {
                 if communityTCopicCategoryModel?.pagination?.currentPage == 1{
                     self?.communityTopicModels.removeAll()
+                    self?.collectionView.resetNoMoreData()
                 }
                 self?.communityTopicModels = (self?.communityTopicModels)! + (communityTCopicCategoryModel?.data!)!
                 self?.collectionView.reloadData()
                 if  self?.communityTopicModels.count ?? 0 >= communityTCopicCategoryModel?.pagination?.total ?? 0 {
-                    self?.collectionView.isHiddenFooter(true)
+                    self?.collectionView.endFooterNoMoreData()
                 }
             }else {
                 self?.collectionView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/ViewController/SearchContentListViewController.swift

@@ -95,6 +95,8 @@ extension SearchContentListViewController {
             if communityPostsModel?.pagination?.currentPage ?? 1  <= communityPostsModel?.pagination?.totalPages ?? 1 {
                 if communityPostsModel?.pagination?.currentPage == 1{
                     self?.communityPostDataModels.removeAll()
+                    self?.collectionView.resetNoMoreData()
+
                 }
                 self?.communityPostDataModels = (self?.communityPostDataModels)! + (communityPostsModel?.data!)!
                 self?.heightList()

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchProduct/ViewController/SearchProductListViewController.swift

@@ -73,11 +73,13 @@ extension SearchProductListViewController {
             if productSearchListModel?.pagination?.currentPage ?? 1  <= productSearchListModel?.pagination?.totalPages ?? 1 {
                 if productSearchListModel?.pagination?.currentPage == 1{
                     self?.productSearchModelArray.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.productSearchModelArray = (self?.productSearchModelArray)! + (productSearchListModel?.data!)!
                 self?.tableView.reloadData()
                 if  self?.productSearchModelArray.count ?? 0 >= productSearchListModel?.pagination?.total ?? 0 {
-                    self?.tableView.isHiddenFooter(true)
+                    self?.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.tableView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchResult/View/SearchResultView.swift

@@ -13,7 +13,7 @@ class SearchResultView: BaseView {
     var productSearchModelArray : Array<ProductSearchModel>? {
         didSet {
             if productSearchModelArray?.isEmpty ?? true {
-                tableView.isHiddenFooter(true)
+                tableView.endFooterNoMoreData()
             }else {
                 tableView.isHiddenFooter(false)
             }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchTopicList/ViewController/SearchTopicListViewController.swift

@@ -76,11 +76,13 @@ extension SearchTopicListViewController {
             if communityTopicsModel?.pagination?.currentPage ?? 1  <= communityTopicsModel?.pagination?.totalPages ?? 1 {
                 if communityTopicsModel?.pagination?.currentPage == 1{
                     self?.communityTopicModels.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.communityTopicModels = (self?.communityTopicModels)! + (communityTopicsModel?.data!)!
                 self?.tableView.reloadData()
                 if  self?.communityTopicModels.count ?? 0 >= communityTopicsModel?.pagination?.total ?? 0 {
-                    self?.tableView.isHiddenFooter(true)
+                    self?.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.tableView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchUser/ViewController/SearchUserListViewController.swift

@@ -93,11 +93,13 @@ extension SearchUserListViewController {
             if searchMemberListModel?.pagination?.currentPage ?? 1  <= searchMemberListModel?.pagination?.totalPages ?? 1 {
                 if searchMemberListModel?.pagination?.currentPage == 1{
                     self?.searchMemberModels.removeAll()
+                    self?.tableView.resetNoMoreData()
+
                 }
                 self?.searchMemberModels = (self?.searchMemberModels)! + (searchMemberListModel?.data!)!
                 self?.tableView.reloadData()
                 if  self?.searchMemberModels.count ?? 0 >= searchMemberListModel?.pagination?.total ?? 0 {
-                    self?.tableView.isHiddenFooter(true)
+                    self?.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.tableView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Category/View/CategoryView.swift

@@ -13,7 +13,7 @@ class CategoryView: BaseView {
     var productSearchModelArray : Array<ProductSearchModel>? {
         didSet {
             if productSearchModelArray?.isEmpty ?? true {
-                rightTableView.isHiddenFooter(true)
+                rightTableView.endFooterNoMoreData()
             }else {
                 rightTableView.isHiddenFooter(false)
             }
@@ -24,10 +24,10 @@ class CategoryView: BaseView {
     var categoryModelArray : Array<CategoryModel>? {
         didSet {
             if categoryModelArray?.isEmpty ?? true {
-                leftTableView.isHiddenFooter(true)
+                leftTableView.endFooterNoMoreData()
 
             }else {
-                leftTableView.isHiddenFooter(true)
+                leftTableView.endFooterNoMoreData()
                 leftTableView.reloadData()
                 leftTableView.selectRow(at: leftIndexPath, animated: true, scrollPosition: UITableView.ScrollPosition.none)
 

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Category/ViewController/CategoryViewController.swift

@@ -122,6 +122,8 @@ class CategoryViewController: BaseViewController {
             if categoryListModel?.pagination?.currentPage ?? 1  <= categoryListModel?.pagination?.totalPages ?? 1 {
                 if categoryListModel?.pagination?.currentPage == 1{
                     self?.categoryModelArray.removeAll()
+                     self?.categoryView.rightTableView.resetNoMoreData()
+
                     self?.categoryModelArray = (self?.categoryModelArray)! + (categoryListModel?.data!)!
                      self?.productSearchApi(page: page)
                 }else {
@@ -147,11 +149,12 @@ class CategoryViewController: BaseViewController {
             if productSearchListModel?.pagination?.currentPage ?? 1  <= productSearchListModel?.pagination?.totalPages ?? 1 {
                 if productSearchListModel?.pagination?.currentPage == 1{
                     self?.productSearchModelArray.removeAll()
+                    self?.categoryView.rightTableView.resetNoMoreData()
                 }
                 self?.productSearchModelArray = (self?.productSearchModelArray)! + (productSearchListModel?.data!)!
                 self?.categoryView.productSearchModelArray = self?.productSearchModelArray
                 if  self?.productSearchModelArray.count ?? 0 >= productSearchListModel?.pagination?.total ?? 0 {
-                    self?.categoryView.rightTableView.isHiddenFooter(true)
+                    self?.categoryView.rightTableView.endFooterNoMoreData()
                 }
             }else {
                 self?.categoryView.rightTableView.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductAllComment/View/ProductAllCommentView.swift

@@ -16,7 +16,7 @@ class ProductAllCommentView: BaseView {
     var productAllCommentArray : Array<ProductCommentModel>? {
         didSet {
             if productAllCommentArray?.isEmpty ?? true {
-                tableView.isHiddenFooter(true)
+                tableView.endFooterNoMoreData()
             }else {
                 tableView.isHiddenFooter(false)
             }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/View/ShopView.swift

@@ -31,7 +31,7 @@ class ShopView: BaseView {
     var productSearchModelArray : Array<ProductSearchModel>? {
         didSet {
             if productSearchModelArray?.isEmpty ?? true {
-                tableView.isHiddenFooter(true)
+                tableView.endFooterNoMoreData()
             }else {
                 tableView.isHiddenFooter(false)
             }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Special/View/SpecialView.swift

@@ -13,7 +13,7 @@ class SpecialView: BaseView {
     var productSearchModelArray : Array<ProductSearchModel>? {
         didSet {
             if productSearchModelArray?.isEmpty ?? true {
-                tableView.isHiddenFooter(true)
+                tableView.endFooterNoMoreData()
             }else {
                 tableView.isHiddenFooter(false)
             }

RainbowPlanet/RainbowPlanet/Router/H5RouterModuleType.swift

@@ -65,7 +65,7 @@ extension H5RouterModuleType: MediatorSourceType {
             return vc
         case .pushOrder: //我的订单
             let vc = H5CommonViewController()
-            vc.URLString = kH5BeanRecordUrl
+            vc.URLString = kH5OrderUrl
             return vc
         case .pushSubject(let id): //兑换商品专题页面
             let vc = H5CommonViewController()

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

@@ -75,7 +75,9 @@ extension SwiftMoyaNetWorkManager {
         if let falseCallback = self.falseCallback  {
             falseCallback()
         }
-        SwiftProgressHUD.shared().showText("网络链接失败,请检查网络")
+        DispatchQueue.main.async {
+            SwiftProgressHUD.shared().showText("网络链接失败,请检查网络")
+        }
     }
     
     /// 网络连接状态

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

@@ -81,7 +81,9 @@ public let provider = MoyaProvider<MultiTarget>(endpointClosure: myEndpointClosu
 public var isNetworkConnect: Bool {
     get{
         if !AlamofireReachabilityManager.shared.isNetworkConnect() {
-            SwiftProgressHUD.shared().hide()
+            DispatchQueue.main.async {
+                SwiftProgressHUD.shared().hide()
+            }
             return false
         }else {
             if !kProductSever { //测试跟开发可以抓包

RainbowPlanet/RainbowPlanet/Supporting Files/Info.plist

@@ -10,17 +10,64 @@
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>en</string>
-		<string>zh</string>
-	</array>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.0</string>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>App需要您的同意,才能访问媒体资料库</string>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>App需要您的同意,才能访问蓝牙</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>App需要您的同意,才能访问日历</string>
+	<key>NSCameraUsageDescription</key>
+	<string>App需要您的同意,才能访问相册</string>
+	<key>NSContactsUsageDescription</key>
+	<string>App需要您的同意,才能访问通信录</string>
+	<key>NSHealthShareUsageDescription</key>
+	<string>App需要您的同意,才能访问健康分享</string>
+	<key>NSHealthUpdateUsageDescription</key>
+	<string>App需要您的同意,才能访问健康更新 </string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
+	<key>NSLocationUsageDescription</key>
+	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>App需要您的同意,才能访问麦克风</string>
+	<key>NSMotionUsageDescription</key>
+	<string>App需要您的同意,才能访问运动与健身</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>App需要您的同意,才能保存图像和视频到您的相册</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>App需要您的同意,才能访问相机</string>
+	<key>NSRemindersUsageDescription</key>
+	<string>App需要您的同意,才能访问提醒事项</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>zh_CN</string>
+	<key>UILaunchStoryboardName</key>
+	<string>Launch Screen</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>en</string>
+		<string>zh</string>
+	</array>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>location</string>
+		<string>remote-notification</string>
+	</array>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -74,61 +121,21 @@
 			</array>
 		</dict>
 	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSApplicationQueriesSchemes</key>
+	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>wechat</string>
-		<string>weixin</string>
-		<string>sinaweibohd</string>
-		<string>sinaweibo</string>
-		<string>sinaweibosso</string>
-		<string>weibosdk</string>
-		<string>weibosdk2.5</string>
-		<string>mqqapi</string>
-		<string>mqq</string>
-		<string>mqqOpensdkSSoLogin</string>
-		<string>mqqconnect</string>
-		<string>mqqopensdkdataline</string>
-		<string>mqqopensdkgrouptribeshare</string>
-		<string>mqqopensdkfriend</string>
-		<string>mqqopensdkapi</string>
-		<string>mqqopensdkapiV2</string>
-		<string>mqqopensdkapiV3</string>
-		<string>mqqopensdkapiV4</string>
-		<string>mqzoneopensdk</string>
-		<string>wtloginmqq</string>
-		<string>wtloginmqq2</string>
-		<string>mqqwpa</string>
-		<string>mqzone</string>
-		<string>mqzonev2</string>
-		<string>mqzoneshare</string>
-		<string>wtloginqzone</string>
-		<string>mqzonewx</string>
-		<string>mqzoneopensdkapiV2</string>
-		<string>mqzoneopensdkapi19</string>
-		<string>mqzoneopensdkapi</string>
-		<string>mqqbrowser</string>
-		<string>mttbrowser</string>
-		<string>tim</string>
-		<string>timapi</string>
-		<string>timopensdkfriend</string>
-		<string>timwpa</string>
-		<string>timgamebindinggroup</string>
-		<string>timapiwallet</string>
-		<string>timOpensdkSSoLogin</string>
-		<string>wtlogintim</string>
-		<string>timopensdkgrouptribeshare</string>
-		<string>timopensdkapiV4</string>
-		<string>timgamebindinggroup</string>
-		<string>timopensdkdataline</string>
-		<string>wtlogintimV1</string>
-		<string>timapiV1</string>
-		<string>alipay</string>
-		<string>alipayshare</string>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
@@ -193,61 +200,56 @@
 			</dict>
 		</dict>
 	</dict>
-	<key>NSAppleMusicUsageDescription</key>
-	<string>App需要您的同意,才能访问媒体资料库</string>
-	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>App需要您的同意,才能访问蓝牙</string>
-	<key>NSCalendarsUsageDescription</key>
-	<string>App需要您的同意,才能访问日历</string>
-	<key>NSCameraUsageDescription</key>
-	<string>App需要您的同意,才能访问相册</string>
-	<key>NSContactsUsageDescription</key>
-	<string>App需要您的同意,才能访问通信录</string>
-	<key>NSHealthShareUsageDescription</key>
-	<string>App需要您的同意,才能访问健康分享</string>
-	<key>NSHealthUpdateUsageDescription</key>
-	<string>App需要您的同意,才能访问健康更新 </string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
-	<key>NSLocationUsageDescription</key>
-	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>App需要您的同意,才能访问麦克风</string>
-	<key>NSMotionUsageDescription</key>
-	<string>App需要您的同意,才能访问运动与健身</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>App需要您的同意,才能保存图像和视频到您的相册</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>App需要您的同意,才能访问相机</string>
-	<key>NSRemindersUsageDescription</key>
-	<string>App需要您的同意,才能访问提醒事项</string>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>location</string>
-		<string>remote-notification</string>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>Launch Screen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UIRequiresFullScreen</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
+	<key>LSApplicationQueriesSchemes</key>
 	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>wechat</string>
+		<string>weixin</string>
+		<string>sinaweibohd</string>
+		<string>sinaweibo</string>
+		<string>sinaweibosso</string>
+		<string>weibosdk</string>
+		<string>weibosdk2.5</string>
+		<string>mqqapi</string>
+		<string>mqq</string>
+		<string>mqqOpensdkSSoLogin</string>
+		<string>mqqconnect</string>
+		<string>mqqopensdkdataline</string>
+		<string>mqqopensdkgrouptribeshare</string>
+		<string>mqqopensdkfriend</string>
+		<string>mqqopensdkapi</string>
+		<string>mqqopensdkapiV2</string>
+		<string>mqqopensdkapiV3</string>
+		<string>mqqopensdkapiV4</string>
+		<string>mqzoneopensdk</string>
+		<string>wtloginmqq</string>
+		<string>wtloginmqq2</string>
+		<string>mqqwpa</string>
+		<string>mqzone</string>
+		<string>mqzonev2</string>
+		<string>mqzoneshare</string>
+		<string>wtloginqzone</string>
+		<string>mqzonewx</string>
+		<string>mqzoneopensdkapiV2</string>
+		<string>mqzoneopensdkapi19</string>
+		<string>mqzoneopensdkapi</string>
+		<string>mqqbrowser</string>
+		<string>mttbrowser</string>
+		<string>tim</string>
+		<string>timapi</string>
+		<string>timopensdkfriend</string>
+		<string>timwpa</string>
+		<string>timgamebindinggroup</string>
+		<string>timapiwallet</string>
+		<string>timOpensdkSSoLogin</string>
+		<string>wtlogintim</string>
+		<string>timopensdkgrouptribeshare</string>
+		<string>timopensdkapiV4</string>
+		<string>timgamebindinggroup</string>
+		<string>timopensdkdataline</string>
+		<string>wtlogintimV1</string>
+		<string>timapiV1</string>
+		<string>alipay</string>
+		<string>alipayshare</string>
 	</array>
 </dict>
 </plist>

RainbowPlanet/RainbowPlanet/Tools/EmptyView/DIYEmptyView.swift

@@ -20,8 +20,18 @@ class DIYEmptyView: LYEmptyView {
         detailLabFont = kRegularFont12
         detailLabTextColor = k666666Color
         
+        actionBtnHorizontalMargin = 180
+        contentViewY = kScaleValue(value: 164 + kNavBarTotalHeight)
+        subViewMargin = 20
+        actionBtnFont = kBoldFont16
+        actionBtnHeight = 32
+        actionBtnCornerRadius = 32/2
+        actionBtnTitleColor = kffffffColor
+        actionBtnBackGroundColor = kThemeColor
+        
     }
     
+    
     /// tableView上的默认图
     ///
     /// - Parameter tableView: UITableView
@@ -35,10 +45,31 @@ class DIYEmptyView: LYEmptyView {
     /// collectionView上的默认图
     ///
     /// - Parameter collectionView: UICollectionView
-    class func emptyTableView(collectionView:UICollectionView,contentViewY : CGFloat = kScaleValue(value: 164)) {
+    class func emptyCollectionView(collectionView:UICollectionView,contentViewY : CGFloat = kScaleValue(value: 164)) {
         let emptyView = DIYEmptyView.empty(withImageStr: "default_page_content", titleStr: nil, detailStr: "暂时没有内容哦")
         emptyView?.contentViewY = contentViewY
         collectionView.ly_emptyView = emptyView
         collectionView.ly_startLoading()
     }
+    
+    /// tableView上的无网络图
+    ///
+    /// - Parameter tableView: tableView
+    class func emptyTableViewNetwork(tableView:UITableView,refresh:@escaping () -> Void) {
+        let emptyView = DIYEmptyView.emptyActionView(withImageStr: "default_page_outage", titleStr: nil, detailStr: "网络异常，请重试", btnTitleStr: "刷新") {
+            refresh()
+        }
+        tableView.ly_emptyView = emptyView
+        tableView.ly_startLoading()
+    }
+    /// collectionView上的无网络图
+    ///
+    /// - Parameter tableView: collectionView
+    class func emptyCollectionViewNetwork(collectionView:UICollectionView,refresh:@escaping () -> Void) {
+        let emptyView = DIYEmptyView.emptyActionView(withImageStr: "default_page_outage", titleStr: nil, detailStr: "网络异常，请重试", btnTitleStr: "刷新") {
+            refresh()
+        }
+        collectionView.ly_emptyView = emptyView
+        collectionView.ly_startLoading()
+    }
 }