Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

Conflicts: LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
Conflicts: LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
朱林
2 parents 463923d4 f7db071f
Showing 62 changed files with 2005 additions and 785 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/CNLiveChatManager
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatMessage.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatUserInfo.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Modules/module.modulemap
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/CNLiveMsgTools
LiveVideoCloud/LiveVideoCloud/Classes/Helpers/Tools.h
LiveVideoCloud/LiveVideoCloud/Classes/Helpers/Tools.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/AnimationBaseView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/AnimationBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BottomToolView/BottomToolView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BounceView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BounceView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/Barrage/CNBarrageManager.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/Barrage/CNBarrageManager.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/Barrage/CNBarrageView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/Barrage/CNBarrageView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/BarrageManager/BarrageManager.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/BarrageManager/BarrageManager.m
@@ -141,18 +141,23 @@
 		D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CF21E6EAE2E0027CD92 /* Foundation+Log.m */; };
 		D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CFE1E6EAE2E0027CD92 /* ZXServerUrl.m */; };
 		D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029D151E6EB00D0027CD92 /* AppDelegate.m */; };
+		D207BE9E1E84BD68006A0CE8 /* BarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D207BE9D1E84BD68006A0CE8 /* BarrageManager.m */; };
+		D207BEA11E84C1EC006A0CE8 /* AnimationBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D207BEA01E84C1EC006A0CE8 /* AnimationBaseView.m */; };
 		D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2471E7B76C7003B44CB /* PresentView.m */; };
 		D217A24B1E7B76C7003B44CB /* PresentViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2491E7B76C7003B44CB /* PresentViewCell.m */; };
 		D217A24E1E7B77C7003B44CB /* ComboCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A24D1E7B77C7003B44CB /* ComboCell.m */; };
+		D224B1971E826ED800CC61D0 /* ChatBarrageAnimAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */; };
 		D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830F01E778C0F00627701 /* LiveBaseView.m */; };
 		D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FB1E77C2D900627701 /* BottomToolView.m */; };
 		D22830FF1E77C69E00627701 /* GiftListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FE1E77C69E00627701 /* GiftListView.m */; };
 		D22831091E77D8D500627701 /* GiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D22831081E77D8D500627701 /* GiftModel.m */; };
 		D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */; };
 		D23696841E7FC6A900E4BF71 /* chatListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D23696831E7FC6A900E4BF71 /* chatListCell.m */; };
-		D236968D1E7FC7C200E4BF71 /* CNBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D236968A1E7FC7C200E4BF71 /* CNBarrageManager.m */; };
-		D236968E1E7FC7C200E4BF71 /* CNBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D236968C1E7FC7C200E4BF71 /* CNBarrageView.m */; };
 		D23696921E7FC83800E4BF71 /* chatMsgModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23696911E7FC83800E4BF71 /* chatMsgModel.m */; };
+		D24571581E8393EB00AA85D6 /* UIImageView+ZXExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = D24571571E8393EB00AA85D6 /* UIImageView+ZXExtension.m */; };
+		D245715C1E83A62B00AA85D6 /* BounceView.m in Sources */ = {isa = PBXBuildFile; fileRef = D245715B1E83A62B00AA85D6 /* BounceView.m */; };
+		D245715F1E83B09900AA85D6 /* userInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D245715E1E83B09900AA85D6 /* userInfoModel.m */; };
+		D24571631E83C40B00AA85D6 /* PrivateView.m in Sources */ = {isa = PBXBuildFile; fileRef = D24571621E83C40B00AA85D6 /* PrivateView.m */; };
 		D25530001E7909AC00DF38A5 /* GiftAnimOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2552FFF1E7909AC00DF38A5 /* GiftAnimOperation.m */; };
 		D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D25530021E79115100DF38A5 /* AnimQueueManager.m */; };
 		D25530061E7911A800DF38A5 /* GiftAnimationAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D25530051E7911A800DF38A5 /* GiftAnimationAction.m */; };
@@ -174,12 +179,6 @@
 		D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */; };
 		D25BF8901E7F7F8F007FB138 /* UGCLoading.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */; };
 		D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */; };
-		D25BF8971E7FE01B007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; };
-		D25BF8991E7FE033007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; };
-		D25BF89A1E7FE046007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; };
-		D25BF89B1E7FE046007FB138 /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D25BF89C1E7FE049007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; };
-		D25BF89D1E7FE049007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */; };
 		D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8A21E80C4FC007FB138 /* Accelerate.framework */; };
 		D25BF8A51E80EC76007FB138 /* 头像.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF8A41E80EC76007FB138 /* 头像.jpg */; };
@@ -188,7 +187,17 @@
 		D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
 		D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB31E6EC154003A77C8 /* HomeViewController.m */; };
 		D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */; };
+		D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
 		D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
+		D2B2ED7A1E88F90C00F7538A /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; };
+		D2B2ED7B1E88F90C00F7538A /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D2B2ED7C1E88F90F00F7538A /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; };
+		D2B2ED7D1E88F90F00F7538A /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */; };
+		D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */; };
+		D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */; };
+		D2D236B41E88F8E600B7C517 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; };
+		D2D236B51E88F8E600B7C517 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -216,8 +225,8 @@
 			dstSubfolderSpec = 10;
 			files = (
 				811BB6851E8106AF005C6291 /* CNLivePlayerSDK.framework in Embed Frameworks */,
-				D25BF89B1E7FE046007FB138 /* CNLiveChatManager.framework in Embed Frameworks */,
-				D25BF89D1E7FE049007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */,
+				D2B2ED7B1E88F90C00F7538A /* CNLiveChatManager.framework in Embed Frameworks */,
+				D2B2ED7D1E88F90F00F7538A /* CNLiveMsgTools.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -510,6 +519,10 @@
 		D2029CFF1E6EAE2E0027CD92 /* UtilKits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UtilKits.h; sourceTree = "<group>"; };
 		D2029D121E6EAF8D0027CD92 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		D2029D151E6EB00D0027CD92 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		D207BE9C1E84BD68006A0CE8 /* BarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BarrageManager.h; sourceTree = "<group>"; };
+		D207BE9D1E84BD68006A0CE8 /* BarrageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BarrageManager.m; sourceTree = "<group>"; };
+		D207BE9F1E84C1EC006A0CE8 /* AnimationBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationBaseView.h; sourceTree = "<group>"; };
+		D207BEA01E84C1EC006A0CE8 /* AnimationBaseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnimationBaseView.m; sourceTree = "<group>"; };
 		D217A2451E7B76C7003B44CB /* PresentModelAble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresentModelAble.h; sourceTree = "<group>"; };
 		D217A2461E7B76C7003B44CB /* PresentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresentView.h; sourceTree = "<group>"; };
 		D217A2471E7B76C7003B44CB /* PresentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PresentView.m; sourceTree = "<group>"; };
@@ -517,6 +530,8 @@
 		D217A2491E7B76C7003B44CB /* PresentViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PresentViewCell.m; sourceTree = "<group>"; };
 		D217A24C1E7B77C7003B44CB /* ComboCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ComboCell.h; path = Present/ComboCell.h; sourceTree = "<group>"; };
 		D217A24D1E7B77C7003B44CB /* ComboCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComboCell.m; path = Present/ComboCell.m; sourceTree = "<group>"; };
+		D224B1951E826ED800CC61D0 /* ChatBarrageAnimAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageAnimAction.h; sourceTree = "<group>"; };
+		D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageAnimAction.m; sourceTree = "<group>"; };
 		D22830EF1E778C0F00627701 /* LiveBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveBaseView.h; sourceTree = "<group>"; };
 		D22830F01E778C0F00627701 /* LiveBaseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveBaseView.m; sourceTree = "<group>"; };
 		D22830FA1E77C2D900627701 /* BottomToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BottomToolView.h; sourceTree = "<group>"; };
@@ -529,12 +544,16 @@
 		D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftPayButton.m; sourceTree = "<group>"; };
 		D23696821E7FC6A900E4BF71 /* chatListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatListCell.h; sourceTree = "<group>"; };
 		D23696831E7FC6A900E4BF71 /* chatListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = chatListCell.m; sourceTree = "<group>"; };
-		D23696891E7FC7C200E4BF71 /* CNBarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNBarrageManager.h; sourceTree = "<group>"; };
-		D236968A1E7FC7C200E4BF71 /* CNBarrageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNBarrageManager.m; sourceTree = "<group>"; };
-		D236968B1E7FC7C200E4BF71 /* CNBarrageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNBarrageView.h; sourceTree = "<group>"; };
-		D236968C1E7FC7C200E4BF71 /* CNBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNBarrageView.m; sourceTree = "<group>"; };
 		D23696901E7FC83800E4BF71 /* chatMsgModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatMsgModel.h; sourceTree = "<group>"; };
 		D23696911E7FC83800E4BF71 /* chatMsgModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = chatMsgModel.m; sourceTree = "<group>"; };
+		D24571561E8393EB00AA85D6 /* UIImageView+ZXExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+ZXExtension.h"; sourceTree = "<group>"; };
+		D24571571E8393EB00AA85D6 /* UIImageView+ZXExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+ZXExtension.m"; sourceTree = "<group>"; };
+		D245715A1E83A62B00AA85D6 /* BounceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BounceView.h; sourceTree = "<group>"; };
+		D245715B1E83A62B00AA85D6 /* BounceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BounceView.m; sourceTree = "<group>"; };
+		D245715D1E83B09900AA85D6 /* userInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = userInfoModel.h; sourceTree = "<group>"; };
+		D245715E1E83B09900AA85D6 /* userInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = userInfoModel.m; sourceTree = "<group>"; };
+		D24571611E83C40B00AA85D6 /* PrivateView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivateView.h; sourceTree = "<group>"; };
+		D24571621E83C40B00AA85D6 /* PrivateView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrivateView.m; sourceTree = "<group>"; };
 		D2552FFE1E7909AC00DF38A5 /* GiftAnimOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftAnimOperation.h; sourceTree = "<group>"; };
 		D2552FFF1E7909AC00DF38A5 /* GiftAnimOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftAnimOperation.m; sourceTree = "<group>"; };
 		D25530011E79115100DF38A5 /* AnimQueueManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimQueueManager.h; sourceTree = "<group>"; };
@@ -574,8 +593,6 @@
 		D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = UGCLoading.jpeg; sourceTree = "<group>"; };
 		D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCBackgroundView.h; sourceTree = "<group>"; };
 		D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCBackgroundView.m; sourceTree = "<group>"; };
-		D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
-		D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
 		D25BF89E1E80C4BD007FB138 /* UIImage+LVCVagueImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+LVCVagueImage.h"; sourceTree = "<group>"; };
 		D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+LVCVagueImage.m"; sourceTree = "<group>"; };
 		D25BF8A21E80C4FC007FB138 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
@@ -590,8 +607,18 @@
 		D2888DB31E6EC154003A77C8 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
 		D2888DB51E6EC1B8003A77C8 /* LVCMyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMyViewController.h; sourceTree = "<group>"; };
 		D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMyViewController.m; sourceTree = "<group>"; };
+		D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; };
+		D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePrepareView.m; sourceTree = "<group>"; };
 		D2A803061E80BD6F009D6F1C /* TopToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopToolView.h; sourceTree = "<group>"; };
 		D2A803071E80BD6F009D6F1C /* TopToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopToolView.m; sourceTree = "<group>"; };
+		D2B7B24F1E8247D400ED084E /* ChatBarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageManager.h; sourceTree = "<group>"; };
+		D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageManager.m; sourceTree = "<group>"; };
+		D2B7B2521E824B2D00ED084E /* ChatBarrageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageView.h; sourceTree = "<group>"; };
+		D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageView.m; sourceTree = "<group>"; };
+		D2B7B2551E8261EF00ED084E /* ChatBarrOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrOperation.h; sourceTree = "<group>"; };
+		D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrOperation.m; sourceTree = "<group>"; };
+		D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
+		D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -601,11 +628,11 @@
 			files = (
 				D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
 				D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
-				D25BF89A1E7FE046007FB138 /* CNLiveChatManager.framework in Frameworks */,
-				D25BF8971E7FE01B007FB138 /* CNLiveMsgTools.framework in Frameworks */,
-				D25BF8991E7FE033007FB138 /* CNLiveChatManager.framework in Frameworks */,
-				D25BF89C1E7FE049007FB138 /* CNLiveMsgTools.framework in Frameworks */,
+				D2B2ED7C1E88F90F00F7538A /* CNLiveMsgTools.framework in Frameworks */,
+				D2B2ED7A1E88F90C00F7538A /* CNLiveChatManager.framework in Frameworks */,
+				D2D236B51E88F8E600B7C517 /* CNLiveMsgTools.framework in Frameworks */,
 				811BB6831E8106A2005C6291 /* CNLivePlayerSDK.framework in Frameworks */,
+				D2D236B41E88F8E600B7C517 /* CNLiveChatManager.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -674,20 +701,12 @@
 			path = ../ChatView;
 			sourceTree = "<group>";
 		};
-		812E504D1E769995004F5FCD /* CNLiveSDK */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = CNLiveSDK;
-			path = LiveVideoCloud/Classes/CNLiveSDK;
-			sourceTree = SOURCE_ROOT;
-		};
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
+				D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */,
+				D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */,
 				811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */,
-				D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */,
-				D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */,
 				D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
 			);
 			path = CNLiveSDK;
@@ -834,7 +853,6 @@
 		D2029BD11E6EADE10027CD92 /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
-				812E504D1E769995004F5FCD /* CNLiveSDK */,
 				D2029BD21E6EADE10027CD92 /* Tools.h */,
 				D2029BD31E6EADE10027CD92 /* Tools.m */,
 			);
@@ -1221,6 +1239,8 @@
 			children = (
 				81A483061E88B6140097A80A /* UIView+ViewController.h */,
 				81A483071E88B6140097A80A /* UIView+ViewController.m */,
+				D24571561E8393EB00AA85D6 /* UIImageView+ZXExtension.h */,
+				D24571571E8393EB00AA85D6 /* UIImageView+ZXExtension.m */,
 				811BB68C1E8116C8005C6291 /* NSString+StringSize.h */,
 				811BB68D1E8116C8005C6291 /* NSString+StringSize.m */,
 				D2029CDE1E6EAE2E0027CD92 /* NSNumber+ScaleHeight.h */,
@@ -1301,6 +1321,15 @@
 			path = AppDelegate;
 			sourceTree = "<group>";
 		};
