Merge branch 'feature/jeremy' into develop

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -175,7 +175,6 @@
 		A739121B229F75F50033177E /* JXPagingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7391214229F75F50033177E /* JXPagingView.swift */; };
 		A739121D229F75F50033177E /* JXPagingListContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7391216229F75F50033177E /* JXPagingListContainerView.swift */; };
 		A73A56D322DC59A3004920FE /* PushModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A73A56D222DC59A3004920FE /* PushModel.swift */; };
-		A73A56D522DC5E34004920FE /* UMPushRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A73A56D422DC5E34004920FE /* UMPushRouterModuleType.swift */; };
 		A73A56D922DC8378004920FE /* UpdateVersionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A73A56D822DC8378004920FE /* UpdateVersionView.swift */; };
 		A73A56DB22DC9AB5004920FE /* UpdateVersionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A73A56DA22DC9AB5004920FE /* UpdateVersionModel.swift */; };
 		A73A56DE22DC9CCE004920FE /* UpdateVersionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A73A56DD22DC9CCE004920FE /* UpdateVersionManager.swift */; };
@@ -433,6 +432,8 @@
 		A7F2D6DD22B2536F0093000B /* CardContentPicVideoCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F2D6DC22B2536F0093000B /* CardContentPicVideoCollectionViewCell.swift */; };
 		A7F2D6DF22B25B5D0093000B /* CardContentPicVideoCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F2D6DE22B25B5D0093000B /* CardContentPicVideoCollectionViewLayout.swift */; };
 		A7F2D6E122B25EF30093000B /* CardContentPicVideoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F2D6E022B25EF30093000B /* CardContentPicVideoModel.swift */; };
+		A7F3069122E1698400DC7917 /* json_Image_0.png in Resources */ = {isa = PBXBuildFile; fileRef = A7F3069022E1698400DC7917 /* json_Image_0.png */; };
+		A7F3069422E16A5B00DC7917 /* MineRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F3069322E16A5B00DC7917 /* MineRouterModuleType.swift */; };
 		A7FF1555228AC27600A85748 /* ProductAllCommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF1554228AC27600A85748 /* ProductAllCommentView.swift */; };
 		A7FF1557228AC3E800A85748 /* ProductAllCommentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF1556228AC3E800A85748 /* ProductAllCommentViewController.swift */; };
 		A7FF1560228C693D00A85748 /* OrderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF155F228C693D00A85748 /* OrderViewController.swift */; };
