首页UI优化
This commit is contained in:
@@ -131,6 +131,7 @@
|
||||
23194DD02AD14BF000649F51 /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC72AD14BF000649F51 /* DDLog.m */; };
|
||||
23194DD12AD14BF000649F51 /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC92AD14BF000649F51 /* DDAbstractDatabaseLogger.m */; };
|
||||
23194DD22AD14BF000649F51 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DCA2AD14BF000649F51 /* DDFileLogger.m */; };
|
||||
23194DD52AD292F200649F51 /* PIPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DD42AD292F200649F51 /* PIPageControl.m */; };
|
||||
2323E0372ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 2323E0362ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.m */; };
|
||||
232C43EA2AB15F4100D4B2ED /* XPRoomTarrowBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */; };
|
||||
232C43EC2AB169EC00D4B2ED /* pi_room_tarrow_banner.svga in Resources */ = {isa = PBXBuildFile; fileRef = 232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */; };
|
||||
@@ -1658,6 +1659,8 @@
|
||||
23194DC92AD14BF000649F51 /* DDAbstractDatabaseLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDAbstractDatabaseLogger.m; sourceTree = "<group>"; };
|
||||
23194DCA2AD14BF000649F51 /* DDFileLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDFileLogger.m; sourceTree = "<group>"; };
|
||||
23194DCB2AD14BF000649F51 /* DDASLLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDASLLogger.h; sourceTree = "<group>"; };
|
||||
23194DD32AD292F200649F51 /* PIPageControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIPageControl.h; sourceTree = "<group>"; };
|
||||
23194DD42AD292F200649F51 /* PIPageControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIPageControl.m; sourceTree = "<group>"; };
|
||||
2323E0352ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "FBSDKSettings+PISDKSettings.h"; path = "YuMi/Appdelegate/FBSDKSettings+PISDKSettings.h"; sourceTree = SOURCE_ROOT; };
|
||||
2323E0362ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "FBSDKSettings+PISDKSettings.m"; path = "YuMi/Appdelegate/FBSDKSettings+PISDKSettings.m"; sourceTree = SOURCE_ROOT; };
|
||||
232C43E82AB15F4100D4B2ED /* XPRoomTarrowBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTarrowBannerView.h; sourceTree = "<group>"; };
|
||||
@@ -8500,6 +8503,8 @@
|
||||
23FF426F2AA6C7CF0055733C /* XPNewHomeItemCell.m */,
|
||||
23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */,
|
||||
23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */,
|
||||
23194DD32AD292F200649F51 /* PIPageControl.h */,
|
||||
23194DD42AD292F200649F51 /* PIPageControl.m */,
|
||||
);
|
||||
path = CustomView;
|
||||
sourceTree = "<group>";
|
||||
@@ -11199,6 +11204,7 @@
|
||||
E873EB02280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m in Sources */,
|
||||
E872309326E8D31500B90D4F /* LoginVerifCodeView.m in Sources */,
|
||||
E82107872987E49100DE7040 /* MessageRedPacketModel.m in Sources */,
|
||||
23194DD52AD292F200649F51 /* PIPageControl.m in Sources */,
|
||||
23E9EA9E2A84C42B00B792F2 /* SGYProgressView.m in Sources */,
|
||||
E87E91552796B6DE00A7B3F2 /* XPRoomInviteUserViewController.m in Sources */,
|
||||
E880B3B5278C1FE400A83B0D /* XPAcrossRoomPKPresenter.m in Sources */,
|
||||
|
@@ -31,7 +31,7 @@
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Debug"
|
||||
buildConfiguration = "Release"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 26 KiB |
Binary file not shown.
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 64 KiB |
@@ -96,7 +96,15 @@
|
||||
make.right.mas_equalTo(self.contentView).offset(-(15));
|
||||
}];
|
||||
|
||||
|
||||
CGFloat width = 28 * 20 / 14;
|
||||
[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.height.mas_equalTo(20);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.height.mas_equalTo(20);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - Event Response
|
||||
@@ -134,35 +142,7 @@
|
||||
self.sexImageView.selected = _fansInfo.gender != GenderType_Male;
|
||||
|
||||
self.findButton.hidden = _fansInfo.userInRoomUid.length <= 0;
|
||||
UIImage* image = self.experImageView.image;
|
||||
if (image) {
|
||||
CGFloat scale = image.size.width / image.size.height;
|
||||
[self.experImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
} else {
|
||||
NSURL *imgUrl = [NSURL URLWithString:_fansInfo.experUrl];
|
||||
UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
|
||||
CGFloat scale = myImage.size.width / myImage.size.height;
|
||||
[self.experImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
}
|
||||
|
||||
UIImage* charmImage = self.charmImageView.image;
|
||||
if (charmImage) {
|
||||
CGFloat scale = charmImage.size.width / charmImage.size.height;
|
||||
[self.charmImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
} else {
|
||||
NSURL *imgUrl = [NSURL URLWithString:_fansInfo.charmUrl];
|
||||
UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
|
||||
CGFloat scale = myImage.size.width / myImage.size.height;
|
||||
[self.charmImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
}
|
||||
|
||||
UIImage *nobleImage = self.nobleImageView.image;
|
||||
if (nobleImage) {
|
||||
@@ -259,7 +239,7 @@
|
||||
- (NetImageView *)experImageView {
|
||||
if (!_experImageView) {
|
||||
NetImageConfig * config = [[NetImageConfig alloc]init];
|
||||
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
|
||||
|
||||
_experImageView = [[NetImageView alloc] initWithConfig:config];
|
||||
_experImageView.layer.maskedCorners = YES;
|
||||
_experImageView.contentMode = UIViewContentModeScaleAspectFit;
|
||||
@@ -270,7 +250,7 @@
|
||||
- (NetImageView *)charmImageView {
|
||||
if (!_charmImageView) {
|
||||
NetImageConfig * config = [[NetImageConfig alloc]init];
|
||||
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
|
||||
|
||||
_charmImageView = [[NetImageView alloc] initWithConfig:config];
|
||||
_charmImageView.layer.maskedCorners = YES;
|
||||
_charmImageView.contentMode = UIViewContentModeScaleAspectFit;
|
||||
|
@@ -97,7 +97,15 @@
|
||||
make.right.mas_equalTo(self.contentView).offset(-(15));
|
||||
}];
|
||||
|
||||
|
||||
CGFloat width = 28 * 20 / 14;
|
||||
[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.height.mas_equalTo(20);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.height.mas_equalTo(20);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - Event Response
|
||||
@@ -139,35 +147,7 @@
|
||||
BOOL isMyFriend = [[NIMSDK sharedSDK].userManager isMyFriend:_fansInfo.uid];
|
||||
self.attentionButton.enabled = !isMyFriend;
|
||||
self.attentionButton.hidden = NO;
|
||||
UIImage* image = self.experImageView.image;
|
||||
if (image) {
|
||||
CGFloat scale = image.size.width / image.size.height;
|
||||
[self.experImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
} else {
|
||||
NSURL *imgUrl = [NSURL URLWithString:_fansInfo.experUrl];
|
||||
UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
|
||||
CGFloat scale = myImage.size.width / myImage.size.height;
|
||||
[self.experImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
}
|
||||
|
||||
UIImage* charmImage = self.charmImageView.image;
|
||||
if (charmImage) {
|
||||
CGFloat scale = charmImage.size.width / charmImage.size.height;
|
||||
[self.charmImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
} else {
|
||||
NSURL *imgUrl = [NSURL URLWithString:_fansInfo.charmUrl];
|
||||
UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
|
||||
CGFloat scale = myImage.size.width / myImage.size.height;
|
||||
[self.charmImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
}
|
||||
|
||||
UIImage *nobleImage = self.nobleImageView.image;
|
||||
if (nobleImage) {
|
||||
@@ -265,7 +245,7 @@
|
||||
- (NetImageView *)experImageView {
|
||||
if (!_experImageView) {
|
||||
NetImageConfig * config = [[NetImageConfig alloc]init];
|
||||
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
|
||||
|
||||
_experImageView = [[NetImageView alloc] initWithConfig:config];
|
||||
}
|
||||
return _experImageView;
|
||||
@@ -274,7 +254,7 @@
|
||||
- (NetImageView *)charmImageView {
|
||||
if (!_charmImageView) {
|
||||
NetImageConfig * config = [[NetImageConfig alloc]init];
|
||||
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
|
||||
|
||||
_charmImageView = [[NetImageView alloc] initWithConfig:config];
|
||||
}
|
||||
return _charmImageView;
|
||||
|
@@ -76,7 +76,15 @@
|
||||
make.left.mas_equalTo(self.stackView);
|
||||
make.top.mas_equalTo(self.stackView.mas_bottom).offset(7);
|
||||
}];
|
||||
|
||||
CGFloat width = 28 * 20 / 14;
|
||||
[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.height.mas_equalTo(20);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.height.mas_equalTo(20);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - Getters And Setters
|
||||
@@ -95,35 +103,7 @@
|
||||
self.sexImageView.backgroundColor = _userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);
|
||||
self.sexImageView.titleEdgeInsets = _userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0);
|
||||
self.sexImageView.selected = _userInfo.gender != GenderType_Male;
|
||||
UIImage* image = self.experImageView.image;
|
||||
if (image) {
|
||||
CGFloat scale = image.size.width / image.size.height;
|
||||
[self.experImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
} else {
|
||||
NSURL *imgUrl = [NSURL URLWithString:_userInfo.userLevelVo.experUrl];
|
||||
UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
|
||||
CGFloat scale = myImage.size.width / myImage.size.height;
|
||||
[self.experImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
}
|
||||
|
||||
UIImage* charmImage = self.charmImageView.image;
|
||||
if (charmImage) {
|
||||
CGFloat scale = charmImage.size.width / charmImage.size.height;
|
||||
[self.charmImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
} else {
|
||||
NSURL *imgUrl = [NSURL URLWithString:_userInfo.userLevelVo.charmUrl];
|
||||
UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
|
||||
CGFloat scale = myImage.size.width / myImage.size.height;
|
||||
[self.charmImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
|
||||
}];
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -177,7 +157,7 @@
|
||||
- (NetImageView *)experImageView {
|
||||
if (!_experImageView) {
|
||||
NetImageConfig * config = [[NetImageConfig alloc]init];
|
||||
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
|
||||
|
||||
_experImageView = [[NetImageView alloc] initWithConfig:config];
|
||||
}
|
||||
return _experImageView;
|
||||
@@ -186,7 +166,7 @@
|
||||
- (NetImageView *)charmImageView {
|
||||
if (!_charmImageView) {
|
||||
NetImageConfig * config = [[NetImageConfig alloc]init];
|
||||
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
|
||||
|
||||
_charmImageView = [[NetImageView alloc] initWithConfig:config];
|
||||
}
|
||||
return _charmImageView;
|
||||
|
@@ -161,7 +161,7 @@
|
||||
NetImageConfig *config = [[NetImageConfig alloc]init];
|
||||
config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder];
|
||||
_bgImageView = [[NetImageView alloc]initWithConfig:config];
|
||||
[_bgImageView setCornerWithLeftTopCorner:kGetScaleWidth(14) rightTopCorner:kGetScaleWidth(14) bottomLeftCorner:kGetScaleWidth(15) bottomRightCorner:kGetScaleWidth(14) size:CGSizeMake(kGetScaleWidth(170), kGetScaleWidth(174))];
|
||||
[_bgImageView setCornerWithLeftTopCorner:kGetScaleWidth(16) rightTopCorner:kGetScaleWidth(16) bottomLeftCorner:kGetScaleWidth(16) bottomRightCorner:kGetScaleWidth(16) size:CGSizeMake(kGetScaleWidth(170), kGetScaleWidth(174))];
|
||||
}
|
||||
return _bgImageView;
|
||||
}
|
||||
|
@@ -92,6 +92,8 @@
|
||||
_collectionView.delegate = self;
|
||||
_collectionView.tag = 9000002;
|
||||
_collectionView.backgroundColor = [UIColor clearColor];
|
||||
_collectionView.showsVerticalScrollIndicator = NO;
|
||||
_collectionView.showsHorizontalScrollIndicator = NO;
|
||||
[_collectionView registerClass:[XPNewHomePlayItemCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPNewHomePlayItemCollectionViewCell class])];
|
||||
}
|
||||
return _collectionView;
|
||||
|
19
YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.h
Normal file
19
YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.h
Normal file
@@ -0,0 +1,19 @@
|
||||
//
|
||||
// PIPageControl.h
|
||||
// YuMi
|
||||
//
|
||||
// Created by duoban on 2023/10/8.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface PIPageControl : UIView
|
||||
@property(nonatomic,assign) NSInteger numberOfPages;
|
||||
@property(nonatomic,assign) NSInteger currentPage;
|
||||
@property(nonatomic,strong) UIColor *currentPageIndicatorTintColor;
|
||||
@property(nonatomic,strong) UIColor *pageIndicatorTintColor;
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
35
YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m
Normal file
35
YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m
Normal file
@@ -0,0 +1,35 @@
|
||||
//
|
||||
// PIPageControl.m
|
||||
// YuMi
|
||||
//
|
||||
// Created by duoban on 2023/10/8.
|
||||
//
|
||||
|
||||
#import "PIPageControl.h"
|
||||
|
||||
@implementation PIPageControl
|
||||
-(void)setNumberOfPages:(NSInteger)numberOfPages{
|
||||
_numberOfPages = numberOfPages;
|
||||
for (int i = 0; i < _numberOfPages; i++) {
|
||||
UIView *dosView = [[UIView alloc]init];
|
||||
dosView.tag = 100 + i;
|
||||
[self addSubview:dosView];
|
||||
CGFloat left = i * kGetScaleWidth(7);
|
||||
[dosView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.width.height.mas_equalTo(kGetScaleWidth(4));
|
||||
make.top.equalTo(self);
|
||||
make.left.mas_equalTo(left);
|
||||
}];
|
||||
dosView.layer.cornerRadius = kGetScaleWidth(4)/2;
|
||||
dosView.layer.masksToBounds = YES;
|
||||
}
|
||||
}
|
||||
- (void)setCurrentPage:(NSInteger)currentPage{
|
||||
_currentPage = currentPage;
|
||||
for (int i = 0; i < _numberOfPages; i++) {
|
||||
UIView *dosView = [self viewWithTag:100 + i];
|
||||
dosView.backgroundColor = _currentPage == i ? _currentPageIndicatorTintColor : _pageIndicatorTintColor;
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
@@ -8,10 +8,12 @@
|
||||
#import "XPNewHomeHeadView.h"
|
||||
#import <SDCycleScrollView/SDCycleScrollView.h>
|
||||
#import "XPNewHomeItemCell.h"
|
||||
#import "PIPageControl.h"
|
||||
@interface XPNewHomeHeadView ()<SDCycleScrollViewDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
|
||||
@property(nonatomic,strong) UICollectionView *collectionView;
|
||||
///轮播图
|
||||
@property (nonatomic, strong) SDCycleScrollView *pi_BannerView;
|
||||
@property(nonatomic,strong) PIPageControl *pageControl;
|
||||
@end
|
||||
@implementation XPNewHomeHeadView
|
||||
|
||||
@@ -26,6 +28,7 @@
|
||||
-(void)installUI{
|
||||
[self addSubview:self.collectionView];
|
||||
[self addSubview:self.pi_BannerView];
|
||||
[self addSubview:self.pageControl];
|
||||
}
|
||||
-(void)installConstraints{
|
||||
|
||||
@@ -41,6 +44,7 @@
|
||||
make.height.mas_equalTo(kGetScaleWidth(80));
|
||||
}];
|
||||
|
||||
|
||||
}
|
||||
#pragma mark - SDCycleScrollViewDelegate
|
||||
- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index {
|
||||
@@ -50,7 +54,9 @@
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didScrollToIndex:(NSInteger)index{
|
||||
self.pageControl.currentPage = index;
|
||||
}
|
||||
#pragma mark - Getters And Setters
|
||||
- (void)setBannerList:(NSArray<HomeBannerInfoModel *> *)bannerList {
|
||||
_bannerList = bannerList;
|
||||
@@ -63,6 +69,16 @@
|
||||
}];
|
||||
if (array.count > 0) {
|
||||
self.pi_BannerView.imageURLStringsGroup = array;
|
||||
CGFloat width = array.count * kGetScaleWidth(7) - kGetScaleWidth(3);
|
||||
[self.pageControl mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.bottom.mas_equalTo(-kGetScaleWidth(4));
|
||||
make.height.mas_equalTo(kGetScaleWidth(4));
|
||||
make.centerX.equalTo(self);
|
||||
make.width.mas_equalTo(width);
|
||||
}];
|
||||
self.pageControl.numberOfPages = array.count;
|
||||
self.pageControl.currentPage = 0;
|
||||
|
||||
[self.pi_BannerView autoScroll];
|
||||
}
|
||||
_pi_BannerView.hidden = NO;
|
||||
@@ -120,22 +136,25 @@
|
||||
|
||||
- (SDCycleScrollView *)pi_BannerView {
|
||||
if (!_pi_BannerView) {
|
||||
_pi_BannerView = [[SDCycleScrollView alloc] init];
|
||||
_pi_BannerView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:[UIImageConstant defalutBannerPlaceholder]];
|
||||
_pi_BannerView.backgroundColor = [UIColor clearColor];
|
||||
_pi_BannerView.layer.cornerRadius = 10;
|
||||
_pi_BannerView.layer.masksToBounds = YES;
|
||||
_pi_BannerView.delegate = self;
|
||||
_pi_BannerView.showPageControl = YES;
|
||||
_pi_BannerView.showPageControl = NO;
|
||||
_pi_BannerView.autoScrollTimeInterval = 5.0;
|
||||
_pi_BannerView.currentPageDotColor = UIColorFromRGB(0x9168FA);
|
||||
_pi_BannerView.pageDotColor = UIColorRGBAlpha(0xB3B3C3, 0.4);
|
||||
_pi_BannerView.pageControlDotSize = CGSizeMake(kGetScaleWidth(4), kGetScaleWidth(4));
|
||||
_pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
|
||||
_pi_BannerView.placeholderImage = [UIImageConstant defalutBannerPlaceholder];
|
||||
_pi_BannerView.tag = 9000001;
|
||||
_pi_BannerView.hidden = YES;
|
||||
}
|
||||
return _pi_BannerView;
|
||||
}
|
||||
- (PIPageControl *)pageControl{
|
||||
if(!_pageControl){
|
||||
_pageControl = [[PIPageControl alloc]init];
|
||||
_pageControl.currentPageIndicatorTintColor = UIColorFromRGB(0x9168FA);
|
||||
_pageControl.pageIndicatorTintColor = UIColorRGBAlpha(0xB3B3C3, 0.4);
|
||||
}
|
||||
return _pageControl;
|
||||
}
|
||||
|
||||
@end
|
||||
|
@@ -47,8 +47,8 @@
|
||||
|
||||
[self.searchView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.mas_equalTo(self).offset(15);
|
||||
make.height.mas_equalTo(32);
|
||||
make.top.mas_equalTo(self).offset(statusbarHeight + 6);
|
||||
make.height.mas_equalTo(34);
|
||||
make.top.mas_equalTo(self).offset(statusbarHeight + 5);
|
||||
make.right.mas_equalTo(self.rankButton.mas_left).offset(-15);
|
||||
}];
|
||||
|
||||
@@ -100,8 +100,8 @@
|
||||
- (UIView *)searchView {
|
||||
if (!_searchView) {
|
||||
_searchView = [[UIView alloc] init];
|
||||
_searchView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.5];
|
||||
_searchView.layer.cornerRadius = 16;
|
||||
_searchView.backgroundColor = UIColorFromRGB(0xFAFBFC);
|
||||
_searchView.layer.cornerRadius = 17;
|
||||
_searchView.layer.masksToBounds = YES;
|
||||
UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapRecognizer)];
|
||||
[_searchView addGestureRecognizer:tap];
|
||||
@@ -121,8 +121,8 @@
|
||||
- (UILabel *)searchLabel {
|
||||
if (!_searchLabel) {
|
||||
_searchLabel = [[UILabel alloc] init];
|
||||
_searchLabel.font = [UIFont systemFontOfSize:12];
|
||||
_searchLabel.textColor = [DJDKMIMOMColor secondTextColor];
|
||||
_searchLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular];
|
||||
_searchLabel.textColor = UIColorFromRGB(0xB8B7C7);
|
||||
_searchLabel.text = YMLocalizedString(@"XPNewHomeNavView0");
|
||||
}
|
||||
return _searchLabel;
|
||||
|
@@ -261,11 +261,15 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if(self.isReload == NO){
|
||||
if ([ClientConfig shareConfig].canOpen) {
|
||||
if(self.isReload == NO){
|
||||
[self initTabs:YES];
|
||||
self.isInitReload = YES;
|
||||
}
|
||||
}else{
|
||||
[self initTabs:YES];
|
||||
self.isInitReload = YES;
|
||||
}
|
||||
|
||||
if ([ClientConfig shareConfig].canOpen) {
|
||||
if (self.inviteCode.length <= 0) {
|
||||
[self initQuickEnterRoom];
|
||||
|
Reference in New Issue
Block a user