liveBaseView增加roomId

张旭
1 parent 507b96f6
Showing 9 changed files with 33 additions and 31 deletions
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftModel/GiftModel.h
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.m
LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.h
LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/Classes/Sections/LiveSections/LVCVerifyLiveAuthService.m
LiveVideoCloud/UtilKits/ServerUrl/ZXServerUrl.h
LiveVideoCloud/UtilKits/ServerUrl/ZXServerUrl.m
LiveVideoCloud/UtilKits/UserTools/UserTools.m
@@ -17,13 +17,13 @@ typedef NS_ENUM(NSInteger, GiftStyle) {//礼物类型
 @interface GiftModel : BaseModel <PresentModelAble>
 @property (copy, nonatomic) NSString *_Nullable sender;//送礼人
-@property (copy, nonatomic) NSString *_Nullable giftName;//礼物名称
+@property (copy, nonatomic) NSString *_Nullable giftName;//礼物名称 ***
 @property (copy, nonatomic) NSString *_Nullable icon;//送礼头像
 @property (copy, nonatomic) NSString *_Nullable giftImageName;//礼物图片名字
-@property (assign, nonatomic) NSInteger giftNumber;//礼物数量
+@property (assign, nonatomic) NSInteger giftNumber;//礼物数量 ***
 //可本地处理
-@property (nonatomic ,copy  ) NSString *            _Nullable price;
+@property (nonatomic ,copy  ) NSString *            _Nullable price; // ***
 @property (nonatomic        ) GiftStyle                       giftStyle;//动画类型
 @property (nonatomic        ) NSInteger                       index;//索引和giftname一样
@@ -39,7 +39,7 @@
         _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];
+        _types = [NSArray arrayWithObjects:@"2",@"3",@"4",@"1",@"1",@"1",@"1",@"1",@"1",@"1",@"1",@"1",@"1", nil];
         self.liveBaseView = liveBaseView;
         self.animQueueManager = [AnimQueueManager sharedAnimQueueManager];
@@ -185,8 +185,8 @@
         NSMutableArray *tempArr = [NSMutableArray array];
         for (int i = 0; i < _images.count; i ++) {
-            int type = [_types[i] intValue];
-            if (type == 1) {
+            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]];
                 model1.giftStyle = GiftStyleCombo;
