moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temp save

Browse Source
This commit is contained in:
eggmanQQQ
2024-06-24 19:11:54 +08:00
parent fe4c8d5737
commit dc7a2688cf
6 changed files with 127 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
YuMi.xcodeproj/project.pbxproj
View File

@@ -529,6 +529,7 @@
54C389622C23BD1600FD47B1 /* HomeRankAvatarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */; };
54C389672C24464600FD47B1 /* HomeMineRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389662C24464600FD47B1 /* HomeMineRoomModel.m */; };
54F4692F2C280CF100A83655 /* XPMineUserInfoViewControllerV2.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F4692E2C280CF100A83655 /* XPMineUserInfoViewControllerV2.m */; };
54F469352C29711400A83655 /* XPMomentUserDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469342C29711400A83655 /* XPMomentUserDataViewController.m */; };
73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACF623970097D653132D69A /* Pods_YuMi.framework */; };
9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C527BA392B0032BD2B /* AnchorStageView.m */; };
9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */; };
@@ -2585,6 +2586,8 @@
54C389662C24464600FD47B1 /* HomeMineRoomModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeMineRoomModel.m; sourceTree = "<group>"; };
54F4692D2C280CF100A83655 /* XPMineUserInfoViewControllerV2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoViewControllerV2.h; sourceTree = "<group>"; };
54F4692E2C280CF100A83655 /* XPMineUserInfoViewControllerV2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoViewControllerV2.m; sourceTree = "<group>"; };
54F469332C29711400A83655 /* XPMomentUserDataViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentUserDataViewController.h; sourceTree = "<group>"; };
54F469342C29711400A83655 /* XPMomentUserDataViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentUserDataViewController.m; sourceTree = "<group>"; };
7DB00EC07F1D0ADFF900B38D /* Pods-YuMi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YuMi.debug.xcconfig"; path = "Target Support Files/Pods-YuMi/Pods-YuMi.debug.xcconfig"; sourceTree = "<group>"; };
9B0086C427BA392B0032BD2B /* AnchorStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorStageView.h; sourceTree = "<group>"; };
9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = "<group>"; };
@@ -10725,6 +10728,8 @@
23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */,
23E9EA932A84BE4800B792F2 /* XPGiftUserDataViewController.h */,
23E9EA922A84BE4800B792F2 /* XPGiftUserDataViewController.m */,
54F469332C29711400A83655 /* XPMomentUserDataViewController.h */,
54F469342C29711400A83655 /* XPMomentUserDataViewController.m */,
23E9EAA42A84C97C00B792F2 /* XPMineUserInfoTagVC.h */,
23E9EAA52A84C97C00B792F2 /* XPMineUserInfoTagVC.m */,
23E9EA962A84C37000B792F2 /* XPMineUserInfoRecordedSoundVC.h */,
@@ -11955,6 +11960,7 @@
E85E7B222A4EB0D300B6D00A /* XPMineGuildIncomeRecordViewController.m in Sources */,
9BD2ECD5288F838200F5CD9A /* XPMineFootPrintPresenter.m in Sources */,
9B1B72BF2800422E003FACE9 /* XPAnchorPKRuleView.m in Sources */,
54F469352C29711400A83655 /* XPMomentUserDataViewController.m in Sources */,
1427219729A75F6F00C7C423 /* DDRange.m in Sources */,
E85E7B6E2A4EC4AE00B6D00A /* XPMineGuildPresenter.m in Sources */,
23CEFC5B2AFB8FC100576D89 /* BSSelectView.m in Sources */,

37
YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m
View File

