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

Conflicts: LiveVideoCloud.xcodeproj/project.pbxproj LiveVideoCloud/PrefixHeader.pch

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
Conflicts: LiveVideoCloud.xcodeproj/project.pbxproj LiveVideoCloud/PrefixHeader.pch
朱林
2 parents d2f4f768 8598c3ab
Showing 13 changed files with 196 additions and 91 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/CNLiveSDK/CNLiveStat.framework/CNLiveStat
LiveVideoCloud/Classes/CNLiveSDK/CNLiveStat.framework/Headers/CNLiveStat.h
LiveVideoCloud/Classes/CNLiveSDK/CNLiveStat.framework/Info.plist
LiveVideoCloud/Classes/CNLiveSDK/CNLiveStat.framework/Modules/module.modulemap
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/MinePersonalDataController.m
LiveVideoCloud/Classes/Sections/PGCSections/Controller/LVCLivePlayerController.m
LiveVideoCloud/Classes/Sections/PGCSections/Controller/LVCTelevisioController.m
LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLivePlayerController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerController.m
LiveVideoCloud/PrefixHeader.pch
@@ -280,6 +280,7 @@
 		D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8A21E80C4FC007FB138 /* Accelerate.framework */; };
 		D25BF8A51E80EC76007FB138 /* 头像.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF8A41E80EC76007FB138 /* 头像.jpg */; };
 		D260E6101F0CE8690095E49D /* praiseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D260E60F1F0CE8690095E49D /* praiseModel.m */; };
+		D263AFC21F13300600A963A6 /* CNLiveStat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D263AFC11F13300600A963A6 /* CNLiveStat.framework */; };
 		D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
 		D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
 		D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
@@ -877,6 +878,7 @@
 		D25BF8A41E80EC76007FB138 /* 头像.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "头像.jpg"; sourceTree = "<group>"; };
 		D260E60E1F0CE8690095E49D /* praiseModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = praiseModel.h; sourceTree = "<group>"; };
 		D260E60F1F0CE8690095E49D /* praiseModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = praiseModel.m; sourceTree = "<group>"; };
+		D263AFC11F13300600A963A6 /* CNLiveStat.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveStat.framework; sourceTree = "<group>"; };
 		D2888D921E6EB8B4003A77C8 /* LVCTabBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCTabBar.h; sourceTree = "<group>"; };
 		D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCTabBar.m; sourceTree = "<group>"; };
 		D2888D9A1E6EBF1B003A77C8 /* LVCLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveViewController.h; sourceTree = "<group>"; };
@@ -957,6 +959,7 @@
 				8181D5441F1366F500959E3D /* GPUImage.framework in Frameworks */,
 				8181D5721F13674200959E3D /* CNLivePlayerSDK.framework in Frameworks */,
 				D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
+				D263AFC21F13300600A963A6 /* CNLiveStat.framework in Frameworks */,
 				D2393D071F02505400D3EE17 /* TencentOpenAPI.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1271,6 +1274,7 @@
 				8181D5401F1366F500959E3D /* CNLiveShortVideoSDK.framework */,
 				8181D5411F1366F500959E3D /* GPUImage.framework */,
 				8181D5421F1366F500959E3D /* libksygpulive.framework */,
+				D263AFC11F13300600A963A6 /* CNLiveStat.framework */,
 				D2EBC8A51F03926E00F198FB /* CNLiveChatManager.framework */,
 				D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */,
 				D2393D2B1F02682000D3EE17 /* CNLiveUserSystemSDK.framework */,
@@ -22,7 +22,7 @@
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.rootViewController = [[ZXTabBarController alloc] init];
-    //测试环境开关,只在初始化时有效
+    //测试环境开关,只在初始化时设置有效
     self.isTestEnvironment = YES;
     [[CNLiveMediaEditKit manager] initWithAppId:UserAppId appKey:UserAppKey isTestEnvironment:self.isTestEnvironment];
@@ -39,19 +39,11 @@
     //初始化聊天SDK并连接服务器
     [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:UserAppKey appId:UserAppId isTestEnvironment:self.isTestEnvironment];
