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

王军波
2 parents e7e53d1d 5565674b
Showing 80 changed files with 2604 additions and 452 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BottomToolView/BottomToolView.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/ChatMsgModel/chatMsgModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatViews/chatListCell.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatViews/chatListCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/AnimQueueManager.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/AnimQueueManager.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimOperation.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimOperation.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimationAction.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimationAction.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftComboView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftComboView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftModel/GiftModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftModel/GiftModel.m
@@ -122,15 +122,21 @@
 		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 */; };
+		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 */; };
 		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 */; };
-		D22831021E77D83C00627701 /* GiftModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22831011E77D83C00627701 /* GiftModelView.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 */; };
 		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 */; };
-		D25530091E791A7100DF38A5 /* GiftComboView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25530081E791A7100DF38A5 /* GiftComboView.m */; };
 		D255300C1E793F8200DF38A5 /* NHFighterView+animDelegagte.m in Sources */ = {isa = PBXBuildFile; fileRef = D255300B1E793F8200DF38A5 /* NHFighterView+animDelegagte.m */; };
 		D2575C461E76857100E3A8FC /* LVCAnimationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C451E76857100E3A8FC /* LVCAnimationManager.m */; };
 		D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C481E7685DE00E3A8FC /* UIView+Bubbling.m */; };
@@ -443,24 +449,37 @@
 		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>"; };
