完善礼物UI,添加歼灭机

张旭
1 parent cf9d0686
Showing 58 changed files with 621 additions and 138 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/AnimQueueManager.m
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/GiftModel/GiftModel.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/GiftViews/GiftListView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftPayButton.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftPayButton.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/PresentModelAble.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/PresentView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/PresentView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/PresentViewCell.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/PresentViewCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Gift/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Gift/beer.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Gift/beer.imageset/beer.png
@@ -131,6 +131,7 @@
 		D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FB1E77C2D900627701 /* BottomToolView.m */; };
 		D22830FF1E77C69E00627701 /* GiftListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FE1E77C69E00627701 /* GiftListView.m */; };
 		D22831091E77D8D500627701 /* GiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D22831081E77D8D500627701 /* GiftModel.m */; };
+		D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */; };
 		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 */; };
@@ -223,7 +224,6 @@
 		8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCPlayerLoadingView.m; sourceTree = "<group>"; };
 		812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
 		812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
-		812E50511E7699DC004F5FCD /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; };
 		81FB5B3A1E7A6FFC00F98E1D /* SevenSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SevenSwitch.h; sourceTree = "<group>"; };
 		81FB5B3B1E7A6FFC00F98E1D /* SevenSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SevenSwitch.m; sourceTree = "<group>"; };
 		D2029B811E6EAAA50027CD92 /* LiveVideoCloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LiveVideoCloud.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -442,8 +442,8 @@
 		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; path = ComboCell.h; sourceTree = "<group>"; };
-		D217A24D1E7B77C7003B44CB /* ComboCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComboCell.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>"; };
@@ -452,6 +452,8 @@
 		D22830FE1E77C69E00627701 /* GiftListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftListView.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>"; };
 		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>"; };
@@ -1205,8 +1207,6 @@
 				D217A2471E7B76C7003B44CB /* PresentView.m */,
 				D217A2481E7B76C7003B44CB /* PresentViewCell.h */,
 				D217A2491E7B76C7003B44CB /* PresentViewCell.m */,
-				D217A24C1E7B77C7003B44CB /* ComboCell.h */,
-				D217A24D1E7B77C7003B44CB /* ComboCell.m */,
 			);
 			path = Present;
 			sourceTree = "<group>";
@@ -1216,6 +1216,8 @@
 			children = (
 				D22830FD1E77C69E00627701 /* GiftListView.h */,
 				D22830FE1E77C69E00627701 /* GiftListView.m */,
+				D236967C1E7F9E4100E4BF71 /* GiftPayButton.h */,
+				D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */,
 			);
 			path = GiftViews;
 			sourceTree = "<group>";
@@ -1291,6 +1293,8 @@
 			isa = PBXGroup;
 			children = (
 				D217A2441E7B76C7003B44CB /* Present */,
+				D217A24C1E7B77C7003B44CB /* ComboCell.h */,
+				D217A24D1E7B77C7003B44CB /* ComboCell.m */,
 				D25530041E7911A800DF38A5 /* GiftAnimationAction.h */,
 				D25530051E7911A800DF38A5 /* GiftAnimationAction.m */,
 				D25530011E79115100DF38A5 /* AnimQueueManager.h */,
@@ -1565,8 +1569,6 @@
 				D2029CB01E6EADE10027CD92 /* MJRefresh.bundle in Resources */,
 				D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */,
 				D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */,
-				D2029B8F1E6EAAA50027CD92 /* Main.storyboard in Resources */,
-				812E50541E7699DC004F5FCD /* KSYGPUResource.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1647,6 +1649,7 @@
 				D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.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 */,
@@ -57,20 +57,21 @@
  @param model modelobj
  */
 - (void)addAnimationWithModel:(GiftModel *)model animContentView:(UIView *)animContentView{
-
+    
+    GiftAnimOperation *op = [GiftAnimOperation addGiftAnimOperationWithGiftModel:model animContentView:animContentView];
     switch (model.giftStyle) {
         case GiftStylePorsch:
         {
-             GiftAnimOperation *op = [GiftAnimOperation addGiftAnimOperationWithGiftModel:model animContentView:animContentView];
             [self.expenAnimationQueue addOperation:op];
         }
             break;
-//        case GiftStyleFighter:
-//            [self.expenAnimationQueue addOperation:op];
-//            break;
+        case GiftStyleFighter:
+        {
+            [self.expenAnimationQueue addOperation:op];
+        }
+            break;
         case GiftStylePlane:
         {
-             GiftAnimOperation *op = [GiftAnimOperation addGiftAnimOperationWithGiftModel:model animContentView:animContentView];
             [self.expenAnimationQueue addOperation:op];
         }
             break;
@@ -11,8 +11,8 @@
 #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,7 +21,7 @@
 }
 @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
@@ -72,9 +72,9 @@
         case GiftStylePorsch:
             [self porschAnimation];
             break;
-//        case GiftStyleFighter:
-//            [self fighterAnimation];
-//            break;
+        case GiftStyleFighter:
+            [self fighterAnimation];
+            break;
         case GiftStylePlane:
             [self planeAnimation];
             break;
@@ -105,24 +105,25 @@
     });
 }
