发礼物走聊天室

张旭
1 parent 70c942db
Showing 15 changed files with 148 additions and 129 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.h
LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatViews/chatListCell.m
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftModel/GiftModel.h
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftModel/GiftModel.m
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.h
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.m
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/ComboCell.m
LiveVideoCloud/Classes/Sections/InteractionSections/LVCInteractionController.h
LiveVideoCloud/Classes/Sections/InteractionSections/LVCInteractionController.m
LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCVerifyViewController.m
LiveVideoCloud/animation.xcassets/Interaction/defaultUserIcon.imageset/Contents.json
LiveVideoCloud/animation.xcassets/player/Is closed.imageset/Contents.json
@@ -211,7 +211,6 @@
 		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 */; };
 		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 */; };
@@ -726,8 +725,6 @@
 		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>"; };
 		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>"; };
@@ -1843,8 +1840,6 @@
 				D207BEA01E84C1EC006A0CE8 /* AnimationBaseView.m */,
 				D22830EF1E778C0F00627701 /* LiveBaseView.h */,
 				D22830F01E778C0F00627701 /* LiveBaseView.m */,
-				D2575C651E76A25400E3A8FC /* LVCInteractionController.h */,
-				D2575C661E76A25400E3A8FC /* LVCInteractionController.m */,
 				D2575C681E76A42B00E3A8FC /* Gift */,
 				D2575C471E7685C500E3A8FC /* heartAnimation */,
 			);
@@ -2373,7 +2368,6 @@
 				810B64FE1E779B1F00133E15 /* MASCompositeConstraint.m in Sources */,
 				D2029C981E6EADE10027CD92 /* MJExtensionConst.m in Sources */,
 				8178D4571F0204D600AA78A4 /* LVCTelevisioController.m in Sources */,
-				D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */,
 				D2029CAE1E6EADE10027CD92 /* MJRefreshNormalHeader.m in Sources */,
 				D23696921E7FC83800E4BF71 /* chatMsgModel.m in Sources */,
 				4BD856071EBACD530082061D /* UIImageView+AFNetworking.m in Sources */,
@@ -49,7 +49,7 @@
     // 20170327 20170328
