动画未完成

张旭
1 parent 7b964133
Showing 30 changed files with 939 additions and 208 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
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/GiftResource/NHCarViews.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHCarViews.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView+animDelegagte.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView+animDelegagte.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHPlaneViews.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHPlaneViews.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/LVCGiftManager.h
@@ -128,10 +128,14 @@
 		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 */; };
+		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 */; };
 		D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C661E76A25400E3A8FC /* LVCInteractionController.m */; };
-		D2575C6B1E76A45400E3A8FC /* LVCGiftManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C6A1E76A45400E3A8FC /* LVCGiftManager.m */; };
 		D2575C7A1E76A4F300E3A8FC /* NHCarViews.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C6F1E76A4F300E3A8FC /* NHCarViews.m */; };
 		D2575C7B1E76A4F300E3A8FC /* NHCarViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2575C701E76A4F300E3A8FC /* NHCarViews.xib */; };
 		D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */ = {isa = PBXBuildFile; fileRef = D2575C721E76A4F300E3A8FC /* NHFighterView.nib */; };
@@ -433,14 +437,22 @@
 		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>"; };
-		D2575C441E76857100E3A8FC /* LVCAnimationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCAnimationManager.h; sourceTree = "<group>"; };
-		D2575C451E76857100E3A8FC /* LVCAnimationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCAnimationManager.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>"; };
+		D2575C451E76857100E3A8FC /* LVCAnimationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCAnimationManager.m; path = ../LVCAnimationManager.m; sourceTree = "<group>"; };
 		D2575C481E7685DE00E3A8FC /* UIView+Bubbling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Bubbling.m"; sourceTree = "<group>"; };
 		D2575C491E7685DE00E3A8FC /* UIView+Bubbling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Bubbling.h"; sourceTree = "<group>"; };
 		D2575C651E76A25400E3A8FC /* LVCInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCInteractionController.h; sourceTree = "<group>"; };
 		D2575C661E76A25400E3A8FC /* LVCInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCInteractionController.m; sourceTree = "<group>"; };
-		D2575C691E76A45400E3A8FC /* LVCGiftManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCGiftManager.h; sourceTree = "<group>"; };
-		D2575C6A1E76A45400E3A8FC /* LVCGiftManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCGiftManager.m; sourceTree = "<group>"; };
 		D2575C6D1E76A4F300E3A8FC /* NHCarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NHCarView.h; sourceTree = "<group>"; };
 		D2575C6E1E76A4F300E3A8FC /* NHCarViews.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NHCarViews.h; sourceTree = "<group>"; };
 		D2575C6F1E76A4F300E3A8FC /* NHCarViews.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NHCarViews.m; sourceTree = "<group>"; };
@@ -1221,8 +1233,6 @@
 				D2575C661E76A25400E3A8FC /* LVCInteractionController.m */,
 				D2575C681E76A42B00E3A8FC /* Gift */,
 				D2575C471E7685C500E3A8FC /* heartAnimation */,
-				D2575C441E76857100E3A8FC /* LVCAnimationManager.h */,
-				D2575C451E76857100E3A8FC /* LVCAnimationManager.m */,
 			);
 			path = InteractionSections;
 			sourceTree = "<group>";
@@ -1232,6 +1242,8 @@
 			children = (
 				D2575C491E7685DE00E3A8FC /* UIView+Bubbling.h */,
 				D2575C481E7685DE00E3A8FC /* UIView+Bubbling.m */,
+				D2575C441E76857100E3A8FC /* LVCAnimationManager.h */,
+				D2575C451E76857100E3A8FC /* LVCAnimationManager.m */,
 			);
 			path = heartAnimation;
 			sourceTree = "<group>";
