Browse Source

分享修复完成

南鑫林 5 years ago
parent
commit
62dd78ce88
18 changed files with 100 additions and 47 deletions
  1. 8 4
      RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj
  2. 1 1
      RainbowPlanet/RainbowPlanet.xcodeproj/xcshareddata/xcschemes/RainbowPlanet.xcscheme
  3. 4 2
      RainbowPlanet/RainbowPlanet/Macro/CommonH5.swift
  4. 2 2
      RainbowPlanet/RainbowPlanet/Model/UserModel/UserModel.swift
  5. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift
  6. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift
  7. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift
  8. 2 2
      RainbowPlanet/RainbowPlanet/Modules/H5Modules/H5Common/ViewController/H5CommonViewController.swift
  9. 3 3
      RainbowPlanet/RainbowPlanet/Modules/MineModule/AccountSecurity/ViewController/AccountSecurityViewController.swift
  10. 2 3
      RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift
  11. 2 3
      RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift
  12. 2 3
      RainbowPlanet/RainbowPlanet/Modules/MineModule/Set/ViewController/SetViewController.swift
  13. 1 1
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/RegisterLogin/ViewController/RegisterLoginViewController.swift
  14. 29 8
      RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommunityModule/ShareCommunity/ShareCommunityView.swift
  15. 2 3
      RainbowPlanet/RainbowPlanet/Router/RegisterLoginModuleType.swift
  16. 27 0
      RainbowPlanet/RainbowPlanet/Router/ShareRouterModuleType.swift
  17. 9 9
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift
  18. 3 0
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkH5Manager.swift

+ 8 - 4
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -383,7 +383,8 @@
 		A7D5F26322C0CF8600F8E9AF /* UserFansModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F26222C0CF8600F8E9AF /* UserFansModel.swift */; };
 		A7D5F26522C118F100F8E9AF /* CMSMemberListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F26422C118F100F8E9AF /* CMSMemberListModel.swift */; };
 		A7DAB33322D881F5005B964E /* H5RouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DAB33222D881F5005B964E /* H5RouterModuleType.swift */; };
-		A7DAB33522D8D3AC005B964E /* RegisterLoginModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DAB33422D8D3AC005B964E /* RegisterLoginModuleType.swift */; };
+		A7DAB33522D8D3AC005B964E /* RegisterLoginRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DAB33422D8D3AC005B964E /* RegisterLoginRouterModuleType.swift */; };
+		A7DAB33922DC2B83005B964E /* ShareRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DAB33822DC2B83005B964E /* ShareRouterModuleType.swift */; };
 		A7DC467F22783A47001F3EFC /* EditExpressAddressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DC467E22783A47001F3EFC /* EditExpressAddressTableViewCell.swift */; };
 		A7DF50D622A4E8B400998908 /* OrderDetailProductTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DF50D522A4E8B400998908 /* OrderDetailProductTableViewCell.swift */; };
 		A7DF50D822A4FAFC00998908 /* ProductDetailEvaluationImageCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DF50D722A4FAFC00998908 /* ProductDetailEvaluationImageCollectionViewCell.swift */; };
@@ -1074,7 +1075,8 @@
 		A7D5F26222C0CF8600F8E9AF /* UserFansModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserFansModel.swift; sourceTree = "<group>"; };
 		A7D5F26422C118F100F8E9AF /* CMSMemberListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CMSMemberListModel.swift; sourceTree = "<group>"; };
 		A7DAB33222D881F5005B964E /* H5RouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = H5RouterModuleType.swift; sourceTree = "<group>"; };
-		A7DAB33422D8D3AC005B964E /* RegisterLoginModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterLoginModuleType.swift; sourceTree = "<group>"; };
+		A7DAB33422D8D3AC005B964E /* RegisterLoginRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterLoginRouterModuleType.swift; sourceTree = "<group>"; };
+		A7DAB33822DC2B83005B964E /* ShareRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareRouterModuleType.swift; sourceTree = "<group>"; };
 		A7DC467E22783A47001F3EFC /* EditExpressAddressTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditExpressAddressTableViewCell.swift; sourceTree = "<group>"; };
 		A7DF50D522A4E8B400998908 /* OrderDetailProductTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderDetailProductTableViewCell.swift; sourceTree = "<group>"; };
 		A7DF50D722A4FAFC00998908 /* ProductDetailEvaluationImageCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDetailEvaluationImageCollectionViewCell.swift; sourceTree = "<group>"; };
@@ -3457,7 +3459,8 @@
 				A770E5DA22CED8C600CBD0A4 /* RouterManager.swift */,
 				A770E5DF22CF19FA00CBD0A4 /* CommunityRouterModuleType.swift */,
 				A7DAB33222D881F5005B964E /* H5RouterModuleType.swift */,