-//- (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)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];
+        
+        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"];
+
+        });
+    });
+}
 - (void)planeAnimation
 {
@@ -169,12 +170,12 @@
  @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;
+}
 /**
  客机动画
@@ -23,11 +23,6 @@ typedef void(^giftAnimationCompletion)();
 - (void)startPorschAnimationWithCompletion:(giftAnimationCompletion)Completion;
 /**
- 歼灭机动画
- */
-//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion;
-
-/**
  客机动画
  */
 - (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion;
@@ -11,45 +11,6 @@
 @implementation GiftAnimationAction
 /**
- 连击横屏动画
- */
-- (void)startComboAnimationWithCompletion:(giftAnimationCompletion)Completion{
-    _giftAnimationCompletion = Completion;
-    [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
@@ -58,14 +19,6 @@
 }
 /**
- 歼灭机动画
- */
-//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion
-//{
-//    _giftAnimationCompletion = Completion;
-//}
-
-/**
  客机动画
  */
 - (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion
@@ -11,7 +11,7 @@
 typedef NS_ENUM(NSInteger, GiftStyle) {//礼物类型
     GiftStyleCombo          = 1,//普通可连击礼物
     GiftStylePorsch            ,//豪华跑车礼物
-//    GiftStyleFighter           ,//豪华歼灭机礼物
+    GiftStyleFighter           ,//豪华歼灭机礼物
     GiftStylePlane             ,//豪华客机礼物
 };
@@ -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
 /**
  *  需要几个控制点就设置几个:
@@ -10,13 +10,20 @@
 #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 ,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;
@@ -28,17 +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];
-        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;
@@ -56,40 +68,65 @@
             }
             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].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;
-        [giftView addSubview:imageView];//右上角连击标识
-    }else
-    {
-        
+        imageView.image = [UIImage imageNamed:@"continuous"];
+        [giftView addSubview:imageView];
     }
     //礼物价格lbl
     UILabel *priceLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, giftView.height - 15, 40, 14)];
@@ -101,7 +138,7 @@
     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];
@@ -125,41 +162,53 @@
     }
 }
+- (NSString *)giftNameWithImageName:(NSString *)imageName
+{
+    NSString *giftName = @"";
+
+    if ([_images containsObject:imageName]) {
+        NSInteger index = [_images indexOfObject:imageName];
+        giftName = [_giftNames objectAtIndex:index];
+    }
+    
+    return giftName;
+}
+
 #pragma mark - getter
 - (NSArray *)giftArray
 {
     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 *senders = [NSArray arrayWithObjects:@"张三",@"李四",@"王五",@"宋刘",@"老七",@"老八",@"老九",@"老十",@"老师",@"小十七", 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 ++) {
+        for (int i = 0; i < _images.count; i ++) {
-            int type = [types[i] intValue];
+            int type = [_types[i] intValue];
             if (type == 1) {
                 //combo
-                GiftModel *model1 = [GiftModel modelWithSender:senders[i] giftName:@"大大的爱心" icon:@"love" giftImageName:images[i]];
+                GiftModel *model1 = [GiftModel modelWithSender:senders[i] giftName:[self giftNameWithImageName:_images[i]] icon:@"love" giftImageName:_images[i]];
                 model1.giftStyle = GiftStyleCombo;
-                model1.price = prices[i];
+                model1.price = _prices[i];
                 [tempArr addObject:model1];
             }else
             {//expen
-                GiftModel *model = [GiftModel modelWithSender:senders[i] giftName:@"豪华礼物" icon:@"love" giftImageName:@"love"];
+                GiftModel *model = [GiftModel modelWithSender:senders[i] giftName:[self giftNameWithImageName:_images[i]] icon:@"love" giftImageName:@""];
                 if (type == 2) {
                     model.giftStyle = GiftStylePorsch;
-                    model.giftName = @"跑车";
+                    model.giftImageName = @"porsch_small80";
                 }
                 if (type == 3) {
+                    model.giftStyle = GiftStyleFighter;
+                    model.giftImageName = @"fighter_small80";
+                }
+                if (type == 4) {
                     model.giftStyle = GiftStylePlane;
-                    model.giftName = @"客机";
+                    model.giftImageName = @"plane_small80";
                 }
-                model.price = prices[i];
+                model.price = _prices[i];
                 [tempArr addObject:model];
             }
         }
+//
+//  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
@@ -2,8 +2,8 @@
 //  PresentModelAble.h
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import <Foundation/Foundation.h>
@@ -2,8 +2,8 @@
 //  PresentView.h
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import <UIKit/UIKit.h>
@@ -2,8 +2,8 @@
 //  PresentView.m
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import "PresentView.h"
@@ -17,7 +17,7 @@
  */
 @property (strong, nonatomic) NSMutableArray *dataCaches;
 /**
- *  不带连城动画的消息缓存数组
+ *  不带连乘动画的消息缓存数组
  */
 @property (strong, nonatomic)NSMutableArray *nonshakeDataCaches;
 /**
@@ -2,8 +2,8 @@
 //  PresentViewCell.h
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import <UIKit/UIKit.h>
@@ -2,8 +2,8 @@
 //  PresentViewCell.m
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import "PresentViewCell.h"
@@ -56,6 +56,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         case BtnClickTypeChat:
         {
             self.popType = PopTypeChat;
+            
         }
             break;
         case BtnClickTypePriChat:
@@ -67,11 +68,16 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         {
             self.popType = PopTypeGift;
-            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 230, SCREEN_WIDTH, 230) liveBaseView:self];
-            giftListView.backgroundColor = [UIColor lightGrayColor];
+            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 250, SCREEN_WIDTH, 250) liveBaseView:self];
             [self addSubview: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:
+{
+  "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