找回丢失文件

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -414,6 +414,25 @@
 		BD12B6AB22B502C200AEB10B /* KSVideoPlayerLiteView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD12B6A522B502C200AEB10B /* KSVideoPlayerLiteView.m */; };
 		BD12B6AC22B502C200AEB10B /* KSVideoPlayerBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD12B6A722B502C200AEB10B /* KSVideoPlayerBaseView.m */; };
 		BD12B6AD22B502C200AEB10B /* KSVideoLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = BD12B6AA22B502C200AEB10B /* KSVideoLayer.m */; };
+		BD13B69422B9CE5E008BB323 /* PublishAddAddressController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B68522B9CE5D008BB323 /* PublishAddAddressController.swift */; };
+		BD13B69522B9CE5E008BB323 /* PublishAddressPOIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B68622B9CE5D008BB323 /* PublishAddressPOIView.swift */; };
+		BD13B69622B9CE5E008BB323 /* SearchAddrNavigationbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B68722B9CE5D008BB323 /* SearchAddrNavigationbarView.swift */; };
+		BD13B69722B9CE5E008BB323 /* PublishAddTopicController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B68A22B9CE5D008BB323 /* PublishAddTopicController.swift */; };
+		BD13B69822B9CE5E008BB323 /* PublishTopicTypeItemCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B68C22B9CE5D008BB323 /* PublishTopicTypeItemCollectionCell.swift */; };
+		BD13B69922B9CE5E008BB323 /* PublishTopicHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B68D22B9CE5D008BB323 /* PublishTopicHeaderView.swift */; };
+		BD13B69A22B9CE5E008BB323 /* PublishTopicItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B68E22B9CE5D008BB323 /* PublishTopicItemCell.swift */; };
+		BD13B69B22B9CE5E008BB323 /* PublishSelTopicCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B68F22B9CE5D008BB323 /* PublishSelTopicCollectionCell.swift */; };
+		BD13B69C22B9CE5E008BB323 /* PublishTopicTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B69022B9CE5D008BB323 /* PublishTopicTypeCell.swift */; };
+		BD13B69D22B9CE5E008BB323 /* PublishSuccessController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B69222B9CE5E008BB323 /* PublishSuccessController.swift */; };
+		BD13B69E22B9CE5E008BB323 /* PublishShareBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B69322B9CE5E008BB323 /* PublishShareBottomView.swift */; };
+		BD13B6AA22B9CE8F008BB323 /* PublishEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6A122B9CE8D008BB323 /* PublishEditController.swift */; };
+		BD13B6AB22B9CE8F008BB323 /* PublishEditAddTopicCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6A322B9CE8D008BB323 /* PublishEditAddTopicCell.swift */; };
+		BD13B6AC22B9CE8F008BB323 /* PublishEditDescribeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6A422B9CE8D008BB323 /* PublishEditDescribeCell.swift */; };
+		BD13B6AD22B9CE8F008BB323 /* PublishEditDefaultCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6A522B9CE8D008BB323 /* PublishEditDefaultCollectionCell.swift */; };
+		BD13B6AE22B9CE8F008BB323 /* PublishEditAddPicCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6A622B9CE8D008BB323 /* PublishEditAddPicCell.swift */; };
+		BD13B6AF22B9CE8F008BB323 /* PublishEditAddImgCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6A722B9CE8D008BB323 /* PublishEditAddImgCollectionCell.swift */; };
+		BD13B6B022B9CE8F008BB323 /* PublishEditAddAddressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6A822B9CE8E008BB323 /* PublishEditAddAddressCell.swift */; };
+		BD13B6B122B9CE8F008BB323 /* PublishEditTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD13B6A922B9CE8E008BB323 /* PublishEditTitleCell.swift */; };
 		BD1DC6C5228CFD0B00B89C57 /* SwiftMoyaNetWorkServiceOrder.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1DC6C3228CFD0B00B89C57 /* SwiftMoyaNetWorkServiceOrder.swift */; };
 		BD1DC6C6228CFD0B00B89C57 /* SwiftMoyaServiceOrderApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1DC6C4228CFD0B00B89C57 /* SwiftMoyaServiceOrderApi.swift */; };
 		BD1DC6C9228D005000B89C57 /* OrderCreateParameterModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1DC6C8228D005000B89C57 /* OrderCreateParameterModel.swift */; };
@@ -436,12 +455,6 @@
 		BD20F1D52283D15500677D8E /* OrderFinishPayFailureCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20F1D42283D15500677D8E /* OrderFinishPayFailureCell.swift */; };
 		BD24FABB22B509CF00C7AA3B /* PublishModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BD24FABA22B509CF00C7AA3B /* PublishModule.xcassets */; };
 		BD24FABF22B50C4B00C7AA3B /* KSMediaPicker.strings in Resources */ = {isa = PBXBuildFile; fileRef = BD24FABE22B50C4B00C7AA3B /* KSMediaPicker.strings */; };
-		BD28077822B721BF002AB976 /* PublishEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28077722B721BF002AB976 /* PublishEditController.swift */; };
-		BD28077A22B72734002AB976 /* PublishEditTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28077922B72734002AB976 /* PublishEditTitleCell.swift */; };
-		BD28077C22B72761002AB976 /* PublishEditDescribeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28077B22B72761002AB976 /* PublishEditDescribeCell.swift */; };
-		BD28077E22B72797002AB976 /* PublishEditAddTopicCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28077D22B72797002AB976 /* PublishEditAddTopicCell.swift */; };
-		BD28078022B727A6002AB976 /* PublishEditAddAddressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28077F22B727A6002AB976 /* PublishEditAddAddressCell.swift */; };
-		BD28078222B727BD002AB976 /* PublishEditAddPicCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28078122B727BD002AB976 /* PublishEditAddPicCell.swift */; };
 		BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */; };
 		BD2FCBE222B21CF70006D974 /* CommunityRecommendController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2FCBE122B21CF70006D974 /* CommunityRecommendController.swift */; };
 		BD2FCBE422B244250006D974 /* RecommendDetailContentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2FCBE322B244250006D974 /* RecommendDetailContentCell.swift */; };
