yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

个播关注房主参数更正

Browse Source
This commit is contained in:
chenguilong
2022-03-04 17:37:39 +08:00
parent 90f868ea55
commit bcbe176beb
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xplan-ios.xcodeproj/project.pbxproj
View File

@@ -124,8 +124,8 @@
9B7D80562753C595003DAC0C /* SendMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7D80552753C595003DAC0C /* SendMessageView.m */; };
9BAA5FED277A1BBE007453F3 /* XPPrivacyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAA5FEC277A1BBE007453F3 /* XPPrivacyViewController.m */; };
9BAA5FF0277A23F4007453F3 /* XPPermissionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAA5FEF277A23F4007453F3 /* XPPermissionsViewController.m */; };
9BE29A6A27D1BFF700446AB5 /* anchor_room_bg.svga in Resources */ = {isa = PBXBuildFile; fileRef = 9BE29A6827D1BFF700446AB5 /* anchor_room_bg.svga */; };
9BE29A6B27D1BFF700446AB5 /* anchor_room_speak.svga in Resources */ = {isa = PBXBuildFile; fileRef = 9BE29A6927D1BFF700446AB5 /* anchor_room_speak.svga */; };
9BE29A6D27D210A500446AB5 /* anchor_room_bg.svga in Resources */ = {isa = PBXBuildFile; fileRef = 9BE29A6C27D210A500446AB5 /* anchor_room_bg.svga */; };
E80487652717DDD9008595F2 /* XPRoomMenuItem.m in Sources */ = {isa = PBXBuildFile; fileRef = E80487642717DDD9008595F2 /* XPRoomMenuItem.m */; };
E80DE4072775665000BE5BCB /* XPFirstRechargeCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E80DE4062775665000BE5BCB /* XPFirstRechargeCollectionViewCell.m */; };
E80DE40A277568D300BE5BCB /* ThemeColor+FirstRecharge.m in Sources */ = {isa = PBXBuildFile; fileRef = E80DE409277568D300BE5BCB /* ThemeColor+FirstRecharge.m */; };
@@ -667,8 +667,8 @@
9BAA5FEE277A23F4007453F3 /* XPPermissionsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPermissionsViewController.h; sourceTree = "<group>"; };
9BAA5FEF277A23F4007453F3 /* XPPermissionsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPermissionsViewController.m; sourceTree = "<group>"; };
9BB865B4272076140029CDE0 /* RtcImplDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RtcImplDelegate.h; sourceTree = "<group>"; };
9BE29A6827D1BFF700446AB5 /* anchor_room_bg.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = anchor_room_bg.svga; sourceTree = "<group>"; };
9BE29A6927D1BFF700446AB5 /* anchor_room_speak.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = anchor_room_speak.svga; sourceTree = "<group>"; };
9BE29A6C27D210A500446AB5 /* anchor_room_bg.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = anchor_room_bg.svga; sourceTree = "<group>"; };
B66633E061B1B34177CD011C /* Pods-xplan-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xplan-ios.release.xcconfig"; path = "Target Support Files/Pods-xplan-ios/Pods-xplan-ios.release.xcconfig"; sourceTree = "<group>"; };
CACF623970097D653132D69A /* Pods_xplan_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_xplan_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E80487632717DDD9008595F2 /* XPRoomMenuItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMenuItem.h; sourceTree = "<group>"; };
@@ -3012,8 +3012,8 @@
E8A1E45D276220DA00B294CA /* candyTree_banner.svga */,
E8A1E45F276220DA00B294CA /* candyTree_light.svga */,
E8A1E45E276220DA00B294CA /* candyTree.svga */,
9BE29A6827D1BFF700446AB5 /* anchor_room_bg.svga */,
9BE29A6927D1BFF700446AB5 /* anchor_room_speak.svga */,
9BE29A6C27D210A500446AB5 /* anchor_room_bg.svga */,
);
path = Sources;
sourceTree = "<group>";
@@ -3655,12 +3655,12 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9BE29A6A27D1BFF700446AB5 /* anchor_room_bg.svga in Resources */,
E8937AC7276C3EDE00B2C7E1 /* svga_member_in_lv40.svga in Resources */,
E8A1E461276220DA00B294CA /* candyTree.svga in Resources */,
E8937AC9276C3EDE00B2C7E1 /* svga_member_in_lv90.svga in Resources */,
E8937ACC276C3EDE00B2C7E1 /* svga_member_in_lv80.svga in Resources */,
9BE29A6B27D1BFF700446AB5 /* anchor_room_speak.svga in Resources */,
9BE29A6D27D210A500446AB5 /* anchor_room_bg.svga in Resources */,
E8937AC8276C3EDE00B2C7E1 /* svga_member_in_lv70.svga in Resources */,
E8DEC98B27637EA50078CB70 /* candyTree_open.svga in Resources */,
E8A1E460276220DA00B294CA /* candyTree_banner.svga in Resources */,