+		D207BE9B1E84BD3E006A0CE8 /* BarrageManager */ = {
+			isa = PBXGroup;
+			children = (
+				D207BE9C1E84BD68006A0CE8 /* BarrageManager.h */,
+				D207BE9D1E84BD68006A0CE8 /* BarrageManager.m */,
+			);
+			path = BarrageManager;
+			sourceTree = "<group>";
+		};
 		D217A2441E7B76C7003B44CB /* Present */ = {
 			isa = PBXGroup;
 			children = (
@@ -1327,7 +1356,8 @@
 		D22830F61E77C26C00627701 /* Chat */ = {
 			isa = PBXGroup;
 			children = (
-				D23696881E7FC7C200E4BF71 /* Barrage */,
+				D207BE9B1E84BD3E006A0CE8 /* BarrageManager */,
+				D2B7B24E1E8247B500ED084E /* ChatBarrageManager */,
 				D236968F1E7FC83800E4BF71 /* ChatMsgModel */,
 				D22830F71E77C27A00627701 /* ChatViews */,
 			);
@@ -1370,32 +1400,45 @@
 			path = GiftModel;
 			sourceTree = "<group>";
 		};
-		D23696881E7FC7C200E4BF71 /* Barrage */ = {
+		D236968F1E7FC83800E4BF71 /* ChatMsgModel */ = {
 			isa = PBXGroup;
 			children = (
-				D23696891E7FC7C200E4BF71 /* CNBarrageManager.h */,
-				D236968A1E7FC7C200E4BF71 /* CNBarrageManager.m */,
-				D236968B1E7FC7C200E4BF71 /* CNBarrageView.h */,
-				D236968C1E7FC7C200E4BF71 /* CNBarrageView.m */,
+				D23696901E7FC83800E4BF71 /* chatMsgModel.h */,
+				D23696911E7FC83800E4BF71 /* chatMsgModel.m */,
 			);
-			path = Barrage;
+			path = ChatMsgModel;
 			sourceTree = "<group>";
 		};
-		D236968F1E7FC83800E4BF71 /* ChatMsgModel */ = {
+		D24571591E83A61E00AA85D6 /* BounceView */ = {
 			isa = PBXGroup;
 			children = (
-				D23696901E7FC83800E4BF71 /* chatMsgModel.h */,
-				D23696911E7FC83800E4BF71 /* chatMsgModel.m */,
+				D245715A1E83A62B00AA85D6 /* BounceView.h */,
+				D245715B1E83A62B00AA85D6 /* BounceView.m */,
 			);
-			path = ChatMsgModel;
+			name = BounceView;
+			sourceTree = "<group>";
+		};
+		D24571601E83C3F900AA85D6 /* PrivateView */ = {
+			isa = PBXGroup;
+			children = (
+				D24571611E83C40B00AA85D6 /* PrivateView.h */,
+				D24571621E83C40B00AA85D6 /* PrivateView.m */,
+			);
+			path = PrivateView;
 			sourceTree = "<group>";
 		};
 		D2575C431E76846900E3A8FC /* InteractionSections */ = {
 			isa = PBXGroup;
 			children = (
+				D24571601E83C3F900AA85D6 /* PrivateView */,
+				D24571591E83A61E00AA85D6 /* BounceView */,
 				D22830F91E77C2D900627701 /* BottomToolView */,
 				D22830F81E77C2A700627701 /* TopToolView */,
 				D22830F61E77C26C00627701 /* Chat */,
+				D245715D1E83B09900AA85D6 /* userInfoModel.h */,
+				D245715E1E83B09900AA85D6 /* userInfoModel.m */,
+				D207BE9F1E84C1EC006A0CE8 /* AnimationBaseView.h */,
+				D207BEA01E84C1EC006A0CE8 /* AnimationBaseView.m */,
 				D22830EF1E778C0F00627701 /* LiveBaseView.h */,
 				D22830F01E778C0F00627701 /* LiveBaseView.m */,
 				D2575C651E76A25400E3A8FC /* LVCInteractionController.h */,
@@ -1472,6 +1515,8 @@
 				D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */,
 				D25BF8781E7B8A82007FB138 /* SliderView.h */,
 				D25BF8791E7B8A82007FB138 /* SliderView.m */,
+				D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */,
+				D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1643,6 +1688,21 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		D2B7B24E1E8247B500ED084E /* ChatBarrageManager */ = {
+			isa = PBXGroup;
+			children = (
+				D2B7B2551E8261EF00ED084E /* ChatBarrOperation.h */,
+				D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */,
+				D2B7B24F1E8247D400ED084E /* ChatBarrageManager.h */,
+				D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */,
+				D2B7B2521E824B2D00ED084E /* ChatBarrageView.h */,
+				D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */,
+				D224B1951E826ED800CC61D0 /* ChatBarrageAnimAction.h */,
+				D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */,
+			);
+			path = ChatBarrageManager;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
@@ -1799,6 +1859,7 @@
 				D2029CBB1E6EADE10027CD92 /* SDWebImageDownloader.m in Sources */,
 				D2029CA71E6EADE10027CD92 /* MJRefreshAutoGifFooter.m in Sources */,
 				D2029CC11E6EADE10027CD92 /* UIImage+MultiFormat.m in Sources */,
+				D245715F1E83B09900AA85D6 /* userInfoModel.m in Sources */,
 				D2029C861E6EADE10027CD92 /* Tools.m in Sources */,
 				D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */,
 				D2029CA01E6EADE10027CD92 /* NSObject+MJProperty.m in Sources */,
@@ -1830,6 +1891,7 @@
 				D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */,
 				D2029CBE1E6EADE10027CD92 /* SDWebImagePrefetcher.m in Sources */,
 				D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */,
+				D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */,
 				810B65011E779B1F00133E15 /* MASLayoutConstraint.m in Sources */,
 				D2029CCE1E6EADE10027CD92 /* SearchRecomListModel.m in Sources */,
 				D2029CA11E6EADE10027CD92 /* NSString+MJExtension.m in Sources */,
@@ -1872,6 +1934,7 @@
 				811BB68E1E8116C8005C6291 /* NSString+StringSize.m in Sources */,
 				D2029C8B1E6EADE10027CD92 /* AFURLResponseSerialization.m in Sources */,
 				D2029C921E6EADE10027CD92 /* UIImageView+AFNetworking.m in Sources */,
+				D224B1971E826ED800CC61D0 /* ChatBarrageAnimAction.m in Sources */,
 				D2029C9E1E6EADE10027CD92 /* NSObject+MJCoding.m in Sources */,
 				81A483021E88B0130097A80A /* LVCChatRoomModel.m in Sources */,
 				D2029C991E6EADE10027CD92 /* MJFoundation.m in Sources */,
@@ -1889,6 +1952,7 @@
 				D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */,
 				81A483011E88B0130097A80A /* LVCBannerModel.m in Sources */,
 				810B65021E779B1F00133E15 /* MASViewAttribute.m in Sources */,
+				D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */,
 				D2029CAC1E6EADE10027CD92 /* MJRefreshBackStateFooter.m in Sources */,
 				D2029CB11E6EADE10027CD92 /* MJRefreshConst.m in Sources */,
 				D2029CAD1E6EADE10027CD92 /* MJRefreshGifHeader.m in Sources */,
@@ -1896,6 +1960,7 @@
 				D2029CB31E6EADE10027CD92 /* UIScrollView+MJRefresh.m in Sources */,
 				D2029D051E6EAE2E0027CD92 /* UILabel+labelFitSize.m in Sources */,
 				D2029CB21E6EADE10027CD92 /* UIScrollView+MJExtension.m in Sources */,
+				D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */,
 				D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */,
 				D2029C8E1E6EADE10027CD92 /* AFImageDownloader.m in Sources */,
 				81A483201E88F4BF0097A80A /* LVCProgramModel.m in Sources */,
@@ -1905,6 +1970,7 @@
 				81A4830B1E88B7EE0097A80A /* LVCOtherHeaderReusableView.m in Sources */,
 				D25BF8801E7BD266007FB138 /* LVCUGCLivePlayerController.m in Sources */,
 				D2029D031E6EAE2E0027CD92 /* UIImage+ZXExtension.m in Sources */,
+				D24571581E8393EB00AA85D6 /* UIImageView+ZXExtension.m in Sources */,
 				D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */,
 				D2029CCA1E6EADE10027CD92 /* SVProgressHUD.m in Sources */,
 				81A483051E88B32C0097A80A /* LVCHeaderRollCollectionViewCell.m in Sources */,
@@ -1913,14 +1979,16 @@
 				D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */,
 				D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */,
 				D2029CBA1E6EADE10027CD92 /* SDWebImageDecoder.m in Sources */,
+				D207BE9E1E84BD68006A0CE8 /* BarrageManager.m in Sources */,
 				8112D4311E7927A5002E00F6 /* LVCPlayerLoadingView.m in Sources */,
 				D2029D081E6EAE2E0027CD92 /* ZXDeviceInfo.m in Sources */,
+				D24571631E83C40B00AA85D6 /* PrivateView.m in Sources */,
 				D2029CC21E6EADE10027CD92 /* UIImage+WebP.m in Sources */,
 				D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */,
 				810B64E01E779AE900133E15 /* LVCPlayer.m in Sources */,
 				810B64FF1E779B1F00133E15 /* MASConstraint.m in Sources */,
-				D236968E1E7FC7C200E4BF71 /* CNBarrageView.m in Sources */,
 				D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */,
+				D207BEA11E84C1EC006A0CE8 /* AnimationBaseView.m in Sources */,
 				D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */,
 				D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */,
 				D2029C951E6EADE10027CD92 /* UIWebView+AFNetworking.m in Sources */,
@@ -1938,10 +2006,12 @@
 				D2029CCF1E6EADE10027CD92 /* SearchHttp.m in Sources */,
 				810B65001E779B1F00133E15 /* MASConstraintMaker.m in Sources */,
 				D2029C881E6EADE10027CD92 /* AFNetworkReachabilityManager.m in Sources */,
+				D245715C1E83A62B00AA85D6 /* BounceView.m in Sources */,
 				D2029D021E6EAE2E0027CD92 /* UIImage+ScaleImageSize.m in Sources */,
 				D2029BCC1E6EADD70027CD92 /* BaseView.m in Sources */,
 				D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */,
 				D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */,
+				D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */,
 				D25530061E7911A800DF38A5 /* GiftAnimationAction.m in Sources */,
 				81A483171E88BED00097A80A /* LVCTVLiveViewController.m in Sources */,
 				81A1B9A91E8277410079FF5F /* LVCInputView.m in Sources */,
@@ -37,9 +37,9 @@
     [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:AppKey appId:AppId];
     [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
-        
+        NSLog(@"connectSuccess");
     } error:^(CNLiveChatConnectErrorCode errors) {
-        
+        NSLog(@"errors%ld",errors);
     }];
     return YES;
@@ -20,17 +20,17 @@
 /**
  目标ID(消息来自聊天室的ID / 接收者ID)
  */
-@property (nonatomic, assign) NSString *targetId;
+@property (nonatomic, copy) NSString *targetId;
 /**
  消息ID(本地存储的消息的唯一值（数据库索引唯一值）)
  */
-@property (nonatomic, assign) NSString *messageId;
+@property (nonatomic, copy) NSString *messageId;
 /**
  消息内容
  */
-@property (nonatomic, strong) NSString *messageContent;
+@property (nonatomic, copy) NSString *messageContent;
 /**
  发送者的用户信息(userId, name, portraitUri)
@@ -13,17 +13,17 @@
 /*!
  用户ID(一旦以一个用户ID连接到服务器,就不能再修改用户ID了,如果修改也会被忽略)
  */
-@property(nonatomic, strong, readonly) NSString *userId;
+@property(nonatomic, copy, readonly) NSString *userId;
 /*!
  用户名称
  */
-@property(nonatomic, strong) NSString *name;
+@property(nonatomic, copy) NSString *name;
 /*!
  用户头像的URL
  */
-@property(nonatomic, strong) NSString *portraitUri;
+@property(nonatomic, copy) NSString *portraitUri;
 /*!
  用户信息的初始化方法,
-framework module CNLiveChatManager {
-  umbrella header "CNLiveChatManager.h"
-
-  export *
-  module * { export * }
-}
@@ -8,6 +8,8 @@
 #import <Foundation/Foundation.h>
+@class userInfoModel;
+
 @interface Tools : NSObject
@@ -19,12 +21,15 @@ typedef NS_ENUM(NSInteger, ShowMessageType) {//消息背景类型
 /**
  弹出页
- @param message 出框展示消息
- @param imageName 弹出框内图片名称
- @param view 将弹出框添加到的视图
- @param showMessageType 背景类型
  @param callBackBlock 弹出框消失时回调
  */
-+ (void)showBouncedWithMessage:(NSString *_Nullable)message leftImageName:(NSString *_Nonnull)imageName toView:(UIView *_Nullable)view showMessageType:(ShowMessageType)showMessageType callBackBlock:(void (^ _Nullable)())callBackBlock;
++ (void)showBouncedWithModel:(userInfoModel *_Nullable)model callBackBlock:(void (^ _Nullable)(UIView * _Nullable bounceView))callBackBlock;
+
++ (void)closeBouces;
+
++ (NSString *_Nullable)dictionaryToJson:(NSDictionary *_Nullable)dic;
+
++ (NSDictionary *_Nullable)dictionaryWithJsonString:(NSString *_Nullable)jsonString;
+
 @end
@@ -7,77 +7,117 @@
 //
 #import "Tools.h"
+#import "BounceView.h"
+#import "userInfoModel.h"
+
+@interface Tools ()
+
+
+@end
 @implementation Tools
 /**
  弹出页
- @param message 出框展示消息
- @param imageName 弹出框内图片名称
- @param view 将弹出框添加到的视图
- @param showMessageType 背景类型
  @param callBackBlock 弹出框消失时回调
  */
-+ (void)showBouncedWithMessage:(NSString *_Nullable)message leftImageName:(NSString *_Nonnull)imageName toView:(UIView *_Nullable)view showMessageType:(ShowMessageType)showMessageType callBackBlock:(void (^ _Nullable)())callBackBlock
++ (void)showBouncedWithModel:(userInfoModel *)model callBackBlock:(void (^ _Nullable)(UIView * _Nullable bounceView))callBackBlock
 {
-    UIImageView *toView = [[UIImageView alloc] initWithFrame:view.bounds];
-    switch (showMessageType) {
-        case ShowMessageTypeClear:
-        {
-            
-        }
-            break;
-        case ShowMessageTypeBlack:
-        {
-            toView.image = [UIImage imageNamed:@"整屏黑蒙版"];
-        }
-            break;
-        default:
-            break;
-    }
-    [view addSubview:toView];
+    UIImageView *toView = [[UIImageView alloc] initWithFrame:[UIApplication sharedApplication].keyWindow.bounds];//keyWindow
+    toView.backgroundColor = [UIColor clearColor];
+    toView.userInteractionEnabled = YES;
+    [[UIApplication sharedApplication].keyWindow addSubview:toView];
+   //    UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapClick:)];
-    UIImageView *centerView = [[UIImageView alloc] initWithFrame:CGRectMake(100, SCREEN_HEIGHT, 150, 50)];
-    centerView.centerX = toView.centerX;
-    centerView.image = [UIImage imageNamed:@"提示背景50"];
-    [toView addSubview:centerView];
-    
-    UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:imageName]];
-    imageView.width = imageView.width * 0.5;
-    imageView.height = imageView.height * 0.5;
-    imageView.centerY = centerView.height * 0.5;
-    [centerView addSubview:imageView];
-    
-    UILabel *titleLabel = [[UILabel alloc] init];
-    titleLabel.text = message;
-    titleLabel.textColor = [UIColor whiteColor];
-    titleLabel.font = kTitleLabelFont;
-    titleLabel.frame = CGRectMake(5, 10, [titleLabel labelSize].width, [titleLabel labelSize].height);
-    titleLabel.centerY = centerView.height * 0.5;
-    CGFloat left =(centerView.width - [titleLabel labelSize].width - 5 - imageView.width) * 0.5;
-    imageView.left = left;
-    titleLabel.left = imageView.right + 5;
-    [centerView addSubview:titleLabel];
-    
-    NSTimer *newTimer = [NSTimer timerWithTimeInterval:2.0 repeats:NO block:^(NSTimer * _Nonnull timer) {
-        [UIView animateWithDuration:0.75 animations:^{
-            centerView.top = SCREEN_HEIGHT;
-            
-        } completion:^(BOOL finished) {
-            [toView removeFromSuperview];
-            [centerView removeFromSuperview];
-            callBackBlock();
-        }];
-    }];
-    [[NSRunLoop currentRunLoop] addTimer:newTimer forMode:NSRunLoopCommonModes];
-    
-    [UIView animateWithDuration:0.75 animations:^{
-        centerView.centerY = toView.centerY;
+    BounceView *bounceView = [BounceView bounceView];
+    bounceView.model = model;
+    bounceView.centerX = toView.centerX;
+    [toView addSubview:bounceView];
+
+    [UIView animateWithDuration:0.5 animations:^{
+        bounceView.centerY = toView.centerY;
     } completion:^(BOOL finished) {
+        callBackBlock(bounceView);
+    }];
+}
+
+
+//+ (void)btnClick
+//{
+//    NSLog(@"btnClick");
+////    BounceView *bounceView = [BounceView bounceView];
+////    [UIView animateWithDuration:0.25 animations:^{
+////        bounceView.top = SCREEN_HEIGHT;
+////        
+////    } completion:^(BOOL finished) {
+////        [bounceView.superview removeFromSuperview];
+////        [bounceView removeFromSuperview];
+////    }];
+//}
+
+//+ (void)tapClick:(UITapGestureRecognizer *)gesture
+//{
+//    NSLog(@"taptaptaptaptap");
+//    UIView *view = gesture.view;
+////    if (view.tag == 1000 && [view isKindOfClass:[UIImageView class]]) {
+//        [UIView animateWithDuration:0.25 animations:^{
+//            gesture.view.top = SCREEN_HEIGHT;
+//            
+//        } completion:^(BOOL finished) {
+//            [gesture.view removeFromSuperview];
+//        }];
+////    }
+//}
+
++ (void)closeBouces
+{
+    BounceView *bounceView = [BounceView bounceView];
+    [UIView animateWithDuration:0.25 animations:^{
+        bounceView.top = SCREEN_HEIGHT;
+    } completion:^(BOOL finished) {
+        [bounceView.superview removeFromSuperview];
+        [bounceView removeFromSuperview];
     }];
 }
+/**
+ 把字典转换成格式化的JSON格式的字符串
+ 
+ @param dic 字典
+ @return JSON格式的字符串
+ */
++ (NSString *_Nullable)dictionaryToJson:(NSDictionary *_Nullable)dic
+{
+    NSError *parseError = nil;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError];
+    return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+}
+
+/**
+ 把格式化的JSON格式的字符串转换成字典
+ 
+ @param jsonString JSON格式的字符串
+ @return 返回字典
+ */
++ (NSDictionary *_Nullable)dictionaryWithJsonString:(NSString *_Nullable)jsonString {
+    if (jsonString == nil) {
+        return nil;
+    }
+    
+    NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *err;
+    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData
+                                                        options:NSJSONReadingMutableContainers
+                                                          error:&err];
+    if(err) {
+        NSLog(@"json解析失败：%@",err);
+        return nil;
+    }
+    return dic;
+}
+
+
 @end
+//
+//  AnimationBaseView.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/24.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "ChatBarrageView.h"
+
+@protocol TouchPointDelegate <NSObject>
+
+- (void)touchPoint:(CGPoint)touchPoint;
+
+@end
+
+@interface AnimationBaseView : UIView
+@property (nonatomic ,assign) BOOL                              isBarrage;//是否在执行动画
+@property (nonatomic ,strong) ChatBarrageView * _Nullable             barrageView;
+@property (nonatomic)_Nonnull id <TouchPointDelegate>                     delegate;
+
+
+@end
+//
+//  AnimationBaseView.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/24.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "AnimationBaseView.h"
+#import "ChatBarrageView.h"
+
+@implementation AnimationBaseView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        self.backgroundColor = [UIColor redColor];
+        self.clipsToBounds = YES;
+    }
+    return self;
+}
+
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
+    UIView *view = [super hitTest:point withEvent:event];
+    
+//    for (UIView *v in [UIApplication sharedApplication].keyWindow.subviews) {
+//        if (v.tag == 1000) {
+//            NSLog(@"添加过了");
+//            return view;
+//        }
+//    }
+    if (self.isBarrage) {
+        NSLog(@"point:%@\n",NSStringFromCGPoint(point));
+        
+        if ([self.delegate respondsToSelector:@selector(touchPoint:)]) {
+            [self.delegate touchPoint:point];
+        }
+    }
+    return view;
+}
+
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -71,8 +71,8 @@
     {
         UIButton *privateChatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         privateChatBtn.frame = CGRectMake(self.width*0.5 - 50, (self.height - 45)*0.5, 45, 45);
-        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatNormal"] forState:UIControlStateNormal];
-        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatTouch"] forState:UIControlStateHighlighted];
+        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"privateChat.png"] forState:UIControlStateNormal];
+        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"privateChat.png"] forState:UIControlStateHighlighted];
         [privateChatBtn addTarget:self action:@selector(privateChatAction) forControlEvents:UIControlEventTouchUpInside];
         _privateChatBtn = privateChatBtn;
     }