-				A7DAB33422D8D3AC005B964E /* RegisterLoginModuleType.swift */,
+				A7DAB33422D8D3AC005B964E /* RegisterLoginRouterModuleType.swift */,
+				A7DAB33822DC2B83005B964E /* ShareRouterModuleType.swift */,
 			);
 			path = Router;
 			sourceTree = "<group>";
@@ -6168,7 +6171,7 @@
 				A7FF1564228C696B00A85748 /* OrderListView.swift in Sources */,
 				A70B2C072284305400B2449F /* ProductModel.swift in Sources */,
 				A72A72BC22321DE000B21995 /* Extension+UIAlertController.swift in Sources */,
-				A7DAB33522D8D3AC005B964E /* RegisterLoginModuleType.swift in Sources */,
+				A7DAB33522D8D3AC005B964E /* RegisterLoginRouterModuleType.swift in Sources */,
 				A71CAB4522CB36EC00D908A8 /* CommunityFollowUserViewModel.swift in Sources */,
 				A7BB68662269B1DD00AB07A2 /* AddressPOIView.swift in Sources */,
 				BDF862A7228E42FA000DEF84 /* OrderApplyRefundController.swift in Sources */,
@@ -6326,6 +6329,7 @@
 				A7284440224DFACD00F82F30 /* InfoModel.swift in Sources */,
 				A72A72B522321DE000B21995 /* Extension+UITextView.swift in Sources */,
 				A770E61922D6780600CBD0A4 /* ShareCommunityVideoView.swift in Sources */,
+				A7DAB33922DC2B83005B964E /* ShareRouterModuleType.swift in Sources */,
 				BD6122FD22C36B0F00D3F513 /* AlivcBaseViewController.m in Sources */,
 				BD0FAA6522C4C35E00DDFB37 /* AliyunCycleProgressView.m in Sources */,
 				A7AA9F6322C62B270086498B /* CommunityRecommnendViewController.swift in Sources */,

+ 1 - 1
RainbowPlanet/RainbowPlanet.xcodeproj/xcshareddata/xcschemes/RainbowPlanet.xcscheme

@@ -62,7 +62,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       disableMainThreadChecker = "YES"

+ 4 - 2
RainbowPlanet/RainbowPlanet/Macro/CommonH5.swift

@@ -8,8 +8,10 @@
 
 import Foundation
 
-let kCommunityPostDetailTitleShare  = "送了你 500 彩虹豆,快来赞我的动态哦!我马上就能换东西啦^_^"
+let kCommunityPostDetailTitleShare  = "送了你 \(ConfigModel.shared.object()?.sharePostBean ?? 0) 彩虹豆,快来赞我的动态哦!我马上就能换东西啦^_^"
 
-let kCommunityPushingNewActivitiesTitleShare  = "在吗?送你 500 彩虹豆~"
 
+let kCommunityPushingNewActivitiesTitle  = "向好友传递美好生活,送TA \(ConfigModel.shared.object()?.sharePostBean ?? 0)彩虹豆"
+let kCommunityPushingNewActivitiesDetailTitle  = "越多好友加入,收获彩虹豆越多"
+let kCommunityPushingNewActivitiesTitleShare  = "在吗?送你 \(ConfigModel.shared.object()?.sharePostBean ?? 0) 彩虹豆~"
 let kCommunityPushingNewActivitiesDetailTitleShare  = "彩虹星球,每天刷一下,免费领优酷会员、腾讯会员、网易云会员、爱奇艺会员、芒果会员...很多会员!!!"

+ 2 - 2
RainbowPlanet/RainbowPlanet/Model/UserModel/UserModel.swift