@@ -882,7 +883,6 @@
 		A7391214229F75F50033177E /* JXPagingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JXPagingView.swift; sourceTree = "<group>"; };
 		A7391216229F75F50033177E /* JXPagingListContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JXPagingListContainerView.swift; sourceTree = "<group>"; };
 		A73A56D222DC59A3004920FE /* PushModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushModel.swift; sourceTree = "<group>"; };
-		A73A56D422DC5E34004920FE /* UMPushRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UMPushRouterModuleType.swift; sourceTree = "<group>"; };
 		A73A56D822DC8378004920FE /* UpdateVersionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateVersionView.swift; sourceTree = "<group>"; };
 		A73A56DA22DC9AB5004920FE /* UpdateVersionModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateVersionModel.swift; sourceTree = "<group>"; };
 		A73A56DD22DC9CCE004920FE /* UpdateVersionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateVersionManager.swift; sourceTree = "<group>"; };
@@ -1153,6 +1153,8 @@
 		A7F2D6DC22B2536F0093000B /* CardContentPicVideoCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardContentPicVideoCollectionViewCell.swift; sourceTree = "<group>"; };
 		A7F2D6DE22B25B5D0093000B /* CardContentPicVideoCollectionViewLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardContentPicVideoCollectionViewLayout.swift; sourceTree = "<group>"; };
 		A7F2D6E022B25EF30093000B /* CardContentPicVideoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardContentPicVideoModel.swift; sourceTree = "<group>"; };
+		A7F3069022E1698400DC7917 /* json_Image_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = json_Image_0.png; sourceTree = "<group>"; };
+		A7F3069322E16A5B00DC7917 /* MineRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineRouterModuleType.swift; sourceTree = "<group>"; };
 		A7FF1554228AC27600A85748 /* ProductAllCommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductAllCommentView.swift; sourceTree = "<group>"; };
 		A7FF1556228AC3E800A85748 /* ProductAllCommentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductAllCommentViewController.swift; sourceTree = "<group>"; };
 		A7FF155F228C693D00A85748 /* OrderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderViewController.swift; sourceTree = "<group>"; };
@@ -2743,10 +2745,8 @@
 		A75B787522E079BC007B986A /* AnimationJSON */ = {
 			isa = PBXGroup;
 			children = (
-				A75B787722E07A50007B986A /* communityModuleTabbar.json */,
-				A75B787622E07A50007B986A /* messageModuleTabbar.json */,
-				A75B787922E07A50007B986A /* MineModuleTabbar.json */,
-				A75B787822E07A50007B986A /* shoppingMallModuleTabbar.json */,
+				A7F3069222E1698700DC7917 /* JSON */,
+				A7F3068F22E1698400DC7917 /* JSONImages */,
 			);
 			path = AnimationJSON;
 			sourceTree = "<group>";
@@ -3625,8 +3625,8 @@
 				A7DAB33222D881F5005B964E /* H5RouterModuleType.swift */,
 				A7DAB33422D8D3AC005B964E /* RegisterLoginRouterModuleType.swift */,
 				A7DAB33822DC2B83005B964E /* ShareRouterModuleType.swift */,
-				A73A56D422DC5E34004920FE /* UMPushRouterModuleType.swift */,
 				BDBC0AF322DDE9BC00CA788E /* PublishRouterModuleType.swift */,
+				A7F3069322E16A5B00DC7917 /* MineRouterModuleType.swift */,
 			);
 			path = Router;
 			sourceTree = "<group>";
@@ -4446,6 +4446,25 @@
 			path = PicVideo;
 			sourceTree = "<group>";
 		};