+//
+//  BounceView.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/23.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+@class userInfoModel;
+
+@interface BounceView : UIView
+
++ (instancetype _Nullable)bounceView;
+
+@property (nonatomic ,strong) userInfoModel * _Nullable             model;
+
+@end
+//
+//  BounceView.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/23.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BounceView.h"
+#import "userInfoModel.h"
+
+@interface BounceView ()
+
+@property (nonatomic ,strong) UIImageView * _Nullable icon;//头像
+@property (nonatomic ,strong) UILabel *     _Nullable nameLbl;//名字
+@property (nonatomic ,strong) UILabel *     _Nullable signLbl;//签名
+@property (nonatomic ,strong) UIButton *    _Nullable closeBtn;//关闭
+@property (nonatomic ,strong) UIButton *    _Nullable privateChatBtn;//私信
+@property (nonatomic ,strong) UIButton *    _Nullable aiteHeBtn;//@他
+@property (nonatomic ,strong) UIButton *    _Nullable homeBtn;//主页
+
+@end
+
+@implementation BounceView
+
++ (instancetype _Nullable)bounceView
+{
+    static BounceView *bounceView;
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        bounceView = [[BounceView alloc] initWithFrame:CGRectMake(100, SCREEN_HEIGHT, SCREEN_WIDTH - 80, 300)];
+    });
+    return bounceView;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        
+        self.backgroundColor = [UIColor whiteColor];
+        [self addSubview:self.signLbl];
+        [self addSubview:self.closeBtn];
+        [self addSubview:self.homeBtn];
+    }
+    return self;
+}
+
+- (void)setModel:(userInfoModel *)model
+{
+    _model = model;
+    [self.icon zx_setHeader:model.icon];
+    self.nameLbl.text = model.name;
+    self.signLbl.text = model.sign;
+    self.signLbl.frame = CGRectMake(self.signLbl.left, self.signLbl.top, [self.signLbl labelSize].width, [self.signLbl labelSize].height);
+    self.signLbl.centerX = self.width * 0.5;
+    self.nameLbl.centerX = _icon.centerX;
+}
+
+- (void)closeClick
+{
+    [Tools closeBouces];
+}
+
+- (void)aiteHeBtnClick
+{
+    NSLog(@"aiteHeBtnClick");
+}
+
+- (void)privateChatClick
+{
+    NSLog(@"privateChatClick");
+}
+
+- (void)homeBtnClick
+{
+    NSLog(@"homeBtnClick");
+}
+
+- (UIImageView *)icon
+{
+    if (!_icon)
+    {
+        _icon = [[UIImageView alloc] initWithFrame:CGRectMake(10, 20, 40, 40)];
+        _icon.centerX = self.width * 0.5;
+        [self addSubview:_icon];
+    }
+    return _icon;
+}
+
+- (UILabel *)signLbl
+{
+    if (!_signLbl)
+    {
+        _signLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.nameLbl.left, self.nameLbl.bottom + 10 , self.width - 20, 20)];
+        _signLbl.centerX = _icon.centerX;
+        _signLbl.text = @"TA很懒,什么都没有留下。";
+        _signLbl.numberOfLines = 0;
+        _signLbl.textAlignment = NSTextAlignmentCenter;
+        _signLbl.font = [UIFont systemFontOfSize:kContentFont];
+    }
+    return _signLbl;
+}
+
+- (UILabel *)nameLbl
+{
+    if (!_nameLbl)
+    {
+        _nameLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.icon.left, self.icon.bottom + 10 , self.width - 20, 20)];
+        _nameLbl.centerX = _icon.centerX;
+        _nameLbl.text = @"姓名";
+        _nameLbl.textAlignment = NSTextAlignmentCenter;
+        _nameLbl.font = [UIFont systemFontOfSize:kContentFont];
+        [self addSubview:_nameLbl];
+    }
+    return _nameLbl;
+}
+
+- (UIButton *)closeBtn
+{
+    if (!_closeBtn)
+    {
+        _closeBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.width - 50, 10, 40, 40)];
+        [_closeBtn addTarget:self action:@selector(closeClick) forControlEvents:UIControlEventTouchUpInside];
+        [_closeBtn setBackgroundImage:[UIImage imageNamed:@"LiveCloseNormal"] forState:UIControlStateNormal];
+    }
+    return _closeBtn;
+}
+
+- (UIButton *)privateChatBtn
+{
+    if (!_privateChatBtn)
+    {
+        _privateChatBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, self.height - 50, self.width / 3.0, 50)];
+        [_privateChatBtn addTarget:self action:@selector(privateChatClick) forControlEvents:UIControlEventTouchUpInside];
+        [_privateChatBtn setTitle:@"私信" forState:UIControlStateNormal];
+        [_privateChatBtn setTitleColor:[UIColor cyanColor] forState:UIControlStateNormal];
+        [self addSubview:_privateChatBtn];
+    }
+    return _privateChatBtn;
+}
+
+- (UIButton *)aiteHeBtn
+{
+    if (!_aiteHeBtn)
+    {
+        _aiteHeBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.privateChatBtn.right, self.height - self.privateChatBtn.height, self.width / 3.0, self.privateChatBtn.height)];
+        [_aiteHeBtn addTarget:self action:@selector(aiteHeBtnClick) forControlEvents:UIControlEventTouchUpInside];
+        [_aiteHeBtn setTitle:@"@TA" forState:UIControlStateNormal];
+        [_aiteHeBtn setTitleColor:[UIColor cyanColor] forState:UIControlStateNormal];
+        [self addSubview:_aiteHeBtn];
+    }
+    return _aiteHeBtn;
+}
+
+- (UIButton *)homeBtn
+{
+    if (!_homeBtn)
+    {
+        _homeBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.aiteHeBtn.right, self.height - self.privateChatBtn.height, self.width / 3.0, self.privateChatBtn.height)];
+        [_homeBtn addTarget:self action:@selector(homeBtnClick) forControlEvents:UIControlEventTouchUpInside];
+        [_homeBtn setTitle:@"主页" forState:UIControlStateNormal];
+        [_homeBtn setTitleColor:[UIColor cyanColor] forState:UIControlStateNormal];
+    }
+    return _homeBtn;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
-//
-//  CNBarrageManager.h
-//  personalXmppChatDemo
-//
-//  Created by 张旭 on 2016/12/10.
-//  Copyright © 2016年 cnlive. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class CNBarrageView;
-@class chatMsgModel;
-@interface CNBarrageManager : NSObject
-
-@property (nonatomic, copy) void(^generateBarrageBlock)(CNBarrageView *view);//生成弹幕View回调
-@property (nonatomic) BOOL isStopBarrage;//是否关闭了弹幕
-/**
- 开始弹幕根据新消息数组
- 
- @param newBarrageArray 新消息数组
- */
-- (void)startBarrageWithNewArray:(NSMutableArray <chatMsgModel *>*)newBarrageArray;
-
-/**
- 停止弹幕
- */
-- (void)stopBarrage;
-
-
-
-@end
-//
-//  CNBarrageManager.m
-//  personalXmppChatDemo
-//
-//  Created by 张旭 on 2016/12/10.
-//  Copyright © 2016年 cnlive. All rights reserved.
-//
-
-#import "CNBarrageManager.h"
-#import "CNBarrageView.h"
-#import "chatMsgModel.h"
-
-#define MAX_OVERLAP_COUNT 100
-
-@interface CNBarrageManager ()
-
-@property (nonatomic, strong) NSMutableArray *_Nullable allComments;//所有评论
-@property (nonatomic, strong) NSMutableArray *_Nullable tmpComments;//临时评论
-@property (nonatomic ,strong) NSMutableArray *_Nullable barrageQueue;//评论管理队列数组
-@property (nonatomic ,strong) NSMutableArray *_Nullable trajectoryArr;//弹幕轨迹数组
-
-@property BOOL isStarted;//标记是否开始弹幕
-@property BOOL isStopAnimation;//标记是否停止弹幕
-
-@end
-
-@implementation CNBarrageManager
-
-/**
- 开始弹幕根据新消息数组
- 
- @param newBarrageArray 新消息数组
- */
-- (void)startBarrageWithNewArray:(NSMutableArray <chatMsgModel *>*)newBarrageArray
-{
-    if (self.isStopAnimation && _isStopBarrage) {
-        return;
-    }
-    [self.allComments addObjectsFromArray:newBarrageArray];
-
-    [self startBarrage];
-}
-
-/**
- 开始弹幕
- */
-- (void)startBarrage
-{
-    if (self.tmpComments.count == 0) {
-        [self.tmpComments addObjectsFromArray:self.allComments];
-        [self.allComments removeAllObjects];
-    }
-    
-    self.isStarted = YES;
-    self.isStopAnimation = NO;
-    [self initBarrageCommentView];
-}
-
-/**
- 停止弹幕
- */
-- (void)stopBarrage
-{
-    self.isStopAnimation = YES;
-
-    [self.barrageQueue enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        CNBarrageView *view = obj;
-        [view stopAnimation];
-        view = nil;
-        self.tmpComments = nil;
-        self.allComments = nil;
-        self.trajectoryArr = nil;
-    }];
-    self.barrageQueue = nil;
-}
-
-/**
- 初始化弹幕的评论View
- */
-- (void)initBarrageCommentView
-{
-    if(self.isStopAnimation)return;
-    //初始化轨道位置随机
-    long count = self.tmpComments.count;
-    for (int i = 0; i < count; i ++) {
-        chatMsgModel *model = [self.tmpComments firstObject];
-        NSString *comment = model.content;
-        NSString *userName = model.name;
-        if (comment) {
-            [self.tmpComments removeObjectAtIndex:0];
-            //根据当前未发送弹幕数量生成轨迹
-            NSString *trajectory;
-            if (self.tmpComments.count > MAX_OVERLAP_COUNT)
-            {//数量较多轨迹可重叠
-                trajectory = [self trajectoryOverlap:YES];
-            }else
-            {//数量较少轨迹可能不重叠,但频率高会使轨迹数组已满,造成重叠
-                trajectory = [self trajectoryOverlap:NO];
-            }
-            [self createBarrageComment:comment userName:userName trajectory:trajectory isMine:model.isMine]; //trajectory:trajectory isMine:model.isMine];
-        }
-        else {
-            //当弹幕没有时跳出循环
-            break;
-        }
-    }
-}
-
-/**
- 生成评论弹幕轨迹
-
- @param isOverlap 是否重叠
- @return 根据轨迹是否可重叠,生成对应的新轨迹
- */
-- (NSString *)trajectoryOverlap:(BOOL)isOverlap
-{
-    NSString *trajectory = @"";
-    long arcIndex = arc4random() % MAX_BARRAGE_VERTICAL_COUNT;
-    CGFloat tra = arcIndex * BARRAGE_VERTICAL_HEIGHT + (arcIndex - 1) * BARRAGE_VERTICAL_MARGIN;
-//    NSLog(@"trajectory = %f ,%ld,%f,%ld,%f",tra,arcIndex,BARRAGE_VERTICAL_MARGIN,MAX_BARRAGE_VERTICAL_COUNT,BARRAGE_VERTICAL_MARGIN);
-    if (isOverlap) {
-    //生成可重叠的轨迹
-        trajectory = [NSString stringWithFormat:@"%f",tra];
-        [self.trajectoryArr addObject:trajectory];
-        return [NSString stringWithFormat:@"%f",tra];
-    }
-    //生成不重叠的轨迹
-    do {
-        arcIndex = arc4random() % MAX_BARRAGE_VERTICAL_COUNT;
-        tra = arcIndex * BARRAGE_VERTICAL_HEIGHT + (arcIndex - 1) * BARRAGE_VERTICAL_MARGIN;
-        trajectory = [NSString stringWithFormat:@"%f",tra];
-        if (self.trajectoryArr.count >= MAX_BARRAGE_VERTICAL_COUNT) break;
-        
-    } while ([self.trajectoryArr containsObject:trajectory]);
-    if (self.trajectoryArr.count >= MAX_BARRAGE_VERTICAL_COUNT)
-    {//当前轨迹数组已满,弹幕需要重叠显示
-        
-    }else
-    {//当前轨迹数组还没满,弹幕无需重叠
-        [self.trajectoryArr addObject:trajectory];
-    }
-    return trajectory;
-}
-
-/**
- 下一条评论
-
- @return 返回当前tmpComments的下一条评论数据
- */
-- (NSString *)nextComment {
-    chatMsgModel *model = [self.tmpComments firstObject];
-    if (model.content) {
-        [self.tmpComments removeObjectAtIndex:0];
-    }
-    return model.content;
-}
-
-/**
- 创建评论弹幕,根据评论内容和弹幕轨迹
-
- @param comment 评论内容
- @param userName 用户名字
- @param trajectory 弹幕轨迹
- @param isMine 是否是我发的弹幕
- */
-- (void)createBarrageComment:(NSString *)comment userName:(NSString *)userName trajectory:(NSString *)trajectory isMine:(BOOL)isMine
-{
-    if (self.isStopAnimation) {
-        return;
-    }
-    //创建一个弹幕view
-    CNBarrageView *view = [[CNBarrageView alloc] initWithContent:comment userName:userName isMine:isMine];
-    
-    //设置运行轨迹
-    view.trajectory = [trajectory floatValue];
-    weakself
-    __weak CNBarrageView *weakBarrageView = view;
-    view.moveBlock = ^(CommentMoveState status){
-        strongself
-        if (self.isStopAnimation) {
-            return;
-        }
-        switch (status) {
-            case CommentMoveStateStart:
-            {
-                //弹幕开始,将view加入弹幕管理数组
-                [self.barrageQueue addObject:weakBarrageView];
-            }
-                break;
-            case CommentMoveStateEnter:
-            {
-                [self.trajectoryArr removeObject:trajectory];
-                //弹幕完全进入屏幕,判断接下来是否还有内容,如果有则在该弹幕轨迹队列中创建弹幕
-                NSString *comment = [self nextComment];
-                if (comment) {
-                    [self createBarrageComment:comment userName:userName trajectory:trajectory isMine:isMine];
-//                    [self createBarrageComment:comment trajectory:trajectory isMine:isMine];
-                }
-                else {
-                    //没有评论了
-                }
-            }
-                break;
-            case CommentMoveStateEnd:
-            {
-                //弹幕飞出屏幕后从弹幕管理队列中删除
-                if ([self.barrageQueue containsObject:weakBarrageView]) {
-                    [self.barrageQueue removeObject:weakBarrageView];
-                }
-            }
-                break;
-            default:
-                break;
-        }
-    };
-    //弹幕生成后,传到Controller进行页面展示
-    if (self.generateBarrageBlock) {
-        self.generateBarrageBlock(view);
-    }
-}
-
-#pragma mark - getter
-
-- (NSMutableArray *)allComments {
-    if (!_allComments) {
-        _allComments = [NSMutableArray array];
-    }
-    return _allComments;
-}
-
-- (NSMutableArray *)tmpComments {
-    if (!_tmpComments) {
-        _tmpComments = [NSMutableArray array];
-    }
-    return _tmpComments;
-}
-
-- (NSMutableArray *)barrageQueue {
-    if (!_barrageQueue) {
-        _barrageQueue = [NSMutableArray array];
-    }
-    return _barrageQueue;
-}
-
-- (NSMutableArray *)trajectoryArr {
-    if (!_trajectoryArr) {
-        _trajectoryArr = [NSMutableArray array];
-    }
-    return _trajectoryArr;
-}
-
-@end
-//
-//  CNBarrageView.h
-//  personalXmppChatDemo
-//
-//  Created by 张旭 on 2016/12/10.
-//  Copyright © 2016年 cnlive. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#define BARRAGE_VERTICAL_HEIGHT 25.f  //每个弹幕View在垂直方向上的高度
-#define MAX_BARRAGE_VERTICAL_COUNT  (long)([UIScreen mainScreen].bounds.size.height * 1.0/BARRAGE_VERTICAL_HEIGHT)         //垂直方向上的弹幕最大数量
-#define BARRAGE_VERTICAL_MARGIN ([UIScreen mainScreen].bounds.size.height - BARRAGE_VERTICAL_HEIGHT * MAX_BARRAGE_VERTICAL_COUNT) * 1.0 / (MAX_BARRAGE_VERTICAL_COUNT - 1)                              //垂直方向上弹幕之间的间隙
-
-typedef NS_ENUM(NSInteger, CommentMoveState){//弹幕移动的状态
-    CommentMoveStateStart = 0,//将要进入屏幕
-    CommentMoveStateEnter    ,//完全进入
-    CommentMoveStateEnd       //完全移除屏幕
-};
-
-
-@interface CNBarrageView : UIView
-
-@property (nonatomic ,copy) void (^moveBlock) (CommentMoveState state);//弹幕移动的状态
-@property (nonatomic) CGFloat trajectory;//弹幕的移动轨迹
-
-/**
- 初始化弹幕View根据评论内容,消息是否是自己发送
-
- @param content 评论内容
- @param userName 用户名字
- @param isMine 是否是自己的评论弹幕
- @return 弹幕View
- */
-- (instancetype)initWithContent:(NSString *)content userName:(NSString *)userName isMine:(BOOL)isMine;
-
-/**
- 开始移动动画
- */
-- (void)startAnimation;
-
-/**
- 停止移动动画
- */
-- (void)stopAnimation;
-
-@end
-
-//
-//  CNBarrageView.m
-//  personalXmppChatDemo
-//
-//  Created by 张旭 on 2016/12/10.
-//  Copyright © 2016年 cnlive. All rights reserved.
-//
-
-#import "CNBarrageView.h"
-
-#define TotalDuration              5 //弹幕飘过总时间
-#define BARRAGE_Horizontal_Margin  5 //弹幕间水平间隙
-
-@interface CNBarrageView ()
-
-@property (nonatomic ,strong) UILabel * _Nullable commentLabel;//评论Label
-@property BOOL isDealloc;//标记资源是否已释放
-
-@end
-
-@implementation CNBarrageView
-
-/**
- 销毁对象及动画
- */
-- (void)dealloc
-{
-    [self stopAnimation];
-    self.moveBlock = nil;
-}
-
-/**
- 初始化弹幕View根据评论内容,消息是否是自己发送
- 
- @param content 评论内容
- @param userName 用户名字
- @param isMine 是否是自己的评论弹幕
- @return 弹幕View
- */
-- (instancetype)initWithContent:(NSString *)content userName:(NSString *)userName isMine:(BOOL)isMine
-{
-    if (self = [super init])
-    {
-        content = [NSString stringWithFormat:@"%@:%@",userName,content];
-        NSDictionary *attributes = @{NSFontAttributeName:[UIFont systemFontOfSize:14]};
-        float width = [content sizeWithAttributes:attributes].width;
-//        float height = [content sizeWithAttributes:attributes].height;//16.707031
-        self.bounds = CGRectMake(0, 0, width + BARRAGE_Horizontal_Margin * 2, BARRAGE_VERTICAL_HEIGHT);
-        self.commentLabel.text = content;
-        self.commentLabel.frame = CGRectMake(BARRAGE_Horizontal_Margin, 0, width, BARRAGE_VERTICAL_HEIGHT);
-        if(isMine)
-        {
-            self.commentLabel.textColor = [UIColor redColor];
-        }else
-        {
-            self.commentLabel.textColor = [UIColor lightGrayColor];
-        }
-        
-    }
-    return self;
-}
-
-/**
- 开始移动动画
- */
-- (void)startAnimation
-{
-    CGFloat wholeWidth = self.width + SCREEN_WIDTH + 50;//总轨迹长度
-    CGFloat speed = wholeWidth / TotalDuration;//速度
-    CGFloat duration = (self.width + 50) / speed;//完全进入屏幕的时间
-    
-    if (self.moveBlock) {
-        //弹幕开始进入屏幕
-        self.moveBlock(CommentMoveStateStart);
-    }
-    
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        //避免重复,若资源已释放 不再操作
-        if (self.isDealloc) {
-            return;
-        }
-        //duration时间后弹幕完全进入屏幕
-        if (self.moveBlock) {
-            self.moveBlock(CommentMoveStateEnter);
-        }
-    });
-    
-    weakself
-    //弹幕完全离开屏幕
-    [UIView animateWithDuration:TotalDuration delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
-        strongself
-        self.left = - self.width;
-    } completion:^(BOOL finished) {
-        if (self.moveBlock) {
-            self.moveBlock(CommentMoveStateEnd);
-        }
-        [self removeFromSuperview];
-    }];
-    
-}
-
-/**
- 停止移动动画
- */
-- (void)stopAnimation
-{
-    self.isDealloc = YES;
-    [self.layer removeAllAnimations];
-    [self removeFromSuperview];
-}
-
-#pragma mark getter
-
-- (UILabel *)commentLabel
-{
-    if (!_commentLabel) {
-        _commentLabel = [[UILabel alloc] init];
-        _commentLabel.backgroundColor = [UIColor clearColor];
-        _commentLabel.font = [UIFont systemFontOfSize:14.f];
-        _commentLabel.textColor = [UIColor lightGrayColor];
-        [self addSubview:self.commentLabel];
-    }
-    return _commentLabel;
-}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end
+//
+//  BarrageManager.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/24.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+@class chatMsgModel;
+@class ChatBarrageView;
+#import "AnimationBaseView.h"
+@interface BarrageManager : NSObject <TouchPointDelegate>
+
+/**
+ 初始化管理类
+ @return 当前manager
+ */
++ (instancetype)sharedManager;
+
+- (ChatBarrageView *)addAnimationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView;
+
+@end
+//
+//  BarrageManager.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/24.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BarrageManager.h"
+#import "chatMsgModel.h"
+#import "ChatBarrageView.h"
+
+@interface BarrageManager ()<CAAnimationDelegate>
+
+@property (nonatomic ,strong) NSTimer *           _Nullable       timer;
+@property (nonatomic ,strong) ChatBarrageView *_Nullable          barrageView;
+@property (nonatomic ,strong) AnimationBaseView * _Nullable       animBaseView;
+@property (nonatomic ,assign) CGRect                              barrCurrentRect;
+
+@end
+@implementation BarrageManager
+
+/**
+ 初始化管理类
+ @return 当前manager
+ */
++ (instancetype)sharedManager{
+    
+    static BarrageManager *manager;
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        manager = [[BarrageManager alloc] init];
+    });
+    return manager;
+}
+
+//- (AnimationBaseView *)animBaseView
+//{
+//    if (!_animBaseView)
+//    {
+//        _animBaseView = [[AnimationBaseView alloc] init];
+//    }
+//    return _animBaseView;
+//}
+
+/**
+ 根据实际model添加动画
+ 
+ @param model modelobj
+ */
+- (ChatBarrageView *)addAnimationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView
+{
+    ChatBarrageView *barrageView = [ChatBarrageView barrageViewWithPoint:CGPointMake(SCREEN_WIDTH + 50, 100)];
+    barrageView.backgroundColor = [UIColor blackColor];
+    [animContentView addSubview:barrageView];
+    self.barrageView = barrageView;
+    self.animBaseView = (AnimationBaseView *)animContentView;
+
+    barrageView.model = model;
+    
+    [self animationWithDuration:8
+                        YValues:@[ @(SCREEN_WIDTH + 50), @(-(200))]
+                       keyTimes:@[@0.0, @1.0]
+                timingFunctions:@[
+                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
+                                  ]
+                        addView:barrageView];
+    [self createTimer];
+    self.animBaseView.isBarrage = YES;
+    
+//    [UIView animateWithDuration:10 animations:^{
+//        
+//        barrageView.left = - 200;
+//    } completion:^(BOOL finished) {
+//        [self stopTimer];
+//        [barrageView removeFromSuperview];
+//        NSLog(@"finished");
+//    }];
+    return barrageView;
+}
+
+// 实时监测 ，也可以用循环定时器
+- (void)createTimer{
+    if (!self.timer) {
+        self.timer = [NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(jianCe) userInfo:nil repeats:YES];
+    }
+}
+- (void) jianCe{
+    CGRect rect = [[self.barrageView.layer presentationLayer ]frame];  // view指动画中移动的view
+    self.barrCurrentRect = rect;
+//    NSLog(@"箭%@",NSStringFromCGRect(rect));
+}
+
+- (void)stopTimer
+{
+    if(self.timer)
+    {
+        [self.timer invalidate];
+        self.timer = nil;
+    }
+}
+
+#pragma mark - touchPointDelegate
+- (void)touchPoint:(CGPoint)touchPoint
+{
+    CGFloat dxLeft = touchPoint.x - self.barrCurrentRect.origin.x;// >0
+    CGFloat dxRight = touchPoint.x - self.barrCurrentRect.origin.x - self.barrCurrentRect.size.width;// < 0
+    CGFloat dyLeft = touchPoint.y - self.barrCurrentRect.origin.y;// >0
+    CGFloat dyRight = touchPoint.y - self.barrCurrentRect.origin.y - self.barrCurrentRect.size.height;// <0
+
+    if (dxLeft > 0 && dxRight < 0 && dyLeft > 0 && dyRight < 0) {
+        //在当前矩形区域内
+//        NSLog(@"在当前矩形区域内");
+        [self.barrageView barrageViewClickWithModel:self.barrageView.model];
+    }else
+    {
+//        NSLog(@"不在当前矩形区域内");
+    }
+}
+
+- (void)animationWithDuration:(float)duration YValues:(NSArray *)YValues keyTimes:(NSArray *)keyTimes timingFunctions:(NSArray *)timingFunctions addView:(UIView *)addView{
+    CAKeyframeAnimation *rocketAnim = [CAKeyframeAnimation animation];
+    rocketAnim.keyPath = @"position.x";
+    rocketAnim.values = YValues;
+    rocketAnim.keyTimes = keyTimes;
+    rocketAnim.timingFunctions = timingFunctions;
+    rocketAnim.duration = duration;
+    rocketAnim.fillMode = kCAFillModeForwards;
+    rocketAnim.removedOnCompletion = NO;
+    rocketAnim.delegate = self;
+    [addView.layer addAnimation:rocketAnim forKey:@"positionY"];
+}
+
+- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
+    NSLog(@"didStop");
+    [self stopTimer];
+    [self.barrageView removeFromSuperview];
+    self.animBaseView.isBarrage = NO;
+}
+@end
+//
+//  ChatBarrOperation.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class chatMsgModel;
+
+/**
+ 动画完成回调
+ */
+typedef void(^barrAnimationCompletion)();
+
+/**
+ 可以开始动画回调
+ */
+typedef void(^canAnimCompletion)(NSDictionary *);
+
+@protocol canAnimDelegate <NSObject>
+
+- (void)canAniCompletion;
+
+@end
+
+@interface ChatBarrOperation : NSOperation
+{
+    barrAnimationCompletion _completion;
+}
+
+@property (nonatomic ,strong) id <canAnimDelegate>             delegate;
+
++ (instancetype)addAnimOperationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView;
+
+@end
+//
+//  ChatBarrOperation.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "ChatBarrOperation.h"
+#import "chatMsgModel.h"
+#import "ChatBarrageView.h"
+
+@interface ChatBarrOperation ()<CAAnimationDelegate>
+{
+    BOOL _finished;  //用于设置队列是否完成
+    BOOL _executing; //队列任务开始执行
+}
+@property (nonatomic ,strong) chatMsgModel * model;//model
+@property (nonatomic ,strong) UIView * animContentView;//需要显示动画的view
+@property (nonatomic ,strong) ChatBarrageView * _Nullable    barrageView;
+@property (nonatomic ,strong) NSArray *         _Nullable    defaultTrajory;
+//@property (nonatomic ,strong) NSMutableDictionary *         _Nullable    trajoryStateDic;
+
+@end
+
+@implementation ChatBarrOperation
+
++ (instancetype)addAnimOperationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView
+{
+    ChatBarrOperation *barrAnimOperation = [[ChatBarrOperation alloc]initWithModel:model animContentView:animContentView];
+    return barrAnimOperation;
+}
+
+/**
+ 初始化
+ 
+ @param model 礼物model
+ @param animContentView 需要把动画view添加到的view
+ @return obj
+ */
+- (instancetype)initWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView{
+    self = [super init];
+    if (self) {
+        self.model = model;
+        self.animContentView = animContentView;
+    }
+    return self;
+}
+
+/**
+ 开始方法(KVO控制队列任务状态)
+ */
+- (void)start{
+//    NSLog(@"start");
+    //这里动画队列任务不存在Cancelled状态所以不需要判断，直接开始执行
+    [self willChangeValueForKey:@"isExecuting"];
+    _executing = YES;
+    [self main];
+    [self didChangeValueForKey:@"isExecuting"];
+}
+
+/**
+ 自定义Operation提供了start main接口。
+ */
+- (void)main{
+    [self barrageAnimation];
+}
+
+/**
+ 弹幕View
+ 
+ @return 弹幕view
+ */
+- (ChatBarrageView *)barrageView{
+    if (!_barrageView) {
+        _barrageView = [ChatBarrageView barrageViewWithPoint:CGPointMake(SCREEN_WIDTH + 50, 100)];
+        _barrageView.animBaseView = (AnimationBaseView *)self.animContentView;
+    }
+    return _barrageView;
+}
+
+static long currentCompleteIndex = 0;
+
+- (void)barrageAnimation
+{
+    weakself
+    dispatch_async(dispatch_get_main_queue(), ^{
+        strongself
+
+//        //获取空的最小轨道
+//        int minIndex = -1;//默认没有
+//        for (int i = 0 ; i < 3; i ++) {
+//            int state = [[self.trajoryStateDic objectForKey:[NSString stringWithFormat:@"state%d",i]] intValue];
+//            NSLog(@"state%d,i%d",state,i);
+//            if (state == -1) {//null
+//                minIndex = i;
+//                break;
+//            }
+//        }
+//        if (minIndex == -1) {//没有空轨道
+//            //等待有complete的op再继续执行
+//            NSLog(@"等待complete");
+//            
+//        }else//有最小空轨道
+//        {
+//            NSLog(@"有最小空轨道");
+            //初始化弹幕View
+//            self.barrageView = [ChatBarrageView barrageView];
+            self.barrageView.model = self.model;
+
+            NSLog(@"barrage:%@",self.barrageView);
+            [self.animContentView addSubview:self.barrageView];
+            
+            self.barrageView.top = [self.defaultTrajory[currentCompleteIndex] integerValue];
+            currentCompleteIndex ++;
+            if (currentCompleteIndex == 3)
+            {
+                currentCompleteIndex = 0;
+            }
+
+//            NSString *key = [NSString stringWithFormat:@"state%d",minIndex];
+//            [self.trajoryStateDic setValue:@1 forKey:key];
+//            [self.trajoryStateDic setValue:self.name forKey:[NSString stringWithFormat:@"name%d",minIndex]];
+//            NSLog(@"top:%zd,index%d",[self.defaultTrajory[currentCompleteIndex] integerValue],minIndex);
+            [self.barrageView startBarrageAnimationWithCompletion:^{
+                
+                NSLog(@"completion");
+//                [self.trajoryStateDic setValue:@(-1) forKey:[NSString stringWithFormat:@"state%d",minIndex]];
+//                [self.trajoryStateDic setValue:@"" forKey:[NSString stringWithFormat:@"name%d",minIndex]];
+                if ([self.delegate respondsToSelector:@selector(canAniCompletion)]) {
+                    [self.delegate canAniCompletion];
+                }
+                [self willChangeValueForKey:@"isFinished"];
+                
+                _finished = YES;
+                
+                [self didChangeValueForKey:@"isFinished"];
+            }];
+//        }
+        
+        });
+}
+
+- (NSArray *)defaultTrajory
+{
+    if (!_defaultTrajory)
+    {
+        _defaultTrajory = [[NSArray alloc] initWithObjects:@200,@240,@280, nil];
+    }
+    return _defaultTrajory;
+}
+
+//- (NSMutableDictionary *)trajoryStateDic
+//{
+//    if (!_trajoryStateDic)
+//    {
+//        _trajoryStateDic = [NSMutableDictionary dictionaryWithObjectsAndKeys:@(-1),@"state0",@(-1),@"state1",@(-1),@"state2",@"",@"name0",@"",@"name1",@"",@"name2", nil];
+//    }
+//    return _trajoryStateDic;
+//}
+
+// 提示：To be deprecated; use and override 'asynchronous' below
+//之前用的isConcurrent
+/**
+ 覆写异步执行
+ 
+ @return YES
+ */
+- (BOOL)isAsynchronous{
+//    NSLog(@"isAsynchronous");
+    return YES;
+}
+
+/**
+ 覆写任务是否完成控制
+ 
+ @return 完成状态 _finished
+ */
+- (BOOL) isFinished{
+//    NSLog(@"isFinished%d",_finished);
+    return _finished;
+}
+
+/**
+ 覆写任务是否完成开始执行
+ 
+ @return 执行状态 _executing
+ */
+- (BOOL) isExecuting{
+//    NSLog(@"isExecuting%d",_executing);
+    return _executing;
+}
+@end
+//
+//  ChatBarrageAnimAction.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+/**
+ 动画完成回调
+ */
+typedef void(^barrAnimationCompletion)();
+
+@interface ChatBarrageAnimAction : UIView<CAAnimationDelegate>{
+     barrAnimationCompletion _barrAnimationCompletion;   //动画完成回调
+}
+
+/**
+ 弹幕动画
+ */
+- (void)startBarrageAnimationWithCompletion:(barrAnimationCompletion)completion;
+
+@end
+//
+//  ChatBarrageAnimAction.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "ChatBarrageAnimAction.h"
+
+@interface ChatBarrageAnimAction ()<CAAnimationDelegate>
+
+
+@end
+
+@implementation ChatBarrageAnimAction
+
+/**
+ 弹幕动画
+ */
+- (void)startBarrageAnimationWithCompletion:(barrAnimationCompletion)completion;
+{
+    _barrAnimationCompletion = completion;
+//    self.left = SCREEN_WIDTH + 50;
+//    NSLog(@"frame:%@",NSStringFromCGRect(self.frame));
+//    [UIView animateWithDuration:10 animations:^{
+//        self.left = - 200;
+//        
+//    } completion:^(BOOL finished) {
+//        _barrAnimationCompletion();
+//    }];
+    [self animationWithDuration:8
+                        YValues:@[ @(SCREEN_WIDTH + 50), @(-(200))]
+                       keyTimes:@[@0.0, @1.0]
+                timingFunctions:@[
+                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
+                                  ]
+                        addView:self];
+}
+
+/**
+ 位移动画具体实现
+ 
+ @param duration 动画持续时间
+ @param YValues 动画帧数组
+ @param keyTimes 动画帧时间
+ @param timingFunctions 动画方式数组
+ @param addView 需要添加的view
+ */
+- (void)animationWithDuration:(float)duration YValues:(NSArray *)YValues keyTimes:(NSArray *)keyTimes timingFunctions:(NSArray *)timingFunctions addView:(UIView *)addView{
+    CAKeyframeAnimation *rocketAnim = [CAKeyframeAnimation animation];
+    rocketAnim.keyPath = @"position.x";
+    rocketAnim.values = YValues;
+    rocketAnim.keyTimes = keyTimes;
+    rocketAnim.timingFunctions = timingFunctions;
+    rocketAnim.duration = duration;
+    rocketAnim.fillMode = kCAFillModeForwards;
+    rocketAnim.removedOnCompletion = NO;
+    rocketAnim.delegate = self;
+    [addView.layer addAnimation:rocketAnim forKey:@"positionY"];
+}
+
+/**
+ 动画回调代理，用于判断是否完成
+ 
+ @param anim 动画对象
+ @param flag 是否完成标记
+ */
+- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
+    _barrAnimationCompletion();
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  ChatBarrageManager.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class chatMsgModel;
+
+@interface ChatBarrageManager : NSObject
+
+/**
+ 初始化管理类
+ @return 当前manager
+ */
++ (instancetype)sharedManager;
+
+- (void)addAnimationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView;
+
+@end
+//
+//  ChatBarrageManager.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "ChatBarrageManager.h"
+#import "chatMsgModel.h"
+#import "ChatBarrOperation.h"
+
+@interface ChatBarrageManager ()<canAnimDelegate>
+
+@property (nonatomic,strong) NSOperationQueue *barrageAnimationQueue;  //聊天弹幕动画队列
+@property (nonatomic ,strong) NSMutableArray * _Nullable             tempOperationArr;
+
+@end
+
+@implementation ChatBarrageManager
+
+/**
+ 初始化管理类
+ @return 当前manager
+ */
++ (instancetype)sharedManager{
+    
+    static ChatBarrageManager *manager;
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        manager = [[ChatBarrageManager alloc] init];
+    });
+    return manager;
+}
+
+/**
+ 聊天弹幕动画队列
+ 
+ @return 队列obj
+ */
+- (NSOperationQueue *)barrageAnimationQueue{
+    if (_barrageAnimationQueue == nil) {
+        _barrageAnimationQueue = [[NSOperationQueue alloc] init];
+        _barrageAnimationQueue.maxConcurrentOperationCount = 1;
+    }
+    return _barrageAnimationQueue;
+}
+
+- (NSMutableArray *)tempOperationArr
+{
+    if (!_tempOperationArr)
+    {
+        _tempOperationArr = [[NSMutableArray alloc] init];
+    }
+    return _tempOperationArr;
+}
+
+/**
+ 根据实际model添加动画
+ 
+ @param model modelobj
+ */
+- (void)addAnimationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView{
+    
+    ChatBarrOperation *op = [ChatBarrOperation addAnimOperationWithModel:model animContentView:animContentView];
+    op.delegate = self;
+//    op.name = model.name;//换UID
+//    NSLog(@"opeCount:%zd",self.barrageAnimationQueue.operationCount);
+    if (self.barrageAnimationQueue.operationCount >= 3) {
+        [self.tempOperationArr addObject:op];
+    }else
+    {
+        [self.barrageAnimationQueue addOperation:op];
+    }
+}
+
+- (void)canAniCompletion
+{
+    //将临时数组的op加到Queue中
+    if (self.tempOperationArr.count > 0) {
+        [self.barrageAnimationQueue addOperation:[self.tempOperationArr firstObject]];
+        [self.tempOperationArr removeObjectAtIndex:0];
+    }
+}
+
+@end
+//
+//  ChatBarrageView.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "ChatBarrageAnimAction.h"
+
+@class AnimationBaseView;
+@class chatMsgModel;
+@interface ChatBarrageView : ChatBarrageAnimAction
+
+@property (nonatomic ,strong) chatMsgModel * _Nullable             model;
+
++ (instancetype _Nullable)barrageViewWithPoint:(CGPoint)point;
+
+- (void)barrageViewClickWithModel:(chatMsgModel *_Nullable)model;
+@property (nonatomic ,strong) AnimationBaseView * _Nullable       animBaseView;
+
+@end
+//
+//  ChatBarrageView.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "ChatBarrageView.h"
+#import "chatMsgModel.h"
+#import "userInfoModel.h"
+#import "AnimationBaseView.h"
+
+@interface ChatBarrageView ()<TouchPointDelegate>
+
+@property (nonatomic ,strong) UIImageView * _Nullable icon;
+@property (nonatomic ,strong) UILabel *     _Nullable nameLbl;
+@property (nonatomic ,strong) UILabel *     _Nullable contentLbl;
+
+@property (nonatomic ,strong) NSTimer *           _Nullable       timer;
+@property (nonatomic ,assign) CGRect                              barrCurrentRect;
+@end
+
+@implementation ChatBarrageView
+
++ (instancetype _Nullable)barrageViewWithPoint:(CGPoint)point
+{
+    ChatBarrageView *barrageView = [[ChatBarrageView alloc] initWithFrame:CGRectMake(point.x, point.y, 200, 50)];
+    return barrageView;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        [self createTimer];
+        
+        self.layer.cornerRadius = self.height * 0.5;
+        self.layer.masksToBounds = YES;
+        self.backgroundColor = [UIColor yellowColor];
+        [self addSubview:self.contentLbl]; 
+    }
+    return self;
+}
+
+- (void)setAnimBaseView:(AnimationBaseView *)animBaseView
+{
+    _animBaseView = animBaseView;
+    self.animBaseView.isBarrage = YES;
+    self.animBaseView.delegate = self;
+}
+
+// 实时监测 ，也可以用循环定时器
+- (void)createTimer{
+    if (!self.timer) {
+        self.timer = [NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(jianCe) userInfo:nil repeats:YES];
+    }
+}
+- (void) jianCe{
+    CGRect rect = [[self.layer presentationLayer ]frame];  // view指动画中移动的view
+    self.barrCurrentRect = rect;
+    //    NSLog(@"箭%@",NSStringFromCGRect(rect));
+}
+
+- (void)stopTimer
+{
+    if(self.timer)
+    {
+        [self.timer invalidate];
+        self.timer = nil;
+    }
+}
+
+#pragma mark - touchPointDelegate
+- (void)touchPoint:(CGPoint)touchPoint
+{
+    CGFloat dxLeft = touchPoint.x - self.barrCurrentRect.origin.x;// >0
+    CGFloat dxRight = touchPoint.x - self.barrCurrentRect.origin.x - self.barrCurrentRect.size.width;// < 0
+    CGFloat dyLeft = touchPoint.y - self.barrCurrentRect.origin.y;// >0
+    CGFloat dyRight = touchPoint.y - self.barrCurrentRect.origin.y - self.barrCurrentRect.size.height;// <0
+    
+    if (dxLeft > 0 && dxRight < 0 && dyLeft > 0 && dyRight < 0) {
+        //在当前矩形区域内
+        //        NSLog(@"在当前矩形区域内");
+        [self barrageViewClickWithModel:self.model];
+    }else
+    {
+        //        NSLog(@"不在当前矩形区域内");
+    }
+}
+
+- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
+{
+    _barrAnimationCompletion();
+    [self stopTimer];
+    [self removeFromSuperview];
+    self.animBaseView.isBarrage = NO;
+
+}
+
+- (void)barrageViewClickWithModel:(chatMsgModel *)model
+{
+    //展示个人详细页
+    userInfoModel *userModel = [[userInfoModel alloc] init];
+    userModel.icon = model.icon;
+    userModel.name = model.name;
+    userModel.sign = model.content;//@"我就是签名,不服来辩";
+    userModel.uId = @"111222";
+    [Tools showBouncedWithModel:userModel callBackBlock:^(UIView * _Nullable bounceView) {
+        
+    }];
+}
+
+- (void)setModel:(chatMsgModel *)model
+{
+    _model = model;
+    [self.icon zx_setHeader:model.icon];
+    self.nameLbl.text = model.name;
+    self.contentLbl.text = model.content;
+}
+
+- (UIImageView *)icon
+{
+    if (!_icon)
+    {
+        _icon = [[UIImageView alloc] initWithFrame:CGRectMake(10, 4, self.height -6, self.height -6)];
+        _icon.centerY = self.height * 0.5;
+        [self addSubview:_icon];
+    }
+    return _icon;
+}
+
+- (UILabel *)nameLbl
+{
+    if (!_nameLbl)
+    {
+        _nameLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.icon.right + 10, 0, self.width - self.icon.right - 10, self.height * 0.5)];
+        _nameLbl.textAlignment = NSTextAlignmentLeft;
+        _nameLbl.textColor = ZXRandomColor;
+        _nameLbl.font = [UIFont systemFontOfSize:kContentFont];
+        [self addSubview:_nameLbl];
+    }
+    return _nameLbl;
+}
+
+- (UILabel *)contentLbl
+{
+    if (!_contentLbl)
+    {
+        _contentLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.nameLbl.left, self.nameLbl.bottom, self.nameLbl.width, self.height * 0.5)];
+        _contentLbl.textAlignment = NSTextAlignmentLeft;
+        _contentLbl.textColor = ZXRandomColor;
+        _contentLbl.font = [UIFont systemFontOfSize:kContentFont];
+    }
+    return _contentLbl;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -26,7 +26,7 @@
     //底部空隙
     _cellHeight += textSize.height + ChatCellMargin;