-    /*
-     [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
-     NSLog(@"连接服务器-----success");
-     } error:^(CNLiveChatConnectErrorCode errors) {
-     NSLog(@"连接服务器失败-----%ld", errors);
-     }];
-     */
+    //初始化统计SDK
+    [CNLiveStat registerApp:UserAppId appKey:UserAppKey isTestEnvironment:self.isTestEnvironment];
-    /*
-     CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170311" name:@"zzllzzzll" portrait:@"https://y3.cnliveimg.com/mobile/images/mobilehead/2017/03/30/1490844962259_small.jpg"];
-     */
-
-    // 20170327 20170328
+    //启动事件数量统计
+    [CNLiveStat event:@"iOS AppStartTest"];
     if ([UserTools isLogin]) {
+//
+//  CNLiveStat.h
+//  CNLiveStat
+//
+//  Created by 雷浩杰 on 2016/11/10.
+//  Copyright © 2016年 雷浩杰. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface CNLiveStat : NSObject
+
+/*
+ * 获取SDK版本号
+ */
++ (NSString *)getVersion;
+
+/*
+ * 注册APP  注册成功或失败信息以log形式输出（CNLiveStatManager registerApp Success 或者 CNLiveStatManager registerApp Error :）
+ 
+   @param appId AppId
+   @param appKey AppKey
+ 
+   此方法默认将统计数据上传到正式环境,如果需要测试SDK,强烈建议用
+    + (void)registerApp:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment 方法初始化SDK
+ */
++ (void)registerApp:(NSString *)appId appKey:(NSString *)appKey;
+
+/**
+ 注册APP  注册成功或失败信息以log形式输出（CNLiveStatManager registerApp Success 或者 CNLiveStatManager registerApp Error :）
+
+ @param appId AppId
+ @param appKey AppKey
+ @param isTestEnvironment 测试环境开关,YES为测试环境,NO为正式环境
+ 
+ */
++ (void)registerApp:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment;
+
+/* 数量统计
+ *
+ * eventID  事件ID
+ *
+ */
++ (void)event:(NSString *)eventID;
+
+/* 时长统计  在调用endEvent:方法前，多次使用同一个eventID调用此方法，只会将第一次视为有效调用
+ *
+ * eventID  事件ID
+ *
+ */
++ (void)beginEvent:(NSString *)eventID;
+
+/* 时长统计 多次使用同一个eventID调用此方法，只会将第一次视为有效调用
+ *
+ * eventID  事件ID
+ *
+ */
++ (void)endEvent:(NSString *)eventID;
+
+/* 直播播放统计
+ *
+ * channelId  直播channelId
+ *
+ */
++ (void)statLivePlayerWithChannelId:(NSString *)channelId;
+
+/* 点播播放统计
+ *
+ * vId     点播vId
+ *
+ */
++ (void)statVodPlayerWithVId:(NSString *)vId;
+
+@end
+framework module CNLiveStat {
+  umbrella header "CNLiveStat.h"
+
+  export *
+  module * { export * }
+}
@@ -154,6 +154,15 @@
     return giftView;
 }