@@ -197,15 +197,15 @@
             {//expen
                 GiftModel *model = [GiftModel modelWithSender:senders[i] giftName:[self giftNameWithImageName:_images[i]] icon:@"love" giftImageName:@""];
-                if (type == 2) {
+                if ([type isEqualToString:@"2"]) {
                     model.giftStyle = GiftStylePorsch;
                     model.giftImageName = @"porsch_small80";
                 }
-                if (type == 3) {
+                if ([type isEqualToString:@"3"]) {
                     model.giftStyle = GiftStyleFighter;
                     model.giftImageName = @"fighter_small80";
                 }
-                if (type == 4) {
+                if ([type isEqualToString:@"4"]) {
                     model.giftStyle = GiftStylePlane;
                     model.giftImageName = @"plane_small80";
                 }
@@ -29,6 +29,7 @@ typedef NS_ENUM(NSInteger, JumpControllerType) {//跳转控制器类型
 @property (nonatomic ,strong) UIViewController * _Nullable             viewController;
 @property (nonatomic ,strong ,readonly) PresentView *   _Nullable presentView;
 @property (nonatomic ,strong) AnimationBaseView * _Nullable             animationBaseView;
+@property (nonatomic ,copy) NSString * _Nullable            roomId;
 + (instancetype _Nullable)liveBaseView;
@@ -42,13 +42,13 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @property (nonatomic ,strong           ) GiftListView *   _Nullable giftListView;
 @property (nonatomic ,weak             ) UIView *         _Nullable giftPopView;
 @property (nonatomic ,strong ,readwrite) PresentView *    _Nullable presentView;//连击View
-@property (nonatomic ,assign           ) PopType   popType;
-@property (nonatomic ,strong           ) UITableView *    _Nullable chatTableView;
-@property (nonatomic ,strong           ) NSMutableArray * _Nullable chatMsgArray;//聊天消息数组
+@property (nonatomic ,assign           ) PopType                        popType;
+@property (nonatomic ,strong           ) UITableView *    _Nullable     chatTableView;
+@property (nonatomic ,strong           ) NSMutableArray * _Nullable     chatMsgArray;//聊天消息数组
 @property (nonatomic ,strong           ) TopToolView *        _Nullable topToolsView;
 @property (nonatomic ,strong           ) UIView *             _Nullable commentsView;
 @property (nonatomic ,strong           ) UITextField *        _Nullable commentText;
-@property (nonatomic ,assign           ) CGFloat   offsetHeight;
+@property (nonatomic ,assign           ) CGFloat                        offsetHeight;
 @property (nonatomic ,strong           ) UISwitch *           _Nullable barrageSwitch;
 @property (nonatomic ,strong           ) ChatBarrageManager * _Nullable chatManager;
 @property (nonatomic ,strong           ) ChatBarrageView *    _Nullable barrageView;
@@ -86,19 +86,23 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [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];
-        
-        [CNLiveChatManager sharedCNLiveChatManager].delegate = self;
-        [[CNLiveChatManager sharedCNLiveChatManager] joinChatRoom:@"1234" messageCount:10 success:^(NSString *targetId) {
-            NSLog(@"success");
-        } error:^(CNLiveChatErrorCode errors, NSString *targetId) {
-            NSLog(@"error");
-        }];
-        
-        [CNLiveChatManager sharedCNLiveChatManager].currentUserInfo.portraitUri = @"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg";
     }
     return self;
 }
+- (void)setRoomId:(NSString *)roomId
+{
+    _roomId = roomId;
+    [CNLiveChatManager sharedCNLiveChatManager].delegate = self;
+    [[CNLiveChatManager sharedCNLiveChatManager] joinChatRoom:roomId messageCount:10 success:^(NSString *targetId) {
+        NSLog(@"success");
+    } 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
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
@@ -200,6 +200,7 @@
     if (!_liveBaseView)
     {
         _liveBaseView = [LiveBaseView liveBaseView];
+        _liveBaseView.roomId = [UserInformationModel manager].uid;
         _liveBaseView.jumpType = JumpControllerTypePresent;
         _liveBaseView.viewController = self;
         _liveBaseView.backgroundColor = [UIColor clearColor];
@@ -24,15 +24,12 @@
     NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], UserAppKey];
     NSString *signString = [[self sha1:string] uppercaseString];
     [parameter setObject:signString forKey:@"sign"];
-//    [parameter setObject:[UserInformationModel manager].uid forKey:@"sid"];
-//    [parameter removeObjectForKey:@"channelId"];
-    
     NSMutableDictionary *params = parameter.mutableCopy;
     completionHandler compleionHandler = ^(id data,NSError *error) {
         handler(data,error);
     };
-    return [[HttpService service] sendRequestWithHttpMethod:E_HTTP_REQUEST_METHOD_GET URLPath:[ZXServerUrl verifyLiveAuthURL] parameters:params completionHandler:compleionHandler];
+    return [[HttpService service] sendRequestWithHttpMethod:E_HTTP_REQUEST_METHOD_GET URLPath:[ZXServerUrl getVerifyLiveAuthURL] parameters:params completionHandler:compleionHandler];
 }
 //sha1加密
@@ -31,7 +31,6 @@
 + (NSString *)getLiveActivityInfoURL;
 /** 验证主播是否有直播权限 */
-+ (NSString *)verifyLiveAuthURL;
-
++ (NSString *)getVerifyLiveAuthURL;
 @end
@@ -76,7 +76,7 @@ static NSString *g_VerifyLiveAuthURL = @&quot;/live_epg/channel/info4App&quot;;
 }
 /** 验证主播是否有直播权限 */
-+ (NSString *)verifyLiveAuthURL
++ (NSString *)getVerifyLiveAuthURL
 {
     NSString *url = serverBaseURL;
     return [NSString stringWithFormat:@"%@%@", url, g_VerifyLiveAuthURL];
@@ -253,8 +253,8 @@
     NSString *signString = [[LiveListService sha1:string] uppercaseString];
     parms[@"sign"] =  signString ;
-    
-    [[AFHTTPRequestOperationManager manager] GET:@"https://api.cnlive.com/open/api2/live_epg/channel/info4App" parameters:parms success:^(AFHTTPRequestOperation *operation, id responseObject) {
+    NSString *url = appDelegate.isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2/live_epg/channel/info4App" : @"https://api.cnlive.com/open/api2/live_epg/channel/info4App";
+    [[AFHTTPRequestOperationManager manager] GET:url parameters:parms success:^(AFHTTPRequestOperation *operation, id responseObject) {
         if ([responseObject[@"errorCode"] isEqualToString:@"0"]) {
             success(operation,responseObject);