-        NSLog(@"cellHeight = %f",_cellHeight);
+     //   NSLog(@"cellHeight = %f",_cellHeight);
     return _cellHeight;
 }
 @end
@@ -19,7 +19,7 @@
 + (instancetype)sharedAnimQueueManager;
 /**
- 根据实际model添加飞机横幅动画(火箭、飞机横幅动画为一个队列)
+ 根据实际model动画
  @param animContentView 需要把动画view添加到的view
  @param model modelobj
@@ -13,7 +13,6 @@
 #import "LiveBaseView.h"
 #import "PresentView.h"
-
 @interface AnimQueueManager ()
 @property (nonatomic,strong) NSOperationQueue *comboAnimationQueue;  //连击动画队列
@@ -225,7 +225,4 @@
 - (BOOL) isExecuting{
     return _executing;
 }
-
-
-
 @end
@@ -8,10 +8,10 @@
 #import "BaseView.h"
 @class PresentView;
-
+@class AnimationBaseView;
 @interface LiveBaseView : BaseView 
 @property (nonatomic ,strong) UIViewController * _Nullable             viewController;
 @property (nonatomic ,strong ,readonly) PresentView *   _Nullable presentView;
-@property (nonatomic ,strong ,readonly) UIView * _Nullable             animationBaseView;
+@property (nonatomic ,strong ,readonly) AnimationBaseView * _Nullable             animationBaseView;
 @end
@@ -17,9 +17,18 @@
 #import "chatListCell.h"
 #import "chatMsgModel.h"
 #import "TopToolView.h"
+#import "ChatBarrageManager.h"
+#import "userInfoModel.h"
+#import "PrivateView.h"
+//#import "BarrageManager.h"
+#import "ChatBarrageView.h"
+#import "AnimationBaseView.h"
 #define BottomToolHeight 60
+static NSString *message_barrage = @"message_barrage";
+static NSString *message_content = @"message_content";
+
 typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     PopTypeGift          = 1,//礼物弹窗
     PopTypeChat             ,//聊天弹窗
@@ -29,7 +38,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,userClickDelegate,CNLiveChatManagerDelegate>
 @property (nonatomic ,strong           ) UIScrollView *   _Nullable scrollView;
-@property (nonatomic ,strong ,readwrite) UIView *         _Nullable animationBaseView;//展示层View
+@property (nonatomic ,strong ,readwrite) AnimationBaseView *         _Nullable animationBaseView;//展示层View
 @property (nonatomic ,strong           ) BottomToolView*  _Nullable bottomToolView;
 @property (nonatomic ,strong           ) UIButton *       _Nullable closeBtn;
 @property (nonatomic ,strong           ) GiftListView *   _Nullable giftListView;
@@ -38,11 +47,15 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @property (nonatomic ,assign           ) PopType   popType;
 @property (nonatomic ,strong           ) UITableView *    _Nullable chatTableView;
 @property (nonatomic ,strong           ) NSMutableArray * _Nullable chatMsgArray;//聊天消息数组
-@property (nonatomic ,strong           ) TopToolView *    _Nullable topToolsView;
-@property (nonatomic ,strong           ) UIView *         _Nullable commentsView;
-@property (nonatomic ,strong           ) UITextField *    _Nullable commentText;
+@property (nonatomic ,strong           ) TopToolView *        _Nullable topToolsView;
+@property (nonatomic ,strong           ) UIView *             _Nullable commentsView;
+@property (nonatomic ,strong           ) UITextField *        _Nullable commentText;
 @property (nonatomic ,assign           ) CGFloat   offsetHeight;
-@property (nonatomic ,strong           ) UISwitch *       _Nullable barrageSwitch;
+@property (nonatomic ,strong           ) UISwitch *           _Nullable barrageSwitch;
+@property (nonatomic ,strong           ) ChatBarrageManager * _Nullable chatManager;
+//@property (nonatomic ,strong           ) BarrageManager * _Nullable barrManager;
+
+@property (nonatomic ,strong) ChatBarrageView * _Nullable             barrageView;
 @end
@@ -52,6 +65,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 {
     if (self = [super initWithFrame:frame]) {
+        self.clipsToBounds = YES;
         [self addSubview:self.scrollView];
         [self.scrollView addSubview:self.animationBaseView];
         [self.animationBaseView addSubview:self.bottomToolView];
@@ -69,7 +83,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil];
         [CNLiveChatManager sharedCNLiveChatManager].delegate = self;
-        [[CNLiveChatManager sharedCNLiveChatManager] joinChatRoom:@"123" messageCount:50 success:^(NSString *targetId) {
+        [[CNLiveChatManager sharedCNLiveChatManager] joinChatRoom:@"1234" messageCount:10 success:^(NSString *targetId) {
             NSLog(@"success");
         } error:^(CNLiveChatErrorCode errors, NSString *targetId) {
             NSLog(@"error");
@@ -111,12 +125,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         bgView.userInteractionEnabled = YES;
         [_commentsView addSubview:bgView];
-        _barrageSwitch = [[UISwitch alloc] initWithFrame:CGRectMake(10, 10, 40, 30)];
-        _barrageSwitch.tintColor = [UIColor orangeColor];
-        _barrageSwitch.onTintColor = [UIColor orangeColor];
-        _barrageSwitch.thumbTintColor = [UIColor lightGrayColor];
-        _barrageSwitch.centerY = _commentsView.height * 0.5;
-        [bgView addSubview:_barrageSwitch];
+        [bgView addSubview:self.barrageSwitch];
         UIButton *sendBtn = [[UIButton alloc] initWithFrame:CGRectMake(_commentsView.width - 80, 0, 80, _commentsView.height)];
         [sendBtn addTarget:self action:@selector(sendClick) forControlEvents:UIControlEventTouchUpInside];
@@ -134,9 +143,11 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         _commentText.returnKeyType       = UIReturnKeySend;
         _commentText.delegate	    = self;
         _commentText.font		= [UIFont systemFontOfSize:15.0];
+        _commentText.placeholder = @"和大家说点什么吧";
         [bgView addSubview:_commentText];
     }
-    [[[UIApplication sharedApplication]keyWindow] addSubview:_commentsView];//添加到window上,在视图以外
+    UIWindow *window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    [window addSubview:_commentsView];//添加到window上,在视图以外
     [_commentText becomeFirstResponder];
 }
@@ -149,10 +160,51 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 - (BOOL)textFieldShouldReturn:(UITextField *)textField
 {
     if (![textField.text isEqualToString:@""]) {
-        //send message
-        NSLog(@"send message");
-        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:textField.text type:CNLive_ConversationType_CHATROOM targetId:@"123" success:^(CNLiveChatMessage *message) {
-            NSLog(@"msgid:%@,tagid:%@,content:%@",message.messageId,message.targetId,message.messageContent);
+
+        NSDictionary *dic;
+        if(self.barrageSwitch.isOn){
+            //开启横屏弹幕
+            dic = @{message_barrage:@"1",message_content:textField.text};
+        }else
+        {
+            dic = @{message_barrage:@"0",message_content:textField.text};
+        }
+        weakself
+        NSString *message = [Tools dictionaryToJson:dic];
+        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_CHATROOM targetId:@"1234" success:^(CNLiveChatMessage *message) {
+            strongself
+            NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
+            NSString *content = [JSONDic objectForKey:message_content];
+            
+            //将消息显示到列表中
+            chatMsgModel *model = [[chatMsgModel alloc] init];
+            model.name = message.userInfo.name;
+            model.content = content;
+            model.ID = message.targetId;
+            model.icon = message.userInfo.portraitUri;
+            model.cellWidth = self.chatTableView.width - 20;
+            [self.chatMsgArray addObject:model];
+            [self.chatTableView reloadData];
+            NSInteger section = [self.chatTableView numberOfSections];
+            if (section < 1) return;
+            NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
+            if (row < 1) return;
+            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
+            [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+            [self.chatTableView reloadData];
+            
+            NSInteger isBarrage = [[JSONDic objectForKey:message_barrage] integerValue];
+            
+            if (isBarrage) {//此条消息飘弹幕
+                
+                chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
+                barrageModel.name = message.userInfo.name;
+                barrageModel.content = content;
+                barrageModel.icon = message.userInfo.portraitUri;
+
+                [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
+           }
+
         } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
             NSLog(@"%@",messageId);
         }];
@@ -165,24 +217,26 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 #pragma mark - bottomBtnActionDelegate
 - (void)bottomActionWithType:(BtnClickType)btnType button:(UIButton *)button
 {
+    [[LVCAnimationManager shareManager] suspend];
+
     switch (btnType) {
         case BtnClickTypeChat:
         {
             self.popType = PopTypeChat;
             [self showCommentText];
-            [[LVCAnimationManager shareManager] suspend];
         }
             break;
         case BtnClickTypePriChat:
         {
             self.popType = PopTypePriMessage;
+            [self hiddenView:YES];
+            [self showPrivateView];
         }
             break;
         case BtnClickTypeGift:
         {
             self.popType = PopTypeGift;
-            [[LVCAnimationManager shareManager] suspend];
             [self hiddenView:YES];
             [self addSubview:self.giftListView];
             self.giftListView.frame = CGRectMake(0, SCREEN_HEIGHT - 250, SCREEN_WIDTH, 250);
@@ -194,6 +248,14 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     }
 }
+- (void)showPrivateView
+{
+    PrivateView *privateView = [PrivateView privateView];
+    privateView.backgroundColor = [UIColor yellowColor];
+    [self addSubview:privateView];
+    self.giftPopView = privateView;
+}
+
 - (void)hiddenView:(BOOL)isHidden
 {
     self.bottomToolView.hidden = isHidden;
@@ -206,6 +268,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
  */
 - (void)clearCurrentPopView
 {
+    [[LVCAnimationManager shareManager] resume];
+
     switch (self.popType) {
         case PopTypeGift:
         {
@@ -213,7 +277,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
                 self.giftPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
                 [self hiddenView:NO];
-                [[LVCAnimationManager shareManager] resume];
             } completion:^(BOOL finished) {
             }];
         }
