更新了pod,准备开始1.发布2.视频播放页面

RainbowPlanet/Podfile.lock

@@ -19,8 +19,8 @@ PODS:
     - AlivcConan/AlivcConan (= 0.9.5)
   - AlivcConan/AlivcConan (0.9.5)
   - AliyunOSSiOS (2.10.7)
-  - AliyunVideoSDKStd (3.10.5)
-  - BaiduMapKit (4.4.0)
+  - AliyunVideoSDKStd (3.11.0)
+  - BaiduMapKit (4.4.2)
   - BMKLocationKit (1.5.0)
   - Cache (5.2.0)
   - DeviceKit (2.0.0)
@@ -40,12 +40,12 @@ PODS:
   - InputBarAccessoryView (4.3.1):
     - InputBarAccessoryView/Core (= 4.3.1)
   - InputBarAccessoryView/Core (4.3.1)
-  - IQKeyboardManagerSwift (6.4.0)
+  - IQKeyboardManagerSwift (6.4.1)
   - JSONModel (1.7.0)
   - JXSegmentedView (0.0.19)
   - KeychainAccess (3.2.0)
   - Kingfisher (4.10.1)
-  - lottie-ios (3.1.1)
+  - lottie-ios (3.1.2)
   - LYEmptyView (1.2.5)
   - MBProgressHUD (1.1.0)
   - MJRefresh (3.2.0)
@@ -72,7 +72,7 @@ PODS:
     - SwiftyMediator/Core
   - UMCAnalytics (6.0.5):
     - UMCCommon
-  - UMCCommon (2.1.0)
+  - UMCCommon (2.1.1)
   - UMCCommonLog (1.0.0)
   - UMCPush (3.2.4):
     - UMCCommon
@@ -207,8 +207,8 @@ SPEC CHECKSUMS:
   Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
   AlivcConan: 9dccc32986024768bb5f50e14ad54490123903c7
   AliyunOSSiOS: 602b6a4e70e62a5f0a6431c20496343141d7e66f
-  AliyunVideoSDKStd: dce7bdd2d7fb0e8f6960ce0b94533ae50c068468
-  BaiduMapKit: 19a568e238d6d5a91b93daf7819b868d39cb2206
+  AliyunVideoSDKStd: 96820a4ea72acb90586fa888a711848ddf689ec1
+  BaiduMapKit: 11acde2e7c06e31b7de60b323880a5eb7c4dccb6
   BMKLocationKit: 40d267478acd8704ddebd0e9deaddc727b13df9f
   Cache: 807c5d86d01a177f06ede9865add3aea269bbfd4
   DeviceKit: 72d36709552d4b3582abd76a53949148acad9811
@@ -222,12 +222,12 @@ SPEC CHECKSUMS:
   FWPopupView: c1dbb33fbe4d223f619f28a7e5e5a00f08c10342
   Gifu: 7bcb6427457d85e0b4dff5a84ec5947ac19a93ea
   InputBarAccessoryView: 58a348be7ea2736c7eec60e5c315511c2dbb39fd
-  IQKeyboardManagerSwift: ed9b04ee0e3067ffba543283462d619f944b05e5
+  IQKeyboardManagerSwift: d2df660d0b8d64a15cb2537c9ff303213fa515b2
   JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d
   JXSegmentedView: 6e22381bd1e6f0767fc078bef1947b13b2d337a1
   KeychainAccess: 3b1bf8a77eb4c6ea1ce9404c292e48f948954c6b
   Kingfisher: c148cd7b47ebde9989f6bc7c27dcaa79d81279a0
-  lottie-ios: 43a472d22b2dd2bed292cc4010c0b4d2e66d3ba8
+  lottie-ios: 49cd85b1f24f61a7708ad7ec76a523ab2d0e3100
   LYEmptyView: b17adfc2dd9ad2988ecaf7c9606efa916e24c767
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
@@ -244,7 +244,7 @@ SPEC CHECKSUMS:
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
   SwiftyMediator: 73d97b2387f03c4f0320c1fbdf615e5fbb98871d
   UMCAnalytics: 045be2cd1ec05aa95ad62405a850757f932e2d59
-  UMCCommon: c9637200488c482b30cdebebb0bd595b9adf0847
+  UMCCommon: 971f324a5a99c9d662ae040a815e7e3d7ef8b2a8
   UMCCommonLog: 05a2d5de21858e3d870551562cff405c1366d244
   UMCPush: 1edd856027dcf905333effb4040ace5d236a7316
   UMCSecurityPlugins: 0831a08f3988f3cea9f1d3a7626cd9bee4fef150

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -111,7 +111,6 @@
 		A7284A75225465DD000BAEC4 /* SwiftMoyaNetWorkServicePay.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7284A74225465DD000BAEC4 /* SwiftMoyaNetWorkServicePay.swift */; };
 		A7284A7722547333000BAEC4 /* AlipayResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7284A7622547333000BAEC4 /* AlipayResultModel.swift */; };
 		A729B5A82266F2E0004AE098 /* AlertSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A729B5A72266F2E0004AE098 /* AlertSheetView.swift */; };
-		A729B5AA2266F6FD004AE098 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A729B5A92266F6FD004AE098 /* Launch Screen.storyboard */; };
 		A729B5AD2266FF45004AE098 /* BindPhoneNumberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A729B5AC2266FF45004AE098 /* BindPhoneNumberView.swift */; };
 		A729B5B022671310004AE098 /* MobileLoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A729B5AF22671310004AE098 /* MobileLoginView.swift */; };
 		A729B5B42267254B004AE098 /* PasswordLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A729B5B32267254B004AE098 /* PasswordLoginViewController.swift */; };
@@ -234,7 +233,7 @@
 		A770E5E922D383E500CBD0A4 /* CommunityCustomCommnetModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5E822D383E500CBD0A4 /* CommunityCustomCommnetModel.swift */; };
 		A770E5EB22D424A300CBD0A4 /* CommunityPostCommentIdModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5EA22D424A300CBD0A4 /* CommunityPostCommentIdModel.swift */; };
 		A770E5ED22D4298100CBD0A4 /* CommentReplyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5EC22D4298100CBD0A4 /* CommentReplyView.swift */; };
-		A770E5F522D5BC2000CBD0A4 /* CommonH5.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5F422D5BC2000CBD0A4 /* CommonH5.swift */; };
+		A770E5F522D5BC2000CBD0A4 /* ShareCommonStr.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5F422D5BC2000CBD0A4 /* ShareCommonStr.swift */; };
 		A770E5F922D5E0E500CBD0A4 /* CommunityShareContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5F822D5E0E500CBD0A4 /* CommunityShareContentViewController.swift */; };
 		A770E60022D6203F00CBD0A4 /* CommunityShareActivityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5FF22D6203F00CBD0A4 /* CommunityShareActivityViewController.swift */; };
 		A770E60522D64CD700CBD0A4 /* WKWebView+SwCapture.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E60222D64CD700CBD0A4 /* WKWebView+SwCapture.swift */; };
@@ -245,7 +244,6 @@
 		A770E61422D6625700CBD0A4 /* ShareCommunityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E60D22D6625700CBD0A4 /* ShareCommunityView.swift */; };
 		A770E61522D6625700CBD0A4 /* ShareView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E61022D6625700CBD0A4 /* ShareView.swift */; };
 		A770E61622D6625700CBD0A4 /* ShareCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E61122D6625700CBD0A4 /* ShareCollectionViewCell.swift */; };
-		A770E61922D6780600CBD0A4 /* ShareCommunityVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E61822D6780600CBD0A4 /* ShareCommunityVideoView.swift */; };
 		A771F07C226D4E1C007999DB /* AddressPOITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A771F07B226D4E1C007999DB /* AddressPOITableViewCell.swift */; };
 		A773D02F229FDC3B007A5751 /* DIYEmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A773D02E229FDC3B007A5751 /* DIYEmptyView.swift */; };
 		A775CBFE2237493600EBDCF8 /* ShoppingMallNavigationBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A775CBFD2237493600EBDCF8 /* ShoppingMallNavigationBarView.swift */; };
@@ -458,6 +456,7 @@
 		A7F577C322FD894F00E2D757 /* ATAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */; };
 		A7F577C422FD894F00E2D757 /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */; };
 		A7F577C522FD894F00E2D757 /* TYRZResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A7F577C222FD894F00E2D757 /* TYRZResource.bundle */; };
+		A7F577C822FE96C600E2D757 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A7F577C722FE96C600E2D757 /* Launch Screen.storyboard */; };
 		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 */; };
@@ -543,8 +542,6 @@
 		BD13B6C522BA034D008BB323 /* PublishEditAddAddressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6BE22BA034D008BB323 /* PublishEditAddAddressCell.swift */; };
 		BD13B6C622BA034D008BB323 /* PublishEditTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6BF22BA034D008BB323 /* PublishEditTitleCell.swift */; };
 		BD13B6C722BA034D008BB323 /* PublishEditAddTopicCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6C022BA034D008BB323 /* PublishEditAddTopicCell.swift */; };