@@ -36,8 +36,7 @@
@property (nonatomic,strong) UITableView *tableView;
///家族信息
@property (nonatomic,strong) ClanDetailInfoModel *clanDetailInfo;
///技能卡
@property (nonatomic,strong) NSArray *skillArray;
///是否折叠
@property (nonatomic,assign) BOOL isFold;
@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView);
@@ -48,7 +47,7 @@
@property (nonatomic,strong) UIView *headView;
///
///
@property (nonatomic,assign) BOOL isOpne;
@property (nonatomic,assign) BOOL isOpen;
@end
@implementation XPMineUserDataViewController
@@ -63,13 +62,13 @@
- (void)viewDidLoad {
[super viewDidLoad];
[self initHettpRequest];
[self initHttpRequest];
[self initSubViews];
[self initSubViewConstraints];
}
#pragma mark - Http
- (void)initHettpRequest {
self.isOpne = self.userUid.integerValue == [[AccountInfoStorage instance]getUid].integerValue;
- (void)initHttpRequest {
self.isOpen = self.userUid.integerValue == [[AccountInfoStorage instance]getUid].integerValue;
self.isFold = YES;
self.isShowEnterClan = NO;
[self.presenter getClanDetailInfo:self.userUid currentUserUid:[AccountInfoStorage instance].getUid];
@@ -104,7 +103,7 @@
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
if(indexPath.section == 0){
if(self.isOpne == YES){
if(self.isOpen == YES){
if (self.clanDetailInfo.clan.elderUid.length > 0) {
return kGetScaleWidth(150);
}
@@ -142,7 +141,7 @@
if (cell == nil) {
cell = [[XPMineDataClanTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineDataClanTableViewCell class])];
}
cell.isOpne = self.isOpne;
cell.isOpne = self.isOpen;
cell.isShowEnterHall = self.isShowEnterClan;
cell.delegate = self;
cell.userInfo = self.userInfo;
@@ -313,7 +312,7 @@
// [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationNone];
}
- (void)xPMineDataClanTableViewCell:(XPMineDataClanTableViewCell *)view didClickOpen:(ClanDetailInfoModel *)clanInfo{
self.isOpne = YES;
self.isOpen = YES;
[self.tableView reloadData];
}
- (void)xPMineDataClanTableViewCell:(XPMineDataClanTableViewCell *)view didClickEnter:(ClanDetailInfoModel *)clanInfo {
@@ -360,26 +359,6 @@
}
#pragma mark - XPMineUserDataProtocol
- (void)getUserSkillCardListSuccess:(NSArray *)list {
NSMutableArray<MineSkillCardListInfoModel *> * array = [NSMutableArray arrayWithArray:list];
__block MineSkillCardListInfoModel * voiceCard;
[array enumerateObjectsUsingBlock:^(MineSkillCardListInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
if ([obj.cardId isEqualToString:@"8"]) {
voiceCard = obj;
*stop = YES;
}
}];
if (voiceCard) {
[array removeObject:voiceCard];
}
if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserDataViewController:didGetVoiceSuccess:)]) {
[self.delegate xPMineUserDataViewController:self didGetVoiceSuccess:voiceCard];
}
self.skillArray = [array copy];
[self.tableView reloadData];
// [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationNone];
}
- (void)getClanDetailInfoSuccess:(ClanDetailInfoModel *)clanDetailInfo currentUserClanInfo:(ClanDetailInfoModel *)currentUserClanInfo {
self.clanDetailInfo = clanDetailInfo;
if (clanDetailInfo.hall.hallName.length > 0 && currentUserClanInfo.hall.hallName.length <= 0 && ![[AccountInfoStorage instance].getUid isEqualToString:self.userUid]) {

4
YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m
View File

@@ -456,8 +456,8 @@ XPMineCustomNavViewDelegate, XPMineUserInfoProtocol, XPMineUserInfoHeaderViewDel
_titleView = [[JXCategoryTitleView alloc] init];
_titleView.delegate = self;
_titleView.backgroundColor = [UIColor clearColor];
_titleView.titleColor = UIColorFromRGB(0x191919);
_titleView.titleSelectedColor = UIColorRGBAlpha(0x191919, 0.5);
_titleView.titleColor = UIColorRGBAlpha(0x191919, 0.5);
_titleView.titleSelectedColor = UIColorFromRGB(0x191919);
_titleView.titleFont = [UIFont systemFontOfSize:18 weight:UIFontWeightBold];
_titleView.titleSelectedFont = [UIFont systemFontOfSize:18 weight:UIFontWeightBold];
_titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter;

4
YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m
View File

@@ -146,14 +146,14 @@ return view;\
[self addSubview:self.onlineButton];
[self.onlineButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self);
make.top.mas_equalTo(self).offset(64);
make.top.mas_equalTo(self).offset(104);
make.size.mas_equalTo(CGSizeMake(63, 23));
}];
[self addSubview:self.pageButton];
[self.pageButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self);
make.top.mas_equalTo(self).offset(84);
make.top.mas_equalTo(self).offset(124);
make.size.mas_equalTo(CGSizeMake(63, 23));
}];