+		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>"; };
+		D217A2481E7B76C7003B44CB /* PresentViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresentViewCell.h; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
 		D22830FB1E77C2D900627701 /* BottomToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BottomToolView.m; sourceTree = "<group>"; };
 		D22830FD1E77C69E00627701 /* GiftListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftListView.h; sourceTree = "<group>"; };
 		D22830FE1E77C69E00627701 /* GiftListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftListView.m; sourceTree = "<group>"; };
-		D22831001E77D83C00627701 /* GiftModelView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftModelView.h; sourceTree = "<group>"; };
-		D22831011E77D83C00627701 /* GiftModelView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftModelView.m; sourceTree = "<group>"; };
 		D22831071E77D8D500627701 /* GiftModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftModel.h; sourceTree = "<group>"; };
 		D22831081E77D8D500627701 /* GiftModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftModel.m; sourceTree = "<group>"; };
+		D236967C1E7F9E4100E4BF71 /* GiftPayButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftPayButton.h; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
 		D25530021E79115100DF38A5 /* AnimQueueManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnimQueueManager.m; sourceTree = "<group>"; };
 		D25530041E7911A800DF38A5 /* GiftAnimationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftAnimationAction.h; sourceTree = "<group>"; };
 		D25530051E7911A800DF38A5 /* GiftAnimationAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftAnimationAction.m; sourceTree = "<group>"; };
-		D25530071E791A7100DF38A5 /* GiftComboView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftComboView.h; sourceTree = "<group>"; };
-		D25530081E791A7100DF38A5 /* GiftComboView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftComboView.m; sourceTree = "<group>"; };
 		D255300A1E793F8200DF38A5 /* NHFighterView+animDelegagte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NHFighterView+animDelegagte.h"; sourceTree = "<group>"; };
 		D255300B1E793F8200DF38A5 /* NHFighterView+animDelegagte.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NHFighterView+animDelegagte.m"; sourceTree = "<group>"; };
 		D2575C441E76857100E3A8FC /* LVCAnimationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCAnimationManager.h; path = ../LVCAnimationManager.h; sourceTree = "<group>"; };
@@ -1174,13 +1193,25 @@
 			path = AppDelegate;
 			sourceTree = "<group>";
 		};
+		D217A2441E7B76C7003B44CB /* Present */ = {
+			isa = PBXGroup;
+			children = (
+				D217A2451E7B76C7003B44CB /* PresentModelAble.h */,
+				D217A2461E7B76C7003B44CB /* PresentView.h */,
+				D217A2471E7B76C7003B44CB /* PresentView.m */,
+				D217A2481E7B76C7003B44CB /* PresentViewCell.h */,
+				D217A2491E7B76C7003B44CB /* PresentViewCell.m */,
+			);
+			path = Present;
+			sourceTree = "<group>";
+		};
 		D22830F51E77C24900627701 /* GiftViews */ = {
 			isa = PBXGroup;
 			children = (
 				D22830FD1E77C69E00627701 /* GiftListView.h */,
 				D22830FE1E77C69E00627701 /* GiftListView.m */,
-				D22831001E77D83C00627701 /* GiftModelView.h */,
-				D22831011E77D83C00627701 /* GiftModelView.m */,
+				D236967C1E7F9E4100E4BF71 /* GiftPayButton.h */,
+				D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */,
 			);
 			path = GiftViews;
 			sourceTree = "<group>";
@@ -1188,6 +1219,8 @@
 		D22830F61E77C26C00627701 /* Chat */ = {
 			isa = PBXGroup;
 			children = (
+				D23696881E7FC7C200E4BF71 /* Barrage */,
+				D236968F1E7FC83800E4BF71 /* ChatMsgModel */,
 				D22830F71E77C27A00627701 /* ChatViews */,
 			);
 			path = Chat;
@@ -1196,6 +1229,8 @@
 		D22830F71E77C27A00627701 /* ChatViews */ = {
 			isa = PBXGroup;
 			children = (
+				D23696821E7FC6A900E4BF71 /* chatListCell.h */,
+				D23696831E7FC6A900E4BF71 /* chatListCell.m */,
 			);
 			path = ChatViews;
 			sourceTree = "<group>";
@@ -1225,6 +1260,26 @@
 			path = GiftModel;
 			sourceTree = "<group>";
 		};
+		D23696881E7FC7C200E4BF71 /* Barrage */ = {
+			isa = PBXGroup;
+			children = (
+				D23696891E7FC7C200E4BF71 /* CNBarrageManager.h */,
+				D236968A1E7FC7C200E4BF71 /* CNBarrageManager.m */,
+				D236968B1E7FC7C200E4BF71 /* CNBarrageView.h */,
+				D236968C1E7FC7C200E4BF71 /* CNBarrageView.m */,
+			);
+			path = Barrage;
+			sourceTree = "<group>";
+		};
+		D236968F1E7FC83800E4BF71 /* ChatMsgModel */ = {
+			isa = PBXGroup;
+			children = (
+				D23696901E7FC83800E4BF71 /* chatMsgModel.h */,
+				D23696911E7FC83800E4BF71 /* chatMsgModel.m */,
+			);
+			path = ChatMsgModel;
+			sourceTree = "<group>";
+		};
 		D2575C431E76846900E3A8FC /* InteractionSections */ = {
 			isa = PBXGroup;
 			children = (
@@ -1255,8 +1310,9 @@
 		D2575C681E76A42B00E3A8FC /* Gift */ = {
 			isa = PBXGroup;
 			children = (
-				D25530071E791A7100DF38A5 /* GiftComboView.h */,
-				D25530081E791A7100DF38A5 /* GiftComboView.m */,
+				D217A2441E7B76C7003B44CB /* Present */,
+				D217A24C1E7B77C7003B44CB /* ComboCell.h */,
+				D217A24D1E7B77C7003B44CB /* ComboCell.m */,
 				D25530041E7911A800DF38A5 /* GiftAnimationAction.h */,
 				D25530051E7911A800DF38A5 /* GiftAnimationAction.m */,
 				D25530011E79115100DF38A5 /* AnimQueueManager.h */,
@@ -1602,7 +1658,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D25530091E791A7100DF38A5 /* GiftComboView.m in Sources */,
 				D2029CC31E6EADE10027CD92 /* UIImageView+HighlightedWebCache.m in Sources */,
 				D22830FF1E77C69E00627701 /* GiftListView.m in Sources */,
 				D2029CC01E6EADE10027CD92 /* UIImage+GIF.m in Sources */,
@@ -1622,6 +1677,7 @@
 				D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */,
 				810B65051E779B1F00133E15 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */,
 				D2029CCB1E6EADE10027CD92 /* SVRadialGradientLayer.m in Sources */,
+				D23696841E7FC6A900E4BF71 /* chatListCell.m in Sources */,
 				D2029CAF1E6EADE10027CD92 /* MJRefreshStateHeader.m in Sources */,
 				D2029C941E6EADE10027CD92 /* UIRefreshControl+AFNetworking.m in Sources */,
 				D2029C911E6EADE10027CD92 /* UIButton+AFNetworking.m in Sources */,
@@ -1644,6 +1700,7 @@
 				D2029CA11E6EADE10027CD92 /* NSString+MJExtension.m in Sources */,
 				D2029BCB1E6EADD70027CD92 /* BaseTableViewCell.m in Sources */,
 				D2029CAA1E6EADE10027CD92 /* MJRefreshBackGifFooter.m in Sources */,
+				D217A24B1E7B76C7003B44CB /* PresentViewCell.m in Sources */,
 				D2029C9B1E6EADE10027CD92 /* MJPropertyKey.m in Sources */,
 				D2029CBF1E6EADE10027CD92 /* UIButton+WebCache.m in Sources */,
 				810B64E31E779AFE00133E15 /* LVCLivePlayerController.m in Sources */,
@@ -1658,9 +1715,9 @@
 				D2029CA31E6EADE10027CD92 /* MJRefreshBackFooter.m in Sources */,
 				D255300C1E793F8200DF38A5 /* NHFighterView+animDelegagte.m in Sources */,
 				D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */,
-				D22831021E77D83C00627701 /* GiftModelView.m in Sources */,
 				D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */,
 				D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */,
+				D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */,
 				D2029CC81E6EADE10027CD92 /* SVProgressAnimatedView.m in Sources */,
 				D2029C961E6EADE10027CD92 /* MBProgressHUD.m in Sources */,
 				810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */,
@@ -1671,6 +1728,7 @@
 				D2029C981E6EADE10027CD92 /* MJExtensionConst.m in Sources */,
 				D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */,
 				D2029CAE1E6EADE10027CD92 /* MJRefreshNormalHeader.m in Sources */,
+				D23696921E7FC83800E4BF71 /* chatMsgModel.m in Sources */,
 				D2029C901E6EADE10027CD92 /* UIActivityIndicatorView+AFNetworking.m in Sources */,
 				D2029CC61E6EADE10027CD92 /* SSKeychain.m in Sources */,
 				D2029C8B1E6EADE10027CD92 /* AFURLResponseSerialization.m in Sources */,
@@ -1682,6 +1740,7 @@
 				D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */,
 				D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */,
 				D2029C871E6EADE10027CD92 /* AFHTTPSessionManager.m in Sources */,
+				D236968D1E7FC7C200E4BF71 /* CNBarrageManager.m in Sources */,
 				D2029B861E6EAAA50027CD92 /* main.m in Sources */,
 				D2029C8C1E6EADE10027CD92 /* AFURLSessionManager.m in Sources */,
 				D2029C9F1E6EADE10027CD92 /* NSObject+MJKeyValue.m in Sources */,
@@ -1704,6 +1763,7 @@
 				D2029CCA1E6EADE10027CD92 /* SVProgressHUD.m in Sources */,
 				D2029CA81E6EADE10027CD92 /* MJRefreshAutoNormalFooter.m in Sources */,
 				D2029C891E6EADE10027CD92 /* AFSecurityPolicy.m in Sources */,
+				D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */,
 				D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */,
 				D2029CBA1E6EADE10027CD92 /* SDWebImageDecoder.m in Sources */,
 				8112D4311E7927A5002E00F6 /* LVCPlayerLoadingView.m in Sources */,
@@ -1712,11 +1772,13 @@
 				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 */,
 				D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */,
 				D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */,
 				D2029C951E6EADE10027CD92 /* UIWebView+AFNetworking.m in Sources */,
 				810B650A1E77B39D00133E15 /* LVCFullScreenPlayerController.m in Sources */,
+				D217A24E1E7B77C7003B44CB /* ComboCell.m in Sources */,
 				D2029CBD1E6EADE10027CD92 /* SDWebImageManager.m in Sources */,
 				D2029CB41E6EADE10027CD92 /* UIView+MJExtension.m in Sources */,
 				81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */,
@@ -31,12 +31,16 @@
 #pragma mark - buttonClick
 - (void)chatAction
 {
-    
+    if ([self.delegate respondsToSelector:@selector(bottomActionWithType:)]) {
+        [self.delegate bottomActionWithType:BtnClickTypeChat];
+    }
 }
 - (void)privateChatAction
 {
-    
+    if ([self.delegate respondsToSelector:@selector(bottomActionWithType:)]) {
+        [self.delegate bottomActionWithType:BtnClickTypePriChat];
+    }
 }
 - (void)giftAction
+//
+//  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
+//
+//  chatMsgModel.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+@interface chatMsgModel : BaseModel
+
+@property (nonatomic ,copy  ) NSString * _Nullable icon;//头像
+@property (nonatomic ,copy  ) NSString * _Nullable name;//姓名
+@property (nonatomic ,copy  ) NSString * _Nullable content;//内容
+
+@property (nonatomic ,assign) CGFloat   cellWidth;//内容宽度
+@property (nonatomic ,assign) CGFloat   cellHeight;//内容高度
+
+@property (nonatomic) BOOL isMine;//消息是否是自己发送
+
+@end
+//
+//  chatMsgModel.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "chatMsgModel.h"
+
+#define ChatCellMargin 10
+
+@implementation chatMsgModel
+
+- (CGFloat)cellHeight
+{
+    //如果计算过高度,直接返回
+    if (_cellHeight) return _cellHeight;
+    
+    //头像
+    _cellHeight = 40;
+    //文字
+    CGFloat textMaxW = self.cellWidth - 2 * ChatCellMargin;
+    CGSize textMaxSize = CGSizeMake(textMaxW, MAXFLOAT);
+    CGSize textSize = [self.content boundingRectWithSize:textMaxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:16]} context:nil].size;
+    
+    //底部空隙
+    _cellHeight += textSize.height + ChatCellMargin;
+    //    NSLog(@"cellHeight = %f",_cellHeight);
+    return _cellHeight;
+}
+@end
+//
+//  chatListCell.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseTableViewCell.h"
+@class chatMsgModel;
+@interface chatListCell : BaseTableViewCell
+
+- (void)loadUIWithModel:(chatMsgModel *)model;
+
+@end
+//
+//  chatListCell.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "chatListCell.h"
+#import "chatMsgModel.h"
+@interface chatListCell ()
+
+@property (nonatomic ,strong) UIImageView * _Nullable iconImageView;//头像图片
+@property (nonatomic ,strong) UILabel     * _Nullable nameLabel;//名字
+@property (nonatomic ,strong) UILabel     * _Nullable contentLabel;//内容
+@property (nonatomic ,strong) UIImageView * _Nullable lineImageView;//分割线
+
+@property (nonatomic ,strong) chatMsgModel * _Nullable model;
+
+@end
+
+@implementation chatListCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        self.backgroundColor = [UIColor clearColor];
+        self.selectionStyle = UITableViewCellSelectionStyleNone;
+    }
+    return self;
+}
+
+- (void)loadUIWithModel:(chatMsgModel *)model
+{
+    model.cellWidth = self.width;
+    _model = model;
+    
+    [self bindView];//更新cell高度后再初始化UI
+    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:nil];
+    //    self.iconImageView.backgroundColor = [UIColor greenColor];
+    self.nameLabel.text = [NSString stringWithFormat:@"%@:",model.name];
+    CGSize labelSize = [self.nameLabel labelSize];
+    self.nameLabel.frame = CGRectMake(self.iconImageView.right + 10, self.iconImageView.top, labelSize.width, labelSize.height);
+    self.nameLabel.centerY = self.iconImageView.centerY;
+    self.contentLabel.text = model.content;
+    CGSize contentLabelSize = [self.contentLabel labelSizeWithWidth:self.width - 2 * self.iconImageView.left];
+    self.contentLabel.frame = CGRectMake(self.iconImageView.left, self.iconImageView.bottom + 10, contentLabelSize.width, contentLabelSize.height);
+    
+    self.lineImageView.frame = CGRectMake(self.iconImageView.left, self.contentLabel.bottom + 5, self.width - self.iconImageView.left * 2, 1);
+}
+
+- (void)bindView
+{
+    self.iconImageView.frame = CGRectMake(10, 10, 30, 30);
+    self.nameLabel.frame = CGRectMake(self.iconImageView.right + 10, self.iconImageView.top, self.width - self.iconImageView.right - 20, 25);
+    self.nameLabel.centerY = self.iconImageView.centerY;
+    self.contentLabel.frame = CGRectMake(self.iconImageView.left, self.iconImageView.bottom + 10, self.width - 2 * self.iconImageView.left, 25);
+}
+
+#pragma mark - getter
+- (UILabel * _Nullable)nameLabel
+{
+    if (!_nameLabel)
+    {
+        _nameLabel = [[UILabel alloc] init];
+        _nameLabel.textAlignment = NSTextAlignmentLeft;
+        _nameLabel.textColor = [UIColor redColor];
+        _nameLabel.font = [UIFont systemFontOfSize:15.f];
+        [self addSubview:_nameLabel];
+    }
+    return _nameLabel;
+}
+
+- (UILabel * _Nullable)contentLabel
+{
+    if (!_contentLabel)
+    {
+        _contentLabel = [[UILabel alloc] init];
+        _contentLabel.textAlignment = NSTextAlignmentLeft;
+        _contentLabel.textColor = [UIColor lightGrayColor];
+        _contentLabel.numberOfLines = 0;
+        _contentLabel.font = [UIFont systemFontOfSize:12.f];
+        [self addSubview:_contentLabel];
+    }
+    return _contentLabel;
+}
+
+- (UIImageView * _Nullable)iconImageView
+{
+    if (!_iconImageView)
+    {
+        _iconImageView = [[UIImageView alloc] init];
+        _iconImageView.layer.masksToBounds = YES;
+        _iconImageView.layer.cornerRadius = 15.f;
+        [self addSubview:_iconImageView];
+    }
+    return _iconImageView;
+}
+
+- (UIImageView * _Nullable)lineImageView
+{
+    if (!_lineImageView)
+    {
+        _lineImageView = [[UIImageView alloc] init];
+        _lineImageView.image = [UIImage imageNamed:@"分割线（聊天复用）"];
+        [self addSubview:_lineImageView];
+    }
+    return _lineImageView;
+}
+
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -9,11 +9,9 @@
 #import <Foundation/Foundation.h>
 @class GiftModel;
+@class PresentView;
 @interface AnimQueueManager : NSObject
-@property (nonatomic, assign)NSInteger maxTop;   //初始位置（需要根据显示设置最低位置在哪里）
-//@property (nonatomic, strong)NSMutableArray *arGiftArray;   //横幅的数量，用于轨道计算（现在结构是一维数组，因为轨道中的弹道只有1个，如果是多个的话需要变为二维数组）
-
 /**
  初始化管理类
  @return 当前manager
@@ -9,10 +9,13 @@
 #import "AnimQueueManager.h"
 #import "GiftAnimOperation.h"
 #import "GiftModel.h"
+#import "PresentView.h"
+
+#import "LiveBaseView.h"
+#import "PresentView.h"
 @interface AnimQueueManager ()
-@property (nonatomic, assign)NSInteger maxOperationCount;   //并发数
 @property (nonatomic,strong) NSOperationQueue *comboAnimationQueue;  //连击动画队列
 @property (nonatomic,strong) NSOperationQueue *expenAnimationQueue;  //豪华礼物动画队列
@@ -31,26 +34,11 @@
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         manager = [[AnimQueueManager alloc] init];
-        manager.maxOperationCount = 2;
-//        manager.arGiftArray = [NSMutableArray arrayWithObjects:@200,@240,@280, nil];
     });
     return manager;
 }
 /**
- 连击动画队列
- 
- @return 队列obj
- */
-- (NSOperationQueue *)comboAnimationQueue{
-    if (_comboAnimationQueue == nil) {
-        _comboAnimationQueue = [[NSOperationQueue alloc] init];
-        _comboAnimationQueue.maxConcurrentOperationCount = 3;
-    }
-    return _comboAnimationQueue;
-}
-
-/**
  豪华动画队列
  @return 队列obj
@@ -69,28 +57,29 @@
  @param model modelobj
  */
 - (void)addAnimationWithModel:(GiftModel *)model animContentView:(UIView *)animContentView{
-
-    GiftAnimOperation *op = [GiftAnimOperation addGiftAnimOperationWithGiftModel:model animContentView:animContentView maxTop:self.maxTop];
-    NSInteger index = self.comboAnimationQueue.operationCount;
-    NSLog(@"index:%zd",index);
+    
+    GiftAnimOperation *op = [GiftAnimOperation addGiftAnimOperationWithGiftModel:model animContentView:animContentView];
     switch (model.giftStyle) {
         case GiftStylePorsch:
+        {
+            [self.expenAnimationQueue addOperation:op];
+        }
+            break;
+        case GiftStyleFighter:
+        {
             [self.expenAnimationQueue addOperation:op];
+        }
             break;
-//        case GiftStyleFighter:
-//            [self.expenAnimationQueue addOperation:op];
-//            break;
         case GiftStylePlane:
+        {
             [self.expenAnimationQueue addOperation:op];
+        }
             break;
+
         case GiftStyleCombo:
         {
-            [self.comboAnimationQueue addOperation:op];
-//            int i = rand()%4;
-//            op.name = i >0 ? @"张三_love" : @"李四_flower";//name imagename
-//            self.comboAnimationQueue.suspended;
-        }
-            
+            [(PresentView *)animContentView insertPresentMessages:@[model] showShakeAnimation:YES];
+        }  
             break;
         default:
             break;
@@ -13,6 +13,6 @@
 @interface GiftAnimOperation : NSOperation
-+ (GiftAnimOperation *)addGiftAnimOperationWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView maxTop:(NSInteger)maxTop;
++ (GiftAnimOperation *)addGiftAnimOperationWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView;
 @end
@@ -8,12 +8,11 @@
 #import "GiftAnimOperation.h"
 #import "GiftModel.h"
-#import "GiftComboView.h"
 #import "NHCarViews.h"
 #import "NHPlaneViews.h"
 #import "GiftAnimationAction.h"
-//#import "NHFighterView.h"
-//#import "NHFighterView+animDelegagte.h"
+#import "NHFighterView.h"
+#import "NHFighterView+animDelegagte.h"
 @interface GiftAnimOperation ()
 {
@@ -21,24 +20,19 @@
     BOOL _executing; //队列任务开始执行
 }
-@property (nonatomic, strong)GiftComboView *giftComboView;  //连击动画
 @property (nonatomic, strong)NHCarViews *giftCarView;  //跑车动画
-//@property (nonatomic, strong)NHFighterView *giftFighterView;  //歼灭机动画
+@property (nonatomic, strong)NHFighterView *giftFighterView;  //歼灭机动画
 @property (nonatomic, strong)NHPlaneViews *giftPlaneView;  //客机动画
-
 @property (nonatomic, strong)GiftModel *model;  //model
 @property (nonatomic,strong) UIView *animContentView;   //需要显示动画的view
-@property (nonatomic, assign)NSInteger maxTop;   //初始位置（需要根据显示设置最低位置在哪里）
-@property (nonatomic ,strong) NSArray * _Nullable             defaultTrajory;//默认轨迹数组
-@property (nonatomic ,strong) NSMutableArray * _Nullable       emptyTrajory;//当前空轨迹数组
 @end
 @implementation GiftAnimOperation
-+ (GiftAnimOperation *)addGiftAnimOperationWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView maxTop:(NSInteger)maxTop{
++ (GiftAnimOperation *)addGiftAnimOperationWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView{
-    GiftAnimOperation *giftAnimOperation = [[GiftAnimOperation alloc]initWithGiftModel:model animContentView:animContentView maxTop:maxTop];
+    GiftAnimOperation *giftAnimOperation = [[GiftAnimOperation alloc]initWithGiftModel:model animContentView:animContentView];
     return giftAnimOperation;
 }
@@ -49,12 +43,11 @@
  @param animContentView 需要把动画view添加到的view
  @return obj
  */
-- (instancetype)initWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView maxTop:(NSInteger)maxTop{
+- (instancetype)initWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView{
     self = [super init];
     if (self) {
         self.model = model;
         self.animContentView = animContentView;
-        self.maxTop = maxTop;
     }
     return self;
 }
@@ -79,15 +72,13 @@
         case GiftStylePorsch:
             [self porschAnimation];
             break;
-//        case GiftStyleFighter:
-//            [self fighterAnimation];
-//            break;
+        case GiftStyleFighter:
+            [self fighterAnimation];
+            break;
         case GiftStylePlane:
             [self planeAnimation];
             break;
-        case GiftStyleCombo:
-            [self comboViewAnimation];
-            break;
+
         default:
             break;
     }
@@ -114,110 +105,48 @@
     });
 }