+		A7F3068F22E1698400DC7917 /* JSONImages */ = {
+			isa = PBXGroup;
+			children = (
+				A7F3069022E1698400DC7917 /* json_Image_0.png */,
+			);
+			path = JSONImages;
+			sourceTree = "<group>";
+		};
+		A7F3069222E1698700DC7917 /* JSON */ = {
+			isa = PBXGroup;
+			children = (
+				A75B787722E07A50007B986A /* communityModuleTabbar.json */,
+				A75B787622E07A50007B986A /* messageModuleTabbar.json */,
+				A75B787922E07A50007B986A /* MineModuleTabbar.json */,
+				A75B787822E07A50007B986A /* shoppingMallModuleTabbar.json */,
+			);
+			path = JSON;
+			sourceTree = "<group>";
+		};
 		A7FF1550228AC22700A85748 /* ProductAllComment */ = {
 			isa = PBXGroup;
 			children = (
@@ -5843,6 +5862,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A7F3069122E1698400DC7917 /* json_Image_0.png in Resources */,
 				A75B787C22E07A51007B986A /* shoppingMallModuleTabbar.json in Resources */,
 				A7D77DE922DDBEF70048D5F6 /* RedemptionAreaModule.xcassets in Resources */,
 				A75B787A22E07A51007B986A /* messageModuleTabbar.json in Resources */,
@@ -5989,6 +6009,7 @@
 				BDE376D722C22A260055E2EA /* MBProgressHUD+AlivcHelper.m in Sources */,
 				A74322A422B8E7F60017C367 /* MyFollowAndFanHeaderView.swift in Sources */,
 				A73911AD229CD62F0033177E /* AlamofireReachabilityManager.swift in Sources */,
+				A7F3069422E16A5B00DC7917 /* MineRouterModuleType.swift in Sources */,
 				A7BB684F2268DCEC00AB07A2 /* SelfRecommendationViewController.swift in Sources */,
 				A7D77DF922DDF8FB0048D5F6 /* RedemptionAreaProductCollectionViewCell.swift in Sources */,
 				A7B4E7352281907A0012914A /* CMSModel.swift in Sources */,
@@ -6433,7 +6454,6 @@
 				A71CAB4122CB32C700D908A8 /* VirusViewModel.swift in Sources */,
 				A7FF1572228C7D4600A85748 /* OrderButtonTableViewCell.swift in Sources */,
 				BD61226122C3561C00D3F513 /* MagicCameraPressCircleView.m in Sources */,
-				A73A56D522DC5E34004920FE /* UMPushRouterModuleType.swift in Sources */,
 				A7B4E72F2281773F0012914A /* ProductFloorCenterTitleView.swift in Sources */,
 				A7AA9F5822C5F6150086498B /* SwiftMoyaServiceVirusApi.swift in Sources */,
 				A7284A542252FB5C000BAEC4 /* PaginationModel.swift in Sources */,

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -17,10 +17,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         //初始化窗口
         initWindow()
         //版本更新
-        _ = UpdateVersionManager.shared
+//        _ = UpdateVersionManager.shared
 
         //初始化百度地图
         BaiduMapManager.shared.initBaiduMap()
+        //百度定位
         BaiduMapManager.shared.startLocation()
         //初始化友盟
         UMManager.shared.initUM(launchOptions: launchOptions)

RainbowPlanet/RainbowPlanet/Macro/Common.swift

@@ -270,7 +270,13 @@ func getImageWidthheightStr(imgStr:String) -> String {
     }else {
 //        let size = UIImage.getImageSize(imgStr)
 //        return "\(size.width)_\(size.height)"
-        return "280_280"
+        if imgStr.contains("?") {
+            var imgStr1 = imgStr.suffix(from: (imgStr.lastIndex(of: "?"))!)
+            imgStr1 = (imgStr1.suffix(imgStr1.count - 1))
+            return String(imgStr1)
+        }else {
+            return "280_280"
+        }
     }
     
 }

RainbowPlanet/RainbowPlanet/Model/UserModel/FollowStatusModel.swift

@@ -10,6 +10,7 @@ class FollowStatusModel : NSObject, Mappable{
 
 	var isFollowStatus : Int?
     var uid : Int?
+    var postId : Int?
 
 	class func newInstance(map: Map) -> Mappable?{
 		return FollowStatusModel()

RainbowPlanet/RainbowPlanet/Model/UserModel/MessageListModel.swift

@@ -33,7 +33,13 @@ class MessageDataModel : NSObject, Mappable{
     var id : Int?
     var isRead : Int?
     var messageRuleId : Int?
-    var messageShowType : Int?
+    var messageShowType : Int? {
+        didSet {
+            messageShowTypeEnum = MessageShowType(rawValue: messageShowType ?? 0)
+        }
+    }
+    var messageShowTypeEnum : MessageShowType?
+    
     var messageType : Int?
     var param : MessageParamModel?
     var uid : Int?
@@ -70,6 +76,14 @@ class MessageParamModel : NSObject, Mappable{
     var uid : Int?
     var userName : String?
     var postId : Int?
+    var postType : String? {
+        didSet {
+            postTypeEnum = PostType(rawValue: postType ?? "")
+        }
+    }
+    
+    var postTypeEnum : PostType?
+
     
     
     class func newInstance(map: Map) -> Mappable?{
@@ -88,6 +102,7 @@ class MessageParamModel : NSObject, Mappable{
         uid <- map["uid"]
         userName <- map["username"]
         postId <- map["post_id"]
+        postType <- map["post_type"]
         
     }
     

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

@@ -31,7 +31,8 @@ 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?.scrollNumberLabel.change(to: NSNumber(integerLiteral: totalBeanModel?.todayBean ?? 0) , animated: true)
+            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)!)

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

@@ -98,7 +98,7 @@ class CommunityFollowViewController: UIViewController {
             let followStatusModel = notification.object as? FollowStatusModel
             if !(self?.communityFollowDataModels.isEmpty ?? true) {
                 for communityFollowDataModel in (self?.communityFollowDataModels)! {
-                    if communityFollowDataModel.relateData?.uid == followStatusModel?.uid {
+                    if communityFollowDataModel.relateData?.id == followStatusModel?.postId {
                         communityFollowDataModel.relateData?.isDislike = followStatusModel?.isFollowStatus
                     }
                 }

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

@@ -208,10 +208,7 @@ class CommunityViewController: BaseViewController {
                 
                 break
             case .activity?: //活动
-                let url = kH5ActivityUrl + "id=\(communityRecommendTypeDataModel?.linkContentId ?? 0)"
-                let vc = H5CommonViewController()
-                vc.URLString = url
-                self?.navigationController?.pushViewController(vc, animated: true)
+                Mediator.push(H5RouterModuleType.pushActivityId(id: "\(communityRecommendTypeDataModel?.linkContentId ?? 0)"))
                 break
             case .topic?: //话题
                 Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: communityRecommendTypeDataModel?.linkContentId ?? 0))

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

@@ -73,7 +73,7 @@ class CommunityRecommnendViewController: UIViewController {
             let followStatusModel = notification.object as? FollowStatusModel
             if !(self?.communityRecommendDataModels.isEmpty ?? true) {
                 for communityRecommendDataModel in (self?.communityRecommendDataModels)! {
-                    if communityRecommendDataModel.uid == followStatusModel?.uid {
+                    if communityRecommendDataModel.id == followStatusModel?.postId {
                         communityRecommendDataModel.isDislike = followStatusModel?.isFollowStatus
                     }
                 }
@@ -200,7 +200,7 @@ extension CommunityRecommnendViewController {
             
             VirusViewModel.shared.comment(communityRecommendDataModel:  self?.communityRecommendDataModel, id: communityPostCommentIdModel?.id ?? 0,content: text)
             
-            let count = self?.communityRecommendDataModel?.commentCount ?? 0 + 1
+            let count = (1 + (self?.communityRecommendDataModel?.commentCount ?? 0))
             self?.communityRecommendDataModel?.commentCount = count
             self?.tableView.reloadData()
             complete()

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

@@ -204,7 +204,7 @@ class CommunityFeaturedTopicsViewController: BaseViewController {
             let followStatusModel = notification.object as? FollowStatusModel
             if !(self?.communityRecommendDataModels.isEmpty ?? true) {
                 for communityRecommendDataModel in (self?.communityRecommendDataModels)! {
-                    if communityRecommendDataModel.uid == followStatusModel?.uid {
+                    if communityRecommendDataModel.id == followStatusModel?.postId {
                         communityRecommendDataModel.isDislike = followStatusModel?.isFollowStatus
                     }
                 }

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

@@ -215,7 +215,7 @@ class CommunityRecommendController: BaseViewController {
         }
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("unlikeApi"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in
             let followStatusModel = notification.object as? FollowStatusModel
-            if self?.communityPostDetailModel?.uid == followStatusModel?.uid {
+            if self?.communityPostDetailModel?.id == followStatusModel?.postId {
                 self?.communityPostDetailModel?.isDislike = followStatusModel?.isFollowStatus
                 self?.communityPostDetailTableViewHeaderView.communityPostDetailModel = self?.communityPostDetailModel
                 self?.tableView.reloadData()
@@ -371,7 +371,7 @@ extension CommunityRecommendController {
     func readVirueRecordAddApi() {
         var postDesc : String?
         if self.communityPostDetailModel?.title == nil ||  self.communityPostDetailModel?.title == "" {
-            postDesc = String(describing:self.communityPostDetailModel?.content?.prefix(20))
+            postDesc = "\(self.communityPostDetailModel?.content?.prefix(20) ?? "")"
         }else {
             postDesc = self.communityPostDetailModel?.title
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/CommunityPostDetailFSPagerViewCell.swift

@@ -49,7 +49,7 @@ class CommunityPostDetailFSPagerViewCell: FSPagerViewCell {
         let bgImageView = UIImageView()
         bgImageView.isUserInteractionEnabled = true
         bgImageView.image = kImage(name: "pic_preload")
-        bgImageView.contentMode = .scaleAspectFit
+        bgImageView.contentMode = .scaleAspectFill
         return bgImageView
     }()
     

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

@@ -85,6 +85,7 @@ class MessageListTableCell: UITableViewCell {
     
     lazy var typeImageView : UIImageView = {
         let typeImageView = UIImageView()
+        typeImageView.contentMode = .scaleAspectFill
         return typeImageView
     }()
     

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 
 /// 消息列表类型
@@ -115,9 +116,12 @@ extension MessageListController: UITableViewDataSource, UITableViewDelegate {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let messageDataModel = messageDataModels[indexPath.row]
         switch messageVCType {
-        case .comment?:
-            break
-        case .praise?:
+        case .comment?,.praise?:
+            if messageDataModel.param?.postTypeEnum == .video {
+                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(messageDataModel.param?.postId ?? 0)"))
+            }else {
+                Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(messageDataModel.param?.postId ?? 0)"))
+            }
             break
         case .follow?:
 

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 class MessagePlanetActivityController: BaseViewController {
     
@@ -53,7 +54,9 @@ class MessagePlanetActivityController: BaseViewController {
         tableView.backgroundColor = kf7f8faColor
         tableView.dataSource = self
         tableView.delegate = self
-        tableView.estimatedRowHeight = 200
+        tableView.estimatedRowHeight = 0
+        tableView.estimatedSectionFooterHeight = 0
+        tableView.estimatedSectionHeaderHeight = 0
         return tableView
     }()
 }
@@ -98,14 +101,46 @@ extension MessagePlanetActivityController: UITableViewDataSource, UITableViewDel
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
          let messageDataModel = messageDataModels[indexPath.row]
-        let url = kH5ActivityUrl + "id=\(messageDataModel.param?.activityUrl ?? "")" + "time=\(messageDataModel.param?.activityTime ?? "")"
-        let vc = H5CommonViewController()
-        vc.URLString = url
-        self.navigationController?.pushViewController(vc, animated: true)
+        switch messageDataModel.messageShowTypeEnum {
+        case .user?:
+            if UserModel.shared().getModel()?.uid != Int(messageDataModel.param?.activityUrl ?? "0") {
+                Mediator.push(MineRouterModuleType.pushOtherPersonalCenter(uid: Int(messageDataModel.param?.activityUrl ?? "0") ?? 0))
+            }
+            break
+        case .post?:
+            if messageDataModel.param?.postTypeEnum == .video {
+                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(messageDataModel.param?.activityUrl ?? "")"))
+            }else {
+                Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(messageDataModel.param?.activityUrl ?? "")"))
+            }
+            break
+        case .activity?:
+            Mediator.push(H5RouterModuleType.pushWeb(URLString: kH5ActivityUrl + "id=\(messageDataModel.param?.activityUrl ?? "")" + "&" + "time=\(messageDataModel.param?.activityTime ?? "")"))
+            break
+        case .topic?:
+            Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: Int(messageDataModel.param?.activityUrl ?? "0") ?? 0))
+            break
+        default:
+            break
+        }
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 212
     }
     
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.000001
+    }
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0.000001
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return nil
+    }
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return nil
+    }
+    
 }

RainbowPlanet/RainbowPlanet/Modules/MineModule/SetPassword/View/SetPasswordView.swift

@@ -102,7 +102,7 @@ class SetPasswordView: BaseView {
         passwordTextField.tintColor = kEnabledButtonColor
         passwordTextField.rx.text.orEmpty.changed.subscribe(onNext: {
             [weak self] (text) in
-            self?.passwordTextField.text = String(text.prefix(16)) as String
+            TextLimitTool.restrictionInputTextField((self?.passwordTextField)!, maxNumber: 16)
             self?.password = self?.passwordTextField.text ?? ""
             self?.observableString()
         }).disposed(by: disposeBag)
@@ -131,7 +131,7 @@ class SetPasswordView: BaseView {
         surePasswordTextField.tintColor = kEnabledButtonColor
         surePasswordTextField.rx.text.orEmpty.changed.subscribe(onNext: {
             [weak self] (text) in
-            self?.surePasswordTextField.text = String(text.prefix(16)) as String
+            TextLimitTool.restrictionInputTextField((self?.surePasswordTextField)!, maxNumber: 16)
             self?.surePassword = self?.surePasswordTextField.text ?? ""
             self?.observableString()
         }).disposed(by: disposeBag)

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderComment/View/OrderCommentTableViewCell.swift

@@ -127,7 +127,6 @@ class OrderCommentTableViewCell: UITableViewCell {
     
     private lazy var iconImageView: UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.contentMode = .scaleAspectFit
         iconImageView.contentMode = .scaleAspectFill
         iconImageView.masksToBounds = true
         return iconImageView

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/TopicSelection/View/TopicSelectionCollectionViewCell.swift

@@ -62,7 +62,7 @@ class TopicSelectionCollectionViewCell: UICollectionViewCell {
         bgLayer1.rainbowLayer(gradientColors: [UIColor(hexString: "000000", alpha: 0).cgColor,UIColor(hexString: "000000", alpha: 0.4).cgColor], gradientLocations: [0,1], gradientDisplayType: .vertical, startPoint: CGPoint(x: 0.5, y: 0), endPoint: CGPoint(x: 1, y: 1))
         iconImageView.image = kImage(name: "pic_preload")
         iconImageView.layer.addSublayer(bgLayer1)
-        iconImageView.contentMode = .scaleAspectFit
+        iconImageView.contentMode = .scaleAspectFill
         iconImageView.isUserInteractionEnabled = true
         return iconImageView
     }()
@@ -80,7 +80,7 @@ class TopicSelectionCollectionViewCell: UICollectionViewCell {
         titleLabel.textColor = kffffffColor
         titleLabel.font = kScaleRegularFont14
         titleLabel.textAlignment = .center
-        titleLabel.adjustsFontSizeToFitWidth = true
+        titleLabel.numberOfLines = 2
         return titleLabel
     }()
     

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchTopicList/View/SearchTopicListTableViewCell.swift

@@ -80,6 +80,7 @@ class SearchTopicListTableViewCell: UITableViewCell {
         iconButton.cornerRadius = 4
         iconButton.masksToBounds = true
         iconButton.isUserInteractionEnabled = false
+        iconButton.imageView?.contentMode = .scaleAspectFill
         return iconButton
     }()
     

RainbowPlanet/RainbowPlanet/Router/H5RouterModuleType.swift

@@ -9,7 +9,6 @@
 import UIKit
 import SwiftyMediator
 
-
 /// h5路由
 ///
 /// - pushWeb: 公共的h5

RainbowPlanet/RainbowPlanet/Router/MineRouterModuleType.swift

@@ -0,0 +1,29 @@
+//
+//  MineRouterModuleType.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/7/19.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import SwiftyMediator
+
+
+/// 我的模块路由
+///
+/// - pushOtherPersonalCenter: 他人个人中心
+public enum MineRouterModuleType: MediatorTargetType {
+    case pushOtherPersonalCenter(uid:Int)
+}
+
+extension MineRouterModuleType: MediatorSourceType {
+    public var viewController: UIViewController? {
+        switch self {
+        case .pushOtherPersonalCenter(let uid):
+            let vc = OtherPersonalCenterViewController()
+            vc.uid = uid
+            return vc
+        }
+    }
+}

RainbowPlanet/RainbowPlanet/Router/RouterManager.swift

@@ -47,10 +47,10 @@ class RouterManager: NSObject {
         case .post?:
             switch pushModel.pushPostType {//图文帖子
             case .image?,.html?:
-                Mediator.push(UMPushRouterModuleType.pushPostContent(id: pushModel.actionId ?? 0))
+                Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(pushModel.actionId ?? 0)"))
                 break
             case .video?: //视频帖子
-                Mediator.push(UMPushRouterModuleType.pushVideoContent(id: pushModel.actionId ?? 0))
+                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(pushModel.actionId ?? 0)"))
                 break
             default:
                 break

RainbowPlanet/RainbowPlanet/Router/UMPushRouterModuleType.swift

@@ -1,35 +0,0 @@
-//
-//  PushRouterModuleType.swift
-//  RainbowPlanet
-//
-//  Created by 南鑫林 on 2019/7/15.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-import SwiftyMediator
-
-/// 友盟推送
-///
-/// - pushPostContent: 帖子内容
-public enum UMPushRouterModuleType: MediatorTargetType {
-    case pushPostContent(id: Int)
-    case pushVideoContent(id: Int)
-}
-
-extension UMPushRouterModuleType: MediatorSourceType {
-    public var viewController: UIViewController? {
-        switch self {
-        case .pushPostContent(let id):
-            let vc = CommunityRecommendController()
-            vc.id = id
-            return vc
-        case .pushVideoContent(let id):
-            let vc = CommunityVideoListController()
-            vc.contentId = id
-            return vc
-        }
-    }
-}
-
-

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

@@ -9,8 +9,8 @@
 import Foundation
 
 let kPersonalService = false
-let kDevelopSever = true
-let kBetaSever = false
+let kDevelopSever = false
+let kBetaSever = true
 let kProductSever = false
 
 // MARK: - 数据服务器
@@ -29,8 +29,8 @@ public func kApiDataPrefix() -> String {
 }
 
 let kVirusPersonalService = false
-let kVirusDevelopSever = true
-let kVirusBetaSever = false
+let kVirusDevelopSever = false
+let kVirusBetaSever = true
 let kVirusProductSever = false
 
 // MARK: - Virus
@@ -49,8 +49,8 @@ public func kApiVirusPrefix() -> String {
 }
 
 let kH5PersonalService = false
-let kH5DevelopSever = true
-let kH5BetaSever = false
+let kH5DevelopSever = false
+let kH5BetaSever = true
 let kH5ProductSever = false
 
 // MARK: - H5

RainbowPlanet/RainbowPlanet/ViewModel/Virus/VirusViewModel.swift

@@ -41,6 +41,7 @@ extension VirusViewModel {
             if communityRecommendDataModel.isDislike == 0 {
                 let followStatusModel = FollowStatusModel()
                 followStatusModel.uid = communityRecommendDataModel.uid!
+                followStatusModel.postId = communityRecommendDataModel.id
                 followStatusModel.isFollowStatus = 1
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "unlikeApi"), object: followStatusModel)
                 completion(1)
@@ -218,6 +219,7 @@ extension VirusViewModel {
             if communityFollowDataModel.relateData?.isDislike == 0 {
                 let followStatusModel = FollowStatusModel()
                 followStatusModel.uid = communityFollowDataModel.relateData?.uid!
+                followStatusModel.postId = communityFollowDataModel.relateData?.id
                 followStatusModel.isFollowStatus = 1
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "unlikeApi"), object: followStatusModel)
                 completion(1)
@@ -769,7 +771,7 @@ extension VirusViewModel {
         virueRecordAddParameterModel.postId = postId
         virueRecordAddParameterModel.actionId = actionId
         virueRecordAddParameterModel.postAuthorUid = postAuthorUid
-        virueRecordAddParameterModel.postDesc = postDesc
+        virueRecordAddParameterModel.postDesc = "\(postDesc ?? "")"
         virueRecordAddParameterModel.postType = postType
         virueRecordAddParameterModel.postCover = postCover
         SwiftMoyaNetWorkServiceVirus.shared().virueRecordAddApi(virueRecordAddParameterModel: virueRecordAddParameterModel, completion: {(data) -> (Void) in
@@ -791,7 +793,7 @@ extension VirusViewModel {
         virueRecordAddParameterModel.actionId = "\(postId ?? 0)"
         virueRecordAddParameterModel.postAuthorUid = postAuthorUid
         if title == "" {
-            virueRecordAddParameterModel.postDesc = String(describing: content?.prefix(20))
+            virueRecordAddParameterModel.postDesc = "\(content?.prefix(20) ?? "")"
         }else {
             virueRecordAddParameterModel.postDesc = title
         }