+- (void)giftViewAddBgView:(UIView *)giftView
+{
+    UIImageView *bgView = [[UIImageView alloc] initWithFrame:giftView.bounds];
+    bgView.backgroundColor = [UIColor blackColor];
+    bgView.tag = giftView.tag + 100;
+    bgView.alpha = 0.2;
+    [giftView addSubview:bgView];
+}
+
 #pragma mark - 选择礼物点击
 - (void)gestureClick:(UITapGestureRecognizer *)gesture
 {
@@ -161,35 +170,45 @@
     NSLog(@"%zd",tag);
     if (_curruntSelectIdx == 0 && _isSelectedGift == NO) {//没选过
-        UIView *giftView = gesture.view;
-        
-        UIImageView *bgView = [[UIImageView alloc] initWithFrame:giftView.bounds];
-        bgView.backgroundColor = [UIColor blackColor];
-        bgView.tag = giftView.tag + 100;
-        bgView.alpha = 0.2;
-        [giftView addSubview:bgView];
+        [self giftViewAddBgView:gesture.view];
+        _isSelectedGift = YES;
     }
     if (_curruntSelectIdx != 0 && _isSelectedGift == YES) {//选过
-        UIView *gView = gesture.view;
-        for (UIView *view in self.scrollView.subviews) {//移除上一个bgView
-            if (view.tag == _curruntSelectIdx) {
-                for (UIView *bg in view.subviews) {
-                    if (bg.tag == view.tag + 100) {
-                        [bg removeFromSuperview];
-                        break;
+
+        if (gesture.view.tag != _curruntSelectIdx) {//选的其他礼物
+            //增加当前bgView
+            [self giftViewAddBgView:gesture.view];
+            for (UIView *view in self.scrollView.subviews) {//移除上一个bgView
+                if (view.tag == _curruntSelectIdx) {
+                    for (UIView *bg in view.subviews) {
+                        if (bg.tag == view.tag + 100) {
+                            [bg removeFromSuperview];
+                            break;
+                        }
+                    }
+                }
+            }
+            _isSelectedGift = YES;
+        }else{//选的当前礼物 ,根据是否选中做变化
+            if (_isSelectedGift == YES) {
+                _isSelectedGift = NO;
+                for (UIView *view in self.scrollView.subviews) {//移除上一个bgView
+                    if (view.tag == _curruntSelectIdx) {
+                        for (UIView *bg in view.subviews) {
+                            if (bg.tag == view.tag + 100) {
+                                [bg removeFromSuperview];
+                                break;
+                            }
+                        }
                     }
                 }
+            }else{
+                _isSelectedGift = YES;
+                [self giftViewAddBgView:gesture.view];
             }
         }
-        //增加当前bgView
-        UIImageView *bgView = [[UIImageView alloc] initWithFrame:gView.bounds];
-        bgView.backgroundColor = [UIColor blackColor];
-        bgView.tag = gView.tag + 100;
-        bgView.alpha = 0.2;
-        [gView addSubview:bgView];
     }
-    _isSelectedGift = YES;
     _curruntSelectIdx = gesture.view.tag;
     GiftModel *model = self.giftArray[tag];
@@ -28,45 +28,38 @@
     [super viewDidLoad];
     self.title = @"个人资料";
-    //    self.view.backgroundColor = CommonBgColor;
 }
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    [_tbv reloadData];
+    [self updateUserData];
 }
+- (void)updateUserData
+{
+    [CNLiveUserSystemCenter queryUserInfoWithUid:[UserInformationModel manager].uid srcUid:[UserInformationModel manager].uid success:^(id result) {
+        NSLog(@"query result = %@",result);
+        [UserTools clearLocalUserInfo];
+        [UserTools saveUserinfoDic:result[@"data"]];
+        [_tbv reloadData];
+
+    } failure:^(NSDictionary *errorDic) {
+        NSLog(@"query errorDic = %@",errorDic);
+    }];
+}
 - (void)bindView
 {
     self.tbv.frame = CGRectMake(0, 0, SCREEN_W, SCREEN_H -64 );
     [self.view addSubview:self.tbv];
 }
--(void)bindModel
+- (void)bindModel
 {
     [self.dataarray removeAllObjects];
-    //    isLogin = NO;
-    //
-    //    if ([UserTools isLogin])
-    //    {
-    //        isLogin = YES;
-    //    }else
-    //    {
-    //        isLogin = NO;
-    //    }
 }
-//- (UIButton *)quitBtn
-//{
-//    if (!_quitBtn) {
-//        _quitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        [_quitBtn setImage:[UIImage imageNamed:@" edit"] forState:UIControlStateNormal];
-//        [_quitBtn addTarget:self action:@selector(quitBtnClick) forControlEvents:UIControlEventTouchUpInside];
-//    }
-//    return _quitBtn;
-//}
 - (NSMutableArray *)dataarray
 {
     if (!_dataarray) {
@@ -44,13 +44,18 @@
     self.navigationController.navigationBar.hidden = YES;
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
     [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];
-
+    
+    //直播时长统计开始
+    [CNLiveStat beginEvent:@"PGCLiveEvent"];
 }
 - (void)viewDidDisappear:(BOOL)animated
 {
     [super viewDidDisappear:animated];
     self.navigationController.navigationBar.hidden = NO;
+    
+    //直播时长统计结束
+    [CNLiveStat endEvent:@"PGCLiveEvent"];
 }
 - (void)viewWillDisappear:(BOOL)animated
@@ -64,6 +69,9 @@
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor blackColor];
+    //直播播放数量统计
+    [CNLiveStat statLivePlayerWithChannelId:@"iosLivePlayStatTest"];
+    
     _roomId = [NSString stringWithFormat:@"syn%@",self.model.mediaId];
     playerFrame = CGRectMake(0, 20, SCREEN_WIDTH, SCREEN_WIDTH*9/16);
     _originalDirection = 0;
@@ -37,7 +37,6 @@
     [self.view addSubview:self.tableView];
     [self loadData];
-    
 }
 - (void)loadData {
@@ -55,14 +55,12 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    
     self.navigationController.navigationBar.hidden = YES;
 }
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    
     self.navigationController.navigationBar.hidden = NO;
 }
@@ -79,6 +77,7 @@
     [self.view addSubview:self.viewThird];
     if ([_model.activityStatus isEqualToString:@"1"]) {
+
         [self addLiveBaseViewWithChannelId:_model.channelId];
     }
     _bgModel = _model;
@@ -117,29 +116,35 @@
     NSLog(@"dealloc");
 }