@@ -949,6 +962,25 @@
 		BD12B6A922B502C200AEB10B /* KSVideoPlayerBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSVideoPlayerBaseView.h; sourceTree = "<group>"; };
 		BD12B6AA22B502C200AEB10B /* KSVideoLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSVideoLayer.m; sourceTree = "<group>"; };
 		BD12B6AE22B5076800AEB10B /* KSLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSLayout.h; sourceTree = "<group>"; };
+		BD13B68522B9CE5D008BB323 /* PublishAddAddressController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishAddAddressController.swift; sourceTree = "<group>"; };
+		BD13B68622B9CE5D008BB323 /* PublishAddressPOIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishAddressPOIView.swift; sourceTree = "<group>"; };
+		BD13B68722B9CE5D008BB323 /* SearchAddrNavigationbarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchAddrNavigationbarView.swift; sourceTree = "<group>"; };
+		BD13B68A22B9CE5D008BB323 /* PublishAddTopicController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishAddTopicController.swift; sourceTree = "<group>"; };
+		BD13B68C22B9CE5D008BB323 /* PublishTopicTypeItemCollectionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishTopicTypeItemCollectionCell.swift; sourceTree = "<group>"; };
+		BD13B68D22B9CE5D008BB323 /* PublishTopicHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishTopicHeaderView.swift; sourceTree = "<group>"; };
+		BD13B68E22B9CE5D008BB323 /* PublishTopicItemCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishTopicItemCell.swift; sourceTree = "<group>"; };
+		BD13B68F22B9CE5D008BB323 /* PublishSelTopicCollectionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishSelTopicCollectionCell.swift; sourceTree = "<group>"; };
+		BD13B69022B9CE5D008BB323 /* PublishTopicTypeCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishTopicTypeCell.swift; sourceTree = "<group>"; };
+		BD13B69222B9CE5E008BB323 /* PublishSuccessController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishSuccessController.swift; sourceTree = "<group>"; };
+		BD13B69322B9CE5E008BB323 /* PublishShareBottomView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishShareBottomView.swift; sourceTree = "<group>"; };
+		BD13B6A122B9CE8D008BB323 /* PublishEditController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditController.swift; sourceTree = "<group>"; };
+		BD13B6A322B9CE8D008BB323 /* PublishEditAddTopicCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditAddTopicCell.swift; sourceTree = "<group>"; };
+		BD13B6A422B9CE8D008BB323 /* PublishEditDescribeCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditDescribeCell.swift; sourceTree = "<group>"; };
+		BD13B6A522B9CE8D008BB323 /* PublishEditDefaultCollectionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditDefaultCollectionCell.swift; sourceTree = "<group>"; };
+		BD13B6A622B9CE8D008BB323 /* PublishEditAddPicCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditAddPicCell.swift; sourceTree = "<group>"; };
+		BD13B6A722B9CE8D008BB323 /* PublishEditAddImgCollectionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditAddImgCollectionCell.swift; sourceTree = "<group>"; };
+		BD13B6A822B9CE8E008BB323 /* PublishEditAddAddressCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditAddAddressCell.swift; sourceTree = "<group>"; };
+		BD13B6A922B9CE8E008BB323 /* PublishEditTitleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishEditTitleCell.swift; sourceTree = "<group>"; };
 		BD1DC6C3228CFD0B00B89C57 /* SwiftMoyaNetWorkServiceOrder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkServiceOrder.swift; sourceTree = "<group>"; };
 		BD1DC6C4228CFD0B00B89C57 /* SwiftMoyaServiceOrderApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftMoyaServiceOrderApi.swift; sourceTree = "<group>"; };
 		BD1DC6C8228D005000B89C57 /* OrderCreateParameterModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCreateParameterModel.swift; sourceTree = "<group>"; };
@@ -976,12 +1008,6 @@
 		BD20F1D42283D15500677D8E /* OrderFinishPayFailureCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderFinishPayFailureCell.swift; sourceTree = "<group>"; };
 		BD24FABA22B509CF00C7AA3B /* PublishModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = PublishModule.xcassets; sourceTree = "<group>"; };
 		BD24FABE22B50C4B00C7AA3B /* KSMediaPicker.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = KSMediaPicker.strings; sourceTree = "<group>"; };
-		BD28077722B721BF002AB976 /* PublishEditController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditController.swift; sourceTree = "<group>"; };
-		BD28077922B72734002AB976 /* PublishEditTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditTitleCell.swift; sourceTree = "<group>"; };
-		BD28077B22B72761002AB976 /* PublishEditDescribeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditDescribeCell.swift; sourceTree = "<group>"; };
-		BD28077D22B72797002AB976 /* PublishEditAddTopicCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditAddTopicCell.swift; sourceTree = "<group>"; };
-		BD28077F22B727A6002AB976 /* PublishEditAddAddressCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditAddAddressCell.swift; sourceTree = "<group>"; };
-		BD28078122B727BD002AB976 /* PublishEditAddPicCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditAddPicCell.swift; sourceTree = "<group>"; };
 		BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCommentParameterModel.swift; sourceTree = "<group>"; };
 		BD2FCBE122B21CF70006D974 /* CommunityRecommendController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityRecommendController.swift; sourceTree = "<group>"; };
 		BD2FCBE322B244250006D974 /* RecommendDetailContentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendDetailContentCell.swift; sourceTree = "<group>"; };
@@ -3617,7 +3643,10 @@
 				BD929CD322B906C10098C139 /* PublishVideoRecorderController.swift */,
 				BD929CD522B906D10098C139 /* PublishTakePhotoController.swift */,
 				BD12B67222B4E99800AEB10B /* PublishMediaPicker */,
-				BD28077422B72175002AB976 /* PublishEditController */,
+				BD13B69F22B9CE8D008BB323 /* PublishEditController */,
+				BD13B68822B9CE5D008BB323 /* PublishAddTopic */,
+				BD13B68422B9CE5D008BB323 /* PublishAddAddress */,
+				BD13B69122B9CE5E008BB323 /* PublishSuccess */,
 			);
 			path = PublishModule;
 			sourceTree = "<group>";
@@ -3692,6 +3721,88 @@
 			path = KSVideoPlayerView;
 			sourceTree = "<group>";
 		};