-//- (void)fighterAnimation
-//{
-//    weakself
-//    dispatch_async(dispatch_get_main_queue(), ^{
-//        strongself
-//        
-//        [self.giftFighterView addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 60) endPoint:CGPointMake( -500, 600)];
-//        [self.animContentView addSubview:self.giftFighterView];
-//        [self.giftFighterView startFighterAnimationWithCompletion:^{
-//            [self willChangeValueForKey:@"isFinished"];
-//            
-//            _finished = YES;
-//            
-//            [self didChangeValueForKey:@"isFinished"];
-//        }];
-//        
-//    });
-//}
-
-- (void)planeAnimation
+- (void)fighterAnimation
 {
     weakself
     dispatch_async(dispatch_get_main_queue(), ^{
         strongself
-        [self.giftPlaneView addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 100) endPoint:CGPointMake(-500, 410)];
-        [self.animContentView addSubview:self.giftPlaneView];
-        [self.giftPlaneView startPlaneAnimationWithCompletion:^{
-            
+        [self.giftFighterView addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 60) endPoint:CGPointMake( -500, 600)];
+        [self.animContentView addSubview:self.giftFighterView];
+        
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(12 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [self willChangeValueForKey:@"isFinished"];
             _finished = YES;
             [self didChangeValueForKey:@"isFinished"];
-        }];
-        
+
+        });
     });
 }
-static long currentCompleteIndex = 0;
-/**
- 连击动画
- */
-- (void)comboViewAnimation{
-    
-    __weak GiftAnimOperation *weakSelf = self;
-//    currentCompleteIndex ++;
-    
-//    if (self.emptyTrajory.count == 0)//index = 0
-//    {
-//        currentCompleteIndex = 0;
-//        
-//    }else if (self.emptyTrajory.count < 3)//从emptyArr取空的index并赋值 index
-//    {
-//        
-//        
-//    }else// = 3已满 index = 0
-//    {
-//        currentCompleteIndex = 0;
-//    }
-//    self.name = @"111";
+- (void)planeAnimation
+{
+    weakself
     dispatch_async(dispatch_get_main_queue(), ^{
-        [weakSelf.animContentView addSubview:weakSelf.giftComboView];
-
-        weakSelf.giftComboView.top = [self.defaultTrajory[currentCompleteIndex] integerValue];
+        strongself
-        NSLog(@"top:%zd,index%ld",[self.defaultTrajory[currentCompleteIndex] integerValue],currentCompleteIndex);
-        currentCompleteIndex ++;
-        if (currentCompleteIndex == 3)
-        {
-            currentCompleteIndex = 0;
-        }
-//        if ([self.name isEqualToString:@"李四_flower"]) {
-////            currentCompleteIndex = 0;
-//            self.
-//        }
-        [weakSelf.giftComboView startComboAnimationWithCompletion:^{
-            NSLog(@"complet top:%zd,index%zd",[self.defaultTrajory[currentCompleteIndex] integerValue],currentCompleteIndex);
-            //empty存当前顺序
-//            [self.emptyTrajory replaceObjectAtIndex:<#(NSUInteger)#> withObject:<#(nonnull id)#>];
-            [weakSelf.giftComboView removeFromSuperview];
+        [self.giftPlaneView addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 100) endPoint:CGPointMake(-500, 410)];
+        [self.animContentView addSubview:self.giftPlaneView];
+    
+        [self.giftPlaneView startPlaneAnimationWithCompletion:^{
-            [weakSelf willChangeValueForKey:@"isFinished"];
+            [self willChangeValueForKey:@"isFinished"];
             _finished = YES;
-            [weakSelf didChangeValueForKey:@"isFinished"];
+            [self didChangeValueForKey:@"isFinished"];
         }];
+        
     });
 }
 /**
- 连击动画
- 
- @return 连击view
- */
-- (GiftComboView *)giftComboView{
-    if (_giftComboView == nil) {
-        _giftComboView = [GiftComboView comboView];
-    }
-    return _giftComboView;
-}
-
-/**
  跑车动画
  @return 连击view
@@ -241,12 +170,12 @@ static long currentCompleteIndex = 0;
  @return 连击view
  */
-//- (NHFighterView *)giftFighterView{
-//    if (_giftFighterView == nil) {
-//        _giftFighterView = [NHFighterView loadFighterViewWithPoint:CGPointMake(10, 100)];
-//    }
-//    return _giftFighterView;
-//}
+- (NHFighterView *)giftFighterView{
+    if (_giftFighterView == nil) {
+        _giftFighterView = [NHFighterView loadFighterViewWithPoint:CGPointMake(10, 100)];
+    }
+    return _giftFighterView;
+}
 /**
  客机动画
@@ -260,24 +189,6 @@ static long currentCompleteIndex = 0;
     return _giftPlaneView;
 }
-- (NSArray *)defaultTrajory
-{
-    if (!_defaultTrajory)
-    {
-        _defaultTrajory = [[NSArray alloc] initWithObjects:@200,@240,@280, nil];
-    }
-    return _defaultTrajory;
-}
-
-- (NSMutableArray *)emptyTrajory
-{
-    if (!_emptyTrajory)
-    {
-        _emptyTrajory = [[NSMutableArray alloc] init];
-    }
-    return _emptyTrajory;
-}
-
 // 提示：To be deprecated; use and override 'asynchronous' below
 //之前用的isConcurrent
 /**
@@ -18,21 +18,11 @@ typedef void(^giftAnimationCompletion)();
 }
 /**
- 连击动画
- */
-- (void)startComboAnimationWithCompletion:(giftAnimationCompletion)Completion;
-
-/**
  跑车动画
  */
 - (void)startPorschAnimationWithCompletion:(giftAnimationCompletion)Completion;
 /**
- 歼灭机动画
- */
-//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion;
-
-/**
  客机动画
  */
 - (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion;
@@ -11,46 +11,6 @@
 @implementation GiftAnimationAction
 /**
- 连击横屏动画
- */
-- (void)startComboAnimationWithCompletion:(giftAnimationCompletion)Completion{
-    _giftAnimationCompletion = Completion;
-    NSLog(@"self.width:%f",self.width);
-    [self animationWithDuration:4
-                        YValues:@[@(0 - self.width), @(115), @(110), @(110), @(0 - self.width)]
-                       keyTimes:@[@0.0, @0.2, @0.3, @0.8, @1.0]
-                timingFunctions:@[
-                                  [CAMediaTimingFunction functionWithName:                    kCAMediaTimingFunctionEaseOut],
-                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault],
-                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault],
-                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]
-                                  ]
-                        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"];
-}
-
-/**
  跑车动画
  */
 - (void)startPorschAnimationWithCompletion:(giftAnimationCompletion)Completion
@@ -59,14 +19,6 @@
 }
 /**
- 歼灭机动画
- */
-//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion
-//{
-//    _giftAnimationCompletion = Completion;
-//}
-
-/**
  客机动画
  */
 - (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion
-//
-//  GiftComboView.h
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/15.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "GiftAnimationAction.h"
-
-@class GiftModel;
-@interface GiftComboView : GiftAnimationAction
-
-/**
- 动画开始
- 
- @param model 对应的动画解析model
- @param animationCompletion 动画完成回调（用于控制队列）
- */
-- (void)startAnimationWithModel:(GiftModel *)model withAnimationCompletion:			(giftAnimationCompletion)animationCompletion;
-
-+ (instancetype)comboView;
-
-@end
-//
-//  GiftComboView.m
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/15.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "GiftComboView.h"
-#import "GiftModel.h"
-
-@interface GiftComboView (){
-    GiftModel *_model;//礼物model
-}
-
-@end
-
-@implementation GiftComboView
-
-/**
- 动画开始
- 
- @param model 对应的动画解析model
- @param animationCompletion 动画完成回调（用于控制队列）
- */
-- (void)startAnimationWithModel:(GiftModel *)model withAnimationCompletion:			(giftAnimationCompletion)animationCompletion
-{
-    _giftAnimationCompletion = animationCompletion;
-    _model = model;
-    
-    [self startComboAnimationWithCompletion:animationCompletion];
-}
-
-
-/**
- 初始化连击View
-
- @return 初始化连击ComboView
- */
-+ (instancetype)comboView
-{
-    GiftComboView *comboView = [[GiftComboView alloc] initWithFrame:CGRectMake(0, 0, 180, 30)];
-    comboView.backgroundColor = [UIColor blueColor];
-    
-    return comboView;
-}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end
@@ -7,29 +7,36 @@
 //
 #import "BaseModel.h"
-
+#import "PresentModelAble.h"
 typedef NS_ENUM(NSInteger, GiftStyle) {//礼物类型
     GiftStyleCombo          = 1,//普通可连击礼物
     GiftStylePorsch            ,//豪华跑车礼物
-//    GiftStyleFighter           ,//豪华歼灭机礼物
+    GiftStyleFighter           ,//豪华歼灭机礼物
     GiftStylePlane             ,//豪华客机礼物
 };
-@interface GiftModel : BaseModel
+@interface GiftModel : BaseModel <PresentModelAble>
+@property (copy, nonatomic) NSString *_Nullable sender;//送礼人
+@property (copy, nonatomic) NSString *_Nullable giftName;//礼物名称
+@property (copy, nonatomic) NSString *_Nullable icon;//送礼头像
+@property (copy, nonatomic) NSString *_Nullable giftImageName;//礼物图片名字
+@property (assign, nonatomic) NSInteger giftNumber;//礼物数量
-@property (nonatomic ,copy  ) NSString *            _Nullable image;
+//可本地处理
 @property (nonatomic ,copy  ) NSString *            _Nullable price;
-
-@property (nonatomic        ) NSInteger                       index;//索引
 @property (nonatomic        ) GiftStyle                       giftStyle;//动画类型
-@property (nonatomic, copy  ) NSString  *           _Nullable giftname;//礼物名字
-@property (nonatomic, strong) NSArray *             _Nullable giftIconArray;//礼物图片数组
-@property (nonatomic, copy  ) NSString  *           _Nullable giftNum;//礼物数量
-@property (nonatomic, copy  ) NSString  *           _Nullable giftRusername;//接受礼物的人
-@property (nonatomic, copy  ) NSString  *           _Nullable giftRuserId;//接受礼物的人id
-@property (nonatomic, copy  ) NSString  *           _Nullable giftGusername;//送礼物的人
-@property (nonatomic, copy  ) NSString  *           _Nullable giftGuserId;//送礼物的id
+@property (nonatomic        ) NSInteger                       index;//索引和giftname一样
+
+//@property (nonatomic, copy  ) NSString  *           _Nullable giftname;//礼物名字
+//@property (nonatomic, strong) NSArray *             _Nullable giftIconArray;//礼物图片数组
+//@property (nonatomic, copy  ) NSString  *           _Nullable giftNum;//礼物数量
+//@property (nonatomic, copy  ) NSString  *           _Nullable giftRusername;//接受礼物的人
+//@property (nonatomic, copy  ) NSString  *           _Nullable giftRuserId;//接受礼物的人id
+//@property (nonatomic, copy  ) NSString  *           _Nullable giftGusername;//送礼物的人
+//@property (nonatomic, copy  ) NSString  *           _Nullable giftGuserId;//送礼物的id
 //@property (nonatomic, strong) NSString  *_Nullable pushId;//跳转id
++ (instancetype _Nonnull)modelWithSender:(NSString *_Nonnull)sender giftName:(NSString *_Nonnull)giftName icon:(NSString *_Nonnull)icon giftImageName:(NSString *_Nonnull)giftImageName;
+
 @end
@@ -9,5 +9,13 @@
 #import "GiftModel.h"
 @implementation GiftModel
-
++ (instancetype)modelWithSender:(NSString *)sender giftName:(NSString *)giftName icon:(NSString *)icon giftImageName:(NSString *)giftImageName 
+{
+    GiftModel *model = [[GiftModel alloc] init];
+    model.sender        = sender;
+    model.giftName      = giftName;
+    model.icon          = icon;
+    model.giftImageName = giftImageName;
+    return model;
+}
 @end
@@ -138,7 +138,7 @@
     [self.layer removeAllAnimations];
     [self removeFromSuperview];
-    _giftAnimationCompletion(-1);
+    _giftAnimationCompletion();
     NSLog(@"删除动画");
 //    [self.animations removeObjectAtIndex:0];
@@ -7,6 +7,7 @@
 //
 #import "NHFighterView+animDelegagte.h"
+#import "GiftAnimationAction.h"
 @implementation NHFighterView (animDelegagte)
@@ -17,7 +18,8 @@
 - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
 {
-    _giftAnimationCompletion(-1);
+//    _giftAnimationCompletion();
+    
     NSLog(@"did stop");
 }
@@ -7,9 +7,8 @@
 //
 #import <UIKit/UIKit.h>
-#import "GiftAnimationAction.h"
-@interface NHFighterView :GiftAnimationAction
+@interface NHFighterView :UIView
 /**
  *  需要几个控制点就设置几个:
@@ -80,7 +80,7 @@
 -(void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
     [self.layer removeAllAnimations];
     [self removeFromSuperview];
-    _giftAnimationCompletion(-1);
+    _giftAnimationCompletion();
 }
@@ -10,16 +10,23 @@
 #import "GiftModel.h"
 #import "LiveBaseView.h"
 #import "AnimQueueManager.h"
+#import "GiftPayButton.h"
 #define MAX_LINE_COUNT 4
 #define MAX_ROW_COUNT  2
+#define GiftPayViewHeight 50
+
 @interface GiftListView ()
-@property (nonatomic ,strong) NSArray <GiftModel *>* _Nullable            giftArray;
-@property (nonatomic ,weak) LiveBaseView * _Nullable             liveBaseView;
-@property (nonatomic, strong) AnimQueueManager *animQueueManager;
-@property (nonatomic ,strong) GiftModel * _Nullable             model;
+@property (nonatomic ,strong) NSArray <GiftModel *>* _Nullable  giftArray;
+@property (nonatomic ,strong) NSArray <NSString *>* _Nullable   images;
+@property (nonatomic ,strong) NSArray <NSString *>* _Nullable   giftNames;
+@property (nonatomic ,strong) NSArray <NSString *>* _Nullable   prices;
+@property (nonatomic ,strong) NSArray <NSString *>* _Nullable   types;
+@property (nonatomic ,weak  ) LiveBaseView *         _Nullable  liveBaseView;
+@property (nonatomic, strong) AnimQueueManager *                animQueueManager;
+@property (nonatomic ,strong) GiftModel *            _Nullable  model;
 @end
@@ -28,18 +35,22 @@
 - (instancetype)initWithFrame:(CGRect)frame liveBaseView:(LiveBaseView *_Nullable)liveBaseView
 {
     if (self = [super initWithFrame:frame]) {
+        
+        _images = [NSArray arrayWithObjects:@"porsch_small80",@"fighter_small80",@"plane_small80",@"love_gift",@"beer",@"chicken",@"cucumber",@"flower",@"hug",@"mouth",@"ring",@"rose",@"sticks",nil];
+        _giftNames = [NSArray arrayWithObjects:@"跑车",@"歼灭机",@"飞机",@"大大的爱心",@"啤酒",@"小鸡",@"小黄瓜",@"鲜花",@"抱抱",@"亲吻",@"戒指",@"玫瑰花",@"荧光棒",nil];
+        _prices = [NSArray arrayWithObjects:@"300000000",@"300000000",@"300000",@"30",@"30",@"3",@"3",@"1",@"3",@"1",@"3",@"30",@"300", nil];
+        _types = [NSArray arrayWithObjects:@2,@3,@4,@1,@1,@1,@1,@1,@1,@1,@1,@1,@1, nil];
+        
         self.liveBaseView = liveBaseView;
         self.animQueueManager = [AnimQueueManager sharedAnimQueueManager];
-        self.animQueueManager.maxTop = 200;
-        UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, self.width, self.height - 30)];
-        scrollView.contentSize = CGSizeMake(self.width *(self.giftArray.count/(MAX_ROW_COUNT*MAX_LINE_COUNT) + 1), self.height - 30);
+        UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, self.width, self.height - GiftPayViewHeight)];
+        scrollView.contentSize = CGSizeMake(self.width *(self.giftArray.count/(MAX_ROW_COUNT*MAX_LINE_COUNT) + 1), self.height - GiftPayViewHeight);
         scrollView.pagingEnabled = YES;
         scrollView.bounces = NO;
         scrollView.showsVerticalScrollIndicator = NO;
         scrollView.showsHorizontalScrollIndicator = NO;
         [self addSubview:scrollView];
-        scrollView.backgroundColor = ZXRandomColor;
         int line = 0;
         int row = 0;
@@ -57,40 +68,67 @@
             }
             row = i % MAX_LINE_COUNT;
             CGFloat giftWidth = self.width / MAX_LINE_COUNT * 1.0;
-            CGFloat giftHeight = (self.height - 30) / MAX_ROW_COUNT * 1.0;
+            CGFloat giftHeight = (self.height - GiftPayViewHeight) / MAX_ROW_COUNT * 1.0;
             giftX = row * giftWidth + page * scrollView.width;
             giftY = line * giftHeight;
             UIView *giftView = [self giftViewWithFrame:CGRectMake(giftX, giftY, giftWidth, giftHeight) model:self.giftArray[i]];
+            giftView.backgroundColor = [UIColor clearColor];
-            UIImageView *picImg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:self.giftArray[i].image]];
+            //礼物图片
+            UIImageView *picImg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:self.giftArray[i].giftImageName]];
             picImg.centerX = giftView.width * 0.5;
             picImg.centerY = giftView.height * 0.5;
             [giftView addSubview:picImg];
-
             [scrollView addSubview:giftView];
             UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(gestureClick:)];
             giftView.tag = i + 10;
             [giftView addGestureRecognizer:gesture];
         }
+        UIImageView *giftBottomView = [[UIImageView alloc] initWithFrame:CGRectMake(0, self.height - GiftPayViewHeight, self.width, GiftPayViewHeight)];
+        giftBottomView.image = [UIImage imageNamed:@"背景400x30"];
+        giftBottomView.alpha = 0.4;
+        [self addSubview:giftBottomView];
+
+        GiftPayButton *payBtn = [[GiftPayButton alloc] initWithFrame:CGRectMake(10, self.height - GiftPayViewHeight, 80, GiftPayViewHeight)];
+        [payBtn addTarget:self action:@selector(payClick) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:payBtn];
+        
+        UIButton *sendBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.width - 70, self.height - GiftPayViewHeight + (GiftPayViewHeight - 30)*0.5, 60, 30)];
+        [sendBtn addTarget:self action:@selector(sendClick) forControlEvents:UIControlEventTouchUpInside];
+        [sendBtn setTitle:@"发送" forState:UIControlStateNormal];
+        [sendBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal
+         ];
+        [sendBtn setBackgroundColor:[UIColor orangeColor]];
+        sendBtn.layer.cornerRadius = sendBtn.height * 0.5;
+        sendBtn.layer.masksToBounds = YES;
+        [self addSubview:sendBtn];
     }
     return self;
 }
+- (void)sendClick
+{
+    NSLog(@"sendClick");
+}
+
+- (void)payClick
+{
+    NSLog(@"payClick");
+}
+
 - (UIView *)giftViewWithFrame:(CGRect)frame model:(GiftModel *)model
 {
     _model = model;
     UIView *giftView = [[UIView alloc] initWithFrame:frame];
     if (model.giftStyle == GiftStyleCombo)
-    {
+    {//右上角连击标识
         UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(giftView.width - 17, 3, 15, 15)];
-        imageView.backgroundColor = ZXRandomColor;
+        imageView.image = [UIImage imageNamed:@"continuous"];
         [giftView addSubview:imageView];
-    }else
-    {
-        
     }
+    //礼物价格lbl
     UILabel *priceLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, giftView.height - 15, 40, 14)];
     priceLbl.font = [UIFont systemFontOfSize:kDetailContentFont];
     priceLbl.textColor = [UIColor greenColor];
@@ -99,8 +137,8 @@
     priceLbl.height = [priceLbl labelSize].height;
     priceLbl.centerX = giftView.width * 0.5 - 4;
     [giftView addSubview:priceLbl];
-    
-    UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"littleHeart2"]];
+    //礼物价格图标
+    UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"diamond"]];
     image.left = priceLbl.right + 3;
     image.centerY = priceLbl.centerY;
     [giftView addSubview:image];
@@ -114,7 +152,26 @@
     NSInteger tag = gesture.view.tag - 10;
     NSLog(@"%zd",tag);
     //右上角添加✔️,再次点击去掉✔️
-    [self.animQueueManager addAnimationWithModel:self.giftArray[tag] animContentView:self.liveBaseView];
+    GiftModel *model = self.giftArray[tag];
+    if (model.giftStyle == GiftStyleCombo) {
+
+        [self.animQueueManager addAnimationWithModel:self.giftArray[tag] animContentView:(UIView *)self.liveBaseView.presentView];
+    }else
+    {
+        [self.animQueueManager addAnimationWithModel:self.giftArray[tag] animContentView:self.liveBaseView];
+    }
+}
+
+- (NSString *)giftNameWithImageName:(NSString *)imageName
+{
+    NSString *giftName = @"";
+
+    if ([_images containsObject:imageName]) {
+        NSInteger index = [_images indexOfObject:imageName];
+        giftName = [_giftNames objectAtIndex:index];
+    }
+    
+    return giftName;
 }
 #pragma mark - getter
@@ -123,39 +180,37 @@
 {
     if (!_giftArray)
     {
-        NSArray *images = [NSArray arrayWithObjects:@"love",@"love",@"love",@"love",@"love",@"love",@"love",@"love",@"love",@"love",nil];
-        NSArray *types = [NSArray arrayWithObjects:@2,@3,@1,@1,@1,@1,@1,@1,@1,@1, nil];
-        NSArray *prices = [NSArray arrayWithObjects:@"300000000",@"3000",@"300000",@"30",@"3",@"3",@"1",@"3",@"1",@"3", nil];
-        
+        NSArray *senders = [NSArray arrayWithObjects:@"张三",@"龙的传人",@"李四",@"王五",@"宋刘",@"老七",@"老八",@"老九",@"老十",@"老师",@"小十七",@"小十八",@"小十九", nil];
         NSMutableArray *tempArr = [NSMutableArray array];
-        for (int i = 0; i < images.count; i ++) {
-            GiftModel *model = [GiftModel new];
-            model.giftname = @"鲜花";
-            model.giftIconArray = @[[UIImage imageNamed:@"love"]];
-            model.giftNum = @"5";
-            model.giftRusername = @"啊啊啊啊啊啊啊啊啊啊啊啊";
-            model.giftRuserId = @"10000";
-            model.giftGusername = @"按时大多数阿萨德 爱傻傻的爱的";
-            model.giftGuserId = @"20000";
-            model.image = images[i];
-            int type = [types[i] intValue];
+        for (int i = 0; i < _images.count; i ++) {
+            
+            int type = [_types[i] intValue];
             if (type == 1) {
-                model.giftStyle = GiftStyleCombo;
-            }else if (type == 2)
-            {
-                model.giftStyle = GiftStylePorsch;
-            }
-//            else if (type == 3)
-//            {
-//                model.giftStyle = GiftStyleFighter;
-//            }
-            else if (type == 3)
-            {
-                model.giftStyle = GiftStylePlane;
-            }
+                //combo
+                GiftModel *model1 = [GiftModel modelWithSender:senders[i] giftName:[self giftNameWithImageName:_images[i]] icon:@"love" giftImageName:_images[i]];
+                model1.giftStyle = GiftStyleCombo;
+                model1.price = _prices[i];
+                [tempArr addObject:model1];
+                
+            }else
+            {//expen
+                GiftModel *model = [GiftModel modelWithSender:senders[i] giftName:[self giftNameWithImageName:_images[i]] icon:@"love" giftImageName:@""];
-            model.price = prices[i];
-            [tempArr addObject:model];
+                if (type == 2) {
+                    model.giftStyle = GiftStylePorsch;
+                    model.giftImageName = @"porsch_small80";
+                }
+                if (type == 3) {
+                    model.giftStyle = GiftStyleFighter;
+                    model.giftImageName = @"fighter_small80";
+                }
+                if (type == 4) {
+                    model.giftStyle = GiftStylePlane;
+                    model.giftImageName = @"plane_small80";
+                }
+                model.price = _prices[i];
+                [tempArr addObject:model];
+            }
         }
         _giftArray = [[NSArray alloc] initWithArray:tempArr];
     }
-//
-//  GiftModelView.m
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/14.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "GiftModelView.h"
-#import "GiftModel.h"
-
-@implementation GiftModelView
-
-//+ (instancetype)giftViewWithModel:(GiftModel *)giftModel
-//{
-//    GiftModelView *view = [[GiftModelView alloc] init];
-//    view
-//    return ;
-//}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end
+//
+//  GiftPayButton.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface GiftPayButton : UIButton
+
+@end
+//
+//  GiftPayButton.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftPayButton.h"
+
+@implementation GiftPayButton
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    [self setTitle:@"充值 10" forState:UIControlStateNormal];
+    self.titleLabel.textAlignment = NSTextAlignmentLeft;
+    self.titleLabel.font = [UIFont systemFontOfSize:kContentFont];
+    [self setTitleColor:[UIColor yellowColor] forState:UIControlStateNormal];
+    [self setImage:[UIImage imageNamed:@"diamond"] forState:UIControlStateNormal];
+    [self setImage:[UIImage imageNamed:@"diamond"] forState:UIControlStateHighlighted];
+    
+    self.titleLabel.left = 0;
+    self.titleLabel.top = 0;
+    self.titleLabel.width = self.width - 20;
+    self.titleLabel.height = self.height;
+    
+    self.imageView.height = 10;
+    self.imageView.width = 13;
+    self.imageView.left = self.width - 25;
+    self.imageView.centerY = self.titleLabel.centerY;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
 //
-//  GiftModelView.h
+//  ComboCell.h
 //  LiveVideoCloud
 //
-//  Created by 张旭 on 2017/3/14.
+//  Created by 张旭 on 2017/3/17.
 //  Copyright © 2017年 cnlive. All rights reserved.
 //
-#import "BaseView.h"
-
+#import "PresentViewCell.h"
 @class GiftModel;
-@interface GiftModelView : BaseView
-+ (instancetype)giftViewWithModel:(GiftModel *)giftModel;
+@interface ComboCell : PresentViewCell
+
+@property (nonatomic ,strong) GiftModel * _Nullable             model;
 @end
+//
+//  ComboCell.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "ComboCell.h"
+#import "GiftModel.h"
+
+@interface ComboCell ()
+
+@property (nonatomic ,strong) UIView *      _Nullable bgView;
+@property (nonatomic ,strong) UIImageView * _Nullable icon;
+@property (nonatomic ,strong) UILabel *     _Nullable senderNameLbl;
+@property (nonatomic ,strong) UILabel *     _Nullable giftNameLbl;
+@property (nonatomic ,strong) UIImageView * _Nullable giftImage;
+
+@end
+
+@implementation ComboCell
+
+- (instancetype)initWithRow:(NSInteger)row
+{
+    if (self = [super initWithRow:row]) {
+        
+        [self addSubview:self.bgView];
+        [self addSubview:self.icon];
+        [self addSubview:self.senderNameLbl];
+        [self addSubview:self.giftNameLbl];
+        [self addSubview:self.giftImage];
+    }
+    return self;
+}
+
+- (void)setModel:(GiftModel *)model
+{
+    _model = model;
+    self.icon.image = [UIImage imageNamed:model.icon];
+    self.senderNameLbl.text = model.sender;
+    self.giftNameLbl.text = [NSString stringWithFormat:@"送一个%@",model.giftName];
+    self.senderNameLbl.size = [self.senderNameLbl labelSize];
+    self.giftNameLbl.size = [self.giftNameLbl labelSize];
+    self.bgView.frame = CGRectMake(0, 0, self.width, self.height);
+    self.bgView.layer.cornerRadius = self.height * 0.5;
+    self.giftImage.frame = CGRectMake(self.width - self.height, 0, self.height, self.height);
+    self.giftImage.image = [UIImage imageNamed:model.giftImageName];
+}
+
+//自定义cell的展示动画
+- (void)customDisplayAnimationOfShowShakeAnimation:(BOOL)flag
+{
+    //这里是直接使用父类中的动画，如果用户想自定义可这里实现动画，不调用父类的方法(这个方法在UIView动画的animations回调中执行)
+    [super customDisplayAnimationOfShowShakeAnimation:flag];
+}
+
+//自定义cell的隐藏动画
+- (void)customHideAnimationOfShowShakeAnimation:(BOOL)flag
+{
+    [super customHideAnimationOfShowShakeAnimation:flag];
+}
+
+#pragma mark - getter
+- (UILabel *)senderNameLbl
+{
+    if (!_senderNameLbl)
+    {
+        _senderNameLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.icon.right + 5, 0, 100, 20)];
+        _senderNameLbl.font = [UIFont systemFontOfSize:kContentFont];
+        _senderNameLbl.textColor = [UIColor blackColor];
+    }
+    return _senderNameLbl;
+}
+
+- (UILabel *)giftNameLbl
+{
+    if (!_giftNameLbl)
+    {
+        _giftNameLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.icon.right + 5, self.senderNameLbl.bottom , 100, 20)];
+        _giftNameLbl.font = [UIFont systemFontOfSize:kContentFont];
+        _giftNameLbl.textColor = [UIColor blackColor];
+    }
+    return _giftNameLbl;
+}
+
+- (UIImageView *)icon
+{
+    if (!_icon)
+    {
+        _icon = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
+        _icon.clipsToBounds     = YES;
+        _icon.layer.cornerRadius = 20;
+        _icon.layer.borderWidth = 1;
+        _icon.layer.borderColor = [UIColor cyanColor].CGColor;
+
+    }
+    return _icon;
+}
+
+- (UIImageView *)giftImage
+{
+    if (!_giftImage)
+    {
+        _giftImage = [[UIImageView alloc] init];
+    }
+    return _giftImage;
+}
+
+- (UIView *)bgView
+{
+    if (!_bgView)
+    {
+        _bgView = [[UIView alloc] init];
+        _bgView.backgroundColor = [UIColor yellowColor];
+        _bgView.clipsToBounds   = YES;
+    }
+    return _bgView;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  PresentModelAble.h
+//  PresentDemo
+//
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// 日志
+
+#ifdef DEBUG
+
+#ifndef DebugLog
+#define DebugLog(fmt, ...) NSLog((@"[%s Line %d]" fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+#endif
+
+#else
+
+#ifndef DebugLog
+#define DebugLog(fmt, ...)
+#endif
+
+#define NSLog
+
+
+#endif
+
+/**
+ *  礼物模型必须遵守的协议
+ */
+@protocol PresentModelAble <NSObject>
+
+@required
+/**
+ *  发送者
+ */
+@property (copy, nonatomic) NSString *sender;
+/**
+ *  礼物名(或礼物编号)
+ */
+@property (copy, nonatomic) NSString *giftName;
+
+@optional
+
+/**
+ 需要展示的礼物连乘数 默认为0
+ 
+ @discussion 用于解决当前礼物消息消息展示到一半时，新加入到聊天室的人看到的礼物消息不是从1开始，如果要使用，消息体中必须包含当前礼物个数
+ */
+@property (assign, nonatomic) NSInteger giftNumber;
+
+@end
+//
+//  PresentView.h
+//  PresentDemo
+//
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "PresentViewCell.h"
+
+@protocol PresentViewDelegate;
+
+@interface PresentView : UIView
+
+/**
+ *  cell高度(默认40)
+ */
+@property (assign, nonatomic) CGFloat cellHeight;
+/**
+ *  礼物动画展示时间(默认3秒)
+ */
+@property (assign, nonatomic)NSTimeInterval showTime;
+/**
+ *  轨道总数
+ */
+@property (assign, nonatomic, readonly) NSInteger rows;
+@property (weak, nonatomic) id<PresentViewDelegate> delegate;
+/**
+ *  获取对应轨道上的cell
+ */
+- (__kindof PresentViewCell *)cellForRowAtIndex:(NSUInteger)index;
+/**
+ *  插入送礼消息
+ *
+ *  @param models 礼物模型数组中的模型必须遵守PresentModelAble协议
+ *  @param flag   是否需要连乘动画
+ */
+- (void)insertPresentMessages:(NSArray<id <PresentModelAble>> *)models showShakeAnimation:(BOOL)flag;
+/**
+ 释放相关引用变量
+ */
+- (void)releaseVariable;
+
+@end
+
+@protocol PresentViewDelegate <NSObject>
+
+@required
+/**
+ *  返回自定义cell样式
+ */
+- (PresentViewCell *)presentView:(PresentView *)presentView cellOfRow:(NSInteger)row;
+/**
+ *  礼物动画即将展示的时调用，根据礼物消息类型为自定义的cell设置对应的模型数据用于展示
+ *
+ *  @param cell        用来展示动画的cell
+ *  @param model       礼物模型
+ */
+- (void)presentView:(PresentView *)presentView
+         configCell:(PresentViewCell *)cell
+              model:(id<PresentModelAble>)model;
+
+@optional
+
+/**
+ *  cell点击事件
+ */
+- (void)presentView:(PresentView *)presentView didSelectedCellOfRowAtIndex:(NSUInteger)index;
+
+/**
+ 一组连乘动画执行完成回调
+ */
+- (void)presentView:(PresentView *)presentView animationCompleted:(NSInteger)shakeNumber model:(id<PresentModelAble>)model;
+
+@end
+//
+//  PresentView.m
+//  PresentDemo
+//
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
+//
+
+#import "PresentView.h"
+
+#define Margin 20
+
+@interface PresentView ()<PresentViewCellDelegate>
+
+/**
+ *  带连乘动画的消息缓存数组
+ */
+@property (strong, nonatomic) NSMutableArray *dataCaches;
+/**
+ *  不带连乘动画的消息缓存数组
+ */
+@property (strong, nonatomic)NSMutableArray *nonshakeDataCaches;
+/**
+ *  记录presentView上的cell
+ */
+@property (strong, nonatomic) NSMutableArray *showCells;
+
+@end
+
+@implementation PresentView
+
+#pragma mark - Setter/Getter
+
+- (void)setCellHeight:(CGFloat)cellHeight
+{
+    _cellHeight = cellHeight;
+    
+    [self setNeedsDisplay];
+}
+
+- (NSMutableArray *)dataCaches
+{
+    if (!_dataCaches) {
+        _dataCaches = [NSMutableArray array];
+    }
+    return _dataCaches;
+}
+
+- (NSMutableArray *)nonshakeDataCaches
+{
+    if (!_nonshakeDataCaches) {
+        _nonshakeDataCaches = [NSMutableArray array];
+    }
+    return _nonshakeDataCaches;
+}
+
+- (NSMutableArray *)showCells
+{
+    if (!_showCells) {
+        _showCells = [NSMutableArray array];
+    }
+    return _showCells;
+}
+
+#pragma mark - Initial
+
+- (instancetype)init
+{
+    if (self = [super init]) {
+        self.userInteractionEnabled = NO;
+    }
+    return self;
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    self.userInteractionEnabled = NO;
+}
+
+- (void)drawRect:(CGRect)rect
+{
+    [super drawRect:rect];
+    
+    //初始值
+    self.showTime = 3;
+    
+    //添加cell
+    self.cellHeight = self.cellHeight ? self.cellHeight : 40;
+    _rows           = (int)floor(rect.size.height / (self.cellHeight + Margin));
+    CGFloat inset   = rect.size.height - (self.cellHeight + Margin) * _rows + Margin;
+    inset           = MAX(0, inset) * 0.5;
+    for (int index = 0; index < _rows; index++) {
+        CGFloat w             = rect.size.width;
+        CGFloat y             = inset + (self.cellHeight + Margin) * index;
+        CGFloat x             = -w;
+        PresentViewCell *cell = [self.delegate presentView:self cellOfRow:index];
+        cell.frame            = CGRectMake(x, y, w, self.cellHeight);
+        cell.delegate         = self;
+        [self addSubview:cell];
+        [self.showCells addObject:cell];
+    }
+}
+
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    UITouch *touch = touches.anyObject;
+    CGPoint point = [touch locationInView:self];
+    for (int index = 0; index < self.showCells.count; index++) {
+        PresentViewCell *cell = self.showCells[index];
+        if (CGRectContainsPoint(cell.frame, point)) {
+            if ([self.delegate respondsToSelector:@selector(presentView:didSelectedCellOfRowAtIndex:)]) {
+                [self.delegate presentView:self didSelectedCellOfRowAtIndex:index];
+            }
+            break;
+        }
+    }
+}
+
+#pragma mark - Private
+
+//问题一：如果展示动画还在执行，就收到了新的连乘动画消息，这时会判定为去执行连乘动画，因为展示动画还没有执行完成，所以连乘lable还没有被创建，所以会导致连乘动画会消失
+//解决办法：等连展示动画执行完成了，才能开始连乘动画，否则连乘动画消息就被缓存
+
+//问题二：点击礼物4，等礼物4快要消失的时候，点击礼物1。会出现两个礼物1，并且下面的cell不会消失，导致礼物1的消息都会被缓存起来
+//问题原因：当礼物4将要隐藏时，这时接收到礼物1的消息，就会利用空闲的cell来展示礼物1，但这是没有马上删除礼物1的缓存，而是等到礼物1展示完成才删除的，所以礼物4展示完成就会检测缓存，这时礼物1并没有被删除，所以这里又会展示礼物1，这就导致了礼物一被展示了两次
+//解决办法：当礼物4执行完成了，去取缓存的时候，如果取到了缓存，还需要判断这个缓存当前有没有在展示，如果在展示就不做处理，如果没有在展示就利用当前的cell去展示它
+
+//问题三：连续快速点击礼物1，会分两次动画展示
+//问题原因：因为两次送的礼物相同，如果快速点击，会发生用于展示第一个礼物的cell还处在AnimationStateShowing状态时，就收到第二个礼物，这个是时候的逻辑处理是将第二个消息缓存了起来(为了解决上述的问题一)
+
+/**
+ *  插入带连乘动画的消息
+ */
+- (void)insertShowShakeAnimationMessages:(NSArray<id<PresentModelAble>> *)models
+{
+    for (int index = 0; index < models.count; index++) {
+        id<PresentModelAble> obj = models[index];
+        PresentViewCell *cell = [self examinePresentingCell:obj];
+        if (cell) {
+            if (cell.state == AnimationStateShowing) {
+                //在执行展示动画期间如果收到了连乘动画礼物消息，就将消息缓存
+                [self.dataCaches addObject:obj];
+            }else {
+                if ([obj giftNumber] > 0) {
+                    [cell shakeAnimationWithModels:@[obj]];
+                } else {
+                    [cell shakeAnimationWithNumber:1];
+                }
+            }
+        }else {
+            [self.dataCaches addObject:obj];//将当前消息加到缓存中
+            NSArray *cells = [self examinePresentViewCells];
+            if (cells.count) {
+                cell                   = cells.firstObject;
+                //设置后，再次展示的动画才会生效
+                cell.showTime          = self.showTime;
+                __weak typeof(self) ws = self;
+                [cell showAnimationWithModel:obj showShakeAnimation:YES prepare:^{
+                    if ([ws.delegate respondsToSelector:@selector(presentView:configCell:model:)]) {
+                        [ws.delegate presentView:ws configCell:cell model:obj];
+                    }
+                } completion:^(BOOL flag) {
+                    if (flag) {
+                        //如果相同礼物类型的消息缓存在执行展示动画之前就删除了，这就会造成在cell执行展示动画期间收到的相同类型的消息会被缓存到下一个cell中展示
+                        if ([obj giftNumber] > 0) {
+                            [cell shakeAnimationWithModels:[self subarrayWithObj:obj]];
+                        }else {
+                            [cell shakeAnimationWithNumber:[self subarrayWithObj:obj].count];
+                        }
+                    }
+                }];
+            }
+        }
+    }
+}
+
+/**
+ *  插入不带连城动画的消息
+ */
+- (void)insertNonshakeAnimationMessages:(NSArray<id<PresentModelAble>> *)models
+{
+    if (models) {
+        [self.nonshakeDataCaches addObjectsFromArray:models];
+    }
+    NSArray *freeCells = [self examinePresentViewCells];
+    if (self.nonshakeDataCaches.count > 0 && freeCells.count > 0) {
+        id<PresentModelAble> obj = self.nonshakeDataCaches.firstObject;
+        [self.nonshakeDataCaches removeObjectAtIndex:0];
+        PresentViewCell *cell    = freeCells.firstObject;
+        cell.showTime            = self.showTime;
+        __weak typeof(self) ws   = self;
+        [cell showAnimationWithModel:obj showShakeAnimation:NO prepare:^{
+            if ([ws.delegate respondsToSelector:@selector(presentView:configCell:model:)]) {
+                [ws.delegate presentView:ws configCell:cell model:obj];
+            }
+        } completion:^(BOOL flag) {
+            if (!flag) {
+                [cell performSelector:@selector(hiddenAnimationOfShowShake:) withObject:@(NO) afterDelay:self.showTime];
+            }
+        }];
+    }
+}
+
+/**
+ *  检测插入的消息模型
+ */
+- (NSArray *)checkElementOfModels:(NSArray<id<PresentModelAble>> *)models
+{
+    NSMutableArray *siftArray = [NSMutableArray array];
+    for (id obj in models) {
+        if (![obj conformsToProtocol:@protocol(PresentModelAble)]) {
+            DebugLog(@"%@对象没有遵守PresentModelAble协议", obj);
+        }else {
+            [siftArray addObject:obj];
+        }
+    }
+    return siftArray;
+}
+
+/**
+ *  检测当前是否有obj类型的礼物消息在展示
+ */
+- (PresentViewCell *)examinePresentingCell:(id<PresentModelAble>)obj
+{
+    for (PresentViewCell *cell in self.showCells) {
+        if ([cell.sender isEqualToString:[obj sender]] && [cell.giftName isEqualToString:[obj giftName]]) {
+            //当前正在展示动画并且不是隐藏动画
+            if (cell.state != AnimationStateNone && cell.state != AnimationStateHiding ) return cell;
+        }
+    }
+    return nil;
+}
+
+/**
+ *  检测空闲cell
+ */
+- (NSArray<PresentViewCell *> *)examinePresentViewCells
+{
+    NSMutableArray *freeCells = [NSMutableArray array];
+    for (PresentViewCell *cell in self.showCells) {
+        if (cell.state == AnimationStateNone) {
+            [freeCells addObject:cell];
+        }
+    }
+    return freeCells;
+}
+
+/**
+ *  从缓存中截取与obj类型相同的消息
+ */
+- (NSArray<id<PresentModelAble>> *)subarrayWithObj:(id<PresentModelAble>)obj
+{
+    NSMutableArray *array = [NSMutableArray array];
+    for (id<PresentModelAble> cache in self.dataCaches) {
+        if ([[cache sender] isEqualToString:[obj sender]] && [[cache giftName] isEqualToString:[obj giftName]]) {
+            [array addObject:cache];
+        }
+    }
+    [self.dataCaches removeObjectsInArray:array];//取出的数据从缓存中移除
+    return array;
+}
+
+#pragma mark - Public
+
+- (void)insertPresentMessages:(NSArray<id<PresentModelAble>> *)models showShakeAnimation:(BOOL)flag
+{
+    NSArray *siftArray = [self checkElementOfModels:models];
+    if (!siftArray.count) return;
+    if (flag) {
+        [self insertShowShakeAnimationMessages:siftArray];
+    }else {
+        [self insertNonshakeAnimationMessages:siftArray];
+    }
+}
+
+- (PresentViewCell *)cellForRowAtIndex:(NSUInteger)index
+{
+    if (index < self.showCells.count)
+    {
+        return self.showCells[index];
+    }
+    return nil;
+}
+
+- (void)releaseVariable
+{
+    [self.dataCaches removeAllObjects];
+    [self.nonshakeDataCaches removeAllObjects];
+    [self.showCells makeObjectsPerformSelector:@selector(removeFromSuperview)];
+    [self.showCells removeAllObjects];
+}
+
+#pragma mark - PresentViewCellDelegate
+
+- (void)presentViewCell:(PresentViewCell *)cell showShakeAnimation:(BOOL)flag shakeNumber:(NSInteger)number
+{
+    if ([self.delegate respondsToSelector:@selector(presentView:animationCompleted:model:)]) {
+        [self.delegate presentView:self animationCompleted:number model:cell.baseModel];
+    }
+    if (self.dataCaches.count) {
+        id<PresentModelAble> obj = self.dataCaches.firstObject;
+        if (![self examinePresentingCell:obj]) {
+            //取到的缓存当前没有在展示
+            __weak typeof(self) ws = self;
+            [cell showAnimationWithModel:obj showShakeAnimation:YES prepare:^{
+                if ([ws.delegate respondsToSelector:@selector(presentView:configCell:model:)]) {
+                    [ws.delegate presentView:ws configCell:cell model:obj];
+                }
+            } completion:^(BOOL flag) {
+                if (flag) {
+                    if ([obj giftNumber] > 0) {
+                        [cell shakeAnimationWithModels:[self subarrayWithObj:obj]];
+                    }else {
+                        [cell shakeAnimationWithNumber:[self subarrayWithObj:obj].count];
+                    }
+                }
+            }];
+        }
+    }else if (self.nonshakeDataCaches.count) {
+        //带连乘的缓存优先处理
+        [self insertNonshakeAnimationMessages:nil];
+    }else {
+        [cell releaseVariable];
+    }
+}
+
+@end
+//
+//  PresentViewCell.h
+//  PresentDemo
+//
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "PresentModelAble.h"
+
+//动画状态
+typedef NS_ENUM(NSUInteger, AnimationState) {
+    AnimationStateNone = 0,
+    AnimationStateShowing,
+    AnimationStateShaking,
+    AnimationStateShaked,
+    AnimationStateHiding
+};
+
+@protocol PresentViewCellDelegate;
+
+@interface PresentViewCell : UIView
+
+@property (weak, nonatomic) id<PresentViewCellDelegate> delegate;
+/**
+ *  cell展示时间
+ */
+@property (assign, nonatomic)NSTimeInterval showTime;
+/**
+ *  轨道编号
+ */
+@property (assign, nonatomic, readonly) NSInteger row;
+/**
+ *  cell当前的动画状态
+ */
+@property (assign, nonatomic, readonly) AnimationState state;
+/**
+ 礼物模型
+ */
+@property (strong, nonatomic, readonly)id<PresentModelAble> baseModel;
+/**
+ *  礼物发送者
+ */
+@property (copy, nonatomic, readonly) NSString *sender;
+/**
+ *  礼物名
+ */
+@property (copy, nonatomic, readonly) NSString *giftName;
+
+- (instancetype)initWithRow:(NSInteger)row;
+/**
+ *  显示cell动画
+ *
+ *  @param model      礼物模型
+ *  @param flag       是否带连乘动画
+ *  @param prepare    准备动画回调
+ *  @param completion 动画完成回调
+ */
+- (void)showAnimationWithModel:(id<PresentModelAble> )model
+            showShakeAnimation:(BOOL)flag
+                       prepare:(void (^)(void))prepare
+                    completion:(void (^)(BOOL flag))completion;
+/**
+ *  连乘动画
+ *
+ *  @param number 连乘次数
+ */
+- (void)shakeAnimationWithNumber:(NSInteger)number;
+/**
+ 连乘动画
+
+ @discussion  当礼物模型中拥有礼物个数时，才调用此接口
+ @param       model 礼物模型
+ */
+- (void)shakeAnimationWithModels:(NSArray<id<PresentModelAble>> *)models;
+/**
+ *  隐藏cell动画
+ *
+ *  @param flag 是否带有连城动画
+ */
+- (void)hiddenAnimationOfShowShake:(BOOL)flag;
+/**
+ *  释放引用变量
+ */
+- (void)releaseVariable;
+
+@end
+
+
+
+//供子类重写的接口
+@interface PresentViewCell (OverWrite)
+
+/**
+ *  自定义展示动画
+ *
+ *  @param flag 是否带有连乘动画
+ */
+- (void)customDisplayAnimationOfShowShakeAnimation:(BOOL)flag;
+/**
+ *  自定义隐藏动画
+ *
+ *  @param flag 是否带有连乘动画
+ */
+- (void)customHideAnimationOfShowShakeAnimation:(BOOL)flag;
+
+@end
+
+
+
+@interface PresentLable : UILabel
+
+/**
+ *  数字描边颜色
+ */
+@property (strong, nonatomic) UIColor *borderColor;
+/**
+ *  开始连乘动画
+ *
+ *  @param interval    动画时间
+ *  @param completion  动画完成回调
+ */
+- (void)startAnimationDuration:(NSTimeInterval)interval
+                    completion:(void (^)(BOOL finish))completion;
+
+@end
+
+
+
+@protocol PresentViewCellDelegate <NSObject>
+
+@optional
+/**
+ *  一组动画组完成回调
+ *
+ *  @param flag   是否带连乘动画
+ *  @param number 最终连乘数，如果flag为NO number就为0
+ */
+- (void)presentViewCell:(PresentViewCell *)cell
+     showShakeAnimation:(BOOL)flag
+            shakeNumber:(NSInteger)number;
+
+@end
+//
+//  PresentViewCell.m
+//  PresentDemo
+//
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
+//
+
+#import "PresentViewCell.h"
+
+#define Duration 0.3
+
+@interface PresentViewCell ()
+
+@property (weak, nonatomic) PresentLable *shakeLable;
+/**
+ *  记录礼物连乘数
+ */
+@property (assign, nonatomic) NSInteger number;
+/**
+ *  记录cell最初始的frame(即开始展示动画前的frame)
+ */
+@property (assign, nonatomic) CGRect originalFrame;
+/**
+ *  shake动画的缓存数组
+ */
+@property (strong, nonatomic) NSMutableArray *caches;
+/**
+ shake动画模型的缓存数组
+ */
+@property (strong, nonatomic) NSMutableArray *modelCaches;
+
+@end
+
+@implementation PresentViewCell
+
+#pragma mark - Setter/Getter
+
+- (NSMutableArray *)caches
+{
+    if (!_caches) {
+        _caches = [NSMutableArray array];
+    }
+    return _caches;
+}
+
+- (NSMutableArray *)modelCaches
+{
+    if (!_modelCaches) {
+        _modelCaches = [NSMutableArray array];
+    }
+    return _modelCaches;
+}
+
+#pragma mark - Initial
+
+- (instancetype)initWithRow:(NSInteger)row
+{
+    if (self = [super init]) {
+        _row              = row;
+        _state            = AnimationStateNone;
+    }
+    return self;
+}
+
+#pragma mark - Private
+
+/**
+ *  添加连乘lable
+ */
+- (void)addShakeLable
+{
+    PresentLable *lable   = [[PresentLable alloc] init];
+    lable.backgroundColor = [UIColor clearColor];
+    lable.borderColor     = [UIColor yellowColor];
+    lable.textColor       = [UIColor greenColor];
+    lable.font            = [UIFont systemFontOfSize:17.0];
+    lable.textAlignment   = NSTextAlignmentCenter;
+    lable.alpha           = 0.0;
+    CGFloat w             = 60;
+    CGFloat h             = 20;
+    CGFloat x             = CGRectGetWidth(self.frame);
+    CGFloat y             = - h * 0.5 + self.frame.size.height * 0.5;
+    lable.frame           = CGRectMake(x, y, w, h);
+    self.shakeLable       = lable;
+    [self addSubview:lable];
+}
+
+/**
+ *  开始连乘动画(利用递归实现连乘动画)
+ *
+ *  @param number 连乘次数
+ *  @param block  当前number次连乘动画执行完成回调
+ */
+- (void)startShakeAnimationWithNumber:(NSInteger)number completion:(void (^)(BOOL finished))block
+{
+    self.superview.userInteractionEnabled = YES;
+    _state                 = AnimationStateShaking;
+    self.shakeLable.text   = [NSString stringWithFormat:@"X%ld", ++self.number];
+    __weak typeof(self) ws = self;
+    [self.shakeLable startAnimationDuration:Duration completion:^(BOOL finish) {
+        if (number > 1) {
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [ws startShakeAnimationWithNumber:(number - 1) completion:block];
+            });
+        }else {
+            _state = AnimationStateShaked;
+            if (block) {
+                block(YES);
+            }
+        }
+    }];
+}
+
+#pragma mark - Public
+
+- (void)showAnimationWithModel:(id<PresentModelAble>)model showShakeAnimation:(BOOL)flag prepare:(void (^)(void))prepare completion:(void (^)(BOOL))completion
+{
+    _state             = AnimationStateShowing;
+    _baseModel         = model;
+    _sender            = [model sender];
+    _giftName          = [model giftName];
+    self.originalFrame = self.frame;
+    self.number        = 0;
+    if (prepare) {
+        prepare();
+    }
+    [UIView animateWithDuration:Duration delay:0 usingSpringWithDamping:1.0 initialSpringVelocity:0.0 options:UIViewAnimationOptionCurveEaseIn animations:^{
+        [self customDisplayAnimationOfShowShakeAnimation:flag];
+    } completion:^(BOOL finished) {
+        if (flag) {
+            if (!self.shakeLable) {
+                [self addShakeLable];
+            }
+            self.shakeLable.alpha = 1.0;
+        }
+        if (completion) {
+            completion(flag);
+        }
+    }];
+}
+
+- (void)shakeAnimationWithNumber:(NSInteger)number
+{
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(hiddenAnimationOfShowShake:) object:@(YES)];
+    [self performSelector:@selector(hiddenAnimationOfShowShake:) withObject:@(YES) afterDelay:self.showTime];
+    if (number > 0) [self.caches addObject:@(number)];
+    if (self.caches.count > 0 && _state != AnimationStateShaking) {
+        NSInteger cache        = [self.caches.firstObject integerValue];
+        [self.caches removeObjectAtIndex:0];//不能删除对象，因为可能有相同的对象
+        __weak typeof(self) ws = self;//
+        [self startShakeAnimationWithNumber:cache completion:^(BOOL finished) {
+            [ws shakeAnimationWithNumber:-1];//传-1是为了缓存不被重复添加
+        }];
+    }
+}
+
+- (void)shakeAnimationWithModels:(NSArray<id<PresentModelAble>> *)models
+{
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(hiddenAnimationOfShowShake:) object:@(YES)];
+    [self performSelector:@selector(hiddenAnimationOfShowShake:) withObject:@(YES) afterDelay:self.showTime];
+    if (models.count > 0) [self.modelCaches addObjectsFromArray:models];
+    if (self.modelCaches.count > 0 && _state != AnimationStateShaking) {
+        _state = AnimationStateShaking;
+        id<PresentModelAble> obj = self.modelCaches.firstObject;
+        self.shakeLable.text = [NSString stringWithFormat:@"X%ld", [obj giftNumber]];
+        [self.modelCaches removeObjectAtIndex:0];
+        __weak typeof(self) ws = self;
+        [self.shakeLable startAnimationDuration:Duration completion:^(BOOL finish) {
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                _state = AnimationStateShaked;
+                if (ws.modelCaches.count > 0) {
+                    [ws shakeAnimationWithModels:nil];
+                }
+            });
+        }];
+    }
+}
+
+- (void)hiddenAnimationOfShowShake:(BOOL)flag
+{
+    self.superview.userInteractionEnabled = NO;
+    _state = AnimationStateHiding;
+    [UIView animateWithDuration:Duration delay:0 usingSpringWithDamping:1.0 initialSpringVelocity:0.0 options:UIViewAnimationOptionCurveEaseIn animations:^{
+        [self customHideAnimationOfShowShakeAnimation:flag];
+    } completion:^(BOOL finished) {
+        
+        //恢复cell的初始状态
+        self.frame            = self.originalFrame;
+        _state                = AnimationStateNone;
+        self.shakeLable.alpha = 0.0;
+        [self.caches removeAllObjects];
+        [self.modelCaches removeAllObjects];
+        
+        //通知代理
+        if ([self.delegate respondsToSelector:@selector(presentViewCell:showShakeAnimation:shakeNumber:)]) {
+            [self.delegate presentViewCell:self showShakeAnimation:flag shakeNumber:self.number];
+            
+        }
+    }];
+}
+
+//目前还没有使用
+- (void)releaseVariable
+{
+//    [self.shakeLable removeFromSuperview];
+}
+
+@end
+
+@implementation PresentViewCell (OverWrite)
+
+- (void)customDisplayAnimationOfShowShakeAnimation:(BOOL)flag
+{
+    self.alpha     = 1.0;
+    CGRect selfF   = self.frame;
+    selfF.origin.x = 0;
+    self.frame     = selfF;
+}
+
+- (void)customHideAnimationOfShowShakeAnimation:(BOOL)flag
+{
+    self.alpha     = 0.0;
+    CGRect selfF   = self.frame;
+    selfF.origin.y -= (CGRectGetHeight(selfF) * 0.5);
+    self.frame     = selfF;
+}
+
+@end
+
+@implementation PresentLable
+
+- (void)drawTextInRect:(CGRect)rect
+{
+    UIColor *textColor = self.textColor;
+    
+    CGContextRef c = UIGraphicsGetCurrentContext();
+    CGContextSetLineWidth(c, 5);
+    CGContextSetLineJoin(c, kCGLineJoinRound);
+    
+    CGContextSetTextDrawingMode(c, kCGTextStroke);
+    self.textColor = self.borderColor;
+    [super drawTextInRect:rect];
+    
+    CGContextSetTextDrawingMode(c, kCGTextFill);
+    self.textColor = textColor;
+    self.shadowOffset = CGSizeMake(0, 0);
+    [super drawTextInRect:rect];
+}
+
+- (void)startAnimationDuration:(NSTimeInterval)interval completion:(void (^)(BOOL finish))completion
+{
+    [UIView animateKeyframesWithDuration:interval delay:0 options:0 animations:^{
+        
+        [UIView addKeyframeWithRelativeStartTime:0 relativeDuration:1/2.0 animations:^{
+            self.transform = CGAffineTransformMakeScale(4, 4);
+        }];
+        [UIView addKeyframeWithRelativeStartTime:1/2.0 relativeDuration:1/2.0 animations:^{
+            self.transform = CGAffineTransformMakeScale(0.8, 0.8);
+        }];
+        
+    } completion:^(BOOL finished) {
+        
+        [UIView animateWithDuration:0.25 delay:0 usingSpringWithDamping:0.4 initialSpringVelocity:10 options:UIViewAnimationOptionCurveEaseInOut animations:^{
+            self.transform = CGAffineTransformMakeScale(1.0, 1.0);
+        } completion:^(BOOL finished) {
+            if (completion) {
+                completion(finished);
+            }
+        }];
+        
+    }];
+}
+
+@end
+
@@ -65,7 +65,7 @@ static LVCAnimationManager * __singleton__;
  */
 - (void)bubblingWithCenterPoint:(CGPoint)centerPoint toView:(UIView *_Nonnull)toView speed:(CGFloat)speed
 {
-    CGFloat defSpeed = 2;
+    CGFloat defSpeed = 1;
     if (speed != 0) {
         defSpeed = speed;
     }
@@ -7,9 +7,11 @@
 //
 #import "BaseView.h"
+@class PresentView;
 @interface LiveBaseView : BaseView 
 @property (nonatomic ,strong) UIViewController * _Nullable             viewController;
-
+@property (nonatomic ,strong ,readonly) PresentView *   _Nullable presentView;
+@property (nonatomic ,strong ,readonly) UIView * _Nullable             animationBaseView;
 @end
@@ -11,12 +11,31 @@
 #import "BottomToolView.h"
 #import "GiftListView.h"
 #import "GiftModel.h"
-@interface LiveBaseView ()<bottomBtnDeledate>
+#import "PresentView.h"
+#import "ComboCell.h"
+#import "LVCAnimationManager.h"
+#import "chatListCell.h"
+#import "chatMsgModel.h"
-@property (nonatomic ,strong) UIScrollView *  _Nullable scrollView;
-@property (nonatomic ,strong) BottomToolView* _Nullable bottomToolView;
-@property (nonatomic ,strong) UIButton *      _Nullable closeBtn;
-@property (nonatomic ,strong) UIView *        _Nullable currentPopView;
+#define BottomToolHeight 60
+
+typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
+    PopTypeGift          = 1,//礼物弹窗
+    PopTypeChat             ,//聊天弹窗
+    PopTypePriMessage        //私信弹窗
+};
+
+@interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource>
+
+@property (nonatomic ,strong           ) UIScrollView *  _Nullable scrollView;
+@property (nonatomic ,strong ,readwrite) UIView *        _Nullable animationBaseView;//展示层View
+@property (nonatomic ,strong           ) BottomToolView* _Nullable bottomToolView;
+@property (nonatomic ,strong           ) UIButton *      _Nullable closeBtn;
+@property (nonatomic ,strong           ) UIView *        _Nullable giftPopView;
+@property (nonatomic ,strong ,readwrite) PresentView *   _Nullable presentView;//连击View
+@property (nonatomic ,assign           ) PopType   popType;
+@property (nonatomic ,strong) UITableView * _Nullable             chatTableView;
+@property (nonatomic ,strong) NSMutableArray * _Nullable chatMsgArray;//聊天消息数组
 @end
@@ -27,9 +46,20 @@
     if (self = [super initWithFrame:frame]) {
         [self addSubview:self.scrollView];
-        [self.scrollView addSubview:self.bottomToolView];
+        [self.scrollView addSubview:self.animationBaseView];
+        [self.animationBaseView addSubview:self.bottomToolView];
+        [self.animationBaseView addSubview:self.presentView];
         [self addSubview:self.closeBtn];
         [self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureClick:)]];
+        [[LVCAnimationManager shareManager] bubblingWithCenterPoint:CGPointMake(SCREEN_WIDTH - 50, SCREEN_HEIGHT - 50) toView:self.animationBaseView speed:1];
+//        ChatView *chatView = [[ChatView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 150, 200, 100)];
+//        chatView.backgroundColor = ZXRandomColor;
+//        [self addSubview:chatView];
+        [self.animationBaseView addSubview:self.chatTableView];
+        self.chatTableView.backgroundColor = ZXRandomColor;
+        chatMsgModel *model = [[chatMsgModel alloc] init];
+        model.name = @"张旭";
+        [self.chatMsgArray addObject:model];
     }
     return self;
 }
@@ -37,25 +67,34 @@
 #pragma mark - bottomBtnDelegate
 - (void)bottomActionWithType:(BtnClickType)btnType
 {
-    [self hiddenView:YES];
     switch (btnType) {
         case BtnClickTypeChat:
         {
+            self.popType = PopTypeChat;
         }
             break;
         case BtnClickTypePriChat:
         {
-            
+            self.popType = PopTypePriMessage;
         }
             break;
         case BtnClickTypeGift:
         {
-            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 230, SCREEN_WIDTH, 230) liveBaseView:self];
-            giftListView.backgroundColor = [UIColor lightGrayColor];
+            self.popType = PopTypeGift;
+            [self hiddenView:YES];
+            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 250, SCREEN_WIDTH, 250) liveBaseView:self];
             [self addSubview:giftListView];