-- (void)quitBtnClick {    // 退出
+- (void)quitBtnClick:(UIButton *)btn {    // 退出
     [_player stop];
-//    if (self.navigationController.viewControllers.count > 2) {//判断
-//        [self.navigationController popViewControllerAnimated:YES];
-//    }
-    
-    [[CNLiveChatManager sharedCNLiveChatManager] quitChatRoom:_liveBaseView.roomId success:^(NSString *targetId) {
-        NSLog(@"quit Success");
-    } error:^(CNLiveChatErrorCode errors, NSString *targetId) {
-        NSLog(@"quit Failure");
-    }];
-    [_liveBaseView clearChatAndGiftData];
-    
-    for (UIViewController *controller in self.navigationController.viewControllers) {
-        if ([controller isKindOfClass:[MineLiveController class]]) {
-            MineLiveController *revise =(MineLiveController *)controller;
-            [self.navigationController popToViewController:revise animated:YES];
-        }
-        else if ([controller isKindOfClass:[LVCUGCLiveListController class]]) {
-            LVCUGCLiveListController *revise =(LVCUGCLiveListController *)controller;
-            [self.navigationController popToViewController:revise animated:YES];
+    if ((btn.tag == 1002) || (btn.tag == 1003)) {
+        [self.navigationController popViewControllerAnimated:YES];
+        //UGC回放时长统计结束
+        [CNLiveStat endEvent:@"UGCPlayback"];
+    } else if (btn.tag == 1001) {
+        //UGC直播时长统计结束
+        [CNLiveStat endEvent:@"UGCLive"];
+        
+        [[CNLiveChatManager sharedCNLiveChatManager] quitChatRoom:_liveBaseView.roomId success:^(NSString *targetId) {
+            NSLog(@"quit Success");
+        } error:^(CNLiveChatErrorCode errors, NSString *targetId) {
+            NSLog(@"quit Failure");
+        }];
+        
+        [_liveBaseView clearChatAndGiftData];
+        
+        for (UIViewController *controller in self.navigationController.viewControllers) {
+            if ([controller isKindOfClass:[MineLiveController class]]) {
+                MineLiveController *revise =(MineLiveController *)controller;
+                [self.navigationController popToViewController:revise animated:YES];
+            }
+            else if ([controller isKindOfClass:[LVCUGCLiveListController class]]) {
+                LVCUGCLiveListController *revise =(LVCUGCLiveListController *)controller;
+                [self.navigationController popToViewController:revise animated:YES];
+            }
         }
     }
 }
@@ -156,6 +161,7 @@
     if ([model.activityStatus isEqualToString:@"1"]) {
         _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:model.channelId anchorStatus:YES authSuccess:^{
+
                                                                          _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
                                                                          _player.view.frame = self.view.bounds;
@@ -163,7 +169,9 @@
                                                                          [_player prepareToPlay];
                                                                          [self.viewSecond addSubview:_player.view];
                                                                          [self.viewSecond sendSubviewToBack:_player.view];
-                                                                         
+            
+                                                    //UGC直播时长统计开始
+                                                    [CNLiveStat beginEvent:@"UGCLive"];
                                                                      } authFailed:^(NSDictionary *errorInfo) {
                                                                          NSLog(@"初始化直播播放器失败：%@", errorInfo);
@@ -193,7 +201,9 @@
                                                                   [self.viewSecond sendSubviewToBack:_player.view];
                                                                   [_player.view addGestureRecognizer:_pan];
                                                                   [_player.view addSubview:self.bottomView];
-                                                                  
+                   
+                                                          //UGC回放时长统计开始
+                                                          [CNLiveStat beginEvent:@"UGCPlayback"];
                                                               } authFailed:^(NSDictionary *errorInfo) {
                                                                   NSLog(@"初始化点播播放器失败%@", errorInfo);
                                                               }];
@@ -669,13 +679,6 @@
     }];
 }