19
YuMi/Modules/YMMine/View/XPMomentUserDataViewController.h Normal file
View File

@@ -0,0 +1,19 @@
//
// XPMomentUserDataViewController.h
// YuMi
//
// Created by P on 2024/6/24.
//
#import "MvpViewController.h"
#import <JXPagingView/JXPagerView.h>
@class MonentsInfoModel;
NS_ASSUME_NONNULL_BEGIN
@interface XPMomentUserDataViewController : MvpViewController<JXPagerViewListViewDelegate>
@property (nonatomic,strong) NSMutableArray<MonentsInfoModel *> *datasource;
@end
NS_ASSUME_NONNULL_END

90
YuMi/Modules/YMMine/View/XPMomentUserDataViewController.m Normal file
View File

@@ -0,0 +1,90 @@
//
// XPMomentUserDataViewController.m
// YuMi
//
// Created by P on 2024/6/24.
//
#import "XPMomentUserDataViewController.h"
#import "XPMonentsLayoutConfig.h"
#import "XPMonentsEmptyTableViewCell.h"
#import "XPMonentsTableViewCell.h"
#import "MonentsInfoModel.h"
@interface XPMomentUserDataViewController () <UITableViewDelegate, UITableViewDataSource>
@property (nonatomic,strong) UITableView *tableView;
@end
@implementation XPMomentUserDataViewController
- (void)viewDidLoad {
[super viewDidLoad];
[self.view addSubview:self.tableView];
}
#pragma mark - UITableViewDelegate And UITableViewDataSource
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
return 2;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
if(section == 0)return 1;
return self.datasource.count > 0 ? self.datasource.count : 1;;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
if (self.datasource.count > 0) {
MonentsInfoModel * momentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row];
[XPMonentsLayoutConfig getNewlayoutMonentsModelWithDynamic:momentInfo];
if(momentInfo.content.length == 0){
return momentInfo.rowHeight + 20;
}
return momentInfo.rowHeight;
}
return KScreenHeight - kNavigationHeight - 49 - kSafeAreaBottomHeight;
}
- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
return nil;
}
- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
return 0.01;
}
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
if(section == 0)return 0.01;
return self.datasource.count > 0 ? 30 : 0.01;
}
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
if(section == 0)return nil;
return nil;//self.datasource.count > 0 ? self.headView : nil;
}
#pragma mark -
- (UITableView *)tableView {
if (!_tableView) {
_tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
_tableView.delegate = self;
_tableView.dataSource = self;
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
_tableView.backgroundColor = [UIColor clearColor];
if (@available(iOS 11.0, *)) {
_tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
}
[_tableView registerClass:[XPMonentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsEmptyTableViewCell class])];
[_tableView registerClass:[XPMonentsTableViewCell class] forCellReuseIdentifier:@"XPMonentsDynamicTableViewCell"];
}
return _tableView;
}
- (NSMutableArray<MonentsInfoModel *> *)datasource {
if (!_datasource) {
_datasource = [NSMutableArray array];
}
return _datasource;
}
@end