区分主播端和观众端

张旭
1 parent 48bbd690
Showing 4 changed files with 23 additions and 7 deletions
LiveVideoCloud/Classes/Sections/InteractionSections/BottomToolView/BottomToolView.h
LiveVideoCloud/Classes/Sections/InteractionSections/BottomToolView/BottomToolView.m
LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/UtilKits/UserTools/UserTools.m
@@ -21,6 +21,10 @@ typedef NS_ENUM(NSInteger, BtnClickType) {//底部按钮类型
 @end
 @interface BottomToolView : BaseView
+@property (nonatomic ,strong) UIButton * _Nullable             chatBtn;
+@property (nonatomic ,strong) UIButton * _Nullable             privateChatBtn;
+@property (nonatomic ,strong) UIButton * _Nullable             giftBtn;
+
 @property (nonatomic) id <bottomBtnDeledate>                     delegate;
 @end
@@ -10,9 +10,6 @@
 @interface BottomToolView ()
-@property (nonatomic ,strong) UIButton * _Nullable             chatBtn;
-@property (nonatomic ,strong) UIButton * _Nullable             privateChatBtn;
-@property (nonatomic ,strong) UIButton * _Nullable             giftBtn;
 @property (nonatomic ,strong) UIImageView * _Nullable             bgView;
 @end
@@ -24,7 +21,7 @@
     if (self = [super initWithFrame:frame]) {
         [self addSubview:self.bgView];
         [self addSubview:self.chatBtn];
-        [self addSubview:self.privateChatBtn];
+//        [self addSubview:self.privateChatBtn];
         [self addSubview:self.giftBtn];
     }
     return self;
@@ -68,7 +65,7 @@
     if (!_chatBtn)
     {
         UIButton *chatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        chatBtn.frame = CGRectMake(10, (self.height - 45)*0.5, 45, 45);
+        chatBtn.frame = CGRectMake(30, (self.height - 45)*0.5, 45, 45);
         [chatBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatNormal"] forState:UIControlStateNormal];
         [chatBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatTouch"] forState:UIControlStateHighlighted];
         [chatBtn addTarget:self action:@selector(chatAction) forControlEvents:UIControlEventTouchUpInside];
@@ -84,6 +84,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [self addSubview:self.scrollView];
         [self.scrollView addSubview:self.animationBaseView];
         [self.animationBaseView addSubview:self.bottomToolView];
+ 
         [self.animationBaseView addSubview:self.presentView];
         [self addSubview:self.closeBtn];
         [self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureClick:)]];
@@ -91,12 +92,27 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [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];
     }
     return self;
 }
+#pragma mark - setter
+- (void)setJumpType:(JumpControllerType)jumpType
+{
+    _jumpType = jumpType;
+    if (self.jumpType == JumpControllerTypePush) {//观众端
+        self.bottomToolView.giftBtn.hidden = NO;
+        self.topToolsView.hidden = NO;
+    }else if(self.jumpType == JumpControllerTypePresent)
+    {//主播端
+        self.bottomToolView.giftBtn.hidden = YES;
+        self.topToolsView.hidden = YES;
+    }
+}
+
 #pragma mark - 加入房间
 - (void)setRoomId:(NSString *)roomId
 {
@@ -788,7 +804,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     if (!_closeBtn)
     {
         UIButton *closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        closeBtn.frame = CGRectMake(SCREEN_WIDTH - 43,SCREEN_HEIGHT - self.bottomToolView.height + (self.bottomToolView.height - 45)*0.5, 45, 45);
+        closeBtn.frame = CGRectMake(SCREEN_WIDTH - 45,SCREEN_HEIGHT - self.bottomToolView.height + (self.bottomToolView.height - 35)*0.5, 35, 35);
         [closeBtn setBackgroundImage:[UIImage imageNamed:@"LiveCloseNormal"] forState:UIControlStateNormal];
         [closeBtn setBackgroundImage:[UIImage imageNamed:@"LiveCloseTouch"] forState:UIControlStateHighlighted];
         _closeBtn = closeBtn;
@@ -210,7 +210,6 @@
     NSString *host = [@"http://api.cnlive.com/open/api2/live_epg/channel/activityList4App" stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     [[AFHTTPRequestOperationManager manager] GET:host parameters:parms success:^(AFHTTPRequestOperation *operation, id responseObject) {
-        
         success(operation,responseObject);
     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {