礼物面板分类顺序及背景调整

xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_gift_panel_arrow@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_gift_panel_arrow@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m

@@ -20,6 +20,8 @@
 @property (nonatomic, strong) UIView *devideView;
 ///分割线
 @property (nonatomic, strong) UIView *bottomDevideView;
+///箭头
+@property (nonatomic, strong) UIImageView *arrowImageView;
 ///互动
 @property (nonatomic, strong) UIButton *interactButton;
 ///轮播图
@@ -45,6 +47,7 @@
     [self addSubview:self.giftButton];
     [self addSubview:self.devideView];
     [self addSubview:self.interactButton];
+    [self addSubview:self.arrowImageView];
     [self addSubview:self.cycleScrollView];
     [self addSubview:self.bottomDevideView];
 }
@@ -59,7 +62,11 @@
         make.centerY.mas_equalTo(self);
         make.width.mas_equalTo(40);
     }];
-    
+    [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(self.bottomDevideView.mas_top);
+        make.centerX.mas_equalTo(self.giftButton);
+        make.size.mas_equalTo(CGSizeMake(9, 7));
+    }];
     [self.interactButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self);
         make.left.mas_equalTo(self.devideView.mas_right).mas_offset(8);
@@ -114,6 +121,11 @@
     self.interactButton.selected = NO;
     sender.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold];
     self.interactButton.titleLabel.font = [UIFont systemFontOfSize:14];
+    [self.arrowImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(self.bottomDevideView.mas_top);
+        make.centerX.mas_equalTo(self.giftButton);
+        make.size.mas_equalTo(CGSizeMake(9, 7));
+    }];
 }
 
 - (void)interactButtonAction:(UIButton *)sender {
@@ -126,6 +138,12 @@
     self.giftButton.selected = NO;
     sender.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold];
     self.giftButton.titleLabel.font = [UIFont systemFontOfSize:14];
+    
+    [self.arrowImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(self.bottomDevideView.mas_top);
+        make.centerX.mas_equalTo(self.interactButton);
+        make.size.mas_equalTo(CGSizeMake(9, 7));
+    }];
 }
 
 #pragma mark - setter
@@ -203,4 +221,14 @@
     return _titleArray;
 }
 
+- (UIImageView *)arrowImageView {
+    if (!_arrowImageView) {
+        UIImageView *imageView = [[UIImageView alloc] init];
+        imageView.image = [UIImage imageNamed:@"room_gift_panel_arrow"];
+        
+        _arrowImageView = imageView;
+    }
+    return _arrowImageView;
+}
+
 @end

xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m

@@ -107,8 +107,8 @@
     if (headType == 1) {
         [self.graffitiButton removeFromSuperview];
         [self.segmentStackView addArrangedSubview:self.normalGiftButton];
-        [self.segmentStackView addArrangedSubview:self.luckyGiftButton];
         [self.segmentStackView addArrangedSubview:self.nobleGiftButton];
+        [self.segmentStackView addArrangedSubview:self.luckyGiftButton];
         [self.segmentStackView addArrangedSubview:self.weekStarButton];
         if(self.segmentType != GiftSegmentType_Pack) {
             [self didClickGiftSegmentAction:self.normalGiftButton];
@@ -135,8 +135,8 @@
 	[self.scrollView addSubview:self.segmentStackView];
 	///分段控制
 	[self.segmentStackView addArrangedSubview:self.normalGiftButton];
-	[self.segmentStackView addArrangedSubview:self.luckyGiftButton];
     [self.segmentStackView addArrangedSubview:self.nobleGiftButton];
+    [self.segmentStackView addArrangedSubview:self.luckyGiftButton];
     [self.segmentStackView addArrangedSubview:self.weekStarButton];
 	///礼物
 	[self.giftStackView addArrangedSubview:self.giftcollectionView];

xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m

@@ -753,9 +753,8 @@
 
 - (UIVisualEffectView *)effectView {
     if (!_effectView) {
-        UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight];
+        UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
         _effectView = [[UIVisualEffectView alloc] initWithEffect:beffect];
-        _effectView.backgroundColor = UIColorRGBAlpha(0x000000, 0.1);
     }
     return _effectView;
 }

xplan-ios/Main/Room/View/MoreView/View/XPRoomMoreMenuViewController.m

@@ -508,9 +508,8 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
 
 - (UIVisualEffectView *)effectView {
     if (!_effectView) {
-        UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight];
+        UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
         _effectView = [[UIVisualEffectView alloc] initWithEffect:beffect];
-        _effectView.backgroundColor = UIColorRGBAlpha(0x000000, 0.1);
         
         UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, KScreenHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)];
         CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];