2
xplan-ios/Main/Room/View/AnchorView/XPRoomAnchorInfoCardView.m
View File

@@ -139,7 +139,7 @@
[TTPopup dismiss];
});
}
} uid:uid likedUid:[NSString stringWithFormat:@"%zd", self.userInfo.uid] ticket:ticket type:type];
} uid:uid likedUid:[NSString stringWithFormat:@"%zd", self.targetUserInfo.uid] ticket:ticket type:type];
}
- (void)close:(UIButton *)btn {

10
xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m
View File

@@ -70,7 +70,7 @@
make.height.mas_equalTo(26);
}];
[self.anchorGiftValueView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.contributionButton.mas_right).mas_offset(12);
make.left.mas_equalTo(self.contributionButton.mas_right).mas_offset(8);
make.centerY.mas_equalTo(self.contributionButton);
make.height.mas_equalTo(26);
}];
@@ -117,9 +117,15 @@
if (!roomInfo.showGiftValue) {
self.anchorGiftValueView.giftValue = 0;
}
[self.contributionButton mas_updateConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(statusbarHeight+49);
}];
} else {
[self.contributionButton setTitle:@"房间榜" forState:UIControlStateNormal];
self.anchorGiftValueView.hidden = YES;
[self.contributionButton mas_updateConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(statusbarHeight+57);
}];
}
}
@@ -290,7 +296,7 @@
if (!_contributionButton) {
_contributionButton = [[UIButton alloc]init];
[_contributionButton addTarget:self action:@selector(contributionButtonAction:) forControlEvents:UIControlEventTouchUpInside];
_contributionButton.backgroundColor = [UIColor colorWithWhite:0 alpha:0.2];
_contributionButton.backgroundColor = [UIColor colorWithWhite:1 alpha:0.2];
[_contributionButton setTitle:@"房间榜" forState:UIControlStateNormal];
[_contributionButton setImage:[UIImage imageNamed:@"room_rank_enter_icon"] forState:UIControlStateNormal];
[_contributionButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];

4
xplan-ios/Main/Room/View/StageView/AnchorStageView.m
View File

@@ -30,7 +30,7 @@
// 昵称高21，距离头像间距 6
#define ownerHeight (ownerWidth + 6 + 20)
///房主头像距上边距离
#define topMargin 40
#define topMargin 60
// 底部 3 个坑位宽40 + 光圈 5
#define mcWidth (40 + 5)
#define mcHeight (mcWidth + 6 + 12)
@@ -72,7 +72,7 @@
}
- (CGFloat)hightForStageView {
return 286;
return 306;
}
- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid {

5
xplan-ios/Main/Room/View/StageView/MicroView/Anchor/AnchorGiftValueView.m
View File

@@ -49,7 +49,7 @@
}];
[self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.bgImageView);
make.width.height.mas_equalTo(12);
make.width.height.mas_equalTo(13);
}];
[self.valueLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.bgImageView);
@@ -84,6 +84,7 @@
_iconImageView = [[UIImageView alloc] init];
_iconImageView.userInteractionEnabled = YES;
_iconImageView.image = [UIImage imageNamed:@"room_position_giftValue_heart"];
_iconImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _iconImageView;
}
@@ -92,7 +93,7 @@
if (_valueLabel == nil) {
_valueLabel = [[UILabel alloc] init];
_valueLabel.textColor = UIColor.whiteColor;
_valueLabel.font = [UIFont systemFontOfSize:12];
_valueLabel.font = [UIFont systemFontOfSize:14];
_valueLabel.text = @"0";
}
return _valueLabel;

BIN
xplan-ios/Sources/anchor_room_bg.svga
View File

Binary file not shown.