-    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328ll" name:@"20170328" portrait:@""];
+    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328ll" name:@"20170328" portrait:@"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg"];
     [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
         NSLog(@"连接服务器-----success");
@@ -13,6 +13,7 @@
 @property (nonatomic ,copy  ) NSString * _Nullable icon;//头像
 @property (nonatomic ,copy  ) NSString * _Nullable name;//姓名
 @property (nonatomic ,copy  ) NSString * _Nullable content;//内容
+@property (nonatomic ,copy  ) NSString * _Nullable uId;
 @property (nonatomic ,assign) CGFloat   level;//等级
 @property (nonatomic ,assign) CGFloat   cellWidth;//内容宽度
@@ -35,7 +35,7 @@
     [self bindView];//更新cell高度后再初始化UI
     [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:nil];
-    self.iconImageView.backgroundColor = ZXRandomColor;
+    self.iconImageView.backgroundColor = [UIColor clearColor];
     self.contentLabel.text = [NSString stringWithFormat:@"%@:%@",model.name,model.content];
     CGSize contentLabelSize = [self.contentLabel labelSizeWithWidth:self.width - self.iconImageView.right - 4];
     self.contentLabel.frame = CGRectMake(20, 0, contentLabelSize.width, contentLabelSize.height);
@@ -16,12 +16,17 @@ typedef NS_ENUM(NSInteger, GiftStyle) {//礼物类型
 };
 @interface GiftModel : BaseModel <PresentModelAble>
-@property (copy, nonatomic) NSString *_Nullable sender;//送礼人
+@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 senderId;//送礼人Id
+//@property (nonatomic ,copy) NSString *_Nullable giftRecName;//收礼物人名字
+@property (nonatomic ,copy) NSString *_Nullable giftRecId;//收礼物人Id
+
 //可本地处理
 @property (nonatomic ,copy  ) NSString *            _Nullable price; // ***
 @property (nonatomic        ) GiftStyle                       giftStyle;//动画类型
@@ -37,6 +42,6 @@ typedef NS_ENUM(NSInteger, GiftStyle) {//礼物类型
 //@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;
++ (instancetype _Nonnull)modelWithGiftName:(NSString *_Nonnull)giftName icon:(NSString *_Nullable)icon giftImageName:(NSString *_Nonnull)giftImageName;
 @end
@@ -9,10 +9,10 @@
 #import "GiftModel.h"
 @implementation GiftModel
-+ (instancetype)modelWithSender:(NSString *)sender giftName:(NSString *)giftName icon:(NSString *)icon giftImageName:(NSString *)giftImageName 
++ (instancetype _Nonnull)modelWithGiftName:(NSString *_Nonnull)giftName icon:(NSString *_Nullable)icon giftImageName:(NSString *_Nonnull)giftImageName
 {
     GiftModel *model = [[GiftModel alloc] init];
-    model.sender        = sender;
+//    model.sender        = sender;
     model.giftName      = giftName;
     model.icon          = icon;
     model.giftImageName = giftImageName;
@@ -8,8 +8,19 @@
 #import "BaseView.h"
 @class LiveBaseView;
+@class GiftModel;
+
+@protocol GiftSelectDelegate <NSObject>
+
+- (void)giftSelectedModel:(GiftModel *_Nonnull)model;
+
+@end
 @interface GiftListView : BaseView
 - (instancetype _Nonnull)initWithFrame:(CGRect)frame liveBaseView:(LiveBaseView *_Nullable)liveBaseView;
+
+@property (nonatomic,weak) id <GiftSelectDelegate> delegate;
+
+- (void)addGiftAnimationWithModel:(GiftModel *_Nonnull)model;
 @end
@@ -27,6 +27,8 @@
 @property (nonatomic ,weak  ) LiveBaseView *         _Nullable  liveBaseView;
 @property (nonatomic, strong) AnimQueueManager *                animQueueManager;
 @property (nonatomic ,strong) GiftModel *            _Nullable  model;
+@property (nonatomic ,assign) BOOL                          isSelectedGift;
+@property (nonatomic ,assign) NSInteger curruntSelectIdx;
 @end
@@ -36,6 +38,7 @@
 {
     if (self = [super initWithFrame:frame]) {
+        _isSelectedGift = NO;
         _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];
@@ -45,7 +48,7 @@
         self.animQueueManager = [AnimQueueManager sharedAnimQueueManager];
         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.contentSize = CGSizeMake(self.width *(self.giftNames.count/(MAX_ROW_COUNT*MAX_LINE_COUNT) + 1), self.height - GiftPayViewHeight);
         scrollView.pagingEnabled = YES;
         scrollView.bounces = NO;
         scrollView.showsVerticalScrollIndicator = NO;
@@ -57,7 +60,7 @@
         CGFloat giftX = 0;
         CGFloat giftY = 0;
         int page = 0;
-        for (int i = 0; i < self.giftArray.count; i ++) {
+        for (int i = 0; i < self.giftNames.count; i ++) {
             if (i % MAX_LINE_COUNT == 0 && i > 0) {
                 line ++;
@@ -110,8 +113,12 @@
 - (void)sendClick
 {
-    NSLog(@"sendClick");
-    [Tools showNaviViewWithMessage:@"请先充值钻石哦"];
+    if (_isSelectedGift) {//当前选择了礼物
+        if ([self.delegate respondsToSelector:@selector(giftSelectedModel:)]) {
+            [self.delegate giftSelectedModel:_model];
+        }
+    }
+//    [Tools showNaviViewWithMessage:@"请先充值钻石哦"];
 }
 - (void)payClick
@@ -150,17 +157,40 @@
 #pragma mark - 选择礼物点击
 - (void)gestureClick:(UITapGestureRecognizer *)gesture
 {
+    _isSelectedGift = YES;
     NSInteger tag = gesture.view.tag - 10;
     NSLog(@"%zd",tag);
+    
+//    if (_curruntSelectIdx == tag && _isSelectedGift) {
+//        _isSelectedGift = NO;
+//        _curruntSelectIdx = -1;
+//    }
+//    _curruntSelectIdx = tag;
+
     //右上角添加✔️,再次点击去掉✔️
+    
     GiftModel *model = self.giftArray[tag];
-    if (model.giftStyle == GiftStyleCombo) {
+    model.sender = [CNLiveChatManager sharedCNLiveChatManager].currentUserInfo.name;
+    model.icon = [CNLiveChatManager sharedCNLiveChatManager].currentUserInfo.portraitUri;
+#warning 测试时 price 用假值 model.giftNumber赋值会导致不能本地连击以后再说
+    model.price = @"0";
+//    model.giftNumber = 3;
+    model.index = tag;
+    _model = model;
+}
-        [self.animQueueManager addAnimationWithModel:self.giftArray[tag] animContentView:(UIView *)self.liveBaseView.presentView];
-    }else
-    {
-        [self.animQueueManager addAnimationWithModel:self.giftArray[tag] animContentView:self.liveBaseView];
-    }
+//应该加验证发送礼物消息成功后 再展示动画
+- (void)addGiftAnimationWithModel:(GiftModel *_Nonnull)model
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (model.giftStyle == GiftStyleCombo) {
+            
+            [self.animQueueManager addAnimationWithModel:self.giftArray[model.index] animContentView:(UIView *)self.liveBaseView.presentView];
+        }else
+        {
+            [self.animQueueManager addAnimationWithModel:self.giftArray[model.index] animContentView:self.liveBaseView];
+        }
+    });
 }
 - (NSString *)giftNameWithImageName:(NSString *)imageName
@@ -181,21 +211,20 @@
 {
     if (!_giftArray)
     {
-        NSArray *senders = [NSArray arrayWithObjects:@"张三",@"龙的传人",@"李四",@"王五",@"宋刘",@"老七",@"老八",@"老九",@"老十",@"老师",@"小十七",@"小十八",@"小十九", nil];
         NSMutableArray *tempArr = [NSMutableArray array];
         for (int i = 0; i < _images.count; i ++) {
             NSString *type = _types[i];
             if ([type isEqualToString:@"1"]) {
                 //combo
-                GiftModel *model1 = [GiftModel modelWithSender:senders[i] giftName:[self giftNameWithImageName:_images[i]] icon:@"love" giftImageName:_images[i]];
+                GiftModel *model1 = [GiftModel modelWithGiftName:[self giftNameWithImageName:_images[i]] icon:@"" 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:@""];
+                GiftModel *model = [GiftModel modelWithGiftName:[self giftNameWithImageName:_images[i]] icon:@"" giftImageName:@""];
                 if ([type isEqualToString:@"2"]) {
                     model.giftStyle = GiftStylePorsch;
@@ -37,7 +37,7 @@
 - (void)setModel:(GiftModel *)model
 {
     _model = model;
-    self.icon.image = [UIImage imageNamed:model.icon];
+    [self.icon sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:nil];//[UIImage zx_circleImageNamed:model.icon];
     self.senderNameLbl.text = model.sender;
     self.giftNameLbl.text = [NSString stringWithFormat:@"送一个%@",model.giftName];
     self.senderNameLbl.size = [self.senderNameLbl labelSize];
-//
-//  LVCInteractionController.h
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/13.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "BaseViewController.h"
-
-@interface LVCInteractionController : BaseViewController
-
-@end
-//
-//  LVCInteractionController.m
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/13.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "LVCInteractionController.h"
-#import "LiveBaseView.h"
-
-@interface LVCInteractionController ()
-
-@property (nonatomic ,strong) LiveBaseView * _Nullable             liveBaseView;
-
-@end
-
-@implementation LVCInteractionController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    self.automaticallyAdjustsScrollViewInsets = NO;
-}
-
-- (void)bindView
-{
-    [self.view addSubview:self.liveBaseView];
-}
-
-- (LiveBaseView *)liveBaseView
-{
-    if (!_liveBaseView)
-    {
-        _liveBaseView = [LiveBaseView liveBaseView];
-        _liveBaseView.viewController = self;
-        _liveBaseView.backgroundColor = [UIColor clearColor];
-    }
-    return _liveBaseView;
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end
@@ -24,8 +24,16 @@
 #define BottomToolHeight 60
-static NSString *message_barrage = @"message_barrage";
-static NSString *message_content = @"message_content";
+static NSString *chatType = @"type";
+static NSString *chatMessage = @"message";
+static NSString *msgGiftPrice = @"giftPrice";
+static NSString *msgGiftName = @"giftName";
+static NSString *msgGiftNumber = @"giftNumber";
+static NSString *msgBarrage = @"messageBarrage";
+static NSString *msgContent = @"content";
+static NSString *giftType = @"giftType";
+static NSString *chatRoomType = @"chatRoom";
+static NSString *joinType = @"joinType";
 typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     PopTypeGift          = 1,//礼物弹窗
@@ -33,7 +41,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     PopTypePriMessage        //私信弹窗
 };
-@interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,userClickDelegate,CNLiveChatManagerDelegate,PopViewDelegate>
+@interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,userClickDelegate,CNLiveChatManagerDelegate,PopViewDelegate,GiftSelectDelegate>
 @property (nonatomic ,strong           ) UIScrollView *   _Nullable scrollView;
 //@property (nonatomic ,strong ,readwrite) AnimationBaseView *         _Nullable animationBaseView;//展示层View
@@ -82,7 +90,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [[LVCAnimationManager shareManager] bubblingWithCenterPoint:CGPointMake(SCREEN_WIDTH - 50, SCREEN_HEIGHT - 50) toView:self.animationBaseView speed:1];
         [self.animationBaseView addSubview:self.chatTableView];
-        
         [self.animationBaseView addSubview:self.topToolsView];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil];
@@ -95,12 +102,10 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     _roomId = roomId;
     [CNLiveChatManager sharedCNLiveChatManager].delegate = self;
     [[CNLiveChatManager sharedCNLiveChatManager] joinChatRoom:roomId messageCount:10 success:^(NSString *targetId) {
-        NSLog(@"success");
+        NSLog(@"连接聊天室成功success  %@",targetId);
     } error:^(CNLiveChatErrorCode errors, NSString *targetId) {
         NSLog(@"error");
     }];
-    
-    [CNLiveChatManager sharedCNLiveChatManager].currentUserInfo.portraitUri = @"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg";
 }
 - (void)dealloc
@@ -185,25 +190,26 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         NSDictionary *dic;
         if(self.barrageSwitch.isOn){
             //开启横屏弹幕
-            dic = @{message_barrage:@"1",message_content:textField.text};
+            dic = @{chatType:chatRoomType, chatMessage:@{msgBarrage:@"1",msgContent:textField.text}};
         }else
         {
-            dic = @{message_barrage:@"0",message_content:textField.text};
+            dic = @{chatType:chatRoomType, chatMessage:@{msgBarrage:@"0",msgContent:textField.text}};
         }
         weakself
         NSString *message = [Tools dictionaryToJson:dic];
-        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_CHATROOM targetId:@"1234" success:^(CNLiveChatMessage *message) {
+        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_CHATROOM targetId:_roomId success:^(CNLiveChatMessage *message) {
             strongself
             NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
-            NSString *content = [JSONDic objectForKey:message_content];
+            NSDictionary *msg = [JSONDic objectForKey:chatMessage];
             //将消息显示到列表中
             chatMsgModel *model = [[chatMsgModel alloc] init];
             model.name = message.userInfo.name;
-            model.content = content;
+            model.content = [msg objectForKey:msgContent];
             model.ID = message.targetId;
             model.icon = message.userInfo.portraitUri;
             model.cellWidth = self.chatTableView.width - 20;
+            model.uId = message.userInfo.userId;
             [self.chatMsgArray addObject:model];
             [self.chatTableView reloadData];
             NSInteger section = [self.chatTableView numberOfSections];
@@ -214,13 +220,13 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
             [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
             [self.chatTableView reloadData];
-            NSInteger isBarrage = [[JSONDic objectForKey:message_barrage] integerValue];
+            NSInteger isBarrage = [[[JSONDic objectForKey:chatMessage] objectForKey:msgBarrage] integerValue];
             if (isBarrage) {//此条消息飘弹幕
                 chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
                 barrageModel.name = message.userInfo.name;
-                barrageModel.content = content;
+                barrageModel.content = [msg objectForKey:msgContent];
                 barrageModel.icon = message.userInfo.portraitUri;
                 [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
@@ -365,6 +371,12 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     }
 }
+- (NSString *)giftModelToJSON:(GiftModel *)model
+{
+    NSDictionary *dic = @{chatType:giftType,chatMessage:@{msgGiftName:model.giftName,msgGiftNumber:[NSString stringWithFormat:@"%zd",model.giftNumber],msgGiftPrice:model.price}};
+    return [Tools dictionaryToJson:dic];
+}
+
 #pragma mark - buttonClick触摸屏幕关闭方法
 - (void)tapGestureClick:(UITapGestureRecognizer *)gesture
 {
@@ -427,6 +439,48 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     [self clearCurrentPopView];
 }
+#pragma mark - GiftSelectedDelegate
+- (void)giftSelectedModel:(GiftModel *_Nonnull)model
+{
+    if (![model.sender isEqualToString:@""]) {
+        if ([[CNLiveChatManager sharedCNLiveChatManager] getConnectionStatus] == CNLive_ConnectionStatus_Connected) {
+            
+            weakself
+            [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:[self giftModelToJSON:model] type:CNLive_ConversationType_CHATROOM targetId:_roomId success:^(CNLiveChatMessage *message) {
+                
+                NSLog(@"send Msg success: %@",message.messageContent);
+                strongself
+                NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
+                NSDictionary *msgDic = [JSONDic objectForKey:chatMessage];
+                
+                [self.giftListView addGiftAnimationWithModel:model];
+                
+                CNLiveChatUserInfo *userInfo = message.userInfo;
+                //将消息显示到列表中
+                chatMsgModel *model1 = [[chatMsgModel alloc] init];
+                model1.name = message.userInfo.name;
+                model1.content = [NSString stringWithFormat:@" 送了一个 %@",msgDic[@"giftName"]];
+                model1.ID = message.targetId;
+                model1.icon = userInfo.portraitUri;
+                model1.cellWidth = self.chatTableView.width - 20;
+                model1.uId = userInfo.userId;
+                [self.chatMsgArray addObject:model1];
+                [self.chatTableView reloadData];
+                NSInteger section = [self.chatTableView numberOfSections];
+                if (section < 1) return;
+                NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
+                if (row < 1) return;
+                NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
+                [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+                [self.chatTableView reloadData];
+                
+            } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
+                NSLog(@"error");
+            }];
+        }
+    }
+}
+
 #pragma mark - CNLiveChatManagerDelegate
 /**
  连接状态的的监听器
@@ -473,15 +527,16 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         case CNLive_ConversationType_CHATROOM:
         {
             NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
-            NSString *content = [JSONDic objectForKey:message_content];
+            NSDictionary *msg = [JSONDic objectForKey:chatMessage];
             //将消息显示到列表中
             chatMsgModel *model = [[chatMsgModel alloc] init];
             model.name = message.userInfo.name;
-            model.content = content;
+            model.content = [msg objectForKey:msgContent];
             model.ID = message.targetId;
             model.icon = message.userInfo.portraitUri;
             model.cellWidth = self.chatTableView.width - 20;
+            model.uId = message.userInfo.userId;
             [self.chatMsgArray addObject:model];
             [self.chatTableView reloadData];
@@ -493,13 +548,13 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
             [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
             [self.chatTableView reloadData];
-            NSInteger isBarrage = [[JSONDic objectForKey:message_barrage] integerValue];
+            NSInteger isBarrage = [[[JSONDic objectForKey:chatMessage] objectForKey:msgBarrage] integerValue];
             if (isBarrage) {//此条消息飘弹幕
                 chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
                 barrageModel.name = message.userInfo.name;
-                barrageModel.content = content;
+                barrageModel.content = [msg objectForKey:msgContent];
                 barrageModel.icon = message.userInfo.portraitUri;
                 [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
             }
@@ -508,14 +563,14 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         case CNLive_ConversationType_PRIVATE:
         {
             NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
-            NSString *content = [JSONDic objectForKey:message_content];
+            NSDictionary *msg = [JSONDic objectForKey:chatMessage];
             PrivateView *privateView = [PrivateView privateView];
             //将消息显示到列表中
             chatMsgModel *model = [[chatMsgModel alloc] init];
             model.name = message.userInfo.name;
             model.isMine = NO;
-            model.content = content;
+            model.content = [msg objectForKey:msgContent];
             model.ID = message.targetId;
             model.icon = message.userInfo.portraitUri;
             model.priCellWidth = privateView.tableView.width * 0.5 - 30;
@@ -702,15 +757,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     if (!_chatMsgArray) {
         _chatMsgArray = [NSMutableArray array];
-//        NSArray *names = [NSArray arrayWithObjects:@"张旭",@"老大",@"老六",@"什么人",@"金光",@"银光",@"阳光", nil];
-//        NSArray *contents = [NSArray arrayWithObjects:@"阿萨德请问发群里发",@"阿萨德请问发群里发发染发我if顽皮的发球局平均分配WiF",@"阿萨德请问发群里发发染发我if顽皮的发球局平均分配WiFi我if为打破我姐夫我批发价为破房间我批发价我批发价为 爱神的箭怕我的哦期",@"里发发染发我if顽",@"金光神的箭怕我的哦期间",@"银光",@"阳光神的箭怕我的哦期间", nil];
-//        for (int i = 0 ; i < names.count; i ++) {
-//            chatMsgModel *model = [[chatMsgModel alloc] init];
-//            model.name = names[i];
-//            model.content = contents[i];
-//            model.cellWidth = self.chatTableView.width - 20;
-//            [self.chatMsgArray addObject:model];
-//        }
     }
     return _chatMsgArray;
 }
@@ -733,6 +779,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     if (!_giftListView)
     {
         _giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 250, SCREEN_WIDTH, 250) liveBaseView:self];
+        _giftListView.delegate = self;
         UIImageView *giftBg = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, _giftListView.width, _giftListView.height)];
         giftBg.image = [UIImage imageNamed:@"背景400x300"];
@@ -752,6 +799,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     }
     return _chatManager;
 }
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.
@@ -41,10 +41,11 @@
     }];
     webView.UIDelegate = self;
     webView.navigationDelegate = self;
-    self.webUrl = [NSString stringWithFormat:@"%@?sid=%@&plat=i&appId=%@",@"https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp",[UserInformationModel manager].uid,UserAppId];
+    self.webUrl = [NSString stringWithFormat:@"%@?sid=%@&plat=i&appId=%@&type=0",@"https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp",[UserInformationModel manager].uid,UserAppId];
     NSString *sign = [self.webUrl containsString:@"?"] ? @"&" : @"?";
     self.webUrl = [self.webUrl stringByAppendingFormat:@"%@appid=%@", sign, UserAppId];
-    
+#warning 测试环境type=0,正式环境不传type
+
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.webUrl]]];
 }
@@ -2,11 +2,11 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "贡献榜小头像.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "贡献榜小头像.png",
       "scale" : "2x"
     },
     {
@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Is closed.png",
       "scale" : "1x"
     },
     {
@@ -11,6 +10,7 @@
     },
     {
       "idiom" : "universal",
+      "filename" : "Is closed.png",
       "scale" : "3x"
     }
   ],