@@ -1239,8 +1251,14 @@
 		D2575C681E76A42B00E3A8FC /* Gift */ = {
 			isa = PBXGroup;
 			children = (
-				D2575C691E76A45400E3A8FC /* LVCGiftManager.h */,
-				D2575C6A1E76A45400E3A8FC /* LVCGiftManager.m */,
+				D25530071E791A7100DF38A5 /* GiftComboView.h */,
+				D25530081E791A7100DF38A5 /* GiftComboView.m */,
+				D25530041E7911A800DF38A5 /* GiftAnimationAction.h */,
+				D25530051E7911A800DF38A5 /* GiftAnimationAction.m */,
+				D25530011E79115100DF38A5 /* AnimQueueManager.h */,
+				D25530021E79115100DF38A5 /* AnimQueueManager.m */,
+				D2552FFE1E7909AC00DF38A5 /* GiftAnimOperation.h */,
+				D2552FFF1E7909AC00DF38A5 /* GiftAnimOperation.m */,
 				D22830F51E77C24900627701 /* GiftViews */,
 				D2575C6C1E76A4F300E3A8FC /* GiftResource */,
 				D22831061E77D8D500627701 /* GiftModel */,
@@ -1251,6 +1269,8 @@
 		D2575C6C1E76A4F300E3A8FC /* GiftResource */ = {
 			isa = PBXGroup;
 			children = (
+				D255300A1E793F8200DF38A5 /* NHFighterView+animDelegagte.h */,
+				D255300B1E793F8200DF38A5 /* NHFighterView+animDelegagte.m */,
 				D2575C6D1E76A4F300E3A8FC /* NHCarView.h */,
 				D2575C6E1E76A4F300E3A8FC /* NHCarViews.h */,
 				D2575C6F1E76A4F300E3A8FC /* NHCarViews.m */,
@@ -1524,6 +1544,7 @@
 			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 */,
@@ -1575,6 +1596,7 @@
 				D2029CA21E6EADE10027CD92 /* MJRefreshAutoFooter.m in Sources */,
 				D2029CC71E6EADE10027CD92 /* SVIndefiniteAnimatedView.m in Sources */,
 				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 */,
@@ -1598,6 +1620,7 @@
 				D2575C461E76857100E3A8FC /* LVCAnimationManager.m in Sources */,
 				D2029C8A1E6EADE10027CD92 /* AFURLRequestSerialization.m in Sources */,
 				D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */,
+				D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */,
 				D2029C871E6EADE10027CD92 /* AFHTTPSessionManager.m in Sources */,
 				D2029B861E6EAAA50027CD92 /* main.m in Sources */,
 				D2029C8C1E6EADE10027CD92 /* AFURLSessionManager.m in Sources */,
@@ -1629,11 +1652,11 @@
 				D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */,
 				D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */,
 				D2029C951E6EADE10027CD92 /* UIWebView+AFNetworking.m in Sources */,
-				D2575C6B1E76A45400E3A8FC /* LVCGiftManager.m in Sources */,
 				D2029CBD1E6EADE10027CD92 /* SDWebImageManager.m in Sources */,
 				D2029CB41E6EADE10027CD92 /* UIView+MJExtension.m in Sources */,
 				D2029CA91E6EADE10027CD92 /* MJRefreshAutoStateFooter.m in Sources */,
 				D2029D061E6EAE2E0027CD92 /* UIView+Extension.m in Sources */,
+				D25530001E7909AC00DF38A5 /* GiftAnimOperation.m in Sources */,
 				D2029C9D1E6EADE10027CD92 /* NSObject+MJClass.m in Sources */,
 				D2029CCF1E6EADE10027CD92 /* SearchHttp.m in Sources */,
 				810B65001E779B1F00133E15 /* MASConstraintMaker.m in Sources */,
@@ -1642,6 +1665,7 @@
 				D2029BCC1E6EADD70027CD92 /* BaseView.m in Sources */,
 				D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */,
 				D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */,
+				D25530061E7911A800DF38A5 /* GiftAnimationAction.m in Sources */,
 				D2029CD41E6EADE70027CD92 /* HttpService.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
+//
+//  AnimQueueManager.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class GiftModel;
+@interface AnimQueueManager : NSObject
+
+@property (nonatomic, assign)NSInteger maxTop;   //初始位置（需要根据显示设置最低位置在哪里）
+//@property (nonatomic, strong)NSMutableArray *arGiftArray;   //横幅的数量，用于轨道计算（现在结构是一维数组，因为轨道中的弹道只有1个，如果是多个的话需要变为二维数组）
+
+/**
+ 初始化管理类
+ @return 当前manager
+ */
++ (instancetype)sharedAnimQueueManager;
+
+/**
+ 根据实际model添加飞机横幅动画(火箭、飞机横幅动画为一个队列)
+ 
+ @param animContentView 需要把动画view添加到的view
+ @param model modelobj
+ */
+- (void)addAnimationWithModel:(GiftModel *)model animContentView:(UIView *)animContentView;
+
+@end
+//
+//  AnimQueueManager.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "AnimQueueManager.h"
+#import "GiftAnimOperation.h"
+#import "GiftModel.h"
+
+@interface AnimQueueManager ()
+
+@property (nonatomic, assign)NSInteger maxOperationCount;   //并发数
+@property (nonatomic,strong) NSOperationQueue *comboAnimationQueue;  //连击动画队列
+@property (nonatomic,strong) NSOperationQueue *expenAnimationQueue;  //豪华礼物动画队列
+
+@end
+
+@implementation AnimQueueManager
+
+/**
+ 初始化管理类
+ @return 当前manager
+ */
++ (instancetype)sharedAnimQueueManager{
+    
+    static AnimQueueManager *manager;
+    
+    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
+ */
+- (NSOperationQueue *)expenAnimationQueue{
+    if (_expenAnimationQueue == nil) {
+        _expenAnimationQueue = [[NSOperationQueue alloc] init];
+        _expenAnimationQueue.maxConcurrentOperationCount = 1;
+    }
+    return _expenAnimationQueue;
+}
+
+/**
+ 根据实际model添加动画
+ 
+ @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);
+    switch (model.giftStyle) {
+        case GiftStylePorsch:
+            [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;
+        }
+            
+            break;
+        default:
+            break;
+    }
+}
+
+@end
+//
+//  GiftAnimOperation.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@class GiftModel;
+
+@interface GiftAnimOperation : NSOperation
+
++ (GiftAnimOperation *)addGiftAnimOperationWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView maxTop:(NSInteger)maxTop;
+
+@end
+//
+//  GiftAnimOperation.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#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"
+
+@interface GiftAnimOperation ()
+{
+    BOOL _finished;  //用于设置队列是否完成
+    BOOL _executing; //队列任务开始执行
+}
+
+@property (nonatomic, strong)GiftComboView *giftComboView;  //连击动画
+@property (nonatomic, strong)NHCarViews *giftCarView;  //跑车动画
+//@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 *giftAnimOperation = [[GiftAnimOperation alloc]initWithGiftModel:model animContentView:animContentView maxTop:maxTop];
+    return giftAnimOperation;
+}
+
+/**
+ 初始化
+ 
+ @param model 礼物model
+ @param animContentView 需要把动画view添加到的view
+ @return obj
+ */
+- (instancetype)initWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView maxTop:(NSInteger)maxTop{
+    self = [super init];
+    if (self) {
+        self.model = model;
+        self.animContentView = animContentView;
+        self.maxTop = maxTop;
+    }
+    return self;
+}
+
+/**
+ 开始方法(KVO控制队列任务状态)
+ */
+- (void)start{
+    //这里动画队列任务不存在Cancelled状态所以不需要判断，直接开始执行
+    [self willChangeValueForKey:@"isExecuting"];
+    _executing = YES;
+    [self main];
+    [self didChangeValueForKey:@"isExecuting"];
+}
+
+/**
+ 自定义Operation提供了start main接口。
+ */
+- (void)main{
+    
+    switch (_model.giftStyle) {
+        case GiftStylePorsch:
+            [self porschAnimation];
+            break;
+//        case GiftStyleFighter:
+//            [self fighterAnimation];
+//            break;
+        case GiftStylePlane:
+            [self planeAnimation];
+            break;
+        case GiftStyleCombo:
+            [self comboViewAnimation];
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)porschAnimation
+{
+    weakself
+    dispatch_async(dispatch_get_main_queue(), ^{
+        strongself
+
+        [self.giftCarView addAnimationsMoveToPoint:CGPointMake(0, 100) endPoint:CGPointMake(self.animContentView.bounds.size.width +166, 500)];
+        [self.animContentView addSubview:self.giftCarView];
+        
+        [self.giftCarView startPorschAnimationWithCompletion:^{
+            
+            [self willChangeValueForKey:@"isFinished"];
+            
+            _finished = YES;
+            
+            [self didChangeValueForKey:@"isFinished"];
+        }];
+        
+    });
+}
+
+//- (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
+{
+    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 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";
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [weakSelf.animContentView addSubview:weakSelf.giftComboView];
+
+        weakSelf.giftComboView.top = [self.defaultTrajory[currentCompleteIndex] integerValue];
+        
+        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];
+            
+            [weakSelf willChangeValueForKey:@"isFinished"];
+            
+            _finished = YES;
+            
+            [weakSelf didChangeValueForKey:@"isFinished"];
+        }];
+    });
+}
+
+/**
+ 连击动画
+ 
+ @return 连击view
+ */
+- (GiftComboView *)giftComboView{
+    if (_giftComboView == nil) {
+        _giftComboView = [GiftComboView comboView];
+    }
+    return _giftComboView;
+}
+
+/**
+ 跑车动画
+ 
+ @return 连击view
+ */
+- (NHCarViews *)giftCarView{
+    if (_giftCarView == nil) {
+        _giftCarView = [NHCarViews loadCarViewWithPoint:CGPointZero];
+        //数组中放CGRect数据，CGRect的x和y分别作为控制点的x和y，CGRect的width和height作为结束点的x和y
+        //方法如下：数组内的每个元素代码一个控制点和结束点
+        NSMutableArray *pointArrs = [[NSMutableArray alloc] init];
+        CGFloat width = SCREEN_WIDTH / 2;
+        [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
+        [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
+        _giftCarView.curveControlAndEndPoints = pointArrs;
+    }
+    return _giftCarView;
+}
+
+/**
+ 歼灭机动画
+ 
+ @return 连击view
+ */
+//- (NHFighterView *)giftFighterView{
+//    if (_giftFighterView == nil) {
+//        _giftFighterView = [NHFighterView loadFighterViewWithPoint:CGPointMake(10, 100)];
+//    }
+//    return _giftFighterView;
+//}
+
+/**
+ 客机动画
+ 
+ @return 连击view
+ */
+- (NHPlaneViews *)giftPlaneView{
+    if (_giftPlaneView == nil) {
+        _giftPlaneView = [NHPlaneViews loadPlaneViewWithPoint:CGPointMake(SCREEN_WIDTH + 232, 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
+/**
+ 覆写异步执行
+ 
+ @return YES
+ */
+- (BOOL)isAsynchronous{
+    return YES;
+}
+
+/**
+ 覆写任务是否完成控制
+ 
+ @return 完成状态 _finished
+ */
+- (BOOL) isFinished{
+    return _finished;
+}
+
+/**
+ 覆写任务是否完成开始执行
+ 
+ @return 执行状态 _executing
+ */
+- (BOOL) isExecuting{
+    return _executing;
+}
+
+
+
+@end
+//
+//  GiftAnimationAction.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+/**
+ 动画完成回调
+ */
+typedef void(^giftAnimationCompletion)();
+
+@interface GiftAnimationAction : UIView<CAAnimationDelegate>{
+    giftAnimationCompletion _giftAnimationCompletion;   //动画完成回调
+}
+
+/**
+ 连击动画
+ */
+- (void)startComboAnimationWithCompletion:(giftAnimationCompletion)Completion;
+
+/**
+ 跑车动画
+ */
+- (void)startPorschAnimationWithCompletion:(giftAnimationCompletion)Completion;
+
+/**
+ 歼灭机动画
+ */
+//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion;
+
+/**
+ 客机动画
+ */
+- (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion;
+@end
+//
+//  GiftAnimationAction.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftAnimationAction.h"
+
+@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
+{
+    _giftAnimationCompletion = Completion;
+}
+
+/**
+ 歼灭机动画
+ */
+//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion
+//{
+//    _giftAnimationCompletion = Completion;
+//}
+
+/**
+ 客机动画
+ */
+- (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion
+{
+    _giftAnimationCompletion = Completion;
+}
+
+/**
+ 动画回调代理，用于判断是否完成
+ 
+ @param anim 动画对象
+ @param flag 是否完成标记
+ */
+- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
+    _giftAnimationCompletion();
+}
+
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  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
@@ -8,15 +8,28 @@
 #import "BaseModel.h"
-typedef NS_ENUM(NSInteger, GiftModelType) {//礼物类型
-    GiftModelTypeCommon          = 1,//普通礼物
-    GiftModelTypeSpecial             //特殊(豪华)礼物
+typedef NS_ENUM(NSInteger, GiftStyle) {//礼物类型
+    GiftStyleCombo          = 1,//普通可连击礼物
+    GiftStylePorsch            ,//豪华跑车礼物
+//    GiftStyleFighter           ,//豪华歼灭机礼物
+    GiftStylePlane             ,//豪华客机礼物
 };
 @interface GiftModel : BaseModel
-@property (nonatomic ,copy) NSString * _Nullable     image;
-@property (nonatomic      ) GiftModelType            type;
-@property (nonatomic ,copy) NSString * _Nullable     price;
+@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, strong) NSString  *_Nullable pushId;//跳转id
 @end
@@ -7,8 +7,9 @@
 //
 #import <UIKit/UIKit.h>
+#import "GiftAnimationAction.h"
-@interface NHCarViews : UIView
+@interface NHCarViews : GiftAnimationAction
 /**
  *  需要几个控制点就设置几个:
  *  数组内的每个元素代码一个控制点和结束点
@@ -138,6 +138,7 @@
     [self.layer removeAllAnimations];
     [self removeFromSuperview];
+    _giftAnimationCompletion(-1);
     NSLog(@"删除动画");
 //    [self.animations removeObjectAtIndex:0];
+//
+//  NHFighterView+animDelegagte.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "NHFighterView.h"
+
+@interface NHFighterView (animDelegagte)
+
+@end
+//
+//  NHFighterView+animDelegagte.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "NHFighterView+animDelegagte.h"
+
+@implementation NHFighterView (animDelegagte)
+
+- (void)animationDidStart:(CAAnimation *)anim
+{
+    NSLog(@"did start");
+}
+
+- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
+{
+    _giftAnimationCompletion(-1);
+    NSLog(@"did stop");
+}
+
+@end
@@ -7,8 +7,9 @@
 //
 #import <UIKit/UIKit.h>
+#import "GiftAnimationAction.h"
-@interface NHFighterView : UIView
+@interface NHFighterView :GiftAnimationAction
 /**
  *  需要几个控制点就设置几个:
@@ -7,8 +7,9 @@
 //
 #import <UIKit/UIKit.h>
+#import "GiftAnimationAction.h"
-@interface NHPlaneViews : UIView
+@interface NHPlaneViews : GiftAnimationAction
 /**
@@ -80,6 +80,7 @@
 -(void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
     [self.layer removeAllAnimations];
     [self removeFromSuperview];
+    _giftAnimationCompletion(-1);
 }
@@ -7,7 +7,9 @@
 //
 #import "BaseView.h"
+@class LiveBaseView;
 @interface GiftListView : BaseView
+- (instancetype _Nonnull)initWithFrame:(CGRect)frame liveBaseView:(LiveBaseView *_Nullable)liveBaseView;
 @end
@@ -8,6 +8,8 @@
 #import "GiftListView.h"
 #import "GiftModel.h"
+#import "LiveBaseView.h"
+#import "AnimQueueManager.h"
 #define MAX_LINE_COUNT 4
 #define MAX_ROW_COUNT  2
@@ -15,24 +17,29 @@
 @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;
 @end
 @implementation GiftListView
-- (instancetype)initWithFrame:(CGRect)frame
+- (instancetype)initWithFrame:(CGRect)frame liveBaseView:(LiveBaseView *_Nullable)liveBaseView
 {
     if (self = [super initWithFrame:frame]) {
+        self.liveBaseView = liveBaseView;
+        self.animQueueManager = [AnimQueueManager sharedAnimQueueManager];
+        self.animQueueManager.maxTop = 200;
-        
-        UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:self.bounds];
-        scrollView.contentSize = CGSizeMake(self.width *(self.giftArray.count/(MAX_ROW_COUNT*MAX_LINE_COUNT) + 1), self.height);
+        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);
         scrollView.pagingEnabled = YES;
         scrollView.bounces = NO;
         scrollView.showsVerticalScrollIndicator = NO;
         scrollView.showsHorizontalScrollIndicator = NO;
-        scrollView.backgroundColor = [UIColor blueColor];
         [self addSubview:scrollView];
+        scrollView.backgroundColor = ZXRandomColor;
         int line = 0;
         int row = 0;
@@ -50,12 +57,11 @@
             }
             row = i % MAX_LINE_COUNT;
             CGFloat giftWidth = self.width / MAX_LINE_COUNT * 1.0;
-            CGFloat giftHeight = self.height / MAX_ROW_COUNT * 1.0;
+            CGFloat giftHeight = (self.height - 30) / 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 = ZXRandomColor;
             UIImageView *picImg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:self.giftArray[i].image]];
             picImg.centerX = giftView.width * 0.5;
@@ -63,6 +69,10 @@
             [giftView addSubview:picImg];
             [scrollView addSubview:giftView];
+            
+            UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(gestureClick:)];
+            giftView.tag = i + 10;
+            [giftView addGestureRecognizer:gesture];
         }
     }
     return self;
@@ -70,40 +80,84 @@
 - (UIView *)giftViewWithFrame:(CGRect)frame model:(GiftModel *)model
 {
+    _model = model;
     UIView *giftView = [[UIView alloc] initWithFrame:frame];
-    switch (model.type) {
-        case GiftModelTypeCommon:
-        {
-            UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(giftView.width - 17, 3, 15, 15)];
-            imageView.backgroundColor = ZXRandomColor;
-            [giftView addSubview:imageView];
-        }
-            break;
-        case GiftModelTypeSpecial:
-        {
-            
-        }
-            break;
-        default:
-            break;
+    if (model.giftStyle == GiftStyleCombo)
+    {
+        UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(giftView.width - 17, 3, 15, 15)];
+        imageView.backgroundColor = ZXRandomColor;
+        [giftView addSubview:imageView];
+    }else
+    {
+        
     }
+    UILabel *priceLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, giftView.height - 15, 40, 14)];
+    priceLbl.font = [UIFont systemFontOfSize:kDetailContentFont];
+    priceLbl.textColor = [UIColor greenColor];
+    priceLbl.text = model.price;
+    priceLbl.width = [priceLbl labelSize].width;
+    priceLbl.height = [priceLbl labelSize].height;
+    priceLbl.centerX = giftView.width * 0.5 - 4;
+    [giftView addSubview:priceLbl];
+    
+    UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"littleHeart2"]];
+    image.left = priceLbl.right + 3;
+    image.centerY = priceLbl.centerY;
+    [giftView addSubview:image];
-    UIButton *coin = [[UIButton alloc] initWithFrame:CGRectMake(0, giftView.height - 13, 15, 10)];
-    coin.centerX = giftView.width * 0.5;
-    coin.backgroundColor = ZXRandomColor;
-    [giftView addSubview:coin];
     return giftView;
 }
+#pragma mark - 选择礼物点击
+- (void)gestureClick:(UITapGestureRecognizer *)gesture
+{
+    NSInteger tag = gesture.view.tag - 10;
+    NSLog(@"%zd",tag);
+    //右上角添加✔️,再次点击去掉✔️
+    [self.animQueueManager addAnimationWithModel:self.giftArray[tag] animContentView:self.liveBaseView];
+}
+
+#pragma mark - getter
+
 - (NSArray *)giftArray
 {
     if (!_giftArray)
     {
-        GiftModel *model = [[GiftModel alloc] init];
-        model.image = @"love";
-        model.type = GiftModelTypeCommon;
-        model.price = @"3";
-        _giftArray = [[NSArray alloc] initWithObjects:model,model,model,model,model,model,model,model,model,model, nil];
+        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];
+        
+        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];
+            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;
+            }
+
+            model.price = prices[i];
+            [tempArr addObject:model];
+        }
+        _giftArray = [[NSArray alloc] initWithArray:tempArr];
     }
     return _giftArray;
 }
-//
-//  LVCGiftManager.h
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/13.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-typedef NS_ENUM(NSInteger, GiftType) {//礼物类型
-    GiftTypePorsch           = 1,//跑车
-    GiftTypeFighter             ,//歼灭机
-    GiftTypePlane               ,//客机
-};
-
-@interface LVCGiftManager : NSObject
-
-+ (void)giftType:(GiftType)giftType toView:(UIView *_Nonnull)toView;
-
-@end
-
-//
-//  LVCGiftManager.m
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/13.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "LVCGiftManager.h"
-#import "NHCarViews.h"
-#import "NHFighterView.h"
-#import "NHPlaneViews.h"
-
-@implementation LVCGiftManager
-
-+ (void)giftType:(GiftType)giftType toView:(UIView *_Nonnull)toView
-{
-    
-    switch (giftType) {
-        case GiftTypePorsch:
-        {
-            NHCarViews *car = [NHCarViews loadCarViewWithPoint:CGPointZero];
-            //数组中放CGRect数据，CGRect的x和y分别作为控制点的x和y，CGRect的width和height作为结束点的x和y
-            //方法如下：数组内的每个元素代码一个控制点和结束点
-            NSMutableArray *pointArrs = [[NSMutableArray alloc] init];
-            CGFloat width = SCREEN_WIDTH / 2;
-            [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
-            [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
-            car.curveControlAndEndPoints = pointArrs;
-            [car addAnimationsMoveToPoint:CGPointMake(0, 100) endPoint:CGPointMake(toView.bounds.size.width +166, 500)];
-            [toView addSubview:car];
-        }
-            break;
-        case GiftTypeFighter:
-        {
-            NHFighterView *fighter = [NHFighterView loadFighterViewWithPoint:CGPointMake(10, 100)];
-            [fighter addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 60) endPoint:CGPointMake( -500, 600)];
-            [toView addSubview:fighter];
-        }
-            break;
-        case GiftTypePlane:
-        {
-            NHPlaneViews *plane = [NHPlaneViews loadPlaneViewWithPoint:CGPointMake(SCREEN_WIDTH + 232, 0)];
-//            NSMutableArray *pointArrs = [[NSMutableArray alloc] init];
-//            [pointArrs addObject:NSStringFromCGRect(CGRectMake(290, 250, 290, 250))];
-//            [pointArrs addObject:NSStringFromCGRect(CGRectMake(290, 250, 290, 250))];
-//            plane.curveControlAndEndPoints = pointArrs;
-            [plane addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 100) endPoint:CGPointMake(-500, 410)];
-            [toView addSubview:plane];
-        }
-            break;
-            
-        default:
-            break;
-    }
-    
-    
-    }
-
-@end
@@ -33,7 +33,8 @@
     if (!_liveBaseView)
     {
         _liveBaseView = [[LiveBaseView alloc] initWithFrame:SCREEN_RECT];
-        _liveBaseView.backgroundColor = [UIColor greenColor];
+        _liveBaseView.viewController = self;
+        _liveBaseView.backgroundColor = [UIColor clearColor];
     }
     return _liveBaseView;
 }
@@ -10,4 +10,6 @@
 @interface LiveBaseView : BaseView 
+@property (nonatomic ,strong) UIViewController * _Nullable             viewController;
+
 @end
@@ -8,10 +8,9 @@
 //
 #import "LiveBaseView.h"
-#import "LVCGiftManager.h"
 #import "BottomToolView.h"
 #import "GiftListView.h"
-
+#import "GiftModel.h"
 @interface LiveBaseView ()<bottomBtnDeledate>
 @property (nonatomic ,strong) UIScrollView *  _Nullable scrollView;
@@ -19,10 +18,6 @@
 @property (nonatomic ,strong) UIButton *      _Nullable closeBtn;
 @property (nonatomic ,strong) UIView *        _Nullable currentPopView;
-@property (nonatomic ,strong) UIButton *      _Nullable porschBtn;
-@property (nonatomic ,strong) UIButton *      _Nullable fightBtn;
-@property (nonatomic ,strong) UIButton *      _Nullable planeBtn;
-
 @end
 @implementation LiveBaseView
@@ -34,11 +29,7 @@
         [self addSubview:self.scrollView];
         [self.scrollView addSubview:self.bottomToolView];
         [self addSubview:self.closeBtn];
-        [self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureClick)]];
-        
-//        [self addSubview:self.porschBtn];
-//        [self addSubview:self.fightBtn];
-//        [self addSubview:self.planeBtn];
+        [self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureClick:)]];
     }
     return self;
 }
@@ -60,14 +51,11 @@
             break;
         case BtnClickTypeGift:
         {
-            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 200, SCREEN_WIDTH, 200)];
-            giftListView.backgroundColor = [UIColor redColor];
+            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 230, SCREEN_WIDTH, 230) liveBaseView:self];
+            giftListView.backgroundColor = [UIColor lightGrayColor];
             [self addSubview:giftListView];
             self.currentPopView = giftListView;
-            
-            
-            
-            
+
         }
             break;
         default:
@@ -93,30 +81,20 @@
 }
 #pragma mark - buttonClick
-- (void)tapGestureClick
+- (void)tapGestureClick:(UITapGestureRecognizer *)gesture
 {
     [self clearCurrentPopView];
 }
-
-- (void)porschAction
-{
-    [LVCGiftManager giftType:GiftTypePorsch toView:self];
-}
-
-- (void)fightAction
-{
-    [LVCGiftManager giftType:GiftTypeFighter toView:self];
-}
-
-- (void)planeAction
+- (void)closeAction
 {
-    [LVCGiftManager giftType:GiftTypePlane toView:self];
+    [self.viewController.navigationController popViewControllerAnimated:YES];
 }
-- (void)closeAction
+#pragma mark - setter
+-(void)setViewController:(UIViewController *)viewController
 {
-    
+    _viewController = viewController;
 }
 #pragma mark - getter
@@ -162,48 +140,6 @@
     return _closeBtn;
 }
-- (UIButton *)porschBtn
-{
-    if (!_porschBtn)
-    {
-        UIButton *porschBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        porschBtn.frame = CGRectMake(SCREEN_WIDTH - 80, 400, 80, 30);
-        [porschBtn setTitle:@"保时捷" forState:UIControlStateNormal];
-        [porschBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [porschBtn addTarget:self action:@selector(porschAction) forControlEvents:UIControlEventTouchUpInside];
-        _porschBtn = porschBtn;
-    }
-    return _porschBtn;
-}
-
-- (UIButton *)fightBtn
-{
-    if (!_fightBtn)
-    {
-        UIButton *fightBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        fightBtn.frame = CGRectMake(SCREEN_WIDTH - 80, 450, 80, 30);
-        [fightBtn setTitle:@"歼灭机" forState:UIControlStateNormal];
-        [fightBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [fightBtn addTarget:self action:@selector(fightAction) forControlEvents:UIControlEventTouchUpInside];
-        _fightBtn = fightBtn;
-    }
-    return _fightBtn;
-}
-
-- (UIButton *)planeBtn
-{
-    if (!_planeBtn)
-    {
-        UIButton *planeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        planeBtn.frame = CGRectMake(SCREEN_WIDTH - 80, 500, 80, 30);
-        [planeBtn setTitle:@"客机" forState:UIControlStateNormal];
-        [planeBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [planeBtn addTarget:self action:@selector(planeAction) forControlEvents:UIControlEventTouchUpInside];
-        _planeBtn = planeBtn;
-    }
-    return _planeBtn;
-}
-
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "littleHeart.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" : "littleHeart1.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" : "littleHeart2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file