-#pragma mark - Button Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-- (void)backToList {
-    
-    [_player stop];
-    [self.navigationController popViewControllerAnimated:YES];
-}
-
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (LiveBaseView *)liveBaseView
 {
@@ -685,7 +688,8 @@
         _liveBaseView.jumpType = JumpControllerTypePush;
         _liveBaseView.viewController = self;
         _liveBaseView.backgroundColor = [UIColor clearColor];
-        [_liveBaseView.closeBtn addTarget:self action:@selector(quitBtnClick) forControlEvents:UIControlEventTouchUpInside];
+        _liveBaseView.closeBtn.tag = 1001;
+        [_liveBaseView.closeBtn addTarget:self action:@selector(quitBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _liveBaseView;
 }
@@ -695,7 +699,8 @@
     if (!_bgView) {
         _bgView = [[LVCUGCBackgroundView alloc] initWithFrame:self.view.bounds];
         _bgView.hidden = YES;
-        [_bgView.backButton addTarget:self action:@selector(backToList) forControlEvents:UIControlEventTouchUpInside];
+        _bgView.backButton.tag = 1002;
+        [_bgView.backButton addTarget:self action:@selector(quitBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _bgView;
 }
@@ -749,7 +754,8 @@
         _vodPlayerQuitBtn.frame = CGRectMake(SCREEN_WIDTH - 50, 50, 40, 40);
         [_vodPlayerQuitBtn setImage:[UIImage imageNamed:@"LiveCloseNormal"] forState:UIControlStateNormal];
         [_vodPlayerQuitBtn setImage:[UIImage imageNamed:@"LiveCloseTouch"] forState:UIControlStateHighlighted];
-        [_vodPlayerQuitBtn addTarget:self action:@selector(backToList) forControlEvents:UIControlEventTouchUpInside];
+        _vodPlayerQuitBtn.tag = 1003;
+        [_vodPlayerQuitBtn addTarget:self action:@selector(quitBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _vodPlayerQuitBtn;
 }
@@ -88,6 +88,9 @@ typedef enum {
     self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.playerSuperView];
     [self.view addSubview:self.commentView];
+    
+    //点播播放数量统计
+    [CNLiveStat statVodPlayerWithVId:@"iosVodPlayStatTest"];
 }
 - (void)setModel:(LVCVodListModel *)model {
@@ -57,6 +57,7 @@
     #import <CNLiveChatManager/CNLiveCommentManager.h>
     #import <CNLiveShortVideoSDK/CNLiveMediaEditKit.h>
     #import "NSString+StringSize.h"
+    #import <CNLiveStat/CNLiveStat.h>
 #if TARGET_OS_IPHONE