@@ -221,12 +284,16 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         case PopTypeChat:
         {
             [self.commentText resignFirstResponder];
-            [[LVCAnimationManager shareManager] resume];
         }
             break;
         case PopTypePriMessage:
         {
-            
+            [UIView animateWithDuration:0.25 animations:^{
+                
+                self.giftPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                [self hiddenView:NO];
+            } completion:^(BOOL finished) {
+            }];
         }
             break;
         default:
@@ -238,6 +305,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 #pragma mark - buttonClick触摸屏幕关闭方法
 - (void)tapGestureClick:(UITapGestureRecognizer *)gesture
 {
+//    NSLog(@" tap gesture%@",gesture.view);
     [[LVCAnimationManager shareManager] bubblingWithCenterPoint:CGPointMake(SCREEN_WIDTH - 50, SCREEN_HEIGHT - 50) toView:self.animationBaseView];
     [self clearCurrentPopView];
 }
@@ -252,10 +320,29 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     [self textFieldShouldReturn:self.commentText];
 }
+- (void)barrageSiwthChange:(UISwitch *)barrageSwitch
+{
+    if (barrageSwitch.isOn) {
+        _commentText.placeholder = @"1视讯币/条";
+    }else
+    {
+        _commentText.placeholder = @"和大家说点什么吧";
+    }
+}
+
 #pragma mark - userDetailDelegate聊天室列表个人信息
 - (void)userClickWithModel:(chatMsgModel *)model
 {
     NSLog(@"点击人:%@",model.name);
+    userInfoModel *userModel = [[userInfoModel alloc ]init];
+    userModel.name = model.name;
+    userModel.icon = model.icon;
+    userModel.sign = model.content;//@"哈哈啊哈哈啊哈哈,这是我的签名~";
+    userModel.uId =  @"123124";
+    [Tools showBouncedWithModel:userModel callBackBlock:^(UIView * _Nullable bounceView) {
+        NSLog(@"%@",bounceView);
+
+    }];
 }
 #pragma mark - CNLiveChatManagerDelegate
