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

1. 优化动态名字部分的显示效果

Browse Source 
2. 修正部分错误的单词
This commit is contained in:
eggmanQQQ
2024-07-17 18:06:24 +08:00
parent 7fe6cc9125
commit c7aea082be
26 changed files with 77 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
YuMi.xcodeproj/project.pbxproj
View File

@@ -931,8 +931,8 @@
E818E348286ECA4B005EDF68 /* XPMonentsPublishViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E818E347286ECA4B005EDF68 /* XPMonentsPublishViewController.m */; };
E818E34B286ECABF005EDF68 /* XPMonentsPublishPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E818E34A286ECABF005EDF68 /* XPMonentsPublishPresenter.m */; };
E818E34F286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E818E34E286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.m */; };
E81A652B2834E4F600F55894 /* XPMonentsAttentionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A652A2834E4F600F55894 /* XPMonentsAttentionViewController.m */; };
E81A65312834E53600F55894 /* XPMonentsLatestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A65302834E53600F55894 /* XPMonentsLatestViewController.m */; };
E81A652B2834E4F600F55894 /* XPMomentsAttentionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A652A2834E4F600F55894 /* XPMomentsAttentionViewController.m */; };
E81A65312834E53600F55894 /* XPMomentsLatestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A65302834E53600F55894 /* XPMomentsLatestViewController.m */; };
E81A653F283511BE00F55894 /* XPMonentsInteractiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A653E283511BE00F55894 /* XPMonentsInteractiveViewController.m */; };
E81A65422835120200F55894 /* XPMonentsInteractivePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A65412835120200F55894 /* XPMonentsInteractivePresenter.m */; };
E81A6546283519CA00F55894 /* MomentsTopicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A6545283519CA00F55894 /* MomentsTopicModel.m */; };
@@ -3250,10 +3250,10 @@
E818E34C286ECAD8005EDF68 /* XPMonentsPublishProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsPublishProtocol.h; sourceTree = "<group>"; };
E818E34D286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsPublishCollectionViewCell.h; sourceTree = "<group>"; };
E818E34E286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsPublishCollectionViewCell.m; sourceTree = "<group>"; };
E81A65292834E4F600F55894 /* XPMonentsAttentionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsAttentionViewController.h; sourceTree = "<group>"; };
E81A652A2834E4F600F55894 /* XPMonentsAttentionViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsAttentionViewController.m; sourceTree = "<group>"; };
E81A652F2834E53600F55894 /* XPMonentsLatestViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsLatestViewController.h; sourceTree = "<group>"; };
E81A65302834E53600F55894 /* XPMonentsLatestViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsLatestViewController.m; sourceTree = "<group>"; };
E81A65292834E4F600F55894 /* XPMomentsAttentionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsAttentionViewController.h; sourceTree = "<group>"; };
E81A652A2834E4F600F55894 /* XPMomentsAttentionViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsAttentionViewController.m; sourceTree = "<group>"; };
E81A652F2834E53600F55894 /* XPMomentsLatestViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsLatestViewController.h; sourceTree = "<group>"; };
E81A65302834E53600F55894 /* XPMomentsLatestViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsLatestViewController.m; sourceTree = "<group>"; };
E81A653D283511BE00F55894 /* XPMonentsInteractiveViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsInteractiveViewController.h; sourceTree = "<group>"; };
E81A653E283511BE00F55894 /* XPMonentsInteractiveViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsInteractiveViewController.m; sourceTree = "<group>"; };
E81A65402835120200F55894 /* XPMonentsInteractivePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsInteractivePresenter.h; sourceTree = "<group>"; };
@@ -7799,10 +7799,10 @@
E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */,
E81DCCCE282B63FD0039E5C5 /* XPMomentsRecommendViewController.h */,
E81DCCCF282B63FD0039E5C5 /* XPMomentsRecommendViewController.m */,
E81A65292834E4F600F55894 /* XPMonentsAttentionViewController.h */,
E81A652A2834E4F600F55894 /* XPMonentsAttentionViewController.m */,
E81A652F2834E53600F55894 /* XPMonentsLatestViewController.h */,
E81A65302834E53600F55894 /* XPMonentsLatestViewController.m */,
E81A65292834E4F600F55894 /* XPMomentsAttentionViewController.h */,
E81A652A2834E4F600F55894 /* XPMomentsAttentionViewController.m */,
E81A652F2834E53600F55894 /* XPMomentsLatestViewController.h */,
E81A65302834E53600F55894 /* XPMomentsLatestViewController.m */,
E81A653D283511BE00F55894 /* XPMonentsInteractiveViewController.h */,
E81A653E283511BE00F55894 /* XPMonentsInteractiveViewController.m */,
E852D739286317F0001465ED /* XPMomentsDetailViewController.h */,
@@ -11756,7 +11756,7 @@
E8A3539428FE605F0014A784 /* WishGiftUserModel.m in Sources */,
E81C1B262770663B0020D1E4 /* XPArrangeMicTableViewCell.m in Sources */,
238B37D22AC55A2C00BFC9D5 /* XPTreasureFairyExchangeView.m in Sources */,
E81A652B2834E4F600F55894 /* XPMonentsAttentionViewController.m in Sources */,
E81A652B2834E4F600F55894 /* XPMomentsAttentionViewController.m in Sources */,
E8E20BEC2816A5B90033B688 /* XPMineBlackListViewController.m in Sources */,
E8AC722F26F49610007D6E91 /* XPMineNotificationItemModel.m in Sources */,
E85410352864155A005CFD9F /* XPMonentDetailPresenter.m in Sources */,
@@ -12254,7 +12254,7 @@
E81366E726F0A49E0076364C /* NSString+Utils.m in Sources */,
23194DD22AD14BF000649F51 /* DDFileLogger.m in Sources */,
E8EEB90126FC31B6007C6EBA /* XPMineUserInfoPresenter.m in Sources */,
E81A65312834E53600F55894 /* XPMonentsLatestViewController.m in Sources */,
E81A65312834E53600F55894 /* XPMomentsLatestViewController.m in Sources */,
18F404BB2760982000A6C548 /* ChatLimitModel.m in Sources */,
E8A30BE828534A63003B4873 /* XPSessionFindNewTableViewCell.m in Sources */,
9BE9F10527FF04CF00667200 /* XPAnchorFansTaskTableViewCell.m in Sources */,

