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

星际UI修改

Browse Source
This commit is contained in:
chenshuanglin
2023-03-23 11:26:38 +08:00
parent 204f14f8a2
commit aace697e45
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xplan-ios/Main/Room/View/Sailing/View/Cell/XPSailingRankTableViewCell.m
View File

@@ -11,6 +11,7 @@
///Tool ///Tool
#import "ThemeColor.h" #import "ThemeColor.h"
#import "NetImageView.h" #import "NetImageView.h"
#import "XPMacro.h"
///Model ///Model
#import "RoomSailingRankModel.h" #import "RoomSailingRankModel.h"
@@ -56,7 +57,7 @@
[self.backView mas_makeConstraints:^(MASConstraintMaker *make) { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.contentView).inset(11); make.left.right.mas_equalTo(self.contentView).inset(11);
make.top.mas_equalTo(self.contentView); make.top.mas_equalTo(self.contentView);
make.height.mas_equalTo(71); make.height.mas_equalTo(self.backView.mas_width).multipliedBy(71.0/353.0);
}]; }];
[self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) { [self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -87,7 +88,7 @@
[self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.backView).offset(-10); make.right.mas_equalTo(self.backView).offset(-10);
make.centerY.mas_equalTo(self.backView); make.centerY.mas_equalTo(self.backView);
make.width.mas_equalTo(72); make.width.mas_lessThanOrEqualTo(67*kScreenScale);
}]; }];
} }

6
xplan-ios/Main/Room/View/Sailing/View/XPSailingRankSubView.m
View File

@@ -119,7 +119,11 @@
} }
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
return self.datasource.count > 0 ? 74 : 380; if (self.datasource.count > 0) {
return 71.0/353.0*(tableView.bounds.size.width-11*2)+3;
}else{
return 300;
}
} }
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {

5
xplan-ios/Main/Room/View/Sailing/View/XPSailingViewController.m
View File

@@ -313,6 +313,7 @@ UIKIT_EXTERN NSString * const kSailingPrizeAlertKey;
NSString * fuleStr = [NSString stringWithFormat:@"持有燃料%ld", self.sailingInfo.keyNum]; NSString * fuleStr = [NSString stringWithFormat:@"持有燃料%ld", self.sailingInfo.keyNum];
[self.fuleButton setTitle:fuleStr forState:UIControlStateNormal]; [self.fuleButton setTitle:fuleStr forState:UIControlStateNormal];
self.exploreButton.userInteractionEnabled = YES; self.exploreButton.userInteractionEnabled = YES;
self.exploreButton.selected = NO;
NSString * key = [NSString stringWithFormat:@"%@_%@", kSailingPrizeAlertKey, [AccountInfoStorage instance].getUid]; NSString * key = [NSString stringWithFormat:@"%@_%@", kSailingPrizeAlertKey, [AccountInfoStorage instance].getUid];
if (![[NSUserDefaults standardUserDefaults] boolForKey:key] && model.prizeItemList.count > 0) { if (![[NSUserDefaults standardUserDefaults] boolForKey:key] && model.prizeItemList.count > 0) {
CGFloat height = 226; CGFloat height = 226;
@@ -376,6 +377,7 @@ UIKIT_EXTERN NSString * const kSailingPrizeAlertKey;
[self.sailingView stopAnimation]; [self.sailingView stopAnimation];
self.sailingImageView.hidden = NO; self.sailingImageView.hidden = NO;
self.exploreButton.userInteractionEnabled = YES; self.exploreButton.userInteractionEnabled = YES;
self.exploreButton.selected = NO;
} }
#pragma mark - SVGAPlayerDelegate #pragma mark - SVGAPlayerDelegate
@@ -451,6 +453,7 @@ UIKIT_EXTERN NSString * const kSailingPrizeAlertKey;
NSString * roomUid = self.roomUid; NSString * roomUid = self.roomUid;
[self.presenter openSailing:roomUid sendMessage:YES keyNum:self.textField.text.integerValue]; [self.presenter openSailing:roomUid sendMessage:YES keyNum:self.textField.text.integerValue];
self.exploreButton.userInteractionEnabled = NO; self.exploreButton.userInteractionEnabled = NO;
self.exploreButton.selected = YES;
} }
} }
@@ -683,7 +686,7 @@ UIKIT_EXTERN NSString * const kSailingPrizeAlertKey;
if (!_exploreButton) { if (!_exploreButton) {
_exploreButton = [UIButton buttonWithType:UIButtonTypeCustom]; _exploreButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_exploreButton setImage:[UIImage imageNamed:@"room_sailing_explore"] forState:UIControlStateNormal]; [_exploreButton setImage:[UIImage imageNamed:@"room_sailing_explore"] forState:UIControlStateNormal];
[_exploreButton setImage:[UIImage imageNamed:@"room_sailing_explore"] forState:UIControlStateSelected]; [_exploreButton setImage:[UIImage imageNamed:@"room_sailing_top_explore"] forState:UIControlStateSelected];
[_exploreButton addTarget:self action:@selector(exploreButtonAction:) forControlEvents:UIControlEventTouchUpInside]; [_exploreButton addTarget:self action:@selector(exploreButtonAction:) forControlEvents:UIControlEventTouchUpInside];
} }
return _exploreButton; return _exploreButton;