-            self.currentPopView = giftListView;
-
+            self.giftPopView = giftListView;
+            
+            UIImageView *giftBg = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, giftListView.width, giftListView.height)];
+            giftBg.image = [UIImage imageNamed:@"背景400x300"];
+            giftBg.centerX = giftListView.width * 0.5;
+            giftBg.centerY = giftListView.height * 0.5;
+            giftBg.alpha = 0.4;
+            [giftListView addSubview:giftBg];
+            
+            
         }
             break;
         default:
@@ -67,22 +106,87 @@
 {
     self.bottomToolView.hidden = isHidden;
     self.closeBtn.hidden = isHidden;
+    self.chatTableView.hidden = isHidden;
 }
 - (void)clearCurrentPopView
 {
-    [UIView animateWithDuration:0.25 animations:^{
-        
-        self.currentPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
-        [self hiddenView:NO];
-    } completion:^(BOOL finished) {
-        [self.currentPopView removeFromSuperview];
-    }];
+    switch (self.popType) {
+        case PopTypeGift:
+        {
+            [UIView animateWithDuration:0.25 animations:^{
+                
+                self.giftPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                [self hiddenView:NO];
+            } completion:^(BOOL finished) {
+                [self.giftPopView removeFromSuperview];
+            }];
+        }
+            break;
+        case PopTypeChat:
+        {
+            
+        }
+            break;
+        case PopTypePriMessage:
+        {
+            
+        }
+            break;
+        default:
+            break;
+    }
+    
+}
+#pragma mark - 聊天消息列表
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.chatMsgArray.count;
+}
+
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    chatListCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([chatListCell class]) forIndexPath:indexPath];
+    [cell loadUIWithModel:self.chatMsgArray[indexPath.row]];
+    return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [self.chatMsgArray[indexPath.row] cellHeight];
+}
+
+#pragma mark - PresentViewDelegate
+
+- (PresentViewCell *)presentView:(PresentView *)presentView cellOfRow:(NSInteger)row
+{
+    return [[ComboCell alloc] initWithRow:row];
+}
+
+- (void)presentView:(PresentView *)presentView configCell:(PresentViewCell *)cell model:(id<PresentModelAble>)model
+{
+    ComboCell *comboCell = (ComboCell *)cell;
+    comboCell.model = (GiftModel *)model;
+}
+
+- (void)presentView:(PresentView *)presentView didSelectedCellOfRowAtIndex:(NSUInteger)index
+{
+    ComboCell *cell = [presentView cellForRowAtIndex:index];
+    NSLog(@"你点击了：%@", cell.model.giftName);
+}
+
+- (void)presentView:(PresentView *)presentView animationCompleted:(NSInteger)shakeNumber model:(id<PresentModelAble>)model
+{
+    NSLog(@"%@礼物的连送动画执行完成", model.giftName);
 }
 #pragma mark - buttonClick
 - (void)tapGestureClick:(UITapGestureRecognizer *)gesture
 {
+    [[LVCAnimationManager shareManager] bubblingWithCenterPoint:CGPointMake(SCREEN_WIDTH - 50, SCREEN_HEIGHT - 50) toView:self.animationBaseView];
     [self clearCurrentPopView];
 }