+		BD13B68422B9CE5D008BB323 /* PublishAddAddress */ = {
+			isa = PBXGroup;
+			children = (
+				BD13B68522B9CE5D008BB323 /* PublishAddAddressController.swift */,
+				BD13B68622B9CE5D008BB323 /* PublishAddressPOIView.swift */,
+				BD13B68722B9CE5D008BB323 /* SearchAddrNavigationbarView.swift */,
+			);
+			name = PublishAddAddress;
+			path = ../../../../../../Desktop/PublishModule/PublishAddAddress;
+			sourceTree = "<group>";
+		};
+		BD13B68822B9CE5D008BB323 /* PublishAddTopic */ = {
+			isa = PBXGroup;
+			children = (
+				BD13B68922B9CE5D008BB323 /* Controller */,
+				BD13B68B22B9CE5D008BB323 /* View */,
+			);
+			name = PublishAddTopic;
+			path = ../../../../../../Desktop/PublishModule/PublishAddTopic;
+			sourceTree = "<group>";
+		};
+		BD13B68922B9CE5D008BB323 /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				BD13B68A22B9CE5D008BB323 /* PublishAddTopicController.swift */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		BD13B68B22B9CE5D008BB323 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				BD13B68C22B9CE5D008BB323 /* PublishTopicTypeItemCollectionCell.swift */,
+				BD13B68D22B9CE5D008BB323 /* PublishTopicHeaderView.swift */,
+				BD13B68E22B9CE5D008BB323 /* PublishTopicItemCell.swift */,
+				BD13B68F22B9CE5D008BB323 /* PublishSelTopicCollectionCell.swift */,
+				BD13B69022B9CE5D008BB323 /* PublishTopicTypeCell.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		BD13B69122B9CE5E008BB323 /* PublishSuccess */ = {
+			isa = PBXGroup;
+			children = (
+				BD13B69222B9CE5E008BB323 /* PublishSuccessController.swift */,
+				BD13B69322B9CE5E008BB323 /* PublishShareBottomView.swift */,
+			);
+			name = PublishSuccess;
+			path = ../../../../../../Desktop/PublishModule/PublishSuccess;
+			sourceTree = "<group>";
+		};
+		BD13B69F22B9CE8D008BB323 /* PublishEditController */ = {
+			isa = PBXGroup;
+			children = (
+				BD13B6A022B9CE8D008BB323 /* Controller */,
+				BD13B6A222B9CE8D008BB323 /* View */,
+			);
+			path = PublishEditController;
+			sourceTree = "<group>";
+		};
+		BD13B6A022B9CE8D008BB323 /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				BD13B6A122B9CE8D008BB323 /* PublishEditController.swift */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		BD13B6A222B9CE8D008BB323 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				BD13B6A322B9CE8D008BB323 /* PublishEditAddTopicCell.swift */,
+				BD13B6A422B9CE8D008BB323 /* PublishEditDescribeCell.swift */,
+				BD13B6A522B9CE8D008BB323 /* PublishEditDefaultCollectionCell.swift */,
+				BD13B6A622B9CE8D008BB323 /* PublishEditAddPicCell.swift */,
+				BD13B6A722B9CE8D008BB323 /* PublishEditAddImgCollectionCell.swift */,
+				BD13B6A822B9CE8E008BB323 /* PublishEditAddAddressCell.swift */,
+				BD13B6A922B9CE8E008BB323 /* PublishEditTitleCell.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		BD1DC6C2228CFD0B00B89C57 /* SwiftMoyaServiceOrder */ = {
 			isa = PBXGroup;
 			children = (
@@ -3758,35 +3869,6 @@
 			path = Category;
 			sourceTree = "<group>";
 		};
-		BD28077422B72175002AB976 /* PublishEditController */ = {
-			isa = PBXGroup;
-			children = (
-				BD28077622B721AC002AB976 /* View */,
-				BD28077522B721A2002AB976 /* Controller */,
-			);
-			path = PublishEditController;
-			sourceTree = "<group>";
-		};
-		BD28077522B721A2002AB976 /* Controller */ = {
-			isa = PBXGroup;
-			children = (
-				BD28077722B721BF002AB976 /* PublishEditController.swift */,
-			);
-			path = Controller;
-			sourceTree = "<group>";
-		};
-		BD28077622B721AC002AB976 /* View */ = {
-			isa = PBXGroup;
-			children = (
-				BD28078122B727BD002AB976 /* PublishEditAddPicCell.swift */,
-				BD28077922B72734002AB976 /* PublishEditTitleCell.swift */,
-				BD28077B22B72761002AB976 /* PublishEditDescribeCell.swift */,
-				BD28077D22B72797002AB976 /* PublishEditAddTopicCell.swift */,
-				BD28077F22B727A6002AB976 /* PublishEditAddAddressCell.swift */,
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
 		BD2FCBDE22B21BE00006D974 /* CommunityRecommendDetail */ = {
 			isa = PBXGroup;
 			children = (
@@ -4333,10 +4415,12 @@
 				A7DF50D622A4E8B400998908 /* OrderDetailProductTableViewCell.swift in Sources */,
 				A74322A422B8E7F60017C367 /* MyFollowAndFanHeaderView.swift in Sources */,
 				A73911AD229CD62F0033177E /* AlamofireReachabilityManager.swift in Sources */,
+				BD13B69C22B9CE5E008BB323 /* PublishTopicTypeCell.swift in Sources */,
 				A7BB684F2268DCEC00AB07A2 /* SelfRecommendationViewController.swift in Sources */,
 				A7B4E7352281907A0012914A /* CMSModel.swift in Sources */,
 				A72A72BE22321DE000B21995 /* Extension+RxTimer.swift in Sources */,
 				A7F2D6CB22B0E4270093000B /* CommunityRecommendFollowCollectionViewCell.swift in Sources */,
+				BD13B6AA22B9CE8F008BB323 /* PublishEditController.swift in Sources */,
 				A7931E1622AFAEF500297D0A /* TopicSelectionModel.swift in Sources */,
 				BDF47D7E22827C3F00941AB9 /* ProductSlidingTopBottomCollectionViewCell.swift in Sources */,
 				BD108C9522A60C2100837DAB /* HGImageCollectionViewCell.swift in Sources */,
@@ -4358,7 +4442,7 @@
 				A72A72B722321DE000B21995 /* Extension+NSMutableAttributedString.swift in Sources */,
 				A7931E0D22AF874600297D0A /* GenderSelectionViewController.swift in Sources */,
 				A7C0FDF522B65FE000BC1E86 /* FeaturedTopicsCollectionViewCell.swift in Sources */,
-				BD28077E22B72797002AB976 /* PublishEditAddTopicCell.swift in Sources */,
+				BD13B69822B9CE5E008BB323 /* PublishTopicTypeItemCollectionCell.swift in Sources */,
 				A7F2D6D022B1119A0093000B /* CommunityEnum.swift in Sources */,
 				A7BB6857226965C100AB07A2 /* SelfRecommendationHeaderCollectionReusableView.swift in Sources */,
 				BDE3045F228554CA001D050F /* ProductCartAmountModel.swift in Sources */,
@@ -4369,6 +4453,7 @@
 				A7A98DFF227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift in Sources */,
 				BDDF3B28228EBB72003A7D16 /* ProductRefundReasonModel.swift in Sources */,
 				A7CC74DC2270352F003C4F38 /* MineOrderCollectionViewCell.swift in Sources */,
+				BD13B6AF22B9CE8F008BB323 /* PublishEditAddImgCollectionCell.swift in Sources */,
 				BDD4FB1222840597006FE833 /* ShoppingCartPayOrderController.swift in Sources */,
 				BD3AA45F22AE6F2500EF4F20 /* MessagePlanetTableCell.swift in Sources */,
 				BD12203A22AF80AD0051C7C2 /* MessageActivityTableCell.swift in Sources */,
@@ -4378,7 +4463,6 @@
 				A71D2A602265673A00A55D16 /* RegisterLoginView.swift in Sources */,
 				BD12B6AC22B502C200AEB10B /* KSVideoPlayerBaseView.m in Sources */,
 				BD2FCBE422B244250006D974 /* RecommendDetailContentCell.swift in Sources */,
-				BD28078022B727A6002AB976 /* PublishEditAddAddressCell.swift in Sources */,
 				A73D7C682268A032002A4CE3 /* SwiftyStarRatingView.swift in Sources */,
 				A7931E0122AF827600297D0A /* ESTabBarItemContentView.swift in Sources */,
 				A71AA5102272156A008FF1A5 /* ExpressAddressListViewController.swift in Sources */,
@@ -4413,6 +4497,7 @@
 				BD12B67D22B4EE6D00AEB10B /* KSMediaPickerItemModel.swift in Sources */,
 				A7F2D6DD22B2536F0093000B /* CardContentPicVideoCollectionViewCell.swift in Sources */,
 				BD7AB83622841A8B0030646A /* ShoppingCartPayOrderItemCell.swift in Sources */,
+				BD13B69E22B9CE5E008BB323 /* PublishShareBottomView.swift in Sources */,
 				A71AA519227219D7008FF1A5 /* EditExpressAddressViewController.swift in Sources */,
 				A7FF1568228C6E2300A85748 /* OrderDeliveryModeAndTimeTableViewCell.swift in Sources */,
 				A71738A822897E96000AEA6A /* SwiftMoyaNetWorkServiceShop.swift in Sources */,
@@ -4427,6 +4512,7 @@
 				A70B2C292286D77200B2449F /* ProductDetailProductInfoTableViewCell.swift in Sources */,
 				A74322A922B900180017C367 /* CommunityFindFriendsViewController.swift in Sources */,
 				BD1FC1A922B1075F00D55081 /* LXKeyBoard.m in Sources */,
+				BD13B69A22B9CE5E008BB323 /* PublishTopicItemCell.swift in Sources */,
 				A72A726822321DBD00B21995 /* UMManager.swift in Sources */,
 				A70B2C042283D06B00B2449F /* ProductFloorFullLeftHeaderCollectionReusableView.swift in Sources */,
 				BD108C9322A60C2100837DAB /* HGImageCompleteButton.swift in Sources */,
@@ -4438,10 +4524,12 @@
 				A7CC74E62270628B003C4F38 /* DeliveryMethodTypeModel.swift in Sources */,
 				BD12B68322B4EFF000AEB10B /* KSMediaPickerView.swift in Sources */,
 				A743229B22B8C1510017C367 /* AppStoreReview.swift in Sources */,
+				BD13B69922B9CE5E008BB323 /* PublishTopicHeaderView.swift in Sources */,
 				BDAF83A222B330540004BCC3 /* RecommendSimilarCell.swift in Sources */,
 				BDAA40FD228E9CD600CF841D /* OrderApplyRefundPhoneCell.swift in Sources */,
 				BD2FCBE222B21CF70006D974 /* CommunityRecommendController.swift in Sources */,
 				A71AA51F22729F35008FF1A5 /* AuthorizationSwift.swift in Sources */,
+				BD13B69D22B9CE5E008BB323 /* PublishSuccessController.swift in Sources */,
 				A7A98E3622802AD7005306E9 /* ShoppingMallBannerFSPagerViewCell.swift in Sources */,
 				BD12B6A222B4FC9B00AEB10B /* KSBorderButton.swift in Sources */,
 				BD12204E22AFB07E0051C7C2 /* MessageThumbController.swift in Sources */,
@@ -4454,6 +4542,7 @@
 				A719016B22757A5A00104A50 /* ProvinceCityAreaTableViewCell.swift in Sources */,
 				BD12B6AD22B502C200AEB10B /* KSVideoLayer.m in Sources */,
 				A729B5B72267270B004AE098 /* PasswordLoginView.swift in Sources */,
+				BD13B6B122B9CE8F008BB323 /* PublishEditTitleCell.swift in Sources */,
 				A7778CB82244E97A00C7C47A /* BindPhoneNumberViewController.swift in Sources */,
 				A754150F224CACF9002480B5 /* SwiftSign.swift in Sources */,
 				A71AF0BA226F00F8001730FE /* SearchResultView.swift in Sources */,
@@ -4462,6 +4551,7 @@
 				A71AA513227215B5008FF1A5 /* ExpressAddressListView.swift in Sources */,
 				A7B4E723228154750012914A /* ProductFloorBannerView.swift in Sources */,
 				A7003EA3229192CC004E51FB /* PayManagerPay.swift in Sources */,
+				BD13B69422B9CE5E008BB323 /* PublishAddAddressController.swift in Sources */,
 				A7DC467F22783A47001F3EFC /* EditExpressAddressTableViewCell.swift in Sources */,
 				A7A98E4522804C63005306E9 /* ShoppingMallSepcialCollectionViewCell.swift in Sources */,
 				A7931E0022AF827600297D0A /* ESTabBarController.swift in Sources */,
@@ -4469,6 +4559,7 @@
 				A77F2CC3223203BA001BD3F6 /* AppDelegate+Window.swift in Sources */,
 				A7824B062271F25400ABA381 /* EditAddressTableViewCell.swift in Sources */,
 				BD12B69E22B4FAF000AEB10B /* KSMediaPickerNavigationView.swift in Sources */,
+				BD13B6AD22B9CE8F008BB323 /* PublishEditDefaultCollectionCell.swift in Sources */,
 				A70B2C4C228845E800B2449F /* ProductDetailParameterTableViewCell.swift in Sources */,
 				A7FF156A228C6E3600A85748 /* OrderProductTableViewCell.swift in Sources */,
 				A7931DF022AF4C9100297D0A /* BaseBouncesContentView.swift in Sources */,
@@ -4490,6 +4581,7 @@
 				BD3474F522857B85000908C5 /* CommonPayHeader.swift in Sources */,
 				BD1FC1A322B1075F00D55081 /* UIView+LX_Frame.m in Sources */,
 				A71AF0B6226EF99A001730FE /* SearchResultViewController.swift in Sources */,
+				BD13B69622B9CE5E008BB323 /* SearchAddrNavigationbarView.swift in Sources */,
 				A757C9302274839900226355 /* SelfMentionAddressListModel.swift in Sources */,
 				BDD22F0B228FAA5B00D43BFB /* ImageUrlModel.swift in Sources */,
 				A72A72D522321E2700B21995 /* ColorMacro.swift in Sources */,
@@ -4502,6 +4594,7 @@
 				BDF47D80228288F900941AB9 /* ShoppingCartAccountView.swift in Sources */,
 				A7284401224DBB7700F82F30 /* SwiftMoyaNetWorkServiceUser.swift in Sources */,
 				A7B4E728228160BA0012914A /* ProductRightSideleftPictureCollectionViewCell.swift in Sources */,
+				BD13B69B22B9CE5E008BB323 /* PublishSelTopicCollectionCell.swift in Sources */,
 				BDEF7793228575A800ED0AC0 /* CommonPayCell.swift in Sources */,
 				A70B2C75228920BA00B2449F /* ProductDetailSkuSectionHeaerCollectionReusableView.swift in Sources */,
 				A7DF50D822A4FAFC00998908 /* ProductDetailEvaluationImageCollectionViewCell.swift in Sources */,
@@ -4538,6 +4631,7 @@
 				A70B2C46228840B100B2449F /* ProductDetailHotSellTableViewCell.swift in Sources */,
 				A7778CDF22461BAD00C7C47A /* PhoneCountryAreaSectionHeaderView.swift in Sources */,
 				A7A98E2D22801642005306E9 /* SwiftMoyaServiceCMSApi.swift in Sources */,
+				BD13B6AE22B9CE8F008BB323 /* PublishEditAddPicCell.swift in Sources */,
 				A70B2C402288312900B2449F /* ProductDetailSectionHeader.swift in Sources */,
 				A7A98E3122801B10005306E9 /* ShoppingMallListView.swift in Sources */,
 				BD1DC6C6228CFD0B00B89C57 /* SwiftMoyaServiceOrderApi.swift in Sources */,
@@ -4549,7 +4643,6 @@
 				A71AA52822732173008FF1A5 /* SwiftMoyaNetWorkServiceConfig.swift in Sources */,
 				A70B2C732289019200B2449F /* ProductDetailSkuView.swift in Sources */,
 				A70B2C4322883B4E00B2449F /* ProductDetailShopTableViewCell.swift in Sources */,
-				BD28078222B727BD002AB976 /* PublishEditAddPicCell.swift in Sources */,
 				A70B2C102286A3BC00B2449F /* ProductDetailModel.swift in Sources */,
 				A7A17E5F22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift in Sources */,
 				A72A72A922321DE000B21995 /* NumberKeyboard.swift in Sources */,
@@ -4595,6 +4688,7 @@
 				A7F2D6BD22B09F930093000B /* CommunityNavigationBarView.swift in Sources */,
 				A7274C5C228EE636000E3A07 /* LBXScanLineAnimation.swift in Sources */,
 				A739121A229F75F50033177E /* JXPagingMainTableView.swift in Sources */,
+				BD13B6B022B9CE8F008BB323 /* PublishEditAddAddressCell.swift in Sources */,
 				A7CC7524227190FB003C4F38 /* AccountSecurityView.swift in Sources */,
 				A7931E1422AF9E4000297D0A /* TopicSelectionCollectionViewCell.swift in Sources */,
 				BD1DC6CB228D157000B89C57 /* OrderCreateBackModel.swift in Sources */,
@@ -4647,7 +4741,6 @@
 				BDAF83AA22B388F20004BCC3 /* RecommendDefaultBackCell.swift in Sources */,
 				A71AF0BC226F099B001730FE /* ProductHBigTableViewCell.swift in Sources */,
 				BD108C9622A60C2100837DAB /* HGImagePickerCell.swift in Sources */,
-				BD28077822B721BF002AB976 /* PublishEditController.swift in Sources */,
 				A7A98E3C228036D7005306E9 /* ShoppingMallCategoryCollectionViewCell.swift in Sources */,
 				A7C0FDEB22B4C6C300BC1E86 /* CardContentCommentListFooterView.swift in Sources */,
 				BD3AA45822AE63EC00EF4F20 /* MessageMainViewController.swift in Sources */,
@@ -4668,7 +4761,7 @@
 				A71AA52622732068008FF1A5 /* SwiftMoyaServiceConfigApi.swift in Sources */,
 				A77F2C982231FD25001BD3F6 /* BaseNavigationViewController.swift in Sources */,
 				A7274C5D228EE636000E3A07 /* LBXScanViewStyle.swift in Sources */,
-				BD28077C22B72761002AB976 /* PublishEditDescribeCell.swift in Sources */,
+				BD13B6AC22B9CE8F008BB323 /* PublishEditDescribeCell.swift in Sources */,
 				A73911B3229ECE340033177E /* UICollectionViewLeftAlignedLayout.m in Sources */,
 				A7A98E1B227EEE49005306E9 /* SpecialView.swift in Sources */,
 				BDF47D7A228271F600941AB9 /* ShoppingCartView.swift in Sources */,
@@ -4676,6 +4769,7 @@
 				A72A72AB22321DE000B21995 /* SwiftProgressHUD.swift in Sources */,
 				BDF862B1228E6690000DEF84 /* OrderApplyRefundProductCell.swift in Sources */,
 				A7CC751C22716426003C4F38 /* SetLogoutTableViewCell.swift in Sources */,
+				BD13B69522B9CE5E008BB323 /* PublishAddressPOIView.swift in Sources */,
 				A7778CD522460D8E00C7C47A /* PhoneCountryAreaTableViewCell.swift in Sources */,
 				A70B2C5C22886B0000B2449F /* ShopView.swift in Sources */,
 				BDAA40F7228E947500CF841D /* OrderApplyRefundAccountCell.swift in Sources */,
@@ -4685,6 +4779,7 @@
 				A70B2C5A22886ADF00B2449F /* ShopViewController.swift in Sources */,
 				BDF862AE228E57E1000DEF84 /* OrderCommentDefaultCollectionCell.swift in Sources */,
 				A70B2C3E228825B100B2449F /* ProductDetailEvaluationTableViewCell.swift in Sources */,
+				BD13B6AB22B9CE8F008BB323 /* PublishEditAddTopicCell.swift in Sources */,
 				A79057022276C9770037F823 /* SetPasswordModel.swift in Sources */,
 				BD12B68022B4EF2600AEB10B /* KSMediaPickerViewImageCell.swift in Sources */,
 				BD929CD422B906C10098C139 /* PublishVideoRecorderController.swift in Sources */,
@@ -4752,7 +4847,7 @@
 				BD12204422AF996E0051C7C2 /* MessageCommentController.swift in Sources */,
 				A7778CDD2246121500C7C47A /* PhoneCountryAreaListMdoel.swift in Sources */,
 				A72A733522325A4B00B21995 /* AppDelegate+HandleOpen.swift in Sources */,
-				BD28077A22B72734002AB976 /* PublishEditTitleCell.swift in Sources */,
+				BD13B69722B9CE5E008BB323 /* PublishAddTopicController.swift in Sources */,
 				A7FF156E228C6EAE00A85748 /* OrderDeliveryModeTableViewCell.swift in Sources */,
 				A72A72AC22321DE000B21995 /* Regex.swift in Sources */,
 				BD12B67422B4EC9700AEB10B /* KSMediaPickerController.swift in Sources */,

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

@@ -13,9 +13,6 @@ import Photos
 
 class PublishEditController: BaseViewController {
     
-    // 上传图片数组
-    var goodsImageArr = Array<UIImage>()
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -32,10 +29,7 @@ class PublishEditController: BaseViewController {
             print("----点击了发布")
         }
         
-        self.view.addSubview(tableView)
-    }
-    
-    override func setupLayouts() {
+        view.addSubview(tableView)
         tableView.snp.makeConstraints { (make) in
             make.top.equalToSuperview().offset(kNavBarTotalHeight)
             make.left.right.bottom.equalToSuperview()
@@ -98,8 +92,37 @@ extension PublishEditController : UITableViewDelegate, UITableViewDataSource {
         }
     }
     
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        switch indexPath.row {
+//        case 0:
+//            let picCell = PublishEditAddPicCell.cellWith(tableView: tableView, indexPath: indexPath)
+//            return picCell
+//        case 1:
+//            let titleCell = PublishEditTitleCell.cellWith(tableView: tableView, indexPath: indexPath)
+//            return titleCell
+//        case 2:
+//            let desCell = PublishEditDescribeCell.cellWith(tableView: tableView, indexPath: indexPath)
+//            //            actCell.allSelectBlock = {
+//            //                [weak self] (isAllSel) in
+//            //                self?.isAllSelected = isAllSel
+//            //                self?.allSelectedAction(isAllSel)
+//            //            }
+//            return desCell
+        case 3:
+            let vc = PublishAddTopicController()
+            self.navigationController?.pushViewController(vc, animated: true)
+        case 4:
+            let vc = PublishAddAddressController()
+            self.navigationController?.pushViewController(vc, animated: true)
+        default:
+            print("----点击了-\(indexPath.row)")
+        }
+    }
+    
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         switch indexPath.row {
+        case 0:
+            return 130
         case 1,3,4:
             return 50
         case 2:

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

@@ -40,9 +40,9 @@ class PublishEditAddAddressCell: UITableViewCell {
         backgroundColor = kffffffColor
         
         addSubview(iconImageView)
+        addSubview(arrowImageView)
         addSubview(titleLabel)
-        addSubview(contentLabel)
-        addSubview(timeLabel)
+        addSubview(subLabel)
     }
     
     private func setupLayouts() {
@@ -51,23 +51,23 @@ class PublishEditAddAddressCell: UITableViewCell {
             make.left.equalTo(14)
             make.size.equalTo(16)
         }
-        titleLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(iconImageView.snp_right).offset(10)
-            make.right.equalToSuperview().offset(-26)
-            make.centerY.equalTo(iconImageView)
-            make.height.equalTo(17)
+        arrowImageView.snp.makeConstraints { (make) in
+            make.right.equalToSuperview().offset(-19)
+            make.centerY.equalToSuperview()
+            make.width.equalTo(7)
+            make.height.equalTo(12)
         }
-        contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(12)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalToSuperview().offset(-26)
+        titleLabel.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(iconImageView.snp_right).offset(6)
+            make.width.equalTo(56)
+            make.height.equalTo(20)
         }
-        timeLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(8)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
-            make.height.equalTo(15)
-            make.bottom.equalToSuperview().offset(-20)
+        subLabel.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(titleLabel.snp_right).offset(10)
+            make.right.equalTo(arrowImageView.snp_left).offset(-10)
+            make.height.equalTo(17)
         }
     }
     
@@ -79,30 +79,26 @@ class PublishEditAddAddressCell: UITableViewCell {
     
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "张吃饭"
-        titleLabel.textColor = k999999Color
-        titleLabel.font = kRegularFont14
+        titleLabel.text = "添加地点"
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kMediumFont14
         titleLabel.textAlignment = .left
         return titleLabel
     }()
     
-    private lazy var contentLabel: UILabel = {
-        let contentLabel = UILabel()
-        contentLabel.text = "点击单条评时弹出选择操作框（目前仅支持回复），点击操作框后进行相应的操作"
-        contentLabel.textColor = k333333Color
-        contentLabel.font = kRegularFont14
-        contentLabel.textAlignment = .left
-        contentLabel.numberOfLines = 0
-        return contentLabel
+    private lazy var subLabel: UILabel = {
+        let subLabel = UILabel()
+        subLabel.text = "(打卡地点，结识附近的彩虹居民)"
+        subLabel.textColor = kDDDDDDColor
+        subLabel.font = kRegularFont12
+        subLabel.textAlignment = .left
+        return subLabel
     }()
     
-    private lazy var timeLabel: UILabel = {
-        let timeLabel = UILabel()
-        timeLabel.text = "6个小时前"
-        timeLabel.textColor = kbbbbbbColor
-        timeLabel.font = kRegularFont12
-        timeLabel.textAlignment = .left
-        return timeLabel
+    lazy var arrowImageView : UIImageView = {
+        let iconImageView = UIImageView()
+        iconImageView.image = kImage(name: "my_arrows_unfold")
+        return iconImageView
     }()
     
 }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/View/PublishEditAddImgCollectionCell.swift

@@ -0,0 +1,93 @@
+//
+//  PublishEditAddImgCollectionCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  编辑发布--添加照片のCell(有图)
+
+import UIKit
+import RxSwift
+
+class PublishEditAddImgCollectionCell: UICollectionViewCell {
+    
+    let disposeBag = DisposeBag()
+    
+    var showImage: UIImage? {
+        didSet {
+            if self.showImage != nil {
+                picImageView.image = self.showImage
+            }
+        }
+    }
+    
+    var productSearchModel: ProductSearchModel? {
+        didSet {
+            picImageView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+        }
+    }
+    
+    typealias DelPicBlock = (_ idxRow:Int?) -> Void
+    var delPicBlock : DelPicBlock?
+    
+    class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> PublishEditAddImgCollectionCell {
+        let ID = "PublishEditAddImgCollectionCell"
+        collectionView.register(PublishEditAddImgCollectionCell.self, forCellWithReuseIdentifier: ID)
+        let cell : PublishEditAddImgCollectionCell = collectionView.dequeueReusableCell(withReuseIdentifier: ID, for: indexPath) as! PublishEditAddImgCollectionCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    //MARK: - indexPath
+    var indexPath: IndexPath?{
+        didSet {
+            
+        }
+    }
+    //MARK: - 初始化
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        cornerRadius = 2
+        masksToBounds = true
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        addSubview(picImageView)        
+        addSubview(delButton)
+    }
+    
+    private func setupLayouts() {
+        picImageView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
+        delButton.snp.makeConstraints { (make) in
+            make.top.right.equalToSuperview()
+            make.size.equalTo(26)
+        }
+    }
+    
+    private lazy var picImageView: UIImageView = {
+        let picImageView = UIImageView()
+        return picImageView
+    }()
+    
+    private lazy var delButton: UIButton = {
+        let delButton = UIButton(type: UIButton.ButtonType.custom)
+        delButton.setImage(kImage(name: "common_sku_cancel"), for: UIControl.State.normal)
+        delButton.rx.tap.subscribe(onNext: {
+            [weak self] (data) in
+            let idxPath = self?.indexPath
+            if let delPicBlock = self?.delPicBlock {
+                delPicBlock(idxPath?.row)
+            }
+        }).disposed(by: disposeBag)
+        return delButton
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/View/PublishEditAddPicCell.swift

@@ -7,15 +7,23 @@
 //
 
 import UIKit
-import RxSwift
-import IQKeyboardManagerSwift
 
 class PublishEditAddPicCell: UITableViewCell {
     
-    let disposeBag = DisposeBag()
+    private let maxImageCount: Int = 3
     
-    typealias NoteTextViewClosure = (_ text: String) -> Void
-    var noteTextViewClosure : NoteTextViewClosure?
+    typealias ChoosePicBlock = () -> Void
+    var choosePicBlock : ChoosePicBlock?
+    
+    typealias DelPicTransBlock = (_ idxRow:Int?) -> Void
+    var delPicTransBlock : DelPicTransBlock?
+    
+    var imgCount: Int = 0
+    var goodsImageArr: Array<UIImage>? {
+        didSet {
+            imgCount = self.goodsImageArr?.count ?? 0
+        }
+    }
     
     class func cellWith(tableView:UITableView,indexPath:IndexPath) -> PublishEditAddPicCell {
         let ID = "PublishEditAddPicCell"
@@ -40,62 +48,93 @@ class PublishEditAddPicCell: UITableViewCell {
             
         }
     }
+    
     //MRAK: - 设置View
     private func setupViews() {
         self.selectionStyle = .none
-        addSubview(titleLabel)
-        addSubview(noteTextView)
+        
+        addSubview(collectionView)
     }
     
     private func setupLayouts() {
-        titleLabel.snp.makeConstraints { (make) in
-            make.top.left.equalTo(14)
-            make.width.equalTo(56)
-            make.height.equalTo(20)
-        }
-        noteTextView.snp.remakeConstraints { (make) in
-            make.top.equalTo(6).priority(999)
-            make.height.greaterThanOrEqualTo(46).priority(888)
-            make.bottom.equalTo(-6).priority(777)
-            make.left.equalTo(titleLabel.snp_right).offset(20)
-            make.right.equalToSuperview().offset(-14)
+        collectionView.snp.remakeConstraints { (make) in
+            make.top.equalTo(15)
+            make.bottom.equalTo(-15)
+            make.left.right.equalToSuperview()
         }
     }
     
-    lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = k333333Color
-        titleLabel.font = kRegularFont14
-        titleLabel.text = "备注信息"
-        return titleLabel
+    private lazy var collectionView: UICollectionView = {
+        let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
+        collectionView.backgroundColor = kffffffColor
+        collectionView.delegate = self;
+        collectionView.dataSource = self;
+        collectionView.showsVerticalScrollIndicator = false
+        collectionView.showsHorizontalScrollIndicator = false
+        return collectionView
     }()
     
-    lazy var noteTextView: IQTextView = {
-        let noteTextView = IQTextView()
-        noteTextView.backgroundColor = kffffffColor
-        noteTextView.textColor = k999999Color
-        noteTextView.font = kRegularFont14
-        noteTextView.placeholder = "如需部分商品退款请备注退款商品的名称和数量，如订单疑问可通过“我的”联系社长哦"
-        noteTextView.placeholderTextColor = k999999Color
-        noteTextView.isScrollEnabled = false
-        noteTextView.delegate = self
-        return noteTextView
+    private lazy var collectionViewLayout: UICollectionViewFlowLayout = {
+        let collectionViewLayout = UICollectionViewFlowLayout.init()
+        collectionViewLayout.minimumInteritemSpacing = 10
+        collectionViewLayout.scrollDirection = .horizontal
+        return collectionViewLayout
     }()
     
 }
 
-extension PublishEditAddPicCell: UITextViewDelegate {
-    
-    func textViewDidChange(_ textView: UITextView) {
-        if textView == noteTextView {
-            var fullStr = textView.text ?? ""
-            if textView.text?.count ?? 0 > 180 {
-                fullStr = String(fullStr.prefix(150)) as String
-                textView.text = fullStr
+extension PublishEditAddPicCell: UICollectionViewDelegateFlowLayout,UICollectionViewDataSource,UICollectionViewDelegate {
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return 1
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        if imgCount < maxImageCount {
+            return imgCount+1
+        } else {
+            return maxImageCount
+        }        
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        if imgCount < maxImageCount && indexPath.row == imgCount {
+            // 添加图片
+            let cell = PublishEditDefaultCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+            if imgCount == 0 {
+                cell.noteStr = "添加图片"
+            } else {
+                cell.noteStr = "\(imgCount)/\(maxImageCount)"
             }
-            
-            if let noteTextViewClosure = self.noteTextViewClosure {
-                noteTextViewClosure(self.noteTextView.text ?? "")
+            return cell
+        } else {
+            // 展示图片
+            let pCell = PublishEditAddImgCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+            if indexPath.row < imgCount {
+                pCell.showImage = self.goodsImageArr![indexPath.row]
+            }
+            pCell.delPicBlock = {
+                [weak self] (idxRow) in
+                if let delPicTransBlock = self?.delPicTransBlock {
+                    delPicTransBlock(idxRow)
+                }
+            }
+            return pCell
+        }
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        return CGSize(width:100, height: 100)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
+        return UIEdgeInsets(top: 0, left: 14, bottom: 0, right: 14)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        if imgCount < maxImageCount && indexPath.row == imgCount {
+            // 添加图片
+            if let choosePicBlock = self.choosePicBlock {
+                choosePicBlock()
             }
         }
     }

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

@@ -40,7 +40,9 @@ class PublishEditAddTopicCell: UITableViewCell {
         backgroundColor = kffffffColor
         
         addSubview(iconImageView)
-        
+        addSubview(arrowImageView)
+        addSubview(titleLabel)
+        addSubview(subLabel)
     }
     
     private func setupLayouts() {
@@ -49,7 +51,24 @@ class PublishEditAddTopicCell: UITableViewCell {
             make.left.equalTo(14)
             make.size.equalTo(16)
         }
-        
+        arrowImageView.snp.makeConstraints { (make) in
+            make.right.equalToSuperview().offset(-19)
+            make.centerY.equalToSuperview()
+            make.width.equalTo(7)
+            make.height.equalTo(12)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(iconImageView.snp_right).offset(6)
+            make.width.equalTo(56)
+            make.height.equalTo(20)
+        }
+        subLabel.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(titleLabel.snp_right).offset(10)
+            make.right.equalTo(arrowImageView.snp_left).offset(-10)
+            make.height.equalTo(17)
+        }
     }
     
     lazy var iconImageView : UIImageView = {
@@ -69,9 +88,9 @@ class PublishEditAddTopicCell: UITableViewCell {
     
     private lazy var subLabel: UILabel = {
         let subLabel = UILabel()
-        subLabel.text = "添加话题"
-        subLabel.textColor = k333333Color
-        subLabel.font = kMediumFont14
+        subLabel.text = "(选择合适的话题让更多人看到)"
+        subLabel.textColor = kDDDDDDColor
+        subLabel.font = kRegularFont12
         subLabel.textAlignment = .left
         return subLabel
     }()

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/View/PublishEditDefaultCollectionCell.swift

@@ -0,0 +1,83 @@
+//
+//  PublishEditDefaultCollectionCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  编辑发布--添加照片のCell(默认，无图)
+
+import UIKit
+import RxSwift
+
+class PublishEditDefaultCollectionCell: UICollectionViewCell {
+    
+    let disposeBag = DisposeBag()
+    
+    var noteStr: String? {
+        didSet {
+            titleLabel.text = noteStr
+        }
+    }
+    
+    class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> PublishEditDefaultCollectionCell {
+        let ID = "PublishEditDefaultCollectionCell.swift"
+        collectionView.register(PublishEditDefaultCollectionCell.self, forCellWithReuseIdentifier: ID)
+        let cell : PublishEditDefaultCollectionCell = collectionView.dequeueReusableCell(withReuseIdentifier: ID, for: indexPath) as! PublishEditDefaultCollectionCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    //MARK: - indexPath
+    var indexPath: IndexPath?{
+        didSet {
+            
+        }
+    }
+    //MARK: - 初始化
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = kf7f8faColor
+        cornerRadius = 2
+        masksToBounds = true
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        addSubview(addImgView)
+        addSubview(titleLabel)
+    }
+    
+    private func setupLayouts() {
+        addImgView.snp.makeConstraints { (make) in
+            make.top.equalToSuperview().offset(28)
+            make.centerX.equalToSuperview()
+            make.size.equalTo(24)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(addImgView.snp_bottom).offset(6)
+            make.centerX.equalToSuperview()
+            make.height.equalTo(17)
+        }
+    }
+    
+    private lazy var addImgView: UIImageView = {
+        let addImgView = UIImageView()
+        addImgView.image = kImage(name: "edit_ico_add_pic")
+        return addImgView
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = kbbbbbbColor
+        titleLabel.font = kRegularFont12
+        titleLabel.textAlignment = .center
+        titleLabel.numberOfLines = 1
+        return titleLabel
+    }()
+    
+}

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

@@ -50,7 +50,9 @@ class PublishEditDescribeCell: UITableViewCell {
     
     private func setupLayouts() {
         cmtTextView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
+            make.top.bottom.equalToSuperview()
+            make.left.equalTo(14)
+            make.right.equalTo(-14)
         }
     }
     
@@ -60,7 +62,7 @@ class PublishEditDescribeCell: UITableViewCell {
         cmtTextView.textColor = k333333Color
         cmtTextView.font = kRegularFont14
         cmtTextView.placeholder = "说一说你的美好心得..."
-        cmtTextView.placeholderTextColor = k999999Color
+        cmtTextView.placeholderTextColor = kDDDDDDColor
         cmtTextView.delegate = self
         return cmtTextView
     }()

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

@@ -65,10 +65,11 @@ class PublishEditTitleCell: UITableViewCell {
     private lazy var editTextField: UITextField = {
         let editTextField = UITextField()
         editTextField.textColor = k333333Color
-        editTextField.font = kRegularFont16
+        editTextField.font = kRegularFont14
         editTextField.tintColor = kEnabledButtonColor
         editTextField.clearButtonMode = .whileEditing
-        editTextField.placeholder = "标题吸引人，收豆不求人(标题20字，内容详情页不限)"
+//        editTextField.placeholder = "标题吸引人，收豆不求人(标题20字，内容详情页不限)"
+        editTextField.attributedPlaceholder = NSAttributedString.init(string:"标题吸引人，收豆不求人(标题20字，内容详情页不限)", attributes: [NSAttributedString.Key.font:kRegularFont14 as Any, NSAttributedString.Key.foregroundColor:kDDDDDDColor])
         editTextField.rx.text.orEmpty.changed.subscribe(onNext: {
             [weak self] (text) in
             self?.editTextField.text = String(describing: text.prefix(11))