4
YuMi/Modules/YMMessage/Model/AttachmentModel.h
View File

@@ -89,7 +89,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
///个播粉丝团
CustomMessageType_Anchor_FansTeam = 90,
///牌照房小时榜
CustomMessageType_Licnese_Hour_Rank = 91,
CustomMessageType_License_Hour_Rank = 91,
///任务完成通知
CustomMessageType_Task_Complete = 92,
///礼物合成
@@ -538,7 +538,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageAnchorFansTeam) {
///first = CustomMessageType_Licnese_Hour_Rank
typedef NS_ENUM(NSUInteger, CustomMessageLicneseHourRank) {
///牌照房小时榜
Custom_Message_Sub_Licnese_Hour_Rank = 911,
Custom_Message_Sub_License_Hour_Rank = 911,
};
///first = CustomMessageType_Task_Complete

4
YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.m
View File

@@ -205,12 +205,12 @@
- (void)footerRefresh {
if (self.hasNoMoreDiamondData && self.type == 0) {
[self.diamondView.tableView.mj_footer endRefreshing];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMonentsRecommendViewController0")];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMomentsRecommendViewController0")];
return;
}
if(self.hasNoMoreGiftData && self.type == 1){
[self.giftView.tableView.mj_footer endRefreshing];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMonentsRecommendViewController0")];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMomentsRecommendViewController0")];
return;
}
if(self.type == 0){

2
YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.h
View File

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
#define kMONENTS_CONTENT_MAX_WIDTH (KScreenWidth - kMONENTS_CONTENT_LEFT_PADDING - kMONENTS_CONTENT_RIGHT_PADDING)
#define kMOMENTS_PIC_ONE_WIDTH 200 ///只有一个动态图片的高度
#define kMOMENTS_PIC_SPACE 4 ///图片之间的间隙的宽度或者高度
#define kMONENTS_USER_INFO_HEIGHT 60 ///用户信息的高度
#define kMOMENTS_USER_INFO_HEIGHT 60 ///用户信息的高度
#define kMOMENTS_TOOL_BAR_HEIGHT 58 ///底部操作栏的高度
#define kMOMENTS_CONTENT_SPACAE_HEIGHT 12 /// 每个内容之间下面的间隙的高度
#define kMOMENTS_TEXT_TOPIC_HEIGHT 20 /// 话题的高度

2
YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.m
View File

@@ -168,7 +168,7 @@
#pragma mark - 正常的布局
+ (void)layoutMomentsModel:(MomentsInfoModel *)moments {
CGFloat rowHeight = kMONENTS_USER_INFO_HEIGHT;
CGFloat rowHeight = kMOMENTS_USER_INFO_HEIGHT;
///用户信息和文字之间的间隙
rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT;
///文字内容的高度

2
YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.h
View File

@@ -1,5 +1,5 @@
//
// XPMonentsTableViewCell.h
// XPMomentsTableViewCell.h
// xplan-ios
//
// Created by 冯硕 on 2022/5/11.

41
YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.m
View File

@@ -134,8 +134,9 @@
}];
[self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.top.mas_equalTo(self.backView);
make.height.mas_equalTo(kMONENTS_USER_INFO_HEIGHT);
make.top.mas_equalTo(self.backView).offset(4);
make.leading.trailing.mas_equalTo(self.backView);
make.height.mas_equalTo(kMOMENTS_USER_INFO_HEIGHT);
}];
[self.textView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -160,46 +161,46 @@
}
#pragma mark - XPMonentsUserInfoViewDelegate
- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickEnterRoom:(MomentsInfoModel *)monents {
if (monents.inRoomUid.integerValue > 0) {
[XPRoomViewController openRoom:monents.inRoomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC];
#pragma mark - XPMomentsUserInfoViewDelegate
- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickEnterRoom:(MomentsInfoModel *)momentsInfo {
if (momentsInfo.inRoomUid.integerValue > 0) {
[XPRoomViewController openRoom:momentsInfo.inRoomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC];
}
}
- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickAvatar:(MomentsInfoModel *)monents {
- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickAvatar:(MomentsInfoModel *)momentsInfo {
XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init];
userInfoVC.uid = monents.uid.integerValue;
userInfoVC.uid = momentsInfo.uid.integerValue;
[[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES];
}
- (void)XPMomentsTooBarView:(XPMomentsUserInfoView *)view didClickDelete:(MomentsInfoModel *)monentsInfo {
- (void)XPMomentsTooBarView:(XPMomentsUserInfoView *)view didClickDelete:(MomentsInfoModel *)momentsInfo {
if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicDelete:)]) {
[self.delegate XPMomentsTableViewCell:self didClicDelete:monentsInfo];
[self.delegate XPMomentsTableViewCell:self didClicDelete:momentsInfo];
}
}
#pragma mark - XPMonentsTooBarViewDelegate
- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickLike:(MomentsInfoModel *)monentsInfo {
#pragma mark - XPMomentsTooBarViewDelegate
- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickLike:(MomentsInfoModel *)momentsInfo {
if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClickLike:)]) {
[self.delegate XPMomentsTableViewCell:self didClickLike:monentsInfo];
[self.delegate XPMomentsTableViewCell:self didClickLike:momentsInfo];
}
}
- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickCommon:(MomentsInfoModel *)monentsInfo {
- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickCommon:(MomentsInfoModel *)momentsInfo {
if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicCommon:)]) {
[self.delegate XPMomentsTableViewCell:self didClicCommon:monentsInfo];
[self.delegate XPMomentsTableViewCell:self didClicCommon:momentsInfo];
}
}
- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickShielding:(MomentsInfoModel *)monentsInfo{
- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickShielding:(MomentsInfoModel *)momentsInfo{
if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicShielding:)]) {
[self.delegate XPMomentsTableViewCell:self didClicShielding:monentsInfo];
[self.delegate XPMomentsTableViewCell:self didClicShielding:momentsInfo];
}
}
#pragma mark - XPMonentsContentViewDelegate
- (void)xPMonentsContentView:(XPMomentsContentView *)view didClickFold:(MomentsInfoModel *)monentsInfo {
#pragma mark - XPMomentsContentViewDelegate
- (void)xPMonentsContentView:(XPMomentsContentView *)view didClickFold:(MomentsInfoModel *)momentsInfo {
if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicFold:)]) {
[self.delegate XPMomentsTableViewCell:self didClicFold:monentsInfo];
[self.delegate XPMomentsTableViewCell:self didClicFold:momentsInfo];
}
}