@@ -91,6 +195,12 @@
     [self.viewController.navigationController popViewControllerAnimated:YES];
 }
+#pragma mark - UIScrollViewDelegate
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
+{
+    [self clearCurrentPopView];
+}
+
 #pragma mark - setter
 -(void)setViewController:(UIViewController *)viewController
 {
@@ -110,15 +220,38 @@
         _scrollView.showsVerticalScrollIndicator = NO;
         _scrollView.showsHorizontalScrollIndicator = NO;
         _scrollView.backgroundColor = [UIColor clearColor];
+        _scrollView.delegate = self;
     }
     return _scrollView;
 }
+- (UIView *)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;
+    }
+    return _animationBaseView;
+}
+
+- (PresentView *)presentView
+{
+    if (!_presentView)
+    {
+        _presentView = [[PresentView alloc] initWithFrame:CGRectMake(0, 200, 220, 200)];
+        _presentView.delegate = self;
+        _presentView.backgroundColor = [UIColor clearColor];
+    }
+    return _presentView;
+}
+
 - (BottomToolView *)bottomToolView
 {
     if (!_bottomToolView)
     {
-        _bottomToolView = [[BottomToolView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH, SCREEN_HEIGHT - 60, SCREEN_WIDTH, 60)];
+        _bottomToolView = [[BottomToolView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - BottomToolHeight, SCREEN_WIDTH, BottomToolHeight)];
         _bottomToolView.delegate = self;
         _bottomToolView.backgroundColor = [UIColor lightGrayColor];
         _bottomToolView.alpha = 0.7;
@@ -126,6 +259,31 @@
     return _bottomToolView;
 }
+- (UITableView *)chatTableView
+{
+    if (!_chatTableView) {
+        UITableView *tableView = [[UITableView alloc]initWithFrame:CGRectMake(10, SCREEN_HEIGHT - 150 - BottomToolHeight - 10, 300, 150)];
+        tableView.delegate = self;
+        tableView.dataSource = self;
+        tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        [tableView registerClass:[chatListCell class] forCellReuseIdentifier:NSStringFromClass([chatListCell class])];
+        tableView.showsVerticalScrollIndicator = NO;
+        tableView.showsHorizontalScrollIndicator = NO;
+        tableView.backgroundColor = [UIColor clearColor];
+        tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _chatTableView = tableView;
+    }
+    return _chatTableView;
+}
+
+- (NSMutableArray *)chatMsgArray
+{
+    if (!_chatMsgArray) {
+        _chatMsgArray = [NSMutableArray array];
+    }
+    return _chatMsgArray;
+}
+
 - (UIButton *)closeBtn
 {
     if (!_closeBtn)
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "beer.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" : "chicken.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" : "continuous.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" : "cucumber.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" : "diamond.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" : "fighter_small80.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "flower.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" : "hug.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" : "love_gift.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" : "mouth.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" : "plane_small80.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" : "porsch_small80.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" : "ring.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" : "rose.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" : "sticks.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" : "背景100x100.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" : "背景150x100.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" : "背景200x50.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" : "背景400x30.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" : "背景400x300.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -3,43 +3,30 @@
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
       "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
       "minimum-system-version" : "7.0",
-      "scale" : "2x"
+      "scale" : "1x"
     },
     {
       "orientation" : "portrait",
-      "idiom" : "iphone",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "subtype" : "retina4",
       "scale" : "2x"
     },
     {
-      "orientation" : "portrait",
+      "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "1x"
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
     }
   ],
   "info" : {