-		BD13B6D822BA03BC008BB323 /* PublishSuccessController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6C922BA03BB008BB323 /* PublishSuccessController.swift */; };
-		BD13B6D922BA03BC008BB323 /* PublishShareBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6CA22BA03BB008BB323 /* PublishShareBottomView.swift */; };
 		BD13B6DA22BA03BC008BB323 /* PublishAddAddressController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6CC22BA03BB008BB323 /* PublishAddAddressController.swift */; };
 		BD13B6DB22BA03BC008BB323 /* PublishAddressPOIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6CD22BA03BB008BB323 /* PublishAddressPOIView.swift */; };
 		BD13B6DC22BA03BC008BB323 /* SearchAddrNavigationbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6CE22BA03BB008BB323 /* SearchAddrNavigationbarView.swift */; };
@@ -823,7 +820,6 @@
 		A7284A74225465DD000BAEC4 /* SwiftMoyaNetWorkServicePay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkServicePay.swift; sourceTree = "<group>"; };
 		A7284A7622547333000BAEC4 /* AlipayResultModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlipayResultModel.swift; sourceTree = "<group>"; };
 		A729B5A72266F2E0004AE098 /* AlertSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertSheetView.swift; sourceTree = "<group>"; };
-		A729B5A92266F6FD004AE098 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		A729B5AC2266FF45004AE098 /* BindPhoneNumberView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BindPhoneNumberView.swift; sourceTree = "<group>"; };
 		A729B5AF22671310004AE098 /* MobileLoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MobileLoginView.swift; sourceTree = "<group>"; };
 		A729B5B32267254B004AE098 /* PasswordLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordLoginViewController.swift; sourceTree = "<group>"; };
@@ -950,7 +946,7 @@
 		A770E5E822D383E500CBD0A4 /* CommunityCustomCommnetModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityCustomCommnetModel.swift; sourceTree = "<group>"; };
 		A770E5EA22D424A300CBD0A4 /* CommunityPostCommentIdModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommunityPostCommentIdModel.swift; sourceTree = "<group>"; };
 		A770E5EC22D4298100CBD0A4 /* CommentReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentReplyView.swift; sourceTree = "<group>"; };
-		A770E5F422D5BC2000CBD0A4 /* CommonH5.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonH5.swift; sourceTree = "<group>"; };
+		A770E5F422D5BC2000CBD0A4 /* ShareCommonStr.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareCommonStr.swift; sourceTree = "<group>"; };
 		A770E5F822D5E0E500CBD0A4 /* CommunityShareContentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityShareContentViewController.swift; sourceTree = "<group>"; };
 		A770E5FF22D6203F00CBD0A4 /* CommunityShareActivityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityShareActivityViewController.swift; sourceTree = "<group>"; };
 		A770E60222D64CD700CBD0A4 /* WKWebView+SwCapture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WKWebView+SwCapture.swift"; sourceTree = "<group>"; };
@@ -961,7 +957,6 @@
 		A770E60D22D6625700CBD0A4 /* ShareCommunityView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareCommunityView.swift; sourceTree = "<group>"; };
 		A770E61022D6625700CBD0A4 /* ShareView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareView.swift; sourceTree = "<group>"; };
 		A770E61122D6625700CBD0A4 /* ShareCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareCollectionViewCell.swift; sourceTree = "<group>"; };
-		A770E61822D6780600CBD0A4 /* ShareCommunityVideoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareCommunityVideoView.swift; sourceTree = "<group>"; };
 		A771F07B226D4E1C007999DB /* AddressPOITableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressPOITableViewCell.swift; sourceTree = "<group>"; };
 		A773D02E229FDC3B007A5751 /* DIYEmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DIYEmptyView.swift; sourceTree = "<group>"; };
 		A775CBFD2237493600EBDCF8 /* ShoppingMallNavigationBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingMallNavigationBarView.swift; sourceTree = "<group>"; };
@@ -1186,6 +1181,7 @@
 		A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ATAuthSDK.framework; path = "../../../../../../../Downloads/号码认证及一键登录iOS SDK v2.6.5_demo工程代码/Release/ATAuthSDK.framework"; sourceTree = "<group>"; };
 		A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ATAuthSDK.bundle; sourceTree = "<group>"; };
 		A7F577C222FD894F00E2D757 /* TYRZResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TYRZResource.bundle; sourceTree = "<group>"; };
+		A7F577C722FE96C600E2D757 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; 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>"; };
@@ -1287,8 +1283,6 @@
 		BD13B6BE22BA034D008BB323 /* PublishEditAddAddressCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditAddAddressCell.swift; sourceTree = "<group>"; };
 		BD13B6BF22BA034D008BB323 /* PublishEditTitleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditTitleCell.swift; sourceTree = "<group>"; };
 		BD13B6C022BA034D008BB323 /* PublishEditAddTopicCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditAddTopicCell.swift; sourceTree = "<group>"; };
-		BD13B6C922BA03BB008BB323 /* PublishSuccessController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishSuccessController.swift; sourceTree = "<group>"; };
-		BD13B6CA22BA03BB008BB323 /* PublishShareBottomView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishShareBottomView.swift; sourceTree = "<group>"; };
 		BD13B6CC22BA03BB008BB323 /* PublishAddAddressController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishAddAddressController.swift; sourceTree = "<group>"; };
 		BD13B6CD22BA03BB008BB323 /* PublishAddressPOIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishAddressPOIView.swift; sourceTree = "<group>"; };
 		BD13B6CE22BA03BB008BB323 /* SearchAddrNavigationbarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchAddrNavigationbarView.swift; sourceTree = "<group>"; };
@@ -2149,7 +2143,6 @@
 			isa = PBXGroup;
 			children = (
 				BD01B1FC22BC677900CE9F36 /* PublishTakeVideo */,
-				BD13B6C822BA03BB008BB323 /* PublishSuccess */,
 			);
 			path = Unused;
 			sourceTree = "<group>";
@@ -2350,7 +2343,6 @@
 				A72A72C822321E2500B21995 /* FontMacro.swift */,
 				A743229322B88ED30017C367 /* EnumMacro.swift */,
 				A72A72C722321E2500B21995 /* NotificationCenterMacro.swift */,
-				A770E5F422D5BC2000CBD0A4 /* CommonH5.swift */,
 				A72A726022321D3400B21995 /* RainbowPlanet-Bridging-Header.h */,
 			);
 			path = Macro;