@@ -299,7 +386,42 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
  */
 - (void)onReceived:(CNLiveChatMessage *)message
 {
-    NSLog(@"onReceived msg:%@",message.messageContent);
+//    NSLog(@"onReceived");
+    NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
+    NSString *content = [JSONDic objectForKey:message_content];
+
+    //将消息显示到列表中
+    chatMsgModel *model = [[chatMsgModel alloc] init];
+    model.name = message.userInfo.name;
+    model.content = content;
+    model.ID = message.targetId;
+    model.icon = message.userInfo.portraitUri;
+    model.cellWidth = self.chatTableView.width - 20;
+    [self.chatMsgArray addObject:model];
+    [self.chatTableView reloadData];
+    
+    NSInteger section = [self.chatTableView numberOfSections];
+    if (section < 1) return;
+    NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
+    if (row < 1) return;
+    NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
+    [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+    [self.chatTableView reloadData];
+    
+    NSInteger isBarrage = [[JSONDic objectForKey:message_barrage] integerValue];
+    
+    if (isBarrage) {//此条消息飘弹幕
+
+        chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
+        barrageModel.name = message.userInfo.name;
+        barrageModel.content = content;
+        barrageModel.icon = message.userInfo.portraitUri;
+//        self.barrageView = [self.barrManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
+        [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];//self.barrageView = 
+
+        self.animationBaseView.delegate = self.chatManager;
+//        self.animationBaseView.barrageView = self.barrageView;
+    }
 }
 /**
@@ -386,13 +508,11 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     return _scrollView;
 }
-- (UIView *)animationBaseView
+- (AnimationBaseView *)animationBaseView
 {
     if (!_animationBaseView)
     {
-        _animationBaseView = [[UIView alloc] initWithFrame:CGRectMake(self.scrollView.width, 0, self.scrollView.width, self.scrollView.height)];
-        _animationBaseView.backgroundColor = [UIColor redColor];
-        _animationBaseView.clipsToBounds = YES;
+        _animationBaseView = [[AnimationBaseView alloc] initWithFrame:CGRectMake(self.scrollView.width, 0, self.scrollView.width, self.scrollView.height)];
     }
     return _animationBaseView;
 }
@@ -412,7 +532,12 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 {
     if (!_barrageSwitch)
     {
-        _barrageSwitch = [[UISwitch alloc] init];
+        _barrageSwitch = [[UISwitch alloc] initWithFrame:CGRectMake(10, 10, 40, 30)];
+        _barrageSwitch.tintColor = [UIColor orangeColor];
+        _barrageSwitch.onTintColor = [UIColor orangeColor];
+        _barrageSwitch.thumbTintColor = [UIColor lightGrayColor];
+        _barrageSwitch.centerY = _commentsView.height * 0.5;
+        [_barrageSwitch addTarget:self action:@selector(barrageSiwthChange:) forControlEvents:UIControlEventValueChanged];
     }
     return _barrageSwitch;
 }
@@ -448,6 +573,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [tableView registerClass:[chatListCell class] forCellReuseIdentifier:NSStringFromClass([chatListCell class])];
         tableView.showsVerticalScrollIndicator = NO;
         tableView.showsHorizontalScrollIndicator = NO;
+        tableView.bounces = NO;
         tableView.backgroundColor = [UIColor clearColor];
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _chatTableView = tableView;
@@ -460,15 +586,15 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     if (!_chatMsgArray) {
         _chatMsgArray = [NSMutableArray array];
-        NSArray *names = [NSArray arrayWithObjects:@"张旭",@"老大",@"老六",@"什么人",@"金光",@"银光",@"阳光", nil];
-        NSArray *contents = [NSArray arrayWithObjects:@"阿萨德请问发群里发",@"阿萨德请问发群里发发染发我if顽皮的发球局平均分配WiF",@"阿萨德请问发群里发发染发我if顽皮的发球局平均分配WiFi我if为打破我姐夫我批发价为破房间我批发价我批发价为 爱神的箭怕我的哦期",@"里发发染发我if顽",@"金光神的箭怕我的哦期间",@"银光",@"阳光神的箭怕我的哦期间", nil];
-        for (int i = 0 ; i < names.count; i ++) {
-            chatMsgModel *model = [[chatMsgModel alloc] init];
-            model.name = names[i];
-            model.content = contents[i];
-            model.cellWidth = self.chatTableView.width - 20;
-            [self.chatMsgArray addObject:model];
-        }
+//        NSArray *names = [NSArray arrayWithObjects:@"张旭",@"老大",@"老六",@"什么人",@"金光",@"银光",@"阳光", nil];
+//        NSArray *contents = [NSArray arrayWithObjects:@"阿萨德请问发群里发",@"阿萨德请问发群里发发染发我if顽皮的发球局平均分配WiF",@"阿萨德请问发群里发发染发我if顽皮的发球局平均分配WiFi我if为打破我姐夫我批发价为破房间我批发价我批发价为 爱神的箭怕我的哦期",@"里发发染发我if顽",@"金光神的箭怕我的哦期间",@"银光",@"阳光神的箭怕我的哦期间", nil];
+//        for (int i = 0 ; i < names.count; i ++) {
+//            chatMsgModel *model = [[chatMsgModel alloc] init];
+//            model.name = names[i];
+//            model.content = contents[i];
+//            model.cellWidth = self.chatTableView.width - 20;
+//            [self.chatMsgArray addObject:model];
+//        }
     }
     return _chatMsgArray;
 }
@@ -503,6 +629,22 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     return _giftListView;
 }
+//- (BarrageManager *)barrManager
+//{
+//    if (!_barrManager)
+//    {
+//        _barrManager = [BarrageManager sharedManager];
+//    }
+//    return _barrManager;
+//}
+- (ChatBarrageManager *)chatManager
+{
+    if (!_chatManager)
+    {
+        _chatManager = [ChatBarrageManager sharedManager];
+    }
+    return _chatManager;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.
+//
+//  PrivateView.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/23.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface PrivateView : UIView
+
++ (instancetype)privateView;
+
+@end
+//
+//  PrivateView.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/23.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "PrivateView.h"
+
+@implementation PrivateView
+
++ (instancetype)privateView
+{
+    return [[PrivateView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 300, SCREEN_WIDTH, 300)];
+}
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  userInfoModel.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/23.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+@interface userInfoModel : BaseModel
+
+@property (nonatomic ,copy) NSString * _Nullable            icon;
+@property (nonatomic ,copy) NSString * _Nullable            name;
+@property (nonatomic ,copy) NSString * _Nullable            sign;
+@property (nonatomic ,copy) NSString * _Nullable            uId;
+
+
+@end
+//
+//  userInfoModel.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/23.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "userInfoModel.h"
+
+@implementation userInfoModel
+
+@end
@@ -10,45 +10,32 @@
 #import <CNLivePlayerSDK/CNLiveGPUStreamerKit.h>
 #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
 #import "FilterFunctionView.h"
+#import "LVCUGCLivePrepareView.h"
 #define KAppId @"60_irn9edco29"
 #define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-@interface LVCLiveViewController ()<UIGestureRecognizerDelegate> {
-    // 开始直播
-    UIButton *_startLiveBtn;
-    // 缩放因子
-    CGFloat _currentPinchZoomFactor;
-}
+@interface LVCLiveViewController ()<UIGestureRecognizerDelegate>
-@property (nonatomic,strong) UIView *captureView;
+@property (nonatomic, strong) LVCUGCLivePrepareView *prepareView;
-@property (nonatomic,strong) CNLiveGPUStreamerKit *kitCN;
+@property (nonatomic, strong) UIView *captureView;
-@property (nonatomic,strong) FilterFunctionView *filterView;
+@property (nonatomic, strong) CNLiveGPUStreamerKit *kitCN;
-@end
+@property (nonatomic, strong) FilterFunctionView *filterView;
-@implementation LVCLiveViewController
+@property (nonatomic, strong) UIButton *quitButton;
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    
-    if (_kitCN) {
-        return UIInterfaceOrientationMaskAllButUpsideDown;
-    } else {
-        return UIInterfaceOrientationMaskPortrait;
-    }
-}
+@property (nonatomic, strong) UIButton *openFilterButton;
--(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
-    
-    UIInterfaceOrientation orie = [[UIApplication sharedApplication] statusBarOrientation];
-    [_kitCN rotatePreviewTo:orie];
-    
-    if (_kitCN.streamerBase.isStreaming) {
-        [_kitCN rotateStreamTo:orie];
-    }
-}
+@property (nonatomic, strong) UIButton *changeCameraButton;
+
+@property (nonatomic, strong) UIButton *openFlashButton;
+
+@end
+
+@implementation LVCLiveViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -56,17 +43,18 @@
     self.view.backgroundColor = [UIColor blueColor];
     [self.view addSubview:self.captureView];
+    [self.view addSubview:self.prepareView];
+    [self.view addSubview:self.quitButton];
+    [self.view addSubview:self.changeCameraButton];
+    [self.view addSubview:self.openFilterButton];
+    [self.view addSubview:self.openFlashButton];
+    [self.view addSubview:self.filterView];
-    UIButton *closeBtn = [[UIButton alloc] initWithFrame:CGRectMake(SCREEN_WIDTH - 50, 30, 50, 30)];
-    [closeBtn setTitle:@"关闭" forState:UIControlStateNormal];
-    [closeBtn addTarget:self action:@selector(closeBtnClivk) forControlEvents:UIControlEventTouchUpInside];
-    [self.view addSubview:closeBtn];
-    
-    // 活动Id
+    // 初始化推流
     NSString *activityId = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
-    // 初始化直播云
+
     [[CNLiveWebcastManager manager] initWithAppId:KAppId appKey:KAppKey];
-    // 初始化推流
+
     _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithActivityId:activityId channelId:@"iOStest" isHorizontalScreen:@"0"];
     //        _kitCN.activityName = @"iOS test";
@@ -74,25 +62,12 @@
     // 设置推流配置
     [self setStreamerCfg];
-    // 添加监听
-    [self addObservers];
-    
-    _startLiveBtn = [self addButton:@"开始直播" frame:CGRectMake(100, 40, 80, 40) action:@selector(startCapture:)];
-    [_startLiveBtn setTitle:@"开始直播" forState:UIControlStateNormal];
-    [_startLiveBtn setTitle:@"停止直播" forState:UIControlStateSelected];
-    [self addButton:@"关闭预览" frame:CGRectMake(10, 40, 80, 40) action:@selector(startPreview:)];
-//    [self addButton:@"退出" frame:CGRectMake(190, 40, 80, 40) action:@selector(quit)];
-    [self addButton:@"美颜" frame:CGRectMake(10, 100, 80, 40) action:@selector(openFilter:)];
-    [self addButton:@"摄像头" frame:CGRectMake(100, 100, 80, 40) action:@selector(changeCamera:)];
-    [self addButton:@"闪光灯" frame:CGRectMake(190, 100, 80, 40) action:@selector(openFlash)];
+    [self addObservers];
     UITapGestureRecognizer * singleRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTap:)];
     singleRecognizer.delegate = self;
     [self.captureView addGestureRecognizer:singleRecognizer];
-    
-    UIPinchGestureRecognizer *pinch = [[UIPinchGestureRecognizer alloc]initWithTarget:self action:@selector(pinchDetected:)];
-    [self.view addGestureRecognizer:pinch];
 }
 #pragma mark - initialization Streamer
@@ -124,75 +99,24 @@
     // 启动预览
     [_kitCN startPreview:self.captureView];
-    //水印图片
-//    _kitCN.watermark.logoPic = [UIImage imageNamed:@"互动电视180x180"];
-//    _kitCN.watermark.logoRect = CGRectMake(0.8, 0.8, 50, 50);
-//    _kitCN.watermark.logoAlpha = 0.6;
-    
-    //水印文字
-//    _kitCN.watermark.textLabel = [[UILabel alloc] init];
-//    _kitCN.watermark.textLabel.text = [NSString stringWithFormat:@"cnlive"];
-//    _kitCN.watermark.textLabel.font = [UIFont systemFontOfSize:8];
-//    _kitCN.watermark.textRect = CGRectMake(0.78, 0.88, 0.2, 0.04);
-//    [_kitCN.watermark updateTextLabel];
-    
 }
-#pragma mark - GetMethod   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// 拍摄视图
-- (UIView *)captureView {
-    
-    if (!_captureView) {
-        _captureView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height)];
-        _captureView.backgroundColor = [UIColor blackColor];
-    }
-    return _captureView;
-}
-
-
 #pragma mark - UIButton Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-// 开始推流
-- (void)startCapture:(UIButton *)button {
+- (void)startCapture:(UIButton *)button {   // 开始推流
-    button.selected = !button.selected;
+    [_prepareView removeFromSuperview];
-    if (button.selected) {
-        [_kitCN startStream:^{
-            NSLog(@"开启推流成功 ------- success");
-        } failure:^(NSDictionary *errorDic) {
-            NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
-            NSLog(@"%@",str);
-            [self toast:errorDic[@"errorMessage"]];
-            _startLiveBtn.selected = NO;
-        }];
-    }else{
-
-        [_kitCN stopStream];
-    }
+    [_kitCN startStream:^{
+        NSLog(@"开启推流成功 ------- success");
+    } failure:^(NSDictionary *errorDic) {
+        NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
+        NSLog(@"%@",str);
+        [self toast:errorDic[@"errorMessage"]];
+    }];
 }
-// 开始 / 关闭 预览
-- (void)startPreview:(UIButton *)button {
-    
-    button.selected = !button.selected;
-    if (button.selected) {
-        _startLiveBtn.enabled = NO;
-        [button setTitle:@"开启预览" forState:UIControlStateNormal];
-        if (_kitCN.streamState == CNLiveStreamStateConnected) {
-            [_kitCN stopStream];
-            _startLiveBtn.selected = NO;
-        }
-        [_kitCN stopPreview];
-    }else{
-        [_kitCN startPreview:self.captureView];
-        [button setTitle:@"关闭预览" forState:UIControlStateNormal];
-        _startLiveBtn.enabled = YES;
-    }
-}
-// 美颜滤镜
-- (void)openFilter:(UIButton *)button {
+- (void)openFilter:(UIButton *)button {  // 美颜滤镜
     button.selected = !button.selected;
@@ -220,14 +144,14 @@
     } else {
         _filterView.hidden = YES;
-        
     }
 }
-// 转换前后置摄像头
-- (void)changeCamera:(UIButton *)button {
+
+- (void)changeCamera:(UIButton *)button {   // 转换前后置摄像头
-//        button.selected = !button.selected;
+    button.selected = !button.selected;
+    _openFlashButton.hidden = !_openFlashButton.hidden;
 //        if (button.selected) {
 //            _kitCN.cameraPosition = AVCaptureDevicePositionBack;
 //        }else{
@@ -237,15 +161,16 @@
 }
-// 闪光灯
-- (void)openFlash {
+
+- (void)openFlash:(UIButton *)button {   // 闪光灯
+    button.selected = !button.selected;
     [_kitCN toggleTorch];
     //    [_kitCN setTorchMode:AVCaptureTorchModeOn];
 }
-// 退出
-- (void)closeBtnClivk {
+
+- (void)quitBtnClick {    // 退出
     if (_kitCN.streamState == CNLiveStreamStateConnected) {
         [_kitCN stopStream];
@@ -259,38 +184,32 @@
 #pragma mark - UIGestureRecognizer Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//对焦与曝光
-- (void)onTap:(UIGestureRecognizer *)sender {
+
+- (void)onTap:(UIGestureRecognizer *)sender {  //对焦与曝光
     CGPoint current = [sender locationInView:self.view];
     CGPoint point = [self convertToPointOfInterestFromViewCoordinates:current];
     [_kitCN exposureAtPoint:point];
     [_kitCN focusAtPoint:point];
-}
-
-//缩放
-- (void)pinchDetected:(UIPinchGestureRecognizer *)recognizer {
-    if (recognizer.state == UIGestureRecognizerStateBegan) {
-        _currentPinchZoomFactor = _kitCN.pinchZoomFactor;
+    if ([_prepareView.titleTextField isFirstResponder]) {
+        [_prepareView.titleTextField resignFirstResponder];
     }
-    CGFloat zoomFactor = _currentPinchZoomFactor * recognizer.scale;//当前触摸缩放因子*坐标比例
-    [_kitCN setPinchZoomFactor:zoomFactor];
 }
 #pragma mark - notification  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// 进入后台
-- (void)enterBg {
+
+- (void)enterBg {   // 进入后台
     [_kitCN appEnterBackground];
 }
-// 回到前台
-- (void)becameActive {
+
+- (void)becameActive {   // 回到前台
     [_kitCN appBecomeActive];
 }
-// 采集状态改变
-- (void)captureStateChange {
+
+- (void)captureStateChange {   // 采集状态改变
     if ( _kitCN.captureState == CNLiveCaptureStateIdle){
         //初始化时状态为空闲
@@ -325,8 +244,8 @@
     }
 }
-// 推流状态改变
-- (void)streamStateChange {
+
+- (void)streamStateChange {   // 推流状态改变
     if (_kitCN.streamState == CNLiveStreamStateIdle) {
@@ -362,8 +281,8 @@
         NSLog(@"---------CNLiveStopStreamSuccess");
     }
 }
-// 推流失败
-- (void)onStreamError {
+
+- (void)onStreamError {   // 推流失败
     CNLiveStreamErrorCode err = _kitCN.streamErrorCode;
@@ -384,7 +303,6 @@
     else if ( CNLiveStreamErrorCode_ABNORMAL == err) {
         [self toast:@"推流异常中断~~"];
-        _startLiveBtn.selected = NO;
     } else if (err == CNLiveStreamErrorCode_CODEC_OPEN_FAILED) {
         NSLog(@"video codec open failed, try software codec");
@@ -403,8 +321,8 @@
 }
-// 重试
-- (void) tryReconnect {
+
+- (void) tryReconnect {   // 重试
     dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC));
     dispatch_after(delay, dispatch_get_main_queue(), ^{
@@ -415,18 +333,16 @@
         [_kitCN startStream:^{
             NSLog(@"开启推流成功 ------- success");
-            _startLiveBtn.selected = YES;
         } failure:^(NSDictionary *errorDic) {
             [self toast:errorDic[@"errorMessage"]];
-            _startLiveBtn.selected = NO;
         }];
     });
 }
-// 提示框
-- (void)toast:(NSString*)message {
+
+- (void)toast:(NSString*)message { // 提示框
     UIAlertView *toast = [[UIAlertView alloc] initWithTitle:nil
                                                     message:message
@@ -441,8 +357,8 @@
 }
-// 将UI的坐标转换成相机坐标
-- (CGPoint)convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates {
+
+- (CGPoint)convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates {// 将UI的坐标转换成相机坐标
     CGPoint pointOfInterest = CGPointMake(.5f, .5f);
     CGSize frameSize = self.view.frame.size;
@@ -476,8 +392,76 @@
     return pointOfInterest;
 }
-#pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#pragma mark - GetMethod   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+- (LVCUGCLivePrepareView *)prepareView {
+    
+    if (!_prepareView) {
+        _prepareView = [[LVCUGCLivePrepareView alloc] initWithFrame:self.view.bounds];
+        [_prepareView.startButton addTarget:self action:@selector(startCapture:) forControlEvents:UIControlEventTouchUpInside];
+        UITapGestureRecognizer * tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTap:)];
+        tapRecognizer.delegate = self;
+        [_prepareView addGestureRecognizer:tapRecognizer];
+    }
+    return _prepareView;
+}
+- (FilterFunctionView *)filterView
+{
+    if (!_filterView) {
+        _filterView = [[FilterFunctionView alloc] initWithFrame:CGRectMake(0, 75, SCREEN_WIDTH, 200)];
+        _filterView.hidden = YES;
+    }
+    return _filterView;
+}
+
+- (UIView *)captureView {  // 拍摄视图
+    
+    if (!_captureView) {
+        _captureView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height)];
+        _captureView.backgroundColor = [UIColor blackColor];
+    }
+    return _captureView;
+}
+
+- (UIButton *)quitButton {
+    
+    if (!_quitButton) {
+        _quitButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 50, 30, 35, 35) image:@"LiveCloseNormal" selected:@"LiveCloseTouch"];
+        [_quitButton addTarget:self action:@selector(quitBtnClick) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _quitButton;
+}
+
+- (UIButton *)changeCameraButton {
+    
+    if (!_changeCameraButton) {
+        _changeCameraButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 100, 30, 35, 35) image:@"camera" selected:@"Select the camera"];
+        [_changeCameraButton addTarget:self action:@selector(changeCamera:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _changeCameraButton;
+}
+
+- (UIButton *)openFlashButton {
+    
+    if (!_openFlashButton) {
+        _openFlashButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 100, 75, 35, 35) image:@"open flash" selected:@"Flash off"];
+        _openFlashButton.hidden = YES;
+        [_openFlashButton addTarget:self action:@selector(openFlash:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _openFlashButton;
+}
+
+- (UIButton *)openFilterButton {
+    
+    if (!_openFilterButton) {
+        _openFilterButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 150, 30, 35, 35) image:@"Is closed" selected:@"Is open"];
+        [_openFilterButton addTarget:self action:@selector(openFilter:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _openFilterButton;
+}
+
+#pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)addObservers {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(captureStateChange) name:CNLiveCaptureStateDidChangeNotification object:nil];
@@ -517,6 +501,15 @@
 }
+- (UIButton *)createButtonWithFrame:(CGRect)frame image:(NSString *)image selected:(NSString *)selected {
+    
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+    [btn setFrame:frame];
+    [btn setImage:[UIImage imageNamed:image] forState:UIControlStateNormal];
+    [btn setImage:[UIImage imageNamed:selected] forState:UIControlStateSelected];
+    return btn;
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -28,9 +28,9 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
-        [self addSubview:self.slider1];
-        [self addSubview:self.slider2];
-        [self addSubview:self.slider3];
+//        [self addSubview:self.slider1];
+//        [self addSubview:self.slider2];
+//        [self addSubview:self.slider3];
         [self addSubview:self.effectPicker];
         [self addSubview:self.filterGroupType];
@@ -135,7 +135,7 @@
 - (UIPickerView *)effectPicker
 {
     if (!_effectPicker) {
-        _effectPicker = [[UIPickerView alloc] initWithFrame:CGRectMake(8, 130, self.bounds.size.width-16, 100)];
+        _effectPicker = [[UIPickerView alloc] initWithFrame:CGRectMake(8, 20, self.bounds.size.width-16, 100)];
         _effectPicker.showsSelectionIndicator=YES;
         _effectPicker.tintColor = [UIColor whiteColor];
         _effectPicker.dataSource = self;
+//
+//  LVCUGCLivePrepareView.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCUGCLivePrepareView : UIView
+
+@property (nonatomic, strong) UIButton *startButton;
+
+@property (nonatomic, strong) UITextField *titleTextField;
+
+@end
+//
+//  LVCUGCLivePrepareView.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLivePrepareView.h"
+
+@interface LVCUGCLivePrepareView()
+
+@property (nonatomic, strong) UIImageView *iconView;
+
+@property (nonatomic, strong) UIView *lineView;
+
+@end
+
+@implementation LVCUGCLivePrepareView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor clearColor];
+        [self addSubview:self.iconView];
+        [self addSubview:self.titleTextField];
+        [self addSubview:self.lineView];
+        [self addSubview:self.startButton];
+    }
+    return self;
+}
+
+#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (UIImageView *)iconView {
+    
+    if (!_iconView) {
+        NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
+        UIImage *image = [UIImage imageWithContentsOfFile:path];
+        _iconView = [[UIImageView alloc] initWithImage:image];
+        _iconView.frame = CGRectMake(10, SCREEN_HEIGHT * 0.35, 90, 90);
+        _iconView.layer.cornerRadius = 45;
+        _iconView.layer.masksToBounds = YES;
+    }
+    return _iconView;
+}
+
+- (UITextField *)titleTextField {
+    
+    if (!_titleTextField) {
+        _titleTextField = [[UITextField alloc] initWithFrame:CGRectMake(110, SCREEN_HEIGHT * 0.35 + 50, SCREEN_WIDTH - 120, 30)];
+        
+        NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:@"起个名字开始直播~"];
+        
+        
+        _titleTextField.attributedPlaceholder = placeholder;
+        
+        _titleTextField.font = [UIFont systemFontOfSize:19];
+    }
+    return _titleTextField;
+}
+
+- (UIView *)lineView {
+    
+    if (!_lineView) {
+        _lineView = [[UIView alloc] initWithFrame:CGRectMake(110, SCREEN_HEIGHT * 0.35 + 82, SCREEN_WIDTH - 120, 2)];
+        _lineView.backgroundColor = [UIColor blackColor];
+    }
+    return _lineView;
+}
+
+- (UIButton *)startButton {
+    
+    if (!_startButton) {
+        _startButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        _startButton.frame = CGRectMake(30, SCREEN_HEIGHT * 0.62, SCREEN_WIDTH - 60, 38);
+        _startButton.backgroundColor = [UIColor redColor];
+        [_startButton setTitle:@"开始直播" forState:UIControlStateNormal];
+        _startButton.titleLabel.font = [UIFont systemFontOfSize:20];
+        [_startButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_startButton setTitleColor:[UIColor blackColor] forState:UIControlStateHighlighted];
+        _startButton.layer.cornerRadius = 19;
+        _startButton.layer.masksToBounds = YES;
+    }
+    return _startButton;
+}
+
+
+@end
+//
+//  UIImageView+ZXExtension.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 17/3/21.
+//  Copyright © 2017年 张旭. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIImageView (ZXExtension)
+- (void)zx_setHeader:(NSString *)url;
+@end
+//
+//  UIImageView+ZXExtension.m
+//  百思LiveVideoCloud姐
+//
+//  Created by mac on 16/8/31.
+//  Copyright © 2016年 mac. All rights reserved.
+//
+
+#import "UIImageView+ZXExtension.h"
+#import "UIImageView+WebCache.h"
+
+static NSString *defaultUserIcon = @"defaultUserIcon";
+
+@implementation UIImageView (ZXExtension)
+- (void)zx_setHeader:(NSString *)url
+{
+    [self zx_setCircleHeader:url];
+}
+
+- (void)zx_setRectHeader:(NSString *)url
+{
+    [self sd_setImageWithURL:[NSURL URLWithString:url] placeholderImage:[UIImage imageNamed:defaultUserIcon]];
+}
+
+- (void)zx_setCircleHeader:(NSString *)url
+{
+    weakself;
+    UIImage *placeholder = [[UIImage imageNamed:defaultUserIcon] zx_circleImage];
+    [self sd_setImageWithURL:[NSURL URLWithString:url] placeholderImage:placeholder completed:
+     ^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) {
+         // 如果图片下载失败，就不做任何处理，按照默认的做法：会显示占位图片
+         if (image == nil) return;
+         
+         weakSelf.image = [image zx_circleImage];
+     }];
+}
+
+@end
@@ -17,6 +17,8 @@
 #import "UIColor+HexString.h"       //生成新颜色
 #import "UIImage+ScaleImageSize.h"  //缩放图片
 #import "UILabel+labelFitSize.h"    //UILabel自适应大小
+#import "UIImageView+ZXExtension.h" //圆角图片
+#import "Tools.h"                   //工具类
 #import "ZXDeviceInfo.h"            //设备信息
 #import "ZXConst.h"                 //常量
@@ -24,4 +26,5 @@
 #import "Macros.h"                  //宏定义
+
 #endif /* UtilKits_h */
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "1 2.png",
+      "filename" : "贡献榜小头像.png",
       "scale" : "1x"
     },
     {
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "privateChat.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Flash off.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Is closed.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Is open.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Select the camera.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "camera.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "open flash.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file