@@ -129,10 +129,10 @@ public class UserModel : NSObject, NSCoding, Mappable{
         }
         
         if inviteUid != nil{
-            aCoder.encode(isFollowSuggestTopic, forKey: "invite_uid")
+            aCoder.encode(inviteUid, forKey: "invite_uid")
         }
         if inviteCode != nil{
-            aCoder.encode(isNewMember, forKey: "invite_code")
+            aCoder.encode(inviteCode, forKey: "invite_code")
         }
 
 	}

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -251,7 +251,7 @@ class CommunityViewController: BaseViewController {
             title: "向好友传递美好生活,送TA 500彩虹豆",
             detailTitle: "越多好友看到,收获彩虹豆越多",
             h5Str: (H5UrlStr ?? "" + "\(UserModel.shared().getModel()?.inviteCode ?? "")"),
-            thumbnailImg: imgUrl ?? "",
+            thumbnailImg: UIImage.imageUrl(imgUrl),
             sharedTitle: String(title ?? ""),
             sharedDetailTitle: kCommunityPostDetailTitleShare,
             shareCommunityViewType: ShareCommunityViewType.postDetail,

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -279,7 +279,7 @@ class CommunityRecommendController: BaseViewController {
             title: "向好友传递美好生活,送TA 500彩虹豆",
             detailTitle: "越多好友看到,收获彩虹豆越多",
             h5Str: (self.communityPostDetailModel?.h5url ?? "" + "\(UserModel.shared().getModel()?.inviteCode ?? "")"),
-            thumbnailImg: self.communityPostDetailModel?.img ?? "",
+            thumbnailImg: UIImage.imageUrl(self.communityPostDetailModel?.img),
             sharedTitle: String(title ?? ""),
             sharedDetailTitle: kCommunityPostDetailTitleShare,
             shareCommunityViewType: ShareCommunityViewType.postDetail,

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift

@@ -290,7 +290,7 @@ extension CommunityVideoListController {
             title: "向好友传递美好生活,送TA 500彩虹豆",
             detailTitle: "越多好友看到,收获彩虹豆越多",
             h5Str: (videoItemModel.h5url ?? "" + "\(UserModel.shared().getModel()?.inviteCode ?? "")"),
-            thumbnailImg: videoItemModel.img ?? "",
+            thumbnailImg: UIImage.imageUrl(videoItemModel.img),
             sharedTitle: String(title ?? ""),
             sharedDetailTitle: kCommunityPostDetailTitleShare,
             shareCommunityViewType: ShareCommunityViewType.postDetail,

+ 2 - 2
RainbowPlanet/RainbowPlanet/Modules/H5Modules/H5Common/ViewController/H5CommonViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 import WebKit
 import SwiftyJSON
+import SwiftyMediator
 
 
 class H5CommonViewController: BaseJSWebBaseViewController {
@@ -52,8 +53,7 @@ class H5CommonViewController: BaseJSWebBaseViewController {
             // 邀请
             if WVJBModelType(rawValue: wvjbModel.type!)  == .share {
                 if WVJBParamsModelType(rawValue: wvjbModel.params!.type ?? "") == .invite {
-                    let vc = CommunityShareActivityViewController()
-                    self?.navigationController?.pushViewController(vc, animated: true)
+                    ShareCommunityView.inviteGoodFriends()
                 }
             }
         }

+ 3 - 3
RainbowPlanet/RainbowPlanet/Modules/MineModule/AccountSecurity/ViewController/AccountSecurityViewController.swift

@@ -76,12 +76,12 @@ class AccountSecurityViewController: BaseViewController {
     /// - Parameter userModel: 用户
     func setMobile(userModel:UserModel?) {
         if userModel?.mobile == nil ||  userModel?.mobile == "" {
-            Mediator.push(RegisterLoginModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .accountSecurityBindMobile))
+            Mediator.push(RegisterLoginRouterModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .accountSecurityBindMobile))
         }else {
             AlertSheetView.alert(title: "确认更换您的手机号", cancelTitle: "取消", sureTitle: "确认", cancelBlock: { (popupView, index, string) in
                 
             }) {(popupView, index, string) in
-                Mediator.push(RegisterLoginModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .accountSecurityBindMobile))
+                Mediator.push(RegisterLoginRouterModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .accountSecurityBindMobile))
             }
         }
     }
@@ -111,7 +111,7 @@ class AccountSecurityViewController: BaseViewController {
     ///   - userModel: 用户
     func setPassword(userModel:UserModel?) {
         if userModel?.mobile == nil ||  userModel?.mobile == "" {
-            Mediator.push(RegisterLoginModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .accountSecuritySet))
+            Mediator.push(RegisterLoginRouterModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .accountSecuritySet))
         }else {
             let vc = SetPasswordViewController()
             self.navigationController?.pushViewController(vc, animated: true)

+ 2 - 3
RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 import JXSegmentedView
 import RxSwift
+import SwiftyMediator
 
 class OtherPersonalCenterViewController: BaseViewController {
 
@@ -71,9 +72,7 @@ class OtherPersonalCenterViewController: BaseViewController {
     
     override func setupData() {
         navigationBar.onClickRightButton = {
-            [weak self] in
-            let vc = CommunityShareActivityViewController()
-            self?.navigationController?.pushViewController(vc, animated: true)
+            ShareCommunityView.inviteGoodFriends()
         }
         reloadData()
         pagingView.mainTableView.addHeaderWithHeader(withBeginRefresh: true, animation: false, refreshBlock: { [weak self] (page) in

+ 2 - 3
RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 import JXSegmentedView
 import RxSwift
+import SwiftyMediator
 
 class UserPersonalCenterViewController: BaseViewController {
     
@@ -90,9 +91,7 @@ class UserPersonalCenterViewController: BaseViewController {
     
     override func setupData() {
         navigationBar.onClickRightButton = {
-            [weak self] in
-            let vc = CommunityShareActivityViewController()
-            self?.navigationController?.pushViewController(vc, animated: true)
+            ShareCommunityView.inviteGoodFriends()
         }
         
         //设置

+ 2 - 3
RainbowPlanet/RainbowPlanet/Modules/MineModule/Set/ViewController/SetViewController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 class SetViewController: BaseViewController {
     
@@ -60,9 +61,7 @@ class SetViewController: BaseViewController {
                     break
                 // 分享彩虹星球app
                 case 3:
-                    let vc = H5CommonViewController()
-                    vc.URLString = "https://www.baidu.com"
-                    self?.navigationController?.pushViewController(vc, animated: true)
+                    ShareCommunityView.inviteGoodFriends()
                     break
                 default:
                     showSwiftProgressHUDInfo()

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/RegisterLogin/ViewController/RegisterLoginViewController.swift

@@ -56,7 +56,7 @@ class RegisterLoginViewController: BaseViewController {
                         userModel1.openId = userModel.openId
                         userModel1.unionId = userModel.unionId
                         UserModel.shared().setModel(model: userModel1)
-                        Mediator.push(RegisterLoginModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .weixinlogin))                        
+                        Mediator.push(RegisterLoginRouterModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .weixinlogin))                        
                     }
 
                 })

+ 29 - 8
RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommunityModule/ShareCommunity/ShareCommunityView.swift

@@ -9,6 +9,7 @@
 import UIKit
 import FWPopupView
 import RxSwift
+import SwiftyMediator
 
 enum ShareCommunityViewType {
     case postDetail
@@ -27,7 +28,7 @@ class ShareCommunityView: FWPopupView {
     private var sharedTitle : String?
     private var sharedDetailTitle : String?
     private var h5Str : String?
-    private var thumbnailImg : String?
+    private var thumbnailImg : UIImage?
     private var shareCommunityViewType : ShareCommunityViewType?
     
     override init(frame: CGRect) {
@@ -38,7 +39,7 @@ class ShareCommunityView: FWPopupView {
     var completion : Completion?
     typealias SaveCompletion = (() -> Void)
     var saveCompletion : SaveCompletion?
-    init(title:String,detailTitle:String,h5Str:String,thumbnailImg:String,sharedTitle:String,sharedDetailTitle:String,shareCommunityViewType:ShareCommunityViewType) {
+    init(title:String,detailTitle:String,h5Str:String,thumbnailImg:UIImage?,sharedTitle:String,sharedDetailTitle:String,shareCommunityViewType:ShareCommunityViewType) {
         self.init()
         self.title = title
         self.detailTitle = detailTitle
@@ -156,12 +157,12 @@ class ShareCommunityView: FWPopupView {
     
     
     /// 初始化
-    class func shareCommunityView(title:String,detailTitle:String,h5Str:String,thumbnailImg:String,sharedTitle:String,sharedDetailTitle:String,shareCommunityViewType:ShareCommunityViewType,completion: @escaping Completion) -> ShareCommunityView {
+    class func shareCommunityView(title:String,detailTitle:String,h5Str:String,thumbnailImg:UIImage?,sharedTitle:String,sharedDetailTitle:String,shareCommunityViewType:ShareCommunityViewType,completion: @escaping Completion) -> ShareCommunityView {
         let view = ShareCommunityView(
             title:title,
             detailTitle: detailTitle,
             h5Str: h5Str,
-            thumbnailImg: thumbnailImg,
+            thumbnailImg : thumbnailImg,
             sharedTitle: sharedTitle,
             sharedDetailTitle:sharedDetailTitle,
             shareCommunityViewType:shareCommunityViewType)
@@ -178,6 +179,23 @@ class ShareCommunityView: FWPopupView {
         view.show()
         return view
     }
+    
+    
+    /// 邀请好友
+    class func inviteGoodFriends() {
+        let shareCommunityView =  ShareCommunityView.shareCommunityView(
+            title: kCommunityPushingNewActivitiesTitle,
+            detailTitle: kCommunityPushingNewActivitiesDetailTitle,
+            h5Str: kH5InviteUrl + "\(UserModel.shared().getModel()?.inviteCode ?? "")",
+            thumbnailImg: UIImage.imageUrl(UserModel.shared().getModel()?.avatarurl),
+            sharedTitle: kCommunityPushingNewActivitiesTitleShare,
+            sharedDetailTitle: kCommunityPushingNewActivitiesDetailTitleShare,
+            shareCommunityViewType: ShareCommunityViewType.activity,
+            completion: {})
+        shareCommunityView.saveCompletion = {
+            Mediator.push(ShareRouterModuleType.pushShareActivity)
+        }
+    }
 
 }
 
@@ -200,23 +218,23 @@ extension ShareCommunityView: UICollectionViewDelegateFlowLayout,UICollectionVie
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         switch indexPath.row {
         case 0:
-            UMManager.shared.shareWebPage(to: UMSocialPlatformType.wechatSession, viewController: findViewController(), title: sharedTitle ?? "", descr: sharedDetailTitle ?? "", thumbImage: UIImage.imageUrl(thumbnailImg) as Any, webpageUrl: h5Str ?? "", completion: {
+            UMManager.shared.shareWebPage(to: UMSocialPlatformType.wechatSession, viewController: findViewController(), title: sharedTitle ?? "", descr: sharedDetailTitle ?? "", thumbImage: thumbnailImg as Any, webpageUrl: h5Str ?? "", completion: {
                 self.completion!()
             })
             break
         case 1:
-            UMManager.shared.shareWebPage(to: UMSocialPlatformType.wechatTimeLine, viewController: findViewController(), title: sharedTitle ?? "", descr: sharedDetailTitle ?? "", thumbImage: UIImage.imageUrl(thumbnailImg) as Any, webpageUrl: h5Str ?? "",completion: {
+            UMManager.shared.shareWebPage(to: UMSocialPlatformType.wechatTimeLine, viewController: findViewController(), title: sharedTitle ?? "", descr: sharedDetailTitle ?? "", thumbImage: thumbnailImg as Any, webpageUrl: h5Str ?? "",completion: {
                 self.completion!()
             })
 
             break
         case 2:
-            UMManager.shared.shareWebPage(to: UMSocialPlatformType.sina, viewController: findViewController(), title: sharedTitle ?? "", descr: sharedDetailTitle ?? "", thumbImage: UIImage.imageUrl(thumbnailImg) as Any, webpageUrl: h5Str ?? "",completion: {
+            UMManager.shared.shareWebPage(to: UMSocialPlatformType.sina, viewController: findViewController(), title: sharedTitle ?? "", descr: sharedDetailTitle ?? "", thumbImage: thumbnailImg as Any, webpageUrl: h5Str ?? "",completion: {
                 self.completion!()
             })
             break
         case 3:
-            commonCopy(string: thumbnailImg ?? "")
+            commonCopy(string: h5Str ?? "")
             break
         case 4:
             switch shareCommunityViewType {
@@ -226,6 +244,9 @@ extension ShareCommunityView: UICollectionViewDelegateFlowLayout,UICollectionVie
                 }
                 break
             case .activity?:
+                if let saveCompletion = self.saveCompletion {
+                    saveCompletion()
+                }
                 break
             default:
                 break

+ 2 - 3
RainbowPlanet/RainbowPlanet/Router/RegisterLoginModuleType.swift

@@ -10,15 +10,14 @@ import UIKit
 
 import SwiftyMediator
 
-
 /// 注册登录模块
 ///
 /// - pushBindPhoneNumber: 绑定手机号
-public enum RegisterLoginModuleType: MediatorTargetType {
+public enum RegisterLoginRouterModuleType: MediatorTargetType {
     case pushBindPhoneNumber(bindPhoneNumberVCType:BindPhoneNumberVCType)
 }
 
-extension RegisterLoginModuleType: MediatorSourceType {
+extension RegisterLoginRouterModuleType: MediatorSourceType {
     public var viewController: UIViewController? {
         switch self {
         case .pushBindPhoneNumber(let bindPhoneNumberVCType):

+ 27 - 0
RainbowPlanet/RainbowPlanet/Router/ShareRouterModuleType.swift

@@ -0,0 +1,27 @@
+//
+//  ShareRouterModuleType.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/7/15.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import SwiftyMediator
+
+/// 分享模块路由
+///
+/// - pushShareActivity: 邀请好友图片
+public enum ShareRouterModuleType: MediatorTargetType {
+    case pushShareActivity
+}
+
+extension ShareRouterModuleType: MediatorSourceType {
+    public var viewController: UIViewController? {
+        switch self {
+        case .pushShareActivity:
+            let vc = CommunityShareActivityViewController()
+            return vc
+        }
+    }
+}

+ 9 - 9
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -9,13 +9,13 @@
 import Foundation
 
 let kPersonalService = false
-let kDevelopSever = true
-let kBetaSever = false
+let kDevelopSever = false
+let kBetaSever = true
 let kProductSever = false
 
 // MARK: - 数据服务器
 public func kApiDataPrefix() -> String {
-    if kPersonalService /** 接口前缀-开发服务器*/ {
+    if kPersonalService /** 接口前缀-个人服务器*/ {
         return ""
     }else if kDevelopSever /** 接口前缀-开发服务器*/ {
         return "https://api.dev.caihongxingqiu.com"
@@ -29,13 +29,13 @@ public func kApiDataPrefix() -> String {
 }
 
 let kVirusPersonalService = false
-let kVirusDevelopSever = true
-let kVirusBetaSever = false
+let kVirusDevelopSever = false
+let kVirusBetaSever = true
 let kVirusProductSever = false
 
 // MARK: - Virus
 public func kApiVirusPrefix() -> String {
-    if kVirusPersonalService /** 接口前缀-开发服务器*/ {
+    if kVirusPersonalService /** 接口前缀-个人服务器*/ {
         return ""
     }else if kVirusDevelopSever /** 接口前缀-开发服务器*/ {
         return "https://api.dev.caihongxingqiu.com/virus/v2"
@@ -49,13 +49,13 @@ public func kApiVirusPrefix() -> String {
 }
 
 let kH5PersonalService = false
-let kH5DevelopSever = true
-let kH5BetaSever = false
+let kH5DevelopSever = false
+let kH5BetaSever = true
 let kH5ProductSever = false
 
 // MARK: - H5
 public func kApiH5Prefix() -> String {
-    if kH5PersonalService /** 接口前缀-开发服务器*/ {
+    if kH5PersonalService /** 接口前缀-个人服务器*/ {
         return ""
     }else if kH5DevelopSever /** 接口前缀-开发服务器*/ {
         return "http://h5.dev.caihongxingqiu.com"

+ 3 - 0
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkH5Manager.swift

@@ -34,3 +34,6 @@ let kH5ActivityUrl = kApiH5Prefix() + "/activity?"
 
 /// 分享内容详情
 let kH5ArticleUrl = kApiH5Prefix() + "/article?"
+
+/// 邀请页面
+let kH5InviteUrl = kApiH5Prefix() + "/invite?invite_code="