2
YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.h
View File

@@ -1,5 +1,5 @@
//
// XPMonentsUserInfoView.h
// XPMomentsUserInfoView.h
// xplan-ios
//
// Created by 冯硕 on 2022/5/12.

7
YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.m
View File

@@ -230,14 +230,11 @@
[TTPopup actionSheetWithItems:@[action]];
}
#pragma mark - Getters And Setters
- (void)setMomentsInfo:(MomentsInfoModel *)monentsInfo {
_momentsInfo = monentsInfo;
- (void)setMomentsInfo:(MomentsInfoModel *)momentsInfo {
_momentsInfo = momentsInfo;
if (_momentsInfo) {
self.avatarImageView.imageUrl = _momentsInfo.avatar;
NSString * nick = _momentsInfo.nick;
if (nick.length > 8) {
nick = [NSString stringWithFormat:@"%@…", [nick substringToIndex:8]];
}
self.nickLabel.text = nick.length > 0 ? nick : @"";
[self.sexImageView setTitle:[NSString stringWithFormat:@"%d",_momentsInfo.age] forState:UIControlStateNormal];

2
YuMi/Modules/YMMonents/View/XPMonentsAttentionViewController.h → YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.h
View File

@@ -9,7 +9,7 @@
#import <JXCategoryView/JXCategoryListContainerView.h>
NS_ASSUME_NONNULL_BEGIN
@interface XPMonentsAttentionViewController : MvpViewController<JXCategoryListContentViewDelegate>
@interface XPMomentsAttentionViewController : MvpViewController<JXCategoryListContentViewDelegate>
@end

6
YuMi/Modules/YMMonents/View/XPMonentsAttentionViewController.m → YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.m
View File

@@ -5,7 +5,7 @@
// Created by 冯硕 on 2022/5/18.
//
#import "XPMonentsAttentionViewController.h"
#import "XPMomentsAttentionViewController.h"
///Third
#import <Masonry/Masonry.h>
#import <MJRefresh/MJRefresh.h>
@@ -23,7 +23,7 @@
#import "XPMomentsEmptyTableViewCell.h"
#import "XPMomentsDetailViewController.h"
UIKIT_EXTERN NSString *kRequestTicket;
@interface XPMonentsAttentionViewController ()<UITableViewDelegate, UITableViewDataSource,XPMonentsAttentionProtocol, XPMomentsTableViewCellDelegate, XPMomentsDetailViewControllerDelegate>
@interface XPMomentsAttentionViewController ()<UITableViewDelegate, UITableViewDataSource,XPMonentsAttentionProtocol, XPMomentsTableViewCellDelegate, XPMomentsDetailViewControllerDelegate>
///列表
@property (nonatomic,strong) UITableView *tableView;
///数据源
@@ -36,7 +36,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
@property (nonatomic,strong) MomentsListInfoModel *listInfo;
@end
@implementation XPMonentsAttentionViewController
@implementation XPMomentsAttentionViewController
-(void)dealloc{
[[NSNotificationCenter defaultCenter]removeObserver:self];
}

2
YuMi/Modules/YMMonents/View/XPMonentsLatestViewController.h → YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.h
View File

@@ -9,7 +9,7 @@
#import <JXCategoryView/JXCategoryListContainerView.h>
NS_ASSUME_NONNULL_BEGIN
@interface XPMonentsLatestViewController : MvpViewController<JXCategoryListContentViewDelegate>
@interface XPMomentsLatestViewController : MvpViewController<JXCategoryListContentViewDelegate>
@end

6
YuMi/Modules/YMMonents/View/XPMonentsLatestViewController.m → YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.m
View File

@@ -5,7 +5,7 @@
// Created by 冯硕 on 2022/5/18.
//
#import "XPMonentsLatestViewController.h"
#import "XPMomentsLatestViewController.h"
///Third
#import <Masonry/Masonry.h>
#import <MJRefresh/MJRefresh.h>
@@ -22,7 +22,7 @@
#import "XPMomentsEmptyTableViewCell.h"
#import "XPMomentsDetailViewController.h"
UIKIT_EXTERN NSString *kRequestTicket;
@interface XPMonentsLatestViewController ()<UITableViewDelegate, UITableViewDataSource,XPMonentsLatestProtocol, XPMomentsTableViewCellDelegate,XPMomentsDetailViewControllerDelegate>
@interface XPMomentsLatestViewController ()<UITableViewDelegate, UITableViewDataSource,XPMonentsLatestProtocol, XPMomentsTableViewCellDelegate,XPMomentsDetailViewControllerDelegate>
///列表
@property (nonatomic,strong) UITableView *tableView;
///数据源
@@ -35,7 +35,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
@property (nonatomic,strong) MomentsListInfoModel *listInfo;
@end
@implementation XPMonentsLatestViewController
@implementation XPMomentsLatestViewController
-(void)dealloc{
[[NSNotificationCenter defaultCenter]removeObserver:self];

2
YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.m
View File

@@ -106,7 +106,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
- (void)footerRefresh {
if([AccountInfoStorage instance].isRequestRicket == YES)return;
if (self.hasNoMoreData) {
[self showErrorToast:YMLocalizedString(@"XPMonentsRecommendViewController0")];
[self showErrorToast:YMLocalizedString(@"XPMomentsRecommendViewController0")];
[self.tableView.mj_footer endRefreshing];
return;
}

18
YuMi/Modules/YMMonents/View/XPMomentsViewController.m
View File

@@ -17,8 +17,8 @@
#import "MonentsUnReadModel.h"
///View
#import "XPMomentsRecommendViewController.h"
#import "XPMonentsAttentionViewController.h"
#import "XPMonentsLatestViewController.h"
#import "XPMomentsAttentionViewController.h"
#import "XPMomentsLatestViewController.h"
#import "XPMonentsInteractiveViewController.h"
#import "XPMonentsPublishViewController.h"
@@ -39,11 +39,11 @@
///发布的按钮
@property (nonatomic,strong) UIButton *publishButton;
///关注
@property (nonatomic,strong) XPMonentsAttentionViewController * attentionVC ;
@property (nonatomic,strong) XPMomentsAttentionViewController *attentionVC ;
///最新的
@property (nonatomic,strong) XPMonentsLatestViewController *latestVC;
@property (nonatomic,strong) XPMomentsLatestViewController *latestVC;
///推荐
@property (nonatomic,strong) XPMomentsRecommendViewController * recommendVC;
@property (nonatomic,strong) XPMomentsRecommendViewController *recommendVC;
@end
@implementation XPMomentsViewController
@@ -260,17 +260,17 @@
return _publishButton;
}
- (XPMonentsAttentionViewController *)attentionVC {
- (XPMomentsAttentionViewController *)attentionVC {
if (!_attentionVC) {
XPMonentsAttentionViewController * attentionVC = [[XPMonentsAttentionViewController alloc] init];
XPMomentsAttentionViewController * attentionVC = [[XPMomentsAttentionViewController alloc] init];
_attentionVC = attentionVC;
}
return _attentionVC;
}
- (XPMonentsLatestViewController *)latestVC {
- (XPMomentsLatestViewController *)latestVC {
if (!_latestVC) {
_latestVC = [[XPMonentsLatestViewController alloc] init];
_latestVC = [[XPMomentsLatestViewController alloc] init];
}
return _latestVC;
}

2
YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
View File

@@ -329,7 +329,7 @@
[self acrossRoomPKBannerAnimation:attachment];
} else if (attachment.first == CustomMessageType_Anchor_Hour_Rank && attachment.second == Custom_Message_Sub_Anchor_Hour_Rank) {///个播小时榜
[self receiveAnchorHourRank:attachment];
} else if (attachment.first == CustomMessageType_Licnese_Hour_Rank && attachment.second == Custom_Message_Sub_Licnese_Hour_Rank) {///牌照房小时榜
} else if (attachment.first == CustomMessageType_License_Hour_Rank && attachment.second == Custom_Message_Sub_License_Hour_Rank) {///牌照房小时榜
[self receiveAnchorHourRank:attachment];
} else if (attachment.first == CustomMessageType_Gift_Compound && attachment.second == Custom_Message_Sub_Gift_Compound) {///魔法小屋合成礼物
[self receiveGiftCompound:attachment];

2
YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.h
View File

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface PIFullScreenBannerAnimation : NSObject
- (void)receiveGift:(GiftReceiveInfoModel *)receiveInfo;
- (void)receiveCandyTreeGiftHighLevle:(AttachmentModel *)attatchment;
- (void)receiveCandyTreeGiftHighLevel:(AttachmentModel *)attatchment;
- (void)receiveLuckyGiftBigPrize:(AttachmentModel *)attachment;
-(void)receiveRoomGraffitiStarKitchen:(AttachmentModel *)attacment;
- (void)receiveTreasureFairyGiftHighLevel:(AttachmentModel *)attatchment ;

2
YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m
View File

@@ -612,7 +612,7 @@
}
}
#pragma mark - 糖果树横幅动画
- (void)receiveCandyTreeGiftHighLevle:(AttachmentModel *)attatchment {
- (void)receiveCandyTreeGiftHighLevel:(AttachmentModel *)attatchment {
PIBaseAnimationViewModel *giftModel = [PIBaseAnimationViewModel new];
giftModel.data = attatchment.data;
giftModel.second = attatchment.second;

4
YuMi/Modules/YMTabbar/View/TabbarViewController.m
View File

@@ -636,7 +636,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
[self.roomAnimation receiveRoomGraffitiStarKitchen:attachment];
}else if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){
if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return;
[self.roomAnimation receiveCandyTreeGiftHighLevle:attachment];
[self.roomAnimation receiveCandyTreeGiftHighLevel:attachment];
}else if (attachment.first == CustomMessageType_Treasure_Fairy && (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L1 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) { //夺宝精灵
if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return;
[self.roomAnimation receiveTreasureFairyGiftHighLevel:attachment];
@@ -649,7 +649,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
}else if (attachment.first == CustomMessageType_Anchor_Hour_Rank && attachment.second == Custom_Message_Sub_Anchor_Hour_Rank) {///个播小时榜
if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return;
[self.roomAnimation receiveAnchorHourRank:attachment];
} else if (attachment.first == CustomMessageType_Licnese_Hour_Rank && attachment.second == Custom_Message_Sub_Licnese_Hour_Rank) {///牌照房小时榜
} else if (attachment.first == CustomMessageType_License_Hour_Rank && attachment.second == Custom_Message_Sub_License_Hour_Rank) {///牌照房小时榜
if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return;
[self.roomAnimation receiveAnchorHourRank:attachment];
}else if (attachment.first == CustomMessageType_Noble_VIP && attachment.second == Custom_Message_Sub_Room_Noble_LevelUp_Suspend) {///VIP升级全服飘屏

4
YuMi/Tools/SDPhotoBrowser/SDBrowserImageView.m
View File

@@ -61,7 +61,7 @@
imageView.image = self.image;
_scrollImageView = imageView;
[scroll addSubview:imageView];
scroll.backgroundColor = SDPhotoBrowserBackgrounColor;
scroll.backgroundColor = SDPhotoBrowserBackgroundColor;
_scroll = scroll;
[self addSubview:scroll];
if (_waitingView) {
@@ -188,7 +188,7 @@
{
if (!_zoomingScroolView) {
_zoomingScroolView = [[UIScrollView alloc] initWithFrame:self.bounds];
_zoomingScroolView.backgroundColor = SDPhotoBrowserBackgrounColor;
_zoomingScroolView.backgroundColor = SDPhotoBrowserBackgroundColor;
_zoomingScroolView.contentSize = self.bounds.size;
UIImageView *zoomingImageView = [[UIImageView alloc] initWithImage:self.image];
CGSize imageSize = zoomingImageView.image.size;

3
YuMi/Tools/SDPhotoBrowser/SDPhotoBrowser.m
View File

@@ -42,7 +42,7 @@
self = [super initWithFrame:frame];
if (self) {
self.backgroundColor = SDPhotoBrowserBackgrounColor;
self.backgroundColor = SDPhotoBrowserBackgroundColor;
_isMe = NO;
}
return self;
@@ -52,7 +52,6 @@
- (void)didMoveToSuperview
{
[self setupScrollView];
[self setupToolbars];
}

2
YuMi/Tools/SDPhotoBrowser/SDPhotoBrowserConfig.h
View File

@@ -19,7 +19,7 @@ typedef enum {
#define SDPhotoBrowserSaveImageFailText @" >_< 保存失敗 ";
// browser背景颜色
#define SDPhotoBrowserBackgrounColor [UIColor colorWithRed:0 green:0 blue:0 alpha:0.95]
#define SDPhotoBrowserBackgroundColor [UIColor colorWithRed:0 green:0 blue:0 alpha:0.95]
// browser中图片间的margin
#define SDPhotoBrowserImageViewMargin 10

6
YuMi/ar.lproj/Localizable.strings
View File

@@ -528,7 +528,7 @@
"SessionNavLiveView0" = "البث المباشر";
"XPMonentsRecommendViewController0" = "لا توجد بيانات إضافية";
"XPMomentsRecommendViewController0" = "لا توجد بيانات إضافية";
"XPMomentsRecommendViewController1" = "بمجرد الحذف، لا يمكن استعادتها\nهل أنت متأكد أنك تريد حذف هذا التحديث؟";
"XPMomentsRecommendViewController2" = "تم الحذف بنجاح";
@@ -2676,7 +2676,7 @@ ineHeadView12" = "الحمل";
"SessionNavLiveView0" = "بث مباشر";
"XPMonentsRecommendViewController0" = "لا توجد مزيد من البيانات";
"XPMomentsRecommendViewController0" = "لا توجد مزيد من البيانات";
"XPMomentsRecommendViewController1" = "بعد الحذف لا يمكن استرداده\nهل أنت متأكد من حذف هذا النشاط؟";
"XPMomentsRecommendViewController2" = "تم الحذف بنجاح";
@@ -2726,7 +2726,7 @@ ineHeadView12" = "الحمل";
"SessionNavLiveView0" = "بث مباشر";
"XPMonentsRecommendViewController0" = "لا توجد مزيد من البيانات";
"XPMomentsRecommendViewController0" = "لا توجد مزيد من البيانات";
"XPMomentsRecommendViewController1" = "بعد الحذف لا يمكن استرداده\nهل أنت متأكد من حذف هذا النشاط؟";
"XPMomentsRecommendViewController2" = "تم الحذف بنجاح";

4
YuMi/en.lproj/Localizable.strings
View File

@@ -221,7 +221,7 @@
"SessionNavLiveView0" = "Live streaming";
"XPMonentsRecommendViewController0" = "No more data";
"XPMomentsRecommendViewController0" = "No more data";
"XPMomentsRecommendViewController1" = "Once deleted, it cannot be recovered\nAre you sure you want to delete this dynamic?";
"XPMomentsRecommendViewController2" = "Deleted successfully";
@@ -2163,7 +2163,7 @@
"SessionNavLiveView0" = "Live";
"XPMonentsRecommendViewController0" = "No more data available";
"XPMomentsRecommendViewController0" = "No more data available";
"XPMomentsRecommendViewController1" = "Deletion is irreversible. Are you sure you want to delete this post?";
"XPMomentsRecommendViewController2" = "Deleted successfully";

2
YuMi/zh-Hans.lproj/Localizable.strings
View File

@@ -2031,7 +2031,7 @@
"SessionNavLiveView0" = "直播中";
"XPMonentsRecommendViewController0" = "没有更多数据了";
"XPMomentsRecommendViewController0" = "没有更多数据了";
"XPMomentsRecommendViewController1" = "删除后不可恢复\n确定删除该动态吗";
"XPMomentsRecommendViewController2" = "删除成功";

2
YuMi/zh-Hant.lproj/Localizable.strings
View File

@@ -2027,7 +2027,7 @@
"SessionNavLiveView0" = "直播中";
"XPMonentsRecommendViewController0" = "沒有更多數據了";
"XPMomentsRecommendViewController0" = "沒有更多數據了";
"XPMomentsRecommendViewController1" = "刪除後不可恢復\n確定刪除該動態嗎";
"XPMomentsRecommendViewController2" = "刪除成功";