@@ -2913,6 +2905,7 @@
 		A770E5EE22D57CEA00CBD0A4 /* ShareModules */ = {
 			isa = PBXGroup;
 			children = (
+				A7F577C622FE6C4100E2D757 /* ShareCommonStr */,
 				A770E60822D6625700CBD0A4 /* ShareCommunityModule */,
 				A770E60E22D6625700CBD0A4 /* ShareShop */,
 			);
@@ -2948,7 +2941,6 @@
 		A770E60822D6625700CBD0A4 /* ShareCommunityModule */ = {
 			isa = PBXGroup;
 			children = (
-				A770E61722D677E900CBD0A4 /* ShareCommunityVideo */,
 				A770E60922D6625700CBD0A4 /* ShareCommunityContent */,
 				A770E60B22D6625700CBD0A4 /* ShareCommunity */,
 			);
@@ -2989,14 +2981,6 @@
 			path = View;
 			sourceTree = "<group>";
 		};
-		A770E61722D677E900CBD0A4 /* ShareCommunityVideo */ = {
-			isa = PBXGroup;
-			children = (
-				A770E61822D6780600CBD0A4 /* ShareCommunityVideoView.swift */,
-			);
-			path = ShareCommunityVideo;
-			sourceTree = "<group>";
-		};
 		A773D02D229FD5B7007A5751 /* MainView */ = {
 			isa = PBXGroup;
 			children = (
@@ -3364,7 +3348,7 @@
 				A7BF202622B3930100396DB3 /* MessageModule.xcassets */,
 				BD24FABA22B509CF00C7AA3B /* PublishModule.xcassets */,
 				A76068E322E47E0E008DF18F /* RegisterLoginModule.xcassets */,
-				A729B5A92266F6FD004AE098 /* Launch Screen.storyboard */,
+				A7F577C722FE96C600E2D757 /* Launch Screen.storyboard */,
 				A77F2C6C2231FB4A001BD3F6 /* Info.plist */,
 				A7F577BB22FD7A9B00E2D757 /* RainbowPlanet.entitlements */,
 			);
@@ -4583,6 +4567,14 @@
 			path = MessageModuleManager;
 			sourceTree = "<group>";
 		};
+		A7F577C622FE6C4100E2D757 /* ShareCommonStr */ = {
+			isa = PBXGroup;
+			children = (
+				A770E5F422D5BC2000CBD0A4 /* ShareCommonStr.swift */,
+			);
+			path = ShareCommonStr;
+			sourceTree = "<group>";
+		};
 		A7FF1550228AC22700A85748 /* ProductAllComment */ = {
 			isa = PBXGroup;
 			children = (
@@ -5007,15 +4999,6 @@
 			path = View;
 			sourceTree = "<group>";
 		};
-		BD13B6C822BA03BB008BB323 /* PublishSuccess */ = {
-			isa = PBXGroup;
-			children = (
-				BD13B6C922BA03BB008BB323 /* PublishSuccessController.swift */,
-				BD13B6CA22BA03BB008BB323 /* PublishShareBottomView.swift */,
-			);
-			path = PublishSuccess;
-			sourceTree = "<group>";
-		};
 		BD13B6CB22BA03BB008BB323 /* PublishAddAddress */ = {
 			isa = PBXGroup;
 			children = (
@@ -5899,6 +5882,7 @@
 				BDD5483422C31752005BBE19 /* AlivcShortVideoImage.bundle in Resources */,
 				A7CC74DE22703B4A003C4F38 /* MineModule.xcassets in Resources */,
 				A7BF202422B392D600396DB3 /* CommunityModule.xcassets in Resources */,
+				A7F577C822FE96C600E2D757 /* Launch Screen.storyboard in Resources */,
 				BDD54A2522C31D5F005BBE19 /* music.json in Resources */,
 				A76068E922E4922F008DF18F /* Skittles.json in Resources */,
 				A71AF0BE226F1792001730FE /* ShoppingMallModule.xcassets in Resources */,
@@ -5927,7 +5911,6 @@
 				A7F3069922E1C72D00DC7917 /* json_Image_1.png in Resources */,
 				A7F577C522FD894F00E2D757 /* TYRZResource.bundle in Resources */,
 				A76068ED22E4A2B4008DF18F /* verywell.json in Resources */,
-				A729B5AA2266F6FD004AE098 /* Launch Screen.storyboard in Resources */,
 				BD24FABB22B509CF00C7AA3B /* PublishModule.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -6109,7 +6092,6 @@
 				BD13B6B922BA0327008BB323 /* PublishEditController.swift in Sources */,
 				A71AA5102272156A008FF1A5 /* ExpressAddressListViewController.swift in Sources */,
 				A7D07CC922B7769600186014 /* RainbowBeanPhysicalCollectionViewCell.swift in Sources */,
-				BD13B6D822BA03BC008BB323 /* PublishSuccessController.swift in Sources */,
 				BD61229922C3605C00D3F513 /* AliyunDBHelper.m in Sources */,
 				BDAA40FF228EA37900CF841D /* OrderApplyRefundPhotoCell.swift in Sources */,
 				A7A98E14227ED0E2005306E9 /* CategoryListModel.swift in Sources */,
@@ -6126,7 +6108,7 @@
 				A7C3DD1C226422D200FA262E /* SwiftMoyaNetWorkServiceSMS.swift in Sources */,
 				BDF862A2228E41CC000DEF84 /* OrderLogisticsInfoCell.swift in Sources */,
 				A72623D322C1FFD100AEF875 /* CommunityPostMyModel.swift in Sources */,
-				A770E5F522D5BC2000CBD0A4 /* CommonH5.swift in Sources */,
+				A770E5F522D5BC2000CBD0A4 /* ShareCommonStr.swift in Sources */,
 				A739121D229F75F50033177E /* JXPagingListContainerView.swift in Sources */,
 				A72A7386223396CB00B21995 /* SwiftMoyaNetWorkManager.swift in Sources */,
 				BD10121122DEBAF0008DF528 /* CommunityRecommendMusicListModel.swift in Sources */,
@@ -6265,7 +6247,6 @@
 				A72A7333223256E100B21995 /* PayManager.swift in Sources */,
 				A70B2C6722887B2B00B2449F /* ProductDetailEvaluationListTableViewCell.swift in Sources */,
 				BD0FAA5C22C4C32E00DDFB37 /* AliyunCropViewController.m in Sources */,
-				BD13B6D922BA03BC008BB323 /* PublishShareBottomView.swift in Sources */,
 				BD1DC6CD228D160D00B89C57 /* OrderPurchaseModel.swift in Sources */,
 				A775CC00223774A300EBDCF8 /* ShoppingMallView.swift in Sources */,
 				A7FF1555228AC27600A85748 /* ProductAllCommentView.swift in Sources */,
@@ -6584,7 +6565,6 @@
 				BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */,
 				A7284440224DFACD00F82F30 /* InfoModel.swift in Sources */,
 				A72A72B522321DE000B21995 /* Extension+UITextView.swift in Sources */,
-				A770E61922D6780600CBD0A4 /* ShareCommunityVideoView.swift in Sources */,
 				A7DAB33922DC2B83005B964E /* ShareRouterModuleType.swift in Sources */,
 				BDD9377722DF3B47002D11B3 /* PublishMusicListController.swift in Sources */,
 				BD0FAA6522C4C35E00DDFB37 /* AliyunCycleProgressView.m in Sources */,

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -15,8 +15,9 @@ extension AppDelegate {
         
         window = UIWindow.init(frame: UIScreen.main.bounds)
         window?.backgroundColor = UIColor.white
-        window?.makeKeyAndVisible()
-        window?.rootViewController = UIViewController()
+        let vc = UIViewController()
+        vc.view.backgroundColor = UIColor.clear
+        window?.rootViewController = vc
         setBaiduToCityFactory()
         /// 设置全局的tabbar
         setTabbarAppearence()
@@ -28,12 +29,12 @@ extension AppDelegate {
         DeliveryMethodTypeModel.shared().setModel(model: deliveryMethodTypeModel)
         //基础配置
         SwiftMoyaNetWorkServiceConfig.shared().configApi {(data) -> (Void) in}
-        //U米
-        UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApiInterval()
         //设置Tabbar
         setTabbarController()
         /// 引导页
         setGuidePageView()
+        window?.makeKeyAndVisible()
+
     }
     
     /// 设置Tabbar
@@ -48,6 +49,8 @@ extension AppDelegate {
                     self?.setLoginOut()
                 }else {
                     self?.window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
+                    //U米
+                    UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApiInterval()
                     //获取消息的小红点
                     MessageModuleManager.shared.userMemberMessageIndexApi()
                 }

RainbowPlanet/RainbowPlanet/Macro/CommonH5.swift

@@ -1,17 +0,0 @@
-//
-//  CommonH5.swift
-//  RainbowPlanet
-//
-//  Created by 南鑫林 on 2019/7/10.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import Foundation
-
-let kCommunityPostDetailTitleShare  = "送了你 \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米，快来赞我的动态哦！我马上就能换东西啦^_^"
-
-
-let kCommunityPushingNewActivitiesTitle  = "向好友传递美好生活，送TA \(ConfigModel.shared.object()?.sharePostBean ?? 0)U米"
-let kCommunityPushingNewActivitiesDetailTitle  = "越多好友加入，收获U米越多"
-let kCommunityPushingNewActivitiesTitleShare  = "在吗？送你 \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米~"
-let kCommunityPushingNewActivitiesDetailTitleShare  = "彩虹星球，每天刷一下，免费领优酷会员、腾讯会员、网易云会员、爱奇艺会员、芒果会员...很多会员！！！"

RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -80,6 +80,7 @@ public extension UMManager {
         //设置Key
         UMConfigure.initWithAppkey(kUMengAppKey, channel: "App Store")
         
+        
 
         //开启Crash收集
         MobClick.setCrashReportEnabled(true)

RainbowPlanet/RainbowPlanet/Model/CommunityModel/CommunityPostDetailModel.swift

@@ -24,7 +24,7 @@ class CommunityPostDetailModel : NSObject, Mappable{
 	var isLike : Int?
 	var location : String?
 	var praiseCount : Int?
-	var pv : Int?
+	var pv : String?
 	var title : String?
 	var topic : [CommunityPostDetailTopicModel]?
     var topicIds : String?

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

@@ -271,12 +271,11 @@ class CommunityViewController: BaseViewController {
             title = contentStr?.prefix(12) ?? ""
         }
         let shareCommunityView =  ShareCommunityView.shareCommunityView(
-            uid: uid ?? 0, title: "向好友传递美好生活，送TA 500U米",
-            detailTitle: "越多好友看到，收获U米越多",
+            uid: uid ?? 0,
             h5Str: (H5UrlStr ?? "" + "\(UserModel.shared().getModel()?.inviteCode ?? "")"),
             thumbnailImg: UIImage.imageUrl(imgUrl),
             sharedTitle: String(title ?? ""),
-            sharedDetailTitle: kCommunityPostDetailTitleShare,
+            sharedDetailTitle: kCommunityPostShareDetailTitle,
             shareCommunityViewType: ShareCommunityViewType.postDetail,
             completion: {
                 VirusViewModel.shared.forwarVirueRecordAddApi(postId: postId, postAuthorUid: "\(uid ?? 0)", title: titleStr, content: contentStr, postType: type, postCover: imgUrl)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/View/CommunityFeaturedTopicsHeaderView.swift

@@ -42,7 +42,6 @@ class CommunityFeaturedTopicsHeaderView: BaseView {
     
     private lazy var numberPeopleLabel: UILabel = {
         let numberPeopleLabel = UILabel()
-        numberPeopleLabel.text = "8888位彩虹居民参与此话题"
         numberPeopleLabel.textColor = kffffffColor
         numberPeopleLabel.font = kRegularFont13
         return numberPeopleLabel
@@ -92,7 +91,7 @@ class CommunityFeaturedTopicsHeaderView: BaseView {
     
     var communityTopicDetailModel : CommunityTopicDetailModel? {
         didSet {
-            numberPeopleLabel.text = "\(communityTopicDetailModel?.followCount ?? "0")位彩虹居民参与此话题"
+            numberPeopleLabel.text = "\(communityTopicDetailModel?.followCount ?? "0")位老板在此话题下讨论"
             topicLabel.text = communityTopicDetailModel?.name
             CommunityFollowTopicViewModel.shared.followTopicButton(communityTopicDetailModel: communityTopicDetailModel!, button: focusButton)
         }

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

@@ -300,12 +300,11 @@ class CommunityRecommendController: BaseViewController {
             title = self.communityPostDetailModel?.content?.prefix(12) ?? ""
         }
         let shareCommunityView =  ShareCommunityView.shareCommunityView(
-            uid: self.communityPostDetailModel?.uid ?? 0, title: "向好友传递美好生活，送TA 500U米",
-            detailTitle: "越多好友看到，收获U米越多",
+            uid: self.communityPostDetailModel?.uid ?? 0,
             h5Str: (self.communityPostDetailModel?.h5url ?? "" + "\(UserModel.shared().getModel()?.inviteCode ?? "")"),
             thumbnailImg: UIImage.imageUrl(self.communityPostDetailModel?.img),
             sharedTitle: String(title ?? ""),
-            sharedDetailTitle: kCommunityPostDetailTitleShare,
+            sharedDetailTitle: kCommunityPostShareDetailTitle,
             shareCommunityViewType: ShareCommunityViewType.postDetail,
             completion: {
             VirusViewModel.shared.forwarVirueRecordAddApi(postId: self.communityPostDetailModel?.id, postAuthorUid: "\(self.communityPostDetailModel?.uid ?? 0)", title: self.communityPostDetailModel?.title, content: self.communityPostDetailModel?.content, postType: self.communityPostDetailModel?.type, postCover: self.communityPostDetailModel?.img)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/HTMLCell/CommunityRecommendDetailHTMLTableViewCell.swift

@@ -251,7 +251,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
             nameButton.setTitle(communityPostDetailModel?.username, for: UIControl.State.normal)
             CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: communityPostDetailModel?.isFollow ?? 0) ?? .futureFollow)
             beanLabel.text = "\(communityPostDetailModel?.availableBean ?? 0)U米待收获"
-            timeReadLabel.text = " I \(communityPostDetailModel?.createdAt ?? "") I 阅读·\(communityPostDetailModel?.pv ?? 0)"
+            timeReadLabel.text = " I \(communityPostDetailModel?.createdAt ?? "") I 阅读·\(communityPostDetailModel?.pv ?? "0")"
             webView.load(URLRequest(url: URL(string: communityPostDetailModel?.descUrl ?? "")!))
             
             if communityPostDetailModel?.uid != UserModel.shared().getModel()?.uid {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/imageCell/RecommendDetailContentCell.swift

@@ -224,7 +224,7 @@ class RecommendDetailContentCell: UITableViewCell {
                 locationButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 3)
 
             }
-            readLabel.text = "阅读·\(communityPostDetailModel?.pv ?? 0)"
+            readLabel.text = "阅读·\(communityPostDetailModel?.pv ?? "0")"
 
             if communityPostDetailModel?.title == nil || communityPostDetailModel?.title == "" {
                 titleLabel.snp.remakeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareContent/CommunityShareContentViewController.swift

@@ -107,7 +107,7 @@ class CommunityShareContentViewController: BaseViewController {
         }
         nickLable.snp.makeConstraints { (make) in
             make.top.equalTo(QRCodeImageView).offset(7*kScaleWidth)
-            make.left.equalTo(QRCodeImageView.snp.right).offset(27*kScaleWidth)
+            make.centerX.equalTo(scanLabel)
             make.height.equalTo(25*kScaleWidth)
         }
         scanLabel.snp.makeConstraints { (make) in
@@ -155,6 +155,7 @@ class CommunityShareContentViewController: BaseViewController {
     lazy var bgImageView: UIImageView = {
         let bgImageView = UIImageView()
         bgImageView.isUserInteractionEnabled = true
+        bgImageView.contentMode = .scaleAspectFill
         return bgImageView
     }()
     
@@ -225,7 +226,7 @@ class CommunityShareContentViewController: BaseViewController {
         let nickLable = UILabel()
         nickLable.textColor = k333333Color
         nickLable.font = kMediumFont18
-        nickLable.text = "彩虹星球 · 开启美好生活"
+        nickLable.text = "你的价值 · 由你创造"
         return nickLable
     }()
     

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

@@ -128,7 +128,7 @@ class CommunityAllCommentView: FWPopupView {
     
     private lazy var noCommentsLabel: UILabel = {
         let noCommentsLabel = UILabel()
-        noCommentsLabel.text = "你不评一句，更新没动力"
+        noCommentsLabel.text = "消灭0回复，U米赚不停！"
         noCommentsLabel.textColor = k999999Color
         noCommentsLabel.font = kRegularFont16
         return noCommentsLabel

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift

@@ -299,12 +299,11 @@ extension CommunityVideoListController {
             title = videoItemModel.content?.prefix(12) ?? ""
         }
         let shareCommunityView =  ShareCommunityView.shareCommunityView(
-            uid: videoItemModel.uid ?? 0, title: "向好友传递美好生活，送TA 500U米",
-            detailTitle: "越多好友看到，收获U米越多",
+            uid: videoItemModel.uid ?? 0,
             h5Str: (videoItemModel.h5url ?? "" + "\(UserModel.shared().getModel()?.inviteCode ?? "")"),
             thumbnailImg: UIImage.imageUrl(videoItemModel.img),
             sharedTitle: String(title ?? ""),
-            sharedDetailTitle: kCommunityPostDetailTitleShare,
+            sharedDetailTitle: kCommunityPostShareDetailTitle,
             shareCommunityViewType: ShareCommunityViewType.postDetail,
             completion: {
                 VirusViewModel.shared.forwarVirueRecordAddApi(postId: videoItemModel.id, postAuthorUid: "\(videoItemModel.uid ?? 0)", title: videoItemModel.title, content: videoItemModel.content, postType: videoItemModel.type, postCover: videoItemModel.img)

RainbowPlanet/RainbowPlanet/Modules/MineModule/ModifyData/View/ModifyDataNickNameSignView.swift

@@ -145,7 +145,7 @@ class ModifyDataNickNameSignView: BaseView {
     
     lazy var signNameTextView: IQTextView = {
         let signNameTextView = IQTextView()
-        signNameTextView.placeholder = "添加个人简介，让更多的彩虹居民认识你~"
+        signNameTextView.placeholder = "添加个人介绍，认识更多老板~"
         signNameTextView.textColor = k999999Color
         signNameTextView.font = kRegularFont16
         signNameTextView.tintColor = kThemeColor

RainbowPlanet/RainbowPlanet/Modules/MineModule/MyFollowAndFan/View/MyFollowAndFanHeaderView.swift

@@ -27,14 +27,14 @@ class MyFollowAndFanHeaderView: BaseView {
         let titleLabel = UILabel()
         titleLabel.font = kRegularFont12
         titleLabel.textColor = k333333Color
-        let str = "已关注3511位彩虹居民"
+        let str = "已关注3511位老板"
         titleLabel.attributedText = str.changeTextColor(rangStr: String("3511"), rangColor: kThemeColor)
         return titleLabel
     }()
     
     var userDetailModel : UserDetailModel? {
         didSet {
-            let str = "已关注\(userDetailModel?.followCount ?? "0")位彩虹居民"
+            let str = "已关注\(userDetailModel?.followCount ?? "0")位老板"
             titleLabel.attributedText = str.changeTextColor(rangStr: userDetailModel?.followCount ?? "0", rangColor: kThemeColor)
 
         }

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

@@ -108,7 +108,7 @@ class PersonViewUserAndOtherHeaderView: BaseView {
     
     private lazy var subtitleLabel: UILabel = {
         let subtitleLabel = UILabel()
-        subtitleLabel.text = "添加个人简介，让更多的彩虹居民认识你~"
+        subtitleLabel.text = "添加个人介绍，认识更多老板~"
         subtitleLabel.textColor = kbbbbbbColor
         subtitleLabel.font = kRegularFont10
         return subtitleLabel
@@ -234,7 +234,7 @@ class PersonViewUserAndOtherHeaderView: BaseView {
             titleLabel.text = userDetailModel?.username
             if userDetailModel?.signature == "" || userDetailModel?.signature == nil  {
                 if userDetailModel?.uid == UserModel.shared().getModel()?.uid {
-                    subtitleLabel.text = "添加个人简介，让更多的彩虹居民认识你~"
+                    subtitleLabel.text = "添加个人介绍，认识更多老板~"
                 }else {
                     subtitleLabel.text = "暂无个人介绍"
                 }

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

@@ -96,11 +96,11 @@ extension PersonViewUserAndOtherListView {
         }
         SwiftMoyaNetWorkServiceCommunity.shared().communityPostMyApi(type: type,uid:uid ?? 0,page:page, completion: {
             [weak self] (communityPostMyModel) -> (Void) in
-            if self?.uid != UserModel.shared().uid {
-                DIYEmptyView.emptyNoDataCollectionView(collectionView: self?.collectionView,imageStr: .one, detailStr: .one)
+            if self?.uid != UserModel.shared().getModel()?.uid {
+                DIYEmptyView.emptyNoDataCollectionView(collectionView: self?.collectionView,imageStr: .one, detailStr: .one,contentViewY: 50)
             }else {
                 if self?.personalCenterVCType != 0 {
-                    DIYEmptyView.emptyNoDataCollectionView(collectionView: self?.collectionView,imageStr: .one, detailStr: .one)
+                    DIYEmptyView.emptyNoDataCollectionView(collectionView: self?.collectionView,imageStr: .one, detailStr: .one,contentViewY: 50)
                 }
             }
             let communityPostMyModel = communityPostMyModel as? CommunityPostMyModel

RainbowPlanet/RainbowPlanet/Modules/MineModule/Set/View/SetView.swift

@@ -21,7 +21,7 @@ class SetView: BaseView {
     var didSelectRowClosure : DidSelectRowClosure?
     
     let sections = [["账号与绑定","推送通知设置"],
-                    ["用户协议","为彩虹星球评分","投诉与建议","分享彩虹星球APP","版本号"],
+                    ["用户协议","为 由你APP 评分","投诉与建议","分享 由你APP","版本号"],
                     ["退出登录"]]
     
     override func setupViews() {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/Controller/PublishEditController.swift

@@ -292,11 +292,10 @@ extension PublishEditController {
         if self.mediaType == .image {
             self.writePhotosToFileAndSetPath()
         }
-        
-        self.navigationController?.dismiss(animated: true, completion: {
-            let mediaType = self.mediaType
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "DismissFromPublishEditVc"), object: mediaType)
-        })
+        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "DismissFromPublishEditVc"), object: self.mediaType)
+        BaseTabbarViewController.shared.esTabBarController.selectedIndex = 0
+        self.dismissToWindowRootViewController(animated: false, completion: nil)
+
     }
     
     // 写入沙盒并设置沙盒路径

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditAddAddressCell.swift

@@ -21,7 +21,7 @@ class PublishEditAddAddressCell: UITableViewCell {
                 remakeSubLabelWithLeading(36)
             } else {
                 titleLabel.text = "添加地点"
-                subLabel.text = "(打卡地点，结识附近的彩虹居民)"
+                subLabel.text = "(打卡地点，结识附近的老板)"
                 iconImageView.image = kImage(name: "edit_ico_address")
                 subLabel.textColor = kDDDDDDColor
                 subLabel.font = kRegularFont12
@@ -107,7 +107,7 @@ class PublishEditAddAddressCell: UITableViewCell {
     
     private lazy var subLabel: UILabel = {
         let subLabel = UILabel()
-        subLabel.text = "(打卡地点，结识附近的彩虹居民)"
+        subLabel.text = "(打卡地点，结识附近的老板)"
         subLabel.textColor = kDDDDDDColor
         subLabel.font = kRegularFont12
         subLabel.textAlignment = .left

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditAddTopicCell.swift

@@ -108,7 +108,7 @@ class PublishEditAddTopicCell: UITableViewCell {
     
     private lazy var subLabel: UILabel = {
         let subLabel = UILabel()
-        subLabel.text = "(选择合适的话题让更多人看到)"
+        subLabel.text = "(选择合适的话题让更多老板看到)"
         subLabel.textColor = kDDDDDDColor
         subLabel.font = kRegularFont12
         subLabel.textAlignment = .left

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditDescribeCell.swift

@@ -61,7 +61,7 @@ class PublishEditDescribeCell: UITableViewCell {
         cmtTextView.backgroundColor = kffffffColor
         cmtTextView.textColor = k333333Color
         cmtTextView.font = kRegularFont14
-        cmtTextView.placeholder = "说一说你的美好心得..."
+        cmtTextView.placeholder = "好的内容可以引发更多共鸣~"
         cmtTextView.placeholderTextColor = kDDDDDDColor
         cmtTextView.delegate = self
         cmtTextView.tintColor = kThemeColor

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditTitleCell.swift

@@ -74,7 +74,7 @@ class PublishEditTitleCell: UITableViewCell {
         editTextField.font = kRegularFont14
         editTextField.tintColor = kEnabledButtonColor
         editTextField.clearButtonMode = .whileEditing
-        editTextField.attributedPlaceholder = NSAttributedString.init(string:"标题吸引人，收豆不求人(标题20字，内容详情页不限)", attributes: [NSAttributedString.Key.font:kRegularFont14 as Any, NSAttributedString.Key.foregroundColor:kDDDDDDColor])
+        editTextField.attributedPlaceholder = NSAttributedString.init(string:"标题好，能收获更多U米哦", attributes: [NSAttributedString.Key.font:kRegularFont14 as Any, NSAttributedString.Key.foregroundColor:kDDDDDDColor])
         editTextField.delegate = self
         return editTextField
     }()

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishSuccess/PublishShareBottomView.swift

@@ -1,147 +0,0 @@
-//
-//  PublishShareBottomView.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/17.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-import RxSwift
-import RxCocoa
-
-class PublishShareBottomView: BaseView {
-    
-    override func setupViews() {
-        self.backgroundColor = kffffffColor
-        
-        addSubview(titleLabel)
-        addSubview(wechatBtn)
-        addSubview(friendsBtn)
-        addSubview(saveImgBtn)
-        addSubview(sepView)
-        addSubview(jumpBtn)
-    }
-    
-    override func setupLayouts() {
-        titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(24)
-            make.centerX.equalToSuperview()
-            make.height.equalTo(18)
-        }
-        
-        wechatBtn.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(20)
-            make.centerX.equalTo(friendsBtn.snp_centerX).multipliedBy(0.565)
-            make.width.equalTo(50)
-            make.height.equalTo(69)
-        }
-        wechatBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
-        
-        friendsBtn.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(20)
-            make.centerX.equalToSuperview()
-            make.width.equalTo(50)
-            make.height.equalTo(69)
-        }
-        friendsBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
-        
-        saveImgBtn.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(20)
-            make.centerX.equalTo(friendsBtn.snp_centerX).multipliedBy(1.435)
-            make.width.equalTo(50)
-            make.height.equalTo(69)
-        }
-        saveImgBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
-        
-        sepView.snp.makeConstraints { (make) in
-            make.left.right.equalToSuperview()
-            make.height.equalTo(1)
-            make.bottom.equalTo(-44)
-        }
-        
-        jumpBtn.snp.makeConstraints { (make) in
-            make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview()
-            make.width.equalTo(160)
-            make.height.equalTo(44)
-        }
-    }
-    
-    private lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.text = "向好友传递美好生活，收货更多U米"
-        titleLabel.textColor = k333333Color
-        titleLabel.font = kRegularFont16
-        return titleLabel
-    }()
-    
-    private lazy var wechatBtn: UIButton = {
-        let wechatBtn = UIButton(type: UIButton.ButtonType.custom)
-        wechatBtn.setTitle("微信", for: UIControl.State.normal)
-        wechatBtn.setTitleColor(k333333Color, for: UIControl.State.normal)
-        wechatBtn.setImage(kImage(name: "edit_pic_wechat"), for: UIControl.State.normal)
-        wechatBtn.titleLabel?.font = kRegularFont11
-        wechatBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-//            if let allSelectBlock = self?.allSelectBlock {
-//                let isAllSel: Int = wechatBtn.isSelected == true ? 1 : 0
-//                allSelectBlock(isAllSel)
-//            }
-            print("----点击了-微信")
-        }).disposed(by: disposeBag)
-        return wechatBtn
-    }()
-    
-    private lazy var friendsBtn: UIButton = {
-        let friendsBtn = UIButton(type: UIButton.ButtonType.custom)
-        friendsBtn.setTitle("朋友圈", for: UIControl.State.normal)
-        friendsBtn.setTitleColor(k333333Color, for: UIControl.State.normal)
-        friendsBtn.setImage(kImage(name: "edit_pic_moments"), for: UIControl.State.normal)
-        friendsBtn.titleLabel?.font = kRegularFont11
-        friendsBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-//            if let allSelectBlock = self?.allSelectBlock {
-//                let isAllSel: Int = wechatBtn.isSelected == true ? 1 : 0
-//                allSelectBlock(isAllSel)
-//            }
-            print("----点击了-朋友圈")
-        }).disposed(by: disposeBag)
-        return friendsBtn
-    }()
-    
-    private lazy var saveImgBtn: UIButton = {
-        let saveImgBtn = UIButton(type: UIButton.ButtonType.custom)
-        saveImgBtn.setTitle("保存图片", for: UIControl.State.normal)
-        saveImgBtn.setTitleColor(k333333Color, for: UIControl.State.normal)
-        saveImgBtn.setImage(kImage(name: "edit_pic_download"), for: UIControl.State.normal)
-        saveImgBtn.titleLabel?.font = kRegularFont11
-        saveImgBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-//            if let allSelectBlock = self?.allSelectBlock {
-//                let isAllSel: Int = wechatBtn.isSelected == true ? 1 : 0
-//                allSelectBlock(isAllSel)
-//            }
-            print("----点击了-保存图片")
-        }).disposed(by: disposeBag)
-        return saveImgBtn
-    }()
-    
-    private lazy var sepView: UIView = {
-        let sepView = UIView()
-        sepView.backgroundColor = kDDDDDDColor
-        return sepView
-    }()
-    
-    private lazy var jumpBtn: UIButton = {
-        let jumpBtn = UIButton(type: UIButton.ButtonType.custom)
-        jumpBtn.setTitle("去首页", for: UIControl.State.normal)
-        jumpBtn.titleLabel?.font = kRegularFont16
-        jumpBtn.setTitleColor(k333333Color, for: .normal)
-        jumpBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-//            if let orderPayBlock = self?.orderPayBlock {
-//                orderPayBlock()
-//            }
-            print("----点击了-去首页")
-        }).disposed(by: disposeBag)
-        return jumpBtn
-    }()
-    
-}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishSuccess/PublishSuccessController.swift

@@ -1,313 +0,0 @@
-//
-//  PublishSuccessController.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/17.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-import EFQRCode
-
-class PublishSuccessController: BaseViewController {
-    
-    var imgUrl : String?
-    var topicStr : String = ""
-    var titleStr : String = ""
-    var avatarStr : String?
-    var nameStr : String?
-    var H5UrlStr : String?
-    var bean : Int?
-    
-    var postId : Int?
-    var uid : Int?
-    var type : String?
-    var contentStr : String?
-    
-    
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        setupViews()
-        setupLayouts()
-        setupData()
-    }
-    
-    override func setupViews() {
-        
-        statusBarStyle = .lightContent
-        navigationBar.barBackgroundColor = UIColor.black
-        navigationBar.title = "分享动态卡片"
-        navigationBar.titleLabelColor = kffffffColor
-        navigationBar.wr_setLeftButton(image: kImage(name: "navbar_back_white")!)
-        navigationBar.onClickLeftButton = {
-            self.navigationController?.dismiss(animated: true, completion: nil)
-        }
-        
-        view.addSubview(shareCommunityContentView)
-        view.addSubview(scrollView)
-        scrollView.addSubview(bgImageView)
-        scrollView.addSubview(bgView)
-        bgView.addSubview(logoImageView)
-        bgView.addSubview(topicLabel)
-        bgView.addSubview(titleLabel)
-        bgView.addSubview(lineLable)
-        bgView.addSubview(avatarImageView)
-        bgView.addSubview(nameLable)
-        scrollView.addSubview(lineImageView)
-        scrollView.addSubview(QRCodeImageView)
-        scrollView.addSubview(nickLable)
-        scrollView.addSubview(scanLabel)
-        
-    }
-    
-    override func setupLayouts() {
-        bgImageView.snp.makeConstraints { (make) in
-            make.centerX.equalTo(scrollView)
-            make.top.equalTo(scrollView.snp.top)
-            make.width.equalTo(kScreenWidth)
-            make.height.equalTo(481*kScaleWidth)
-        }
-        bgView.snp.makeConstraints { (make) in
-            make.centerX.equalTo(scrollView)
-            make.top.equalTo(scrollView.snp.top)
-            make.width.equalTo(kScreenWidth)
-            make.height.equalTo(481*kScaleWidth)
-        }
-        logoImageView.snp.makeConstraints { (make) in
-            make.top.equalTo(30*kScaleWidth)
-            make.left.equalTo(27*kScaleWidth)
-        }
-        topicLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(logoImageView.snp.bottom).offset(66*kScaleWidth)
-            make.left.equalTo(27*kScaleWidth)
-        }
-        titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(topicLabel.snp.bottom).offset(15*kScaleWidth)
-            make.left.equalTo(27*kScaleWidth)
-            make.right.equalTo(-27*kScaleWidth)
-        }
-        lineLable.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp.bottom).offset(30*kScaleWidth)
-            make.left.equalTo(27*kScaleWidth)
-            make.height.equalTo(1)
-            make.width.equalTo(20*kScaleWidth)
-        }
-        avatarImageView.snp.makeConstraints { (make) in
-            make.centerY.equalTo(lineLable)
-            make.size.equalTo(20*kScaleWidth)
-            make.left.equalTo(lineLable.snp.right).offset(5*kScaleWidth)
-        }
-        nameLable.snp.makeConstraints { (make) in
-            make.centerY.equalTo(lineLable)
-            make.left.equalTo(avatarImageView.snp.right).offset(5*kScaleWidth)
-        }
-        lineImageView.snp.makeConstraints { (make) in
-            make.top.equalTo(bgView.snp.bottom).offset(10*kScaleWidth)
-            make.centerX.equalToSuperview()
-        }
-        QRCodeImageView.snp.makeConstraints { (make) in
-            make.left.equalTo(27*kScaleWidth)
-            make.top.equalTo(lineImageView.snp.bottom).offset(40*kScaleWidth)
-            make.size.equalTo(90*kScaleWidth)
-        }
-        nickLable.snp.makeConstraints { (make) in
-            make.top.equalTo(QRCodeImageView).offset(7*kScaleWidth)
-            make.left.equalTo(QRCodeImageView.snp.right).offset(27*kScaleWidth)
-            make.height.equalTo(25*kScaleWidth)
-        }
-        scanLabel.snp.makeConstraints { (make) in
-            make.bottom.equalTo(QRCodeImageView).offset(-7*kScaleWidth)
-            make.height.equalTo(34*kScaleWidth)
-            make.left.equalTo(QRCodeImageView.snp.right).offset(23*kScaleWidth)
-            make.width.equalTo(210*kScaleWidth)
-        }
-    }
-    
-    override func setupData() {
-        bgImageView.kf.setImage(with: kURLImage(name: imgUrl ?? ""), placeholder: kImage(name: "default_pic"))
-        topicLabel.text = "#\(topicStr)#"
-        titleLabel.text = titleStr
-        avatarImageView.kf.setImage(with: kURLImage(name: avatarStr ?? ""), placeholder: kImage(name: "default_pic"))
-        nameLable.text = nameStr ?? ""
-        
-        if let tryImage = EFQRCode.generate(
-            content: H5UrlStr ?? "",
-            size: EFIntSize(width: Int(90*kScaleWidth), height: Int(90*kScaleWidth))
-            ) {
-            QRCodeImageView.image = UIImage(cgImage: tryImage)
-        } else {
-        }
-        scanLabel.text = "扫码查看内容 领取\(bean ?? 0)U米"
-        scrollView.swContentScrollCapture {
-            [weak self] (image) in
-            self?.shareCommunityContentView.image = image
-        }
-        
-        shareCommunityContentView.completion = {
-            [weak self] in
-            VirusViewModel.shared.forwarVirueRecordAddApi(postId: self?.postId, postAuthorUid: "\(self?.uid ?? 0)", title: self?.titleStr, content: self?.contentStr, postType: self?.type, postCover: self?.imgUrl)
-        }
-        
-    }
-    
-    lazy var scrollView : UIScrollView = {
-        let scrollView = UIScrollView(frame: CGRect(x: 0, y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight-kNavBarTotalHeight-179))
-        scrollView.contentSize = CGSize(width: kScreenWidth, height: 667*kScaleWidth)
-        scrollView.backgroundColor = kffffffColor
-        return scrollView
-    }()
-    
-    lazy var bgImageView: UIImageView = {
-        let bgImageView = UIImageView()
-        bgImageView.isUserInteractionEnabled = true
-        return bgImageView
-    }()
-    
-    lazy var bgView: UIView = {
-        let bgView = UIView()
-        bgView.backgroundColor = UIColor(hexString: "000000", alpha: 0.2)
-        bgView.isUserInteractionEnabled = true
-        return bgView
-    }()
-    
-    lazy var logoImageView: UIImageView = {
-        let logoImageView = UIImageView()
-        logoImageView.image = kImage(name: "posters_pic_logo")
-        logoImageView.isUserInteractionEnabled = true
-        return logoImageView
-    }()
-    
-    lazy var topicLabel: UILabel = {
-        let topicLabel = UILabel()
-        topicLabel.textColor = kffffffColor
-        topicLabel.font = kRegularFont13
-        return topicLabel
-    }()
-    
-    lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = kffffffColor
-        titleLabel.font = kBoldFont18
-        titleLabel.numberOfLines = 2
-        return titleLabel
-    }()
-    
-    lazy var lineLable: UILabel = {
-        let lineLable = UILabel()
-        lineLable.backgroundColor = UIColor.white
-        return lineLable
-    }()
-    
-    lazy var avatarImageView: UIImageView = {
-        let avatarImageView = UIImageView()
-        avatarImageView.cornerRadius = 10 * kScaleWidth
-        avatarImageView.masksToBounds = true
-        avatarImageView.isUserInteractionEnabled = true
-        return avatarImageView
-    }()
-    
-    lazy var nameLable: UILabel = {
-        let nameLable = UILabel()
-        nameLable.textColor = kffffffColor
-        nameLable.font = kRegularFont12
-        return nameLable
-    }()
-    
-    lazy var lineImageView: UIImageView = {
-        let lineImageView = UIImageView()
-        lineImageView.image = kImage(name: "posters_pic_text")
-        lineImageView.isUserInteractionEnabled = true
-        return lineImageView
-    }()
-    
-    lazy var QRCodeImageView: UIImageView = {
-        let QRCodeImageView = UIImageView()
-        QRCodeImageView.isUserInteractionEnabled = true
-        return QRCodeImageView
-    }()
-    
-    lazy var nickLable: UILabel = {
-        let nickLable = UILabel()
-        nickLable.textColor = k333333Color
-        nickLable.font = kMediumFont18
-        nickLable.text = "彩虹星球 · 开启美好生活"
-        return nickLable
-    }()
-    
-    lazy var scanLabel: UILabel = {
-        let scanLabel = UILabel()
-        scanLabel.textColor = kffffffColor
-        scanLabel.font = kMediumFont14
-        scanLabel.backgroundColor = kThemeColor
-        scanLabel.cornerRadius = 34/2 * kScaleWidth
-        scanLabel.masksToBounds = true
-        scanLabel.textAlignment = .center
-        return scanLabel
-    }()
-    
-    lazy var shareCommunityContentView: ShareCommunityVideoView = {
-        let shareCommunityContentView = ShareCommunityVideoView(frame: CGRect(x: 0, y: kScreenHeight - 184, width: kScreenWidth, height: 157))
-        return shareCommunityContentView
-    }()
-    
-    
-}
-
-
-//import UIKit
-//import RxSwift
-//
-//class PublishSuccessController: BaseViewController {
-//
-//    override func viewDidLoad() {
-//        super.viewDidLoad()
-//        setupViews()
-//        setupData()
-//    }
-//
-//    override func setupViews() {
-//        self.view.backgroundColor = kffffffColor
-//
-//        view.addSubview(shareView)
-//        view.addSubview(iconImageView)
-//
-//        shareView.snp.makeConstraints { (make) in
-//            make.left.right.equalToSuperview()
-//            make.bottom.equalTo(-kSafeTabBarHeight)
-//            make.height.equalTo(185)
-//        }
-//        iconImageView.snp.makeConstraints { (make) in
-//            make.top.left.right.equalToSuperview()
-//            make.bottom.equalTo(shareView.snp_top)
-//        }
-//    }
-//
-//    override func setupLayouts() {
-//
-//    }
-//
-//    override func setupData() {
-//
-//    }
-//
-//    lazy var iconImageView: UIImageView = {
-//        let iconImageView = UIImageView()
-//        iconImageView.image = kImage(name: "pic_example_12")
-//        return iconImageView
-//    }()
-//
-//    lazy var shareView: PublishShareBottomView = {
-//        let shareView = PublishShareBottomView()
-//
-////        shareView.orderPayBlock = {
-////            [weak self] in
-////            if let orderPayTransBlock = self?.orderPayTransBlock {
-////                orderPayTransBlock(self!.selModelArr, self!.totalPrice)
-////            }
-////        }
-//
-//        return shareView
-//    }()
-//
-//}

RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommonStr/ShareCommonStr.swift

@@ -0,0 +1,19 @@
+//
+//  CommonH5.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/7/10.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import Foundation
+
+//MARK: - 帖子详情分享
+let kCommunityPostTitle  = "向好友分享内容，各得 \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米"
+let kCommunityPostDetailTitle  = "分享越多，收获越多！"
+let kCommunityPostShareDetailTitle  = "来看看我给你挑的这篇内容怎么样！顺便给你转了 \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米，可以在由你APP里换东西，记得查收哦~"
+//MARK: - 邀请好友分享
+let kInviteGoodFriendsTitle = "邀请好友当老板，送TA \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米"
+let kInviteGoodFriendsDetailTitle  = "入驻好友越多，收获越多！"
+let kInviteGoodFriendsShareTitle = "我想请你来由你玩儿~"
+let kInviteGoodFriendsShareDetailTitle  = "我在由你APP里当老板了，超好玩儿的~ 给你转了 \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米，会员随便换，记得查收哦！"

RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommunityModule/ShareCommunity/ShareCommunityView.swift

@@ -160,8 +160,8 @@ class ShareCommunityView: FWPopupView {
     }
     
     
-    /// 初始化
-    class func shareCommunityView(uid:Int,title:String,detailTitle:String,h5Str:String,thumbnailImg:UIImage?,sharedTitle:String,sharedDetailTitle:String,shareCommunityViewType:ShareCommunityViewType,completion: @escaping Completion) -> ShareCommunityView {
+    /// 分享内容
+    class func shareCommunityView(uid:Int,title:String = kCommunityPostTitle,detailTitle:String = kCommunityPostDetailTitle, h5Str:String,thumbnailImg:UIImage?,sharedTitle:String,sharedDetailTitle:String,shareCommunityViewType:ShareCommunityViewType,completion: @escaping Completion) -> ShareCommunityView {
         let view = ShareCommunityView(
             uid:uid,
             title:title,
@@ -190,12 +190,12 @@ class ShareCommunityView: FWPopupView {
     class func inviteGoodFriends() {
         let shareCommunityView =  ShareCommunityView.shareCommunityView(
             uid:0,
-            title: kCommunityPushingNewActivitiesTitle,
-            detailTitle: kCommunityPushingNewActivitiesDetailTitle,
+            title: kInviteGoodFriendsTitle,
+            detailTitle: kInviteGoodFriendsDetailTitle,
             h5Str: kH5InviteUrl + "\(UserModel.shared().getModel()?.inviteCode ?? "")",
             thumbnailImg: UIImage.imageUrl(UserModel.shared().getModel()?.avatarurl),
-            sharedTitle: kCommunityPushingNewActivitiesTitleShare,
-            sharedDetailTitle: kCommunityPushingNewActivitiesDetailTitleShare,
+            sharedTitle: kInviteGoodFriendsShareTitle,
+            sharedDetailTitle: kInviteGoodFriendsShareDetailTitle,
             shareCommunityViewType: ShareCommunityViewType.activity,
             completion: {})
         shareCommunityView.saveCompletion = {

RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommunityModule/ShareCommunityContent/ShareCommunityContentView.swift

@@ -123,18 +123,31 @@ extension ShareCommunityContentView: UICollectionViewDelegateFlowLayout,UICollec
             break
         case 2:
             if image != nil {
-                UMManager.shared.shareImage(to: UMSocialPlatformType.sina, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
+                UMManager.shared.shareImage(to: UMSocialPlatformType.QQ, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
                     self.completion!()
                 }
             }
             if imageUrl != nil {
-                UMManager.shared.shareImage(to: UMSocialPlatformType.sina, viewController: findViewController(), thumbImage: UIImage.imageUrl(imageUrl) as Any, shareImage: UIImage.imageUrl(imageUrl) as Any) {
+                UMManager.shared.shareImage(to: UMSocialPlatformType.QQ, viewController: findViewController(), thumbImage: UIImage.imageUrl(imageUrl) as Any, shareImage: UIImage.imageUrl(imageUrl) as Any) {
                 }
             }
 
 
             break
         case 3:
+            if image != nil {
+                UMManager.shared.shareImage(to: UMSocialPlatformType.sina, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
+                    self.completion!()
+                }
+            }
+            if imageUrl != nil {
+                UMManager.shared.shareImage(to: UMSocialPlatformType.sina, viewController: findViewController(), thumbImage: UIImage.imageUrl(imageUrl) as Any, shareImage: UIImage.imageUrl(imageUrl) as Any) {
+                }
+            }
+            
+            
+            break
+        case 4:
             if image != nil {
                 UIImageWriteToSavedPhotosAlbum(image ?? UIImage(), nil, nil, nil)
             }

RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommunityModule/ShareCommunityVideo/ShareCommunityVideoView.swift

@@ -1,179 +0,0 @@
-
-//
-//  ShareCommunityVideoView.swift
-//  RainbowPlanet
-//
-//  Created by 南鑫林 on 2019/7/11.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-
-class ShareCommunityVideoView: BaseView {
-
-    let platformTitles = ["微信","朋友圈","QQ","微博","保存图片"]
-    let platformImages = ["edit_pic_wechat","edit_pic_moments","edit_pic_qq","edit_pic_sina","edit_pic_download"]
-    
-    var imageUrl : String?
-    var image : UIImage?
-    
-    typealias Completion = (() -> Void)
-    var completion : Completion?
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        backgroundColor = UIColor.black
-        configRectCorner(corner: [.topLeft,.topRight], radii: CGSize(width: 8, height: 8))
-        setupViews()
-        setupLayouts()
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func setupViews() {
-        addSubview(titleLabel)
-        addSubview(beanLabel)
-        addSubview(collectionView)
-        
-    }
-    
-    override func setupLayouts() {
-        titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(20)
-            make.right.equalTo(-20)
-            make.left.equalTo(20)
-            make.height.equalTo(20)
-        }
-        beanLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp.bottom).offset(10)
-            make.centerX.equalToSuperview()
-            make.height.equalTo(24)
-            make.width.equalTo(163)
-        }
-        collectionView.snp.makeConstraints { (make) in
-            make.top.equalTo(beanLabel.snp.bottom).offset(20)
-            make.height.equalTo(69)
-            make.left.right.equalToSuperview()
-        }
-    }
-    
-    lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = kffffffColor
-        titleLabel.font = kRegularFont15
-        titleLabel.textAlignment = .center
-        titleLabel.text = "向好友传递美好生活，收获更多U米"
-        return titleLabel
-    }()
-    
-    lazy var beanLabel: UILabel = {
-        let beanLabel = UILabel()
-        beanLabel.textColor = UIColor(hexString: "FFA42F")
-        beanLabel.font = kMediumFont13
-        beanLabel.textAlignment = .center
-        beanLabel.text = "预计可获得0U米"
-        beanLabel.backgroundColor = UIColor(hexString: "FFF9F0")
-        return beanLabel
-    }()
-    
-    lazy var collectionView: UICollectionView = {
-        let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
-        collectionView.backgroundColor = UIColor.black
-        collectionView.delegate = self;
-        collectionView.dataSource = self;
-        collectionView.showsVerticalScrollIndicator = false
-        collectionView.showsHorizontalScrollIndicator = false
-        return collectionView
-    }()
-    
-    private lazy var collectionViewLayout: UICollectionViewFlowLayout = {
-        let collectionViewLayout = UICollectionViewFlowLayout.init()
-        collectionViewLayout.minimumLineSpacing = 30
-        collectionViewLayout.minimumInteritemSpacing = 0
-        collectionViewLayout.scrollDirection = .horizontal
-        return collectionViewLayout
-    }()
-    
-}
-
-extension ShareCommunityVideoView: UICollectionViewDelegateFlowLayout,UICollectionViewDataSource {
-    func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return 1
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return platformTitles.count
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = ShareCommunityViewCollectionViewCell.cellWith(collectionView: collectionView, indexPath: indexPath)
-        cell.titleIcon(title: platformTitles[indexPath.row], iconStr: platformImages[indexPath.row], textColor: kffffffColor)
-        return cell
-        
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        switch indexPath.row {
-        case 0:
-            if image != nil {
-                UMManager.shared.shareImage(to: UMSocialPlatformType.wechatSession, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
-                    self.completion!()
-                }
-            }
-            if imageUrl != nil {
-                UMManager.shared.shareImage(to: UMSocialPlatformType.wechatSession, viewController: findViewController(), thumbImage: UIImage.imageUrl(imageUrl) as Any, shareImage: UIImage.imageUrl(imageUrl)  as Any) {
-                }
-            }
-            
-            break
-        case 1:
-            if image != nil {
-                UMManager.shared.shareImage(to: UMSocialPlatformType.wechatSession, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
-                    self.completion!()
-                }
-            }
-            if imageUrl != nil {
-                UMManager.shared.shareImage(to: UMSocialPlatformType.wechatTimeLine, viewController: findViewController(), thumbImage: UIImage.imageUrl(imageUrl) as Any, shareImage: UIImage.imageUrl(imageUrl) as Any) {
-                }
-            }
-            break
-        case 2:
-            if image != nil {
-                UMManager.shared.shareImage(to: UMSocialPlatformType.sina, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
-                    self.completion!()
-                }
-            }
-            if imageUrl != nil {
-                UMManager.shared.shareImage(to: UMSocialPlatformType.sina, viewController: findViewController(), thumbImage: UIImage.imageUrl(imageUrl) as Any, shareImage: UIImage.imageUrl(imageUrl) as Any) {
-                }
-            }
-            
-            
-            break
-        case 3:
-            if image != nil {
-                UIImageWriteToSavedPhotosAlbum(image ?? UIImage(), nil, nil, nil)
-            }
-            if imageUrl != nil {
-                UIImageWriteToSavedPhotosAlbum(UIImage.imageUrl(imageUrl), nil, nil, nil)
-            }
-            
-            SwiftProgressHUD.shared().showText("保存成功")
-            break
-        default:
-            break
-        }
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        return CGSize(width:50, height: 69)
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
-        return UIEdgeInsets(top: 0, left: 43, bottom: 0, right: 43)
-    }
-    
-}
-

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/logo.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "logo@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "logo@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/Launch Screen.storyboard

@@ -18,18 +18,18 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="aXh-cS-nO6">
-                                <rect key="frame" x="152" y="403" width="110" height="100"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="news_logo" translatesAutoresizingMaskIntoConstraints="NO" id="qwh-gD-Vh3">
+                                <rect key="frame" x="157" y="403" width="100" height="100"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="110" id="3Zm-xA-50g"/>
-                                    <constraint firstAttribute="height" constant="100" id="KWN-cz-Lwk"/>
+                                    <constraint firstAttribute="height" constant="100" id="eAl-ha-OR3"/>
+                                    <constraint firstAttribute="width" constant="100" id="wpH-Vd-Obu"/>
                                 </constraints>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="aXh-cS-nO6" firstAttribute="centerY" secondItem="Bcu-3y-fUS" secondAttribute="centerY" id="E6s-6F-83d"/>
-                            <constraint firstItem="aXh-cS-nO6" firstAttribute="centerX" secondItem="Bcu-3y-fUS" secondAttribute="centerX" id="etd-B2-pt9"/>
+                            <constraint firstItem="qwh-gD-Vh3" firstAttribute="centerX" secondItem="Bcu-3y-fUS" secondAttribute="centerX" id="AUz-BA-Kgm"/>
+                            <constraint firstItem="qwh-gD-Vh3" firstAttribute="centerY" secondItem="Bcu-3y-fUS" secondAttribute="centerY" id="bFv-s3-gy0"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                     </view>
@@ -40,6 +40,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="logo" width="110" height="100"/>
+        <image name="news_logo" width="19" height="19"/>
     </resources>
 </document>

RainbowPlanet/RainbowPlanet/Tools/EmptyView/DIYEmptyView.swift

@@ -165,6 +165,20 @@ class DIYEmptyView: LYEmptyView {
         collectionView?.ly_startLoading()
     }
     
+    /// collectionView上的默认图 不带button
+    ///
+    /// - Parameters:
+    ///   - collectionView: collectionView
+    ///   - imageStr: 图片默认图
+    ///   - detailStr: 标题
+    ///   - contentViewY: contentViewY
+    class func emptyNoDataCollectionView(collectionView:UICollectionView?,imageStr:DIYEmptyViewImageStr = .one,detailStr:DIYEmptyViewDetailString = .one,contentViewY:CGFloat) {
+        let emptyView = DIYEmptyView.empty(withImageStr: imageStr.rawValue, titleStr: nil, detailStr: detailStr.rawValue)
+        emptyView?.contentViewY = contentViewY
+        collectionView?.ly_emptyView = emptyView
+        collectionView?.ly_startLoading()
+    }
+    
     /// collectionView上的默认图 带button
     ///
     /// - Parameters:

RainbowPlanet/RainbowPlanet/Tools/Extension/Extension+UIImage.swift

@@ -234,7 +234,7 @@ extension UIImage {
         if data != nil {
             image = UIImage(data: data!, scale: 0.5)
         }else {
-            image = kImage(name: "logo")
+            image = kImage(name: "LaunchScreenLogo")
         }
         return image!
     }