换肤
This commit is contained in:
启星
@@ -756,7 +756,7 @@
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = QXLive/QXLive.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEVELOPMENT_TEAM = 8798G5VMH9;
|
||||
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
@@ -776,7 +776,7 @@
|
||||
);
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = QXLive/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "羽声语音";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "秘地";
|
||||
INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频";
|
||||
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天";
|
||||
@@ -791,7 +791,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.1.0;
|
||||
MARKETING_VERSION = 1.0.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
@@ -816,7 +816,7 @@
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = QXLive/QXLive.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEVELOPMENT_TEAM = 8798G5VMH9;
|
||||
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
@@ -836,7 +836,7 @@
|
||||
);
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = QXLive/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "羽声语音";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "秘地";
|
||||
INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频";
|
||||
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天";
|
||||
@@ -851,7 +851,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.1.0;
|
||||
MARKETING_VERSION = 1.0.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
@@ -1061,7 +1061,7 @@
|
||||
DEVELOPMENT_TEAM = 8798G5VMH9;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = QXLiveScreen/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "羽声";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "秘地";
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
@@ -1087,7 +1087,7 @@
|
||||
DEVELOPMENT_TEAM = 8798G5VMH9;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = QXLiveScreen/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "羽声";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "秘地";
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
@@ -1113,7 +1113,7 @@
|
||||
DEVELOPMENT_TEAM = 8798G5VMH9;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = "QXLiveScreen copy-Info.plist";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "羽声";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "秘地";
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
@@ -1139,7 +1139,7 @@
|
||||
DEVELOPMENT_TEAM = 8798G5VMH9;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = "QXLiveScreen copy-Info.plist";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "羽声";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "秘地";
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
@@ -1185,7 +1185,7 @@
|
||||
);
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = QXLive/QXLiveDev.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "羽声测试";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "秘地测试";
|
||||
INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频";
|
||||
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天";
|
||||
@@ -1200,7 +1200,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.2;
|
||||
MARKETING_VERSION = 1.0.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
@@ -1245,7 +1245,7 @@
|
||||
);
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = QXLive/QXLiveDev.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "羽声测试";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "秘地测试";
|
||||
INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频";
|
||||
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天";
|
||||
@@ -1260,7 +1260,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.2;
|
||||
MARKETING_VERSION = 1.0.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
|
||||
Binary file not shown.
@@ -16,22 +16,6 @@
|
||||
stopOnStyle = "0">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
uuid = "980EC9A0-A7C7-439F-A105-39EEF5BC03E8"
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "527"
|
||||
endingLineNumber = "527"
|
||||
landmarkName = "-headerAction"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
@@ -218,8 +202,8 @@
|
||||
filePath = "QXLive/Login(登录)/Controlller/QXLoginViewController.m"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "477"
|
||||
endingLineNumber = "477"
|
||||
startingLineNumber = "481"
|
||||
endingLineNumber = "481"
|
||||
landmarkName = "-loginAndGetAccountListWithType:user_login:sms_code:password:code:login_token:auth_code:"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
[super viewDidLoad];
|
||||
// Do any additional setup after loading the view.
|
||||
self.bgImaegView = [[UIImageView alloc] initWithFrame:[UIScreen mainScreen].bounds];
|
||||
self.bgImaegView.image = [UIImage imageNamed:@"启动页"];;
|
||||
self.bgImaegView.image = [UIImage imageNamed:@"app_start_midi"];;
|
||||
self.bgImaegView.contentMode = UIViewContentModeScaleAspectFill;
|
||||
[self.view addSubview:self.bgImaegView];
|
||||
// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:noticeUserLogin object:nil];
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
config.backgroundImage = @"app_bg";
|
||||
config.placehoulderTextColor = RGB16(0x9b9b9b);
|
||||
/// appstore
|
||||
config.themeColor = RGB16(0x0dffb9);
|
||||
config.btnTextColor = RGB16(0x333333);
|
||||
config.themeColor = RGB16(0x6C49E4);
|
||||
config.btnTextColor = RGB16(0xffffff);
|
||||
|
||||
// config.themeColor = RGB16(0xFC7285);
|
||||
// config.btnTextColor = RGB16(0xFFFFFF);
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
#import "QXFirstRechargePopView.h"
|
||||
#import "QXRechargeView.h"
|
||||
#import "QXAppstoreHomeView.h"
|
||||
#import "QXConfig.h"
|
||||
|
||||
@interface QXHomeViewController ()<JXPagerViewDelegate,JXCategoryViewDelegate,GKCycleScrollViewDataSource,GKCycleScrollViewDelegate,QXGiftScrollViewDelegate,SDCycleScrollViewDelegate>
|
||||
@property (nonatomic, strong) JXPagerView *pagingView;
|
||||
@@ -60,33 +61,54 @@
|
||||
}
|
||||
|
||||
- (void)initSubViews{
|
||||
UILabel *tLabel = [[UILabel alloc] init];
|
||||
tLabel.text = QXText(@"羽声");
|
||||
tLabel.font = [UIFont boldSystemFontOfSize:20];
|
||||
[self.view addSubview:tLabel];
|
||||
[tLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
// UILabel *tLabel = [[UILabel alloc] init];
|
||||
// tLabel.text = QXText(@"秘地");
|
||||
// tLabel.font = [UIFont boldSystemFontOfSize:20];
|
||||
// [self.view addSubview:tLabel];
|
||||
// [tLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
// make.left.mas_equalTo(16);
|
||||
// make.top.mas_equalTo(kSafeAreaTop +10);
|
||||
// }];
|
||||
|
||||
|
||||
if ([QXConfig.backgroundImage hasPrefix:@"http"] || [QXConfig.backgroundImage hasPrefix:@"https"]) {
|
||||
[self updateBgImage:QXConfig.backgroundImage];
|
||||
}else{
|
||||
[self updateBgImage:@"app_home_bg"];
|
||||
}
|
||||
UIImageView *logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mi_di"]];
|
||||
[self.view addSubview:logoImageView];
|
||||
[logoImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.mas_equalTo(16);
|
||||
make.top.mas_equalTo(kSafeAreaTop +10);
|
||||
make.top.mas_equalTo(kSafeAreaTop +8);
|
||||
make.width.mas_equalTo(66);
|
||||
make.height.mas_equalTo(32);
|
||||
}];
|
||||
|
||||
[self.view addSubview:self.rankRightBtn];
|
||||
[self.view addSubview:self.searchRightBtn];
|
||||
[self.view addSubview:self.roomBtn];
|
||||
|
||||
[self.roomBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.width.height.mas_equalTo(30);
|
||||
make.centerY.equalTo(tLabel);
|
||||
make.width.mas_equalTo(54);
|
||||
make.height.mas_equalTo(26);
|
||||
make.centerY.equalTo(logoImageView);
|
||||
make.right.equalTo(self.view).offset(-10);
|
||||
}];
|
||||
[self.searchRightBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.right.equalTo(self.roomBtn.mas_left).offset(-10);
|
||||
make.centerY.width.height.equalTo(self.roomBtn);
|
||||
}];
|
||||
|
||||
[self.rankRightBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.right.equalTo(self.searchRightBtn.mas_left).offset(-10);
|
||||
make.right.equalTo(self.roomBtn.mas_left).offset(-10);
|
||||
make.centerY.equalTo(self.roomBtn);
|
||||
make.width.height.mas_equalTo(32);
|
||||
}];
|
||||
|
||||
[self.searchRightBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.right.equalTo(self.rankRightBtn.mas_left).offset(-10);
|
||||
make.centerY.equalTo(self.roomBtn);
|
||||
make.width.height.mas_equalTo(30);
|
||||
}];
|
||||
|
||||
|
||||
self.listVCArray = [NSMutableArray array];
|
||||
[self requestSlideToolData];
|
||||
[self getTopRoomList];
|
||||
@@ -277,7 +299,7 @@
|
||||
}
|
||||
|
||||
- (CGSize)sizeForCellInCycleScrollView:(GKCycleScrollView *)cycleScrollView {
|
||||
return CGSizeMake((SCREEN_WIDTH)/3, 113);
|
||||
return CGSizeMake(180, 155);
|
||||
}
|
||||
|
||||
- (void)cycleScrollView:(GKCycleScrollView *)cycleScrollView didSelectCellAtIndex:(NSInteger)index {
|
||||
@@ -371,28 +393,28 @@
|
||||
_categoryView = [[JXCategoryTitleView alloc] init];
|
||||
_categoryView.frame = CGRectMake(15, 0, SCREEN_WIDTH-30, 44);
|
||||
_categoryView.delegate = self;
|
||||
_categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#333333"];
|
||||
_categoryView.titleColor = [UIColor colorWithHexString:@"#666666"];
|
||||
_categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#FFFFFF"];
|
||||
_categoryView.titleColor = RGB16A(0xF1ECFF, 0.45);
|
||||
_categoryView.cellWidth = JXCategoryViewAutomaticDimension;
|
||||
_categoryView.contentEdgeInsetLeft = 3;
|
||||
_categoryView.cellSpacing = 16;
|
||||
_categoryView.titleLabelZoomEnabled = YES;
|
||||
_categoryView.titleFont = [UIFont boldSystemFontOfSize:13];
|
||||
_categoryView.titleSelectedFont = [UIFont boldSystemFontOfSize:18];
|
||||
_categoryView.titleFont = [UIFont boldSystemFontOfSize:16];
|
||||
_categoryView.titleSelectedFont = [UIFont boldSystemFontOfSize:20];
|
||||
_categoryView.averageCellSpacingEnabled = NO;
|
||||
JXCategoryIndicatorImageView *indicatorView = [[JXCategoryIndicatorImageView alloc] init];
|
||||
indicatorView.indicatorWidth = JXCategoryViewAutomaticDimension;
|
||||
indicatorView.indicatorImageView.image = [UIImage imageNamed:@"home_slider"];
|
||||
indicatorView.indicatorImageViewSize = CGSizeMake(29, 8);
|
||||
indicatorView.indicatorImageViewSize = CGSizeMake(50, 28);
|
||||
self.indicatorView = indicatorView;
|
||||
indicatorView.verticalMargin = 11;
|
||||
indicatorView.verticalMargin = 5;
|
||||
_categoryView.indicators = @[indicatorView];
|
||||
}
|
||||
return _categoryView;
|
||||
}
|
||||
-(UIView *)headerView{
|
||||
if (!_headerView) {
|
||||
_headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, self.cycleScrollView.height+self.bannerScrollView.height)];
|
||||
_headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, self.cycleScrollView.height+self.bannerScrollView.height+10)];
|
||||
[_headerView addSubview:self.cycleScrollView];
|
||||
[_headerView addSubview:self.bannerScrollView];
|
||||
}
|
||||
@@ -400,7 +422,7 @@
|
||||
}
|
||||
-(SDCycleScrollView *)bannerScrollView{
|
||||
if (!_bannerScrollView) {
|
||||
_bannerScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(16, self.cycleScrollView.bottom, SCREEN_WIDTH-32, ScaleWidth(95)) delegate:self placeholderImage:nil];
|
||||
_bannerScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(16, self.cycleScrollView.bottom+10, SCREEN_WIDTH-32, ScaleWidth(95)) delegate:self placeholderImage:nil];
|
||||
_bannerScrollView.backgroundColor = [UIColor clearColor];
|
||||
_bannerScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
|
||||
[_bannerScrollView addRoundedCornersWithRadius:8] ;
|
||||
@@ -410,18 +432,20 @@
|
||||
}
|
||||
-(GKCycleScrollView *)cycleScrollView{
|
||||
if (!_cycleScrollView) {
|
||||
_cycleScrollView = [[GKCycleScrollView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, ScaleWidth(113))];
|
||||
_cycleScrollView = [[GKCycleScrollView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 155)];
|
||||
_cycleScrollView.dataSource = self;
|
||||
_cycleScrollView.delegate = self;
|
||||
_cycleScrollView.minimumCellAlpha = 0.0;
|
||||
_cycleScrollView.leftRightMargin = 16.0f;
|
||||
_cycleScrollView.topBottomMargin = 10.0f;
|
||||
_cycleScrollView.topBottomMargin = 15.0f;
|
||||
_cycleScrollView.isInfiniteLoop = YES;
|
||||
_cycleScrollView.isAutoScroll = YES;
|
||||
}
|
||||
return _cycleScrollView;
|
||||
}
|
||||
-(QXGiftScrollView *)giftScrollView{
|
||||
if (!_giftScrollView) {
|
||||
_giftScrollView = [[QXGiftScrollView alloc] initWithFrame:CGRectMake(16, self.cycleScrollView.bottom, SCREEN_WIDTH-32, 31)];
|
||||
_giftScrollView = [[QXGiftScrollView alloc] initWithFrame:CGRectMake(16, self.cycleScrollView.bottom, SCREEN_WIDTH-32, 36)];
|
||||
_giftScrollView.delegate = self;
|
||||
}
|
||||
return _giftScrollView;
|
||||
|
||||
@@ -141,7 +141,7 @@ NSInteger maxMessageCount = 20;
|
||||
-(void)insertNoitce{
|
||||
QXRoomChatListModel *model = [QXRoomChatListModel new];
|
||||
model.messageType = QXRoomChatMessageTypeSystem;
|
||||
model.text = @"羽声严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。";
|
||||
model.text = @"秘地严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。";
|
||||
[self.dataArray addObject:model];
|
||||
[self.tableView reloadData];
|
||||
[self scrollToBottom];
|
||||
|
||||
@@ -25,6 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface QXGiftScrollViewCell : UICollectionViewCell
|
||||
@property (nonatomic,strong)UIImageView *noticeImageView;
|
||||
@property (nonatomic,strong)UIImageView *bgImageView;
|
||||
@property (nonatomic,strong)MarqueeLabel *titleLabel;
|
||||
@property (nonatomic,strong)UIImageView *gotoRoomImageView;
|
||||
@property (nonatomic,strong)QXGiftScrollModel *model;
|
||||
|
||||
@@ -25,9 +25,9 @@ static NSInteger maxCount = 5;
|
||||
}
|
||||
|
||||
-(void)initSubViews{
|
||||
[self addRoundedCornersWithRadius:15.5];
|
||||
self.layer.borderWidth = 2;
|
||||
self.layer.borderColor = RGB16(0x333333).CGColor;
|
||||
// [self addRoundedCornersWithRadius:15.5];
|
||||
// self.layer.borderWidth = 2;
|
||||
// self.layer.borderColor = RGB16(0x333333).CGColor;
|
||||
self.cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:self.bounds delegate:self placeholderImage:nil];
|
||||
self.cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleNone;
|
||||
self.cycleScrollView.scrollDirection = UICollectionViewScrollDirectionVertical;
|
||||
@@ -83,35 +83,46 @@ static NSInteger maxCount = 5;
|
||||
}
|
||||
- (void)setModel:(QXGiftScrollModel *)model{
|
||||
_model = model;
|
||||
self.titleLabel.text = [NSString stringWithFormat:@"%@%@%@ %@X%@",model.fromUserName,QXText(@"送给了"),model.toUserName,model.giftName,model.number];
|
||||
NSString *giftInfo = [NSString stringWithFormat:@"%@%@%@ %@X%@",model.fromUserName,QXText(@"送给了"),model.toUserName,model.giftName,model.number];
|
||||
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:giftInfo];
|
||||
[attr yy_setColor:RGB16A(0xffffff, 0.84) range:[giftInfo rangeOfString:QXText(@"送给了")]];
|
||||
self.titleLabel.attributedText = attr;
|
||||
}
|
||||
-(void)initSubViews{
|
||||
self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_gift_bg"]];
|
||||
[self.contentView addSubview:self.bgImageView];
|
||||
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.right.left.top.bottom.equalTo(self);
|
||||
}];
|
||||
|
||||
self.gotoRoomImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_goto_room"]];
|
||||
self.gotoRoomImageView.contentMode = UIViewContentModeScaleAspectFit;
|
||||
[self.contentView addSubview:self.gotoRoomImageView];
|
||||
[self.gotoRoomImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.right.top.bottom.equalTo(self);
|
||||
make.width.mas_equalTo(85);
|
||||
}];
|
||||
|
||||
|
||||
self.noticeImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_notice"]];
|
||||
[self.contentView addSubview:self.noticeImageView];
|
||||
[self.noticeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.equalTo(self).offset(12);
|
||||
make.right.mas_equalTo(-ScaleWidth(25));
|
||||
make.centerY.equalTo(self);
|
||||
make.size.mas_equalTo(CGSizeMake(24, 24));
|
||||
make.width.mas_equalTo(ScaleWidth(50));
|
||||
make.height.mas_equalTo(ScaleWidth(20));
|
||||
}];
|
||||
|
||||
|
||||
// self.noticeImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_notice"]];
|
||||
// [self.contentView addSubview:self.noticeImageView];
|
||||
// [self.noticeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
// make.left.equalTo(self).offset(12);
|
||||
// make.centerY.equalTo(self);
|
||||
// make.size.mas_equalTo(CGSizeMake(24, 24));
|
||||
// }];
|
||||
|
||||
self.titleLabel = [[MarqueeLabel alloc] initWithFrame:CGRectZero];
|
||||
self.titleLabel.scrollDuration = 2;
|
||||
self.titleLabel.marqueeType = MLLeftRight;
|
||||
self.titleLabel.textColor = QXConfig.textColor;
|
||||
self.titleLabel.textColor = QXConfig.themeColor;
|
||||
self.titleLabel.font = [UIFont systemFontOfSize:14];
|
||||
[self.contentView addSubview:self.titleLabel];
|
||||
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.bottom.equalTo(self);
|
||||
make.left.equalTo(self.noticeImageView.mas_right).offset(8);
|
||||
make.left.mas_equalTo(ScaleWidth(52));
|
||||
make.right.equalTo(self.gotoRoomImageView.mas_left).offset(-8);
|
||||
}];
|
||||
}
|
||||
|
||||
@@ -33,6 +33,31 @@
|
||||
<constraint firstAttribute="width" constant="66" id="ljY-RT-6T7"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qsd-Ig-Nmi">
|
||||
<rect key="frame" x="8" y="8" width="28" height="14"/>
|
||||
<subviews>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="T17-NM-Dxi">
|
||||
<rect key="frame" x="7.6666666666666661" y="2" width="12.999999999999998" height="10"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="10" id="Jz4-mP-9ub"/>
|
||||
<constraint firstAttribute="width" constant="13" id="bFQ-Sn-QsD"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="T17-NM-Dxi" firstAttribute="centerY" secondItem="qsd-Ig-Nmi" secondAttribute="centerY" id="P0b-UN-AKa"/>
|
||||
<constraint firstAttribute="width" constant="28" id="cYa-LN-pr8"/>
|
||||
<constraint firstItem="T17-NM-Dxi" firstAttribute="centerX" secondItem="qsd-Ig-Nmi" secondAttribute="centerX" id="gQb-yk-Hae"/>
|
||||
<constraint firstAttribute="height" constant="14" id="uNt-1H-CWh"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="7"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="raq-XK-qhh">
|
||||
<rect key="frame" x="0.0" y="0.0" width="294" height="284"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
@@ -51,46 +76,11 @@
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qsd-Ig-Nmi">
|
||||
<rect key="frame" x="12" y="258" width="28" height="14"/>
|
||||
<subviews>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="T17-NM-Dxi">
|
||||
<rect key="frame" x="7.6666666666666679" y="2" width="13" height="10"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="10" id="Jz4-mP-9ub"/>
|
||||
<constraint firstAttribute="width" constant="13" id="bFQ-Sn-QsD"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<viewLayoutGuide key="safeArea" id="aVk-wF-KeM"/>
|
||||
<color key="backgroundColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="T17-NM-Dxi" firstAttribute="centerX" secondItem="qsd-Ig-Nmi" secondAttribute="centerX" id="1hF-Jg-jvh"/>
|
||||
<constraint firstAttribute="width" constant="28" id="PWa-Xg-JLt"/>
|
||||
<constraint firstItem="T17-NM-Dxi" firstAttribute="centerY" secondItem="qsd-Ig-Nmi" secondAttribute="centerY" id="VQd-l3-nt3"/>
|
||||
<constraint firstAttribute="height" constant="14" id="suT-YR-dzr"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="7"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V8F-du-Rah">
|
||||
<rect key="frame" x="12" y="232" width="31" height="18"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="18" id="BJy-ur-bLw"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FdH-8c-jAP">
|
||||
<rect key="frame" x="207" y="254" width="75" height="22"/>
|
||||
<rect key="frame" x="240.33333333333334" y="254" width="41.666666666666657" height="22"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BSc-rv-bf4">
|
||||
<rect key="frame" x="26" y="4.0000000000000009" width="41" height="14.333333333333336"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BSc-rv-bf4">
|
||||
<rect key="frame" x="25.999999999999972" y="4.0000000000000009" width="7.6666666666666643" height="14.333333333333336"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
@@ -103,13 +93,12 @@
|
||||
</constraints>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="BSc-rv-bf4" firstAttribute="leading" secondItem="NbC-hm-dDF" secondAttribute="trailing" constant="5" id="1TS-Nb-vk6"/>
|
||||
<constraint firstItem="NbC-hm-dDF" firstAttribute="leading" secondItem="FdH-8c-jAP" secondAttribute="leading" constant="8" id="4i4-XP-rtz"/>
|
||||
<constraint firstItem="NbC-hm-dDF" firstAttribute="centerY" secondItem="FdH-8c-jAP" secondAttribute="centerY" id="BV7-rF-E1Y"/>
|
||||
<constraint firstItem="BSc-rv-bf4" firstAttribute="centerY" secondItem="FdH-8c-jAP" secondAttribute="centerY" id="FZY-q3-vZ5"/>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="75" id="OI1-Rh-zJL"/>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="30" id="OI1-Rh-zJL"/>
|
||||
<constraint firstAttribute="height" constant="22" id="oWJ-kZ-B8e"/>
|
||||
<constraint firstAttribute="trailing" secondItem="BSc-rv-bf4" secondAttribute="trailing" constant="8" id="wk2-Xp-c2N"/>
|
||||
</constraints>
|
||||
@@ -120,28 +109,34 @@
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V8F-du-Rah">
|
||||
<rect key="frame" x="8" y="258" width="31" height="14.333333333333314"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</view>
|
||||
<viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
|
||||
<constraints>
|
||||
<constraint firstItem="V8F-du-Rah" firstAttribute="centerY" secondItem="FdH-8c-jAP" secondAttribute="centerY" id="1Yd-6L-A2k"/>
|
||||
<constraint firstItem="074-Lr-sTa" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="12" id="3jT-jw-g2s"/>
|
||||
<constraint firstItem="raq-XK-qhh" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="65M-Vz-wVN"/>
|
||||
<constraint firstItem="074-Lr-sTa" firstAttribute="top" secondItem="V8F-du-Rah" secondAttribute="bottom" constant="6" id="BXi-Dl-VEW"/>
|
||||
<constraint firstItem="GYb-S9-FB8" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="Ejx-IG-t0a"/>
|
||||
<constraint firstItem="qsd-Ig-Nmi" firstAttribute="centerY" secondItem="074-Lr-sTa" secondAttribute="centerY" id="HaA-HN-SwS"/>
|
||||
<constraint firstItem="nPz-Ym-vpk" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="IlJ-YP-mXS"/>
|
||||
<constraint firstItem="qsd-Ig-Nmi" firstAttribute="leading" secondItem="V8F-du-Rah" secondAttribute="leading" id="KWW-LZ-X3E"/>
|
||||
<constraint firstItem="V8F-du-Rah" firstAttribute="leading" secondItem="074-Lr-sTa" secondAttribute="leading" id="KcI-CR-utf"/>
|
||||
<constraint firstItem="qsd-Ig-Nmi" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="8" id="O5K-MQ-58N"/>
|
||||
<constraint firstItem="FdH-8c-jAP" firstAttribute="centerY" secondItem="074-Lr-sTa" secondAttribute="centerY" id="SJP-Iu-Agm"/>
|
||||
<constraint firstAttribute="trailing" secondItem="raq-XK-qhh" secondAttribute="trailing" id="Sr2-8l-I7Z"/>
|
||||
<constraint firstAttribute="trailing" secondItem="FdH-8c-jAP" secondAttribute="trailing" constant="12" id="Vg4-Bv-qiW"/>
|
||||
<constraint firstItem="nPz-Ym-vpk" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="WJN-ti-QhO"/>
|
||||
<constraint firstAttribute="bottom" secondItem="nPz-Ym-vpk" secondAttribute="bottom" id="aif-M8-0Jh"/>
|
||||
<constraint firstAttribute="bottom" secondItem="raq-XK-qhh" secondAttribute="bottom" id="eE2-ef-bWE"/>
|
||||
<constraint firstItem="qsd-Ig-Nmi" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="8" id="gwT-Kf-zHQ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="GYb-S9-FB8" secondAttribute="trailing" id="mDi-oS-hhJ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="nPz-Ym-vpk" secondAttribute="trailing" id="nMO-wi-Ic7"/>
|
||||
<constraint firstItem="raq-XK-qhh" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="qAp-bv-ObA"/>
|
||||
<constraint firstAttribute="bottom" secondItem="074-Lr-sTa" secondAttribute="bottom" constant="10" id="wAO-bU-aoJ"/>
|
||||
<constraint firstItem="V8F-du-Rah" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="8" id="y0G-cJ-lg2"/>
|
||||
</constraints>
|
||||
<size key="customSize" width="294" height="284"/>
|
||||
<connections>
|
||||
|
||||
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
|
||||
@property (nonatomic,strong)UIView *roomPeopleBgView;
|
||||
@property (nonatomic,strong)UIImageView *roomPeopleBgImageView;
|
||||
//@property (nonatomic,strong)UIImageView *roomPeopleBgImageView;
|
||||
@property (nonatomic,strong)UIImageView *firstHeaderImageView;
|
||||
@property (nonatomic,strong)UIImageView *secondHeaderImageView;
|
||||
@property (nonatomic,strong)UIImageView *thirdHeaderImageView;
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
#import "QXHomeTopCell.h"
|
||||
@interface QXHomeTopCell()
|
||||
@property(nonatomic,strong)NSMutableArray *imgs;
|
||||
@property(nonatomic,strong)UIImageView *peopleIconView;
|
||||
//
|
||||
@end
|
||||
@implementation QXHomeTopCell
|
||||
|
||||
@@ -27,14 +29,15 @@
|
||||
[self addSubview:self.roomCoverImageView];
|
||||
|
||||
|
||||
self.disPlayMaskView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH/3, 91)];
|
||||
self.disPlayMaskView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 180, 40)];
|
||||
[self.disPlayMaskView setTopToBottomGradientBackgroundWithColors:@[[UIColor colorWithHexString:@"#00000000"],[UIColor colorWithHexString:@"#00000096"]] frame:self.disPlayMaskView.bounds];
|
||||
[self.disPlayMaskView addRoundedCornersWithRadius:7];
|
||||
[self addSubview:self.disPlayMaskView];
|
||||
|
||||
|
||||
self.titleLabel = [[UILabel alloc] init];
|
||||
self.titleLabel.textColor = RGB16(0x333333);
|
||||
self.titleLabel.textColor = RGB16A(0xF1ECFF, 0.85);
|
||||
self.titleLabel.textAlignment = NSTextAlignmentCenter;
|
||||
self.titleLabel.font = [UIFont systemFontOfSize:12];
|
||||
[self addSubview:self.titleLabel];
|
||||
|
||||
@@ -51,9 +54,9 @@
|
||||
self.roomPeopleBgView = [[UIView alloc] init];
|
||||
[self.roomPeopleBgView addRoundedCornersWithRadius:7];
|
||||
[self addSubview:self.roomPeopleBgView];
|
||||
self.roomPeopleBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_top_room_people_bg"]];
|
||||
self.roomPeopleBgImageView.contentMode = UIViewContentModeScaleToFill;
|
||||
[self.roomPeopleBgView addSubview:self.roomPeopleBgImageView];
|
||||
// self.roomPeopleBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_top_room_people_bg"]];
|
||||
// self.roomPeopleBgImageView.contentMode = UIViewContentModeScaleToFill;
|
||||
// [self.roomPeopleBgView addSubview:self.roomPeopleBgImageView];
|
||||
self.firstHeaderImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_header_placehoulder"]];
|
||||
self.firstHeaderImageView.backgroundColor = [UIColor whiteColor];
|
||||
[self.firstHeaderImageView addRoundedCornersWithRadius:8];
|
||||
@@ -76,12 +79,16 @@
|
||||
self.countLabel.textColor = UIColor.whiteColor;
|
||||
[self.roomPeopleBgView addSubview:self.countLabel];
|
||||
|
||||
self.peopleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"room_people"]];
|
||||
[self.roomPeopleBgView addSubview:self.peopleIconView];
|
||||
|
||||
[self.roomCoverImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.top.right.equalTo(self);
|
||||
make.height.mas_equalTo(91);
|
||||
make.height.mas_equalTo(135);
|
||||
}];
|
||||
[self.disPlayMaskView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.top.right.bottom.equalTo(self.roomCoverImageView);
|
||||
make.left.right.bottom.equalTo(self.roomCoverImageView);
|
||||
make.height.mas_equalTo(40);
|
||||
}];
|
||||
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.right.equalTo(self);
|
||||
@@ -96,34 +103,43 @@
|
||||
make.centerX.centerY.equalTo(self.animateBgView);
|
||||
}];
|
||||
[self.roomPeopleBgView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.right.mas_equalTo(0);
|
||||
make.size.mas_equalTo(CGSizeMake(93, 24));
|
||||
make.bottom.equalTo(self.roomCoverImageView.mas_bottom);
|
||||
make.left.mas_equalTo(8);
|
||||
// make.size.mas_equalTo(CGSizeMake(93, 24));
|
||||
make.height.mas_equalTo(24);
|
||||
make.right.mas_equalTo(-8);
|
||||
make.bottom.equalTo(self.roomCoverImageView.mas_bottom).offset(-8);
|
||||
}];
|
||||
[self.roomPeopleBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.bottom.right.left.equalTo(self.roomPeopleBgView);
|
||||
}];
|
||||
[self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.right.mas_equalTo(-5);
|
||||
make.width.mas_equalTo(32);
|
||||
make.height.mas_equalTo(12);
|
||||
make.centerY.equalTo(self.roomPeopleBgView);
|
||||
}];
|
||||
[self.thirdHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
// [self.roomPeopleBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
// make.top.bottom.right.left.equalTo(self.roomPeopleBgView);
|
||||
// }];
|
||||
[self.firstHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(16, 16));
|
||||
make.right.equalTo(self.countLabel.mas_left).offset(-5);
|
||||
make.centerY.equalTo(self.roomPeopleBgView);
|
||||
make.left.equalTo(self.roomPeopleBgView.mas_left);
|
||||
make.bottom.equalTo(self.roomPeopleBgView);
|
||||
}];
|
||||
[self.secondHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(16, 16));
|
||||
make.right.equalTo(self.thirdHeaderImageView.mas_left).offset(6);
|
||||
make.centerY.equalTo(self.roomPeopleBgView);
|
||||
make.left.equalTo(self.firstHeaderImageView.mas_right).offset(-6);
|
||||
make.centerY.equalTo(self.firstHeaderImageView);
|
||||
}];
|
||||
[self.firstHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
[self.thirdHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(16, 16));
|
||||
make.right.equalTo(self.secondHeaderImageView.mas_left).offset(6);
|
||||
make.centerY.equalTo(self.roomPeopleBgView);
|
||||
make.left.equalTo(self.secondHeaderImageView.mas_right).offset(-6);
|
||||
make.centerY.equalTo(self.firstHeaderImageView);
|
||||
}];
|
||||
[self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.right.equalTo(self.roomPeopleBgView);
|
||||
make.width.mas_equalTo(32);
|
||||
make.height.mas_equalTo(12);
|
||||
make.centerY.equalTo(self.firstHeaderImageView);
|
||||
}];
|
||||
[self.peopleIconView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.right.equalTo(self.countLabel.mas_left).offset(-2);
|
||||
make.centerY.equalTo(self.firstHeaderImageView);
|
||||
make.width.height.mas_equalTo(14);
|
||||
}];
|
||||
|
||||
|
||||
self.countLabel.text = @"23人";
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XUB-Y8-XcZ">
|
||||
<rect key="frame" x="16.000000000000007" y="30" width="126.66666666666669" height="190"/>
|
||||
<subviews>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rank_first_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Udd-CZ-76S">
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rank_second_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Udd-CZ-76S">
|
||||
<rect key="frame" x="0.0" y="30" width="126.66666666666667" height="150"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="150" id="OpL-6e-PQF"/>
|
||||
@@ -108,7 +108,7 @@
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YTz-cQ-cnc">
|
||||
<rect key="frame" x="155.66666666666666" y="10" width="126.66666666666666" height="190"/>
|
||||
<subviews>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rank_second_bg" translatesAutoresizingMaskIntoConstraints="NO" id="OYC-81-j70">
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rank_first_bg" translatesAutoresizingMaskIntoConstraints="NO" id="OYC-81-j70">
|
||||
<rect key="frame" x="0.0" y="30" width="126.66666666666667" height="150"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="150" id="20d-Os-Gh8"/>
|
||||
|
||||
@@ -100,7 +100,8 @@
|
||||
{
|
||||
self = [super init];
|
||||
if (self) {
|
||||
[self setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)];
|
||||
[self setTitleColor:QXConfig.btnTextColor forState:(UIControlStateSelected)];
|
||||
[self setTitleColor:QXConfig.textColor forState:(UIControlStateNormal)];
|
||||
self.titleLabel.font = [UIFont boldSystemFontOfSize:14];
|
||||
self.backgroundColor = RGB16(0xF6F6F6);
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
self.contentView.layer.masksToBounds = YES;
|
||||
self.contentView.layer.borderColor = [UIColor blackColor].CGColor;
|
||||
self.contentView.layer.borderWidth = 0;
|
||||
_titleLabel.textColor = RGB16(0x006B4C);
|
||||
_titleLabel.textColor = QXConfig.themeColor;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@@ -78,12 +78,12 @@
|
||||
return;
|
||||
}
|
||||
if (userTag.isSelected) {
|
||||
self.contentView.backgroundColor = RGB16(0xBBFFEB);
|
||||
self.contentView.backgroundColor = RGB16A(0x6C49E4, 0.1);
|
||||
self.contentView.layer.cornerRadius = 11;
|
||||
self.contentView.layer.masksToBounds = YES;
|
||||
self.contentView.layer.borderColor = [UIColor blackColor].CGColor;
|
||||
self.contentView.layer.borderWidth = 0;
|
||||
_titleLabel.textColor = RGB16(0x006B4C);
|
||||
_titleLabel.textColor = QXConfig.themeColor;
|
||||
}else{
|
||||
self.contentView.backgroundColor = RGB16(0xF3F3F3);
|
||||
self.contentView.layer.cornerRadius = 11;
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
self.bgView.layer.borderColor = RGB16(0x333333).CGColor;
|
||||
[self addSubview:self.bgView];
|
||||
|
||||
self.searchIcon = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_search"]];
|
||||
self.searchIcon = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"home_search"] imageByTintColor:RGB16(0x333333)]];
|
||||
[self.bgView addSubview:self.searchIcon];
|
||||
|
||||
self.textField = [[UITextField alloc] init];
|
||||
|
||||
@@ -82,17 +82,17 @@
|
||||
}
|
||||
|
||||
-(void)configLanguage{
|
||||
[self.comitUserInfoBtn setTitle:QXText(@"进入羽声") forState:(UIControlStateNormal)];
|
||||
[self.comitUserInfoBtn setTitle:QXText(@"进入秘地") forState:(UIControlStateNormal)];
|
||||
[self.comitUserInfoBtn setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)];
|
||||
self.comitUserInfoBtn.backgroundColor = QXConfig.themeColor;
|
||||
self.nickTitleLabel.text = QXText(@"希望大家怎么称呼你");
|
||||
self.nickTitleLabel.text = QXText(@"起个好听的名字");
|
||||
NSString *noChangeText = [NSString stringWithFormat:@"(%@)",QXText(@"注册成功，不可更改")];
|
||||
NSString *str = [NSString stringWithFormat:@"%@%@",QXText(@"选择您的性别"),noChangeText];
|
||||
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:str];
|
||||
[attr yy_setFont:[UIFont boldSystemFontOfSize:16] range:NSMakeRange(0, str.length)];
|
||||
[attr yy_setFont:[UIFont systemFontOfSize:12] range:[noChangeText rangeOfString:str]];
|
||||
[attr yy_setColor:RGB16(0x333333) range:NSMakeRange(0, str.length)];
|
||||
[attr yy_setColor:RGB16(0x666666) range:[noChangeText rangeOfString:str]];
|
||||
[attr yy_setFont:[UIFont systemFontOfSize:16] range:[noChangeText rangeOfString:str]];
|
||||
[attr yy_setColor:RGB16A(0x000000, 0.45) range:NSMakeRange(0, str.length)];
|
||||
[attr yy_setColor:RGB16A(0x000000, 0.45) range:[noChangeText rangeOfString:str]];
|
||||
self.sexTitleLabel.attributedText = attr;
|
||||
self.birthdayTitleLabel.text = QXText(@"您的生日");
|
||||
|
||||
@@ -100,9 +100,9 @@
|
||||
NSString *str1 = [NSString stringWithFormat:@"%@%@",QXText(@"邀请码"),noChangeText1];
|
||||
NSMutableAttributedString *attr1 = [[NSMutableAttributedString alloc] initWithString:str1];
|
||||
[attr1 yy_setFont:[UIFont boldSystemFontOfSize:16] range:NSMakeRange(0, str1.length)];
|
||||
[attr1 yy_setFont:[UIFont systemFontOfSize:12] range:[noChangeText1 rangeOfString:str1]];
|
||||
[attr1 yy_setColor:RGB16(0x333333) range:NSMakeRange(0, str1.length)];
|
||||
[attr1 yy_setColor:RGB16(0x666666) range:[noChangeText rangeOfString:str1]];
|
||||
[attr1 yy_setFont:[UIFont systemFontOfSize:16] range:[noChangeText1 rangeOfString:str1]];
|
||||
[attr1 yy_setColor:RGB16A(0x000000, 0.45) range:NSMakeRange(0, str1.length)];
|
||||
[attr1 yy_setColor:RGB16A(0x000000, 0.45) range:[noChangeText rangeOfString:str1]];
|
||||
self.invitTitleLabel.attributedText = attr1;
|
||||
|
||||
[self.randomBtn setTitle:QXText(@"随机") forState:(UIControlStateNormal)];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="QXFillUserInfoViewController">
|
||||
<connections>
|
||||
<outlet property="birthdayTitleLabel" destination="m33-I3-e3t" id="cMP-Zf-LHC"/>
|
||||
<outlet property="birthdayTitleLabel" destination="9Qo-ST-Hra" id="9fL-og-ysk"/>
|
||||
<outlet property="boyBtn" destination="ij4-1N-0BV" id="MBp-jR-94t"/>
|
||||
<outlet property="codeTF" destination="HhQ-8r-qtJ" id="zmJ-S1-1T2"/>
|
||||
<outlet property="comitUserInfoBtn" destination="GuU-b0-9BY" id="jKb-VY-EJq"/>
|
||||
@@ -24,7 +24,7 @@
|
||||
<outlet property="monthTitleLabel" destination="aXB-DB-CmS" id="G8p-Bd-ONQ"/>
|
||||
<outlet property="nickTitleLabel" destination="K6o-ay-pNF" id="rqv-sn-pPU"/>
|
||||
<outlet property="randomBtn" destination="18Z-Qm-Tls" id="477-k1-dqY"/>
|
||||
<outlet property="sexTitleLabel" destination="Yl8-1m-ydh" id="x5x-Ui-2kX"/>
|
||||
<outlet property="sexTitleLabel" destination="Yl8-1m-ydh" id="Lah-kw-j2L"/>
|
||||
<outlet property="userNameTF" destination="tPx-V6-flb" id="rb1-Do-JYO"/>
|
||||
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
|
||||
<outlet property="yearLabel" destination="QLP-jb-2xt" id="fzv-aS-6iO"/>
|
||||
@@ -40,16 +40,16 @@
|
||||
<rect key="frame" x="0.0" y="0.0" width="393" height="818"/>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7ME-m0-gvR" userLabel="UserNameView">
|
||||
<rect key="frame" x="17" y="238.66666666666663" width="294" height="55"/>
|
||||
<rect key="frame" x="17" y="238.66666666666663" width="360" height="44"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g55-bD-buN">
|
||||
<rect key="frame" x="12" y="27.666666666666657" width="0.0" height="0.0"/>
|
||||
<rect key="frame" x="12" y="22.000000000000028" width="0.0" height="0.0"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入昵称" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="tPx-V6-flb">
|
||||
<rect key="frame" x="12" y="0.0" width="272" height="55"/>
|
||||
<rect key="frame" x="12" y="0.0" width="179" height="44"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="16"/>
|
||||
<textInputTraits key="textInputTraits"/>
|
||||
@@ -60,7 +60,7 @@
|
||||
</userDefinedRuntimeAttributes>
|
||||
</textField>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MjX-Zz-zRf">
|
||||
<rect key="frame" x="249" y="0.0" width="45" height="55"/>
|
||||
<rect key="frame" x="203" y="0.0" width="45" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="45" id="jC2-zo-Ewz"/>
|
||||
</constraints>
|
||||
@@ -70,42 +70,61 @@
|
||||
<action selector="clearNickName:" destination="-1" eventType="touchUpInside" id="b99-gX-61K"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.93725490196078431" green="0.94901960784313721" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="18Z-Qm-Tls">
|
||||
<rect key="frame" x="258" y="0.0" width="90" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstItem="tPx-V6-flb" firstAttribute="leading" secondItem="g55-bD-buN" secondAttribute="trailing" id="0A5-n5-ewx"/>
|
||||
<constraint firstAttribute="bottom" secondItem="MjX-Zz-zRf" secondAttribute="bottom" id="36P-K1-wdQ"/>
|
||||
<constraint firstItem="tPx-V6-flb" firstAttribute="top" secondItem="7ME-m0-gvR" secondAttribute="top" id="8vu-JG-y3d"/>
|
||||
<constraint firstItem="g55-bD-buN" firstAttribute="leading" secondItem="7ME-m0-gvR" secondAttribute="leading" constant="12" id="MoA-3B-OfL"/>
|
||||
<constraint firstItem="MjX-Zz-zRf" firstAttribute="top" secondItem="7ME-m0-gvR" secondAttribute="top" id="WfN-NF-B9S"/>
|
||||
<constraint firstAttribute="trailing" secondItem="MjX-Zz-zRf" secondAttribute="trailing" id="YBB-VP-tfm"/>
|
||||
<constraint firstAttribute="bottom" secondItem="tPx-V6-flb" secondAttribute="bottom" id="cNg-zE-Mim"/>
|
||||
<constraint firstItem="g55-bD-buN" firstAttribute="centerY" secondItem="7ME-m0-gvR" secondAttribute="centerY" id="fRX-bs-C0L"/>
|
||||
<constraint firstAttribute="trailing" secondItem="tPx-V6-flb" secondAttribute="trailing" constant="10" id="ipl-Y8-V2I"/>
|
||||
<constraint firstAttribute="height" constant="55" id="nDg-VI-UXD"/>
|
||||
<constraint firstAttribute="width" constant="90" id="tUJ-kn-cNz"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="11"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="18Z-Qm-Tls">
|
||||
<rect key="frame" x="317" y="238.66666666666663" width="60" height="55"/>
|
||||
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
|
||||
<state key="normal" title="随机">
|
||||
<color key="titleColor" red="1" green="0.54117647058823526" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||
<state key="normal" title="随机" image="random">
|
||||
<color key="titleColor" red="0.42352941176470588" green="0.28627450980392155" blue="0.89411764705882346" alpha="1" colorSpace="calibratedRGB"/>
|
||||
</state>
|
||||
<connections>
|
||||
<action selector="randomAction:" destination="-1" eventType="touchUpInside" id="3Yc-LB-baH"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2ih-sw-a1X">
|
||||
<rect key="frame" x="252" y="15" width="2" height="14"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="2" id="Xbm-3S-Omz"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.92549019607843142" green="0.91764705882352937" blue="0.95686274509803915" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="tPx-V6-flb" secondAttribute="bottom" id="1Qy-jt-f6D"/>
|
||||
<constraint firstAttribute="bottom" secondItem="MjX-Zz-zRf" secondAttribute="bottom" id="36P-K1-wdQ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="18Z-Qm-Tls" secondAttribute="trailing" constant="12" id="7xR-fe-9TE"/>
|
||||
<constraint firstItem="18Z-Qm-Tls" firstAttribute="top" secondItem="7ME-m0-gvR" secondAttribute="top" id="83M-Cn-BRj"/>
|
||||
<constraint firstItem="MjX-Zz-zRf" firstAttribute="top" secondItem="7ME-m0-gvR" secondAttribute="top" id="LLq-0q-Xpx"/>
|
||||
<constraint firstItem="g55-bD-buN" firstAttribute="leading" secondItem="7ME-m0-gvR" secondAttribute="leading" constant="12" id="MoA-3B-OfL"/>
|
||||
<constraint firstItem="2ih-sw-a1X" firstAttribute="leading" secondItem="MjX-Zz-zRf" secondAttribute="trailing" constant="4" id="N1I-QS-sk1"/>
|
||||
<constraint firstItem="2ih-sw-a1X" firstAttribute="top" secondItem="7ME-m0-gvR" secondAttribute="top" constant="15" id="PoF-v1-4E6"/>
|
||||
<constraint firstAttribute="bottom" secondItem="2ih-sw-a1X" secondAttribute="bottom" constant="15" id="T5v-cy-geK"/>
|
||||
<constraint firstItem="tPx-V6-flb" firstAttribute="leading" secondItem="7ME-m0-gvR" secondAttribute="leading" constant="12" id="YZZ-kR-X0C"/>
|
||||
<constraint firstItem="MjX-Zz-zRf" firstAttribute="leading" secondItem="tPx-V6-flb" secondAttribute="trailing" constant="12" id="cVH-ba-2dQ"/>
|
||||
<constraint firstItem="g55-bD-buN" firstAttribute="centerY" secondItem="7ME-m0-gvR" secondAttribute="centerY" id="fRX-bs-C0L"/>
|
||||
<constraint firstAttribute="height" constant="44" id="nDg-VI-UXD"/>
|
||||
<constraint firstAttribute="bottom" secondItem="18Z-Qm-Tls" secondAttribute="bottom" id="nuj-FK-Jos"/>
|
||||
<constraint firstItem="18Z-Qm-Tls" firstAttribute="leading" secondItem="MjX-Zz-zRf" secondAttribute="trailing" constant="10" id="v3X-BO-HGV"/>
|
||||
<constraint firstItem="tPx-V6-flb" firstAttribute="top" secondItem="7ME-m0-gvR" secondAttribute="top" id="wT8-Oh-y10"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="22"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rwk-8l-Fr0" userLabel="View1">
|
||||
<rect key="frame" x="17" y="345.66666666666669" width="172" height="77"/>
|
||||
<rect key="frame" x="17" y="334.66666666666669" width="172" height="90.333333333333314"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="00d-00-Cba">
|
||||
<rect key="frame" x="0.0" y="0.0" width="172" height="77"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="172" height="90.333333333333329"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="00d-00-Cba" secondAttribute="height" multiplier="137:72" id="L8H-qr-9Z8"/>
|
||||
</constraints>
|
||||
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
|
||||
<state key="normal" backgroundImage="login_sex_girl_nor"/>
|
||||
<state key="selected" backgroundImage="login_sex_girl_sel">
|
||||
@@ -121,15 +140,14 @@
|
||||
<constraint firstAttribute="trailing" secondItem="00d-00-Cba" secondAttribute="trailing" id="8pT-GO-EDd"/>
|
||||
<constraint firstItem="00d-00-Cba" firstAttribute="top" secondItem="rwk-8l-Fr0" secondAttribute="top" id="CgM-hi-eIZ"/>
|
||||
<constraint firstItem="00d-00-Cba" firstAttribute="leading" secondItem="rwk-8l-Fr0" secondAttribute="leading" id="dWg-az-QSQ"/>
|
||||
<constraint firstAttribute="height" constant="77" id="gR8-Rg-QJI"/>
|
||||
<constraint firstAttribute="bottom" secondItem="00d-00-Cba" secondAttribute="bottom" id="v6K-Lk-bJ2"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8K8-1E-c7A" userLabel="View2">
|
||||
<rect key="frame" x="204" y="345.66666666666669" width="172" height="77"/>
|
||||
<rect key="frame" x="204" y="334.66666666666669" width="172" height="90.333333333333314"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ij4-1N-0BV">
|
||||
<rect key="frame" x="0.0" y="0.0" width="172" height="77"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="172" height="90.333333333333329"/>
|
||||
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
|
||||
<state key="normal" backgroundImage="login_sex_boy_nor"/>
|
||||
<state key="selected" backgroundImage="login_sex_boy_sel">
|
||||
@@ -144,16 +162,16 @@
|
||||
<constraints>
|
||||
<constraint firstItem="ij4-1N-0BV" firstAttribute="leading" secondItem="8K8-1E-c7A" secondAttribute="leading" id="GrA-Q1-aie"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ij4-1N-0BV" secondAttribute="bottom" id="iVZ-Oh-tVb"/>
|
||||
<constraint firstAttribute="height" constant="77" id="n4c-zJ-Cmx"/>
|
||||
<constraint firstItem="ij4-1N-0BV" firstAttribute="top" secondItem="8K8-1E-c7A" secondAttribute="top" id="rpw-Rw-1zJ"/>
|
||||
<constraint firstAttribute="width" secondItem="ij4-1N-0BV" secondAttribute="height" multiplier="137:72" id="tjM-qp-Aq6"/>
|
||||
<constraint firstAttribute="trailing" secondItem="ij4-1N-0BV" secondAttribute="trailing" id="uG7-Zn-wUO"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DoH-16-gCV" userLabel="FillCode">
|
||||
<rect key="frame" x="17" y="570.66666666666663" width="359" height="55"/>
|
||||
<rect key="frame" x="17" y="572" width="359" height="44"/>
|
||||
<subviews>
|
||||
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="选填" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HhQ-8r-qtJ">
|
||||
<rect key="frame" x="12" y="0.0" width="337" height="55"/>
|
||||
<rect key="frame" x="12" y="0.0" width="337" height="44"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/>
|
||||
<textInputTraits key="textInputTraits"/>
|
||||
@@ -164,26 +182,26 @@
|
||||
</userDefinedRuntimeAttributes>
|
||||
</textField>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.93725490199999995" green="0.94901960780000005" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" red="0.94117647058823528" green="0.93333333333333335" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="HhQ-8r-qtJ" firstAttribute="top" secondItem="DoH-16-gCV" secondAttribute="top" id="6XB-gm-v2C"/>
|
||||
<constraint firstAttribute="trailing" secondItem="HhQ-8r-qtJ" secondAttribute="trailing" constant="10" id="8DA-Px-fk8"/>
|
||||
<constraint firstItem="HhQ-8r-qtJ" firstAttribute="leading" secondItem="DoH-16-gCV" secondAttribute="leading" constant="12" id="BQi-xk-hck"/>
|
||||
<constraint firstAttribute="bottom" secondItem="HhQ-8r-qtJ" secondAttribute="bottom" id="sdt-Px-r25"/>
|
||||
<constraint firstAttribute="height" constant="55" id="xIT-Kc-gBX"/>
|
||||
<constraint firstAttribute="height" constant="44" id="xIT-Kc-gBX"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="11"/>
|
||||
<integer key="value" value="22"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GuU-b0-9BY">
|
||||
<rect key="frame" x="17" y="688" width="359" height="55"/>
|
||||
<rect key="frame" x="17" y="699" width="359" height="44"/>
|
||||
<color key="backgroundColor" red="0.87450980389999999" green="0.99607843139999996" blue="0.34901960780000002" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="55" id="1L5-ba-06n"/>
|
||||
<constraint firstAttribute="height" constant="44" id="1L5-ba-06n"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="16"/>
|
||||
<state key="normal" title="开启初梦之旅">
|
||||
@@ -192,59 +210,35 @@
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<real key="value" value="27.5"/>
|
||||
<integer key="value" value="22"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="comitUserInfoBtnAction:" destination="-1" eventType="touchUpInside" id="B6x-Yf-l4O"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="希望大家怎么称呼你" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K6o-ay-pNF">
|
||||
<rect key="frame" x="17" y="203" width="144" height="22.666666666666657"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="起个好听的名字" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K6o-ay-pNF">
|
||||
<rect key="frame" x="17" y="203" width="112" height="22.666666666666657"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="16"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.45237479304635764" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yl8-1m-ydh">
|
||||
<rect key="frame" x="17" y="309.66666666666669" width="296" height="23"/>
|
||||
<attributedString key="attributedText">
|
||||
<fragment content="选择您的性别">
|
||||
<attributes>
|
||||
<color key="NSColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<font key="NSFont" size="16" name="PingFangSC-Semibold"/>
|
||||
</attributes>
|
||||
</fragment>
|
||||
<fragment content="(注册成功，不可更改)">
|
||||
<attributes>
|
||||
<color key="NSColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<font key="NSFont" size="13" name="PingFangSC-Regular"/>
|
||||
</attributes>
|
||||
</fragment>
|
||||
</attributedString>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择您的性别(注册成功，不可更改)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yl8-1m-ydh">
|
||||
<rect key="frame" x="17" y="298.66666666666669" width="296" height="23"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="16"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.45000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您的生日" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m33-I3-e3t">
|
||||
<rect key="frame" x="17" y="438.66666666666669" width="64" height="23"/>
|
||||
<rect key="frame" x="17" y="441" width="64" height="23"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="16"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.45000000000000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Qo-ST-Hra">
|
||||
<rect key="frame" x="17" y="534.66666666666663" width="86" height="23"/>
|
||||
<attributedString key="attributedText">
|
||||
<fragment content="邀请码">
|
||||
<attributes>
|
||||
<color key="NSColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<font key="NSFont" size="16" name="PingFangSC-Semibold"/>
|
||||
</attributes>
|
||||
</fragment>
|
||||
<fragment content="(选填)">
|
||||
<attributes>
|
||||
<color key="NSColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<font key="NSFont" size="14" name="PingFangSC-Semibold"/>
|
||||
</attributes>
|
||||
</fragment>
|
||||
</attributedString>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="邀请码(选填)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Qo-ST-Hra">
|
||||
<rect key="frame" x="17" y="536" width="91.333333333333329" height="23"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="16"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.45000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2cZ-D5-6Hl">
|
||||
@@ -255,16 +249,16 @@
|
||||
<constraint firstAttribute="height" constant="95" id="ovf-44-Own"/>
|
||||
</constraints>
|
||||
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
|
||||
<state key="normal" backgroundImage="user_header_placehoulder"/>
|
||||
<connections>
|
||||
<action selector="headerAction:" destination="-1" eventType="touchUpInside" id="e4n-2q-lEd"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZfF-HQ-Th2">
|
||||
<rect key="frame" x="16" y="473.66666666666669" width="361" height="45.000000000000057"/>
|
||||
<rect key="frame" x="16" y="476" width="361" height="44"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QLP-jb-2xt">
|
||||
<rect key="frame" x="0.0" y="0.0" width="94" height="45"/>
|
||||
<color key="backgroundColor" red="0.93725490196078431" green="0.94901960784313721" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="94" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="94" id="wTN-zV-bKq"/>
|
||||
</constraints>
|
||||
@@ -279,14 +273,13 @@
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="年" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PiP-Sf-MR5">
|
||||
<rect key="frame" x="101" y="0.0" width="16" height="45"/>
|
||||
<rect key="frame" x="101" y="0.0" width="16" height="44"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="16"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.45000000000000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IdC-ao-2uy">
|
||||
<rect key="frame" x="124" y="0.0" width="67" height="45"/>
|
||||
<color key="backgroundColor" red="0.93725490199999995" green="0.94901960780000005" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<rect key="frame" x="124" y="0.0" width="67" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="67" id="erN-vS-Nf8"/>
|
||||
</constraints>
|
||||
@@ -301,8 +294,7 @@
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hJf-t3-dDM">
|
||||
<rect key="frame" x="221" y="0.0" width="67" height="45"/>
|
||||
<color key="backgroundColor" red="0.93725490199999995" green="0.94901960780000005" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<rect key="frame" x="221" y="0.0" width="67" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="67" id="6nL-F2-7Rh"/>
|
||||
</constraints>
|
||||
@@ -317,29 +309,30 @@
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="月" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aXB-DB-CmS">
|
||||
<rect key="frame" x="198" y="0.0" width="16" height="45"/>
|
||||
<rect key="frame" x="198" y="0.0" width="16" height="44"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="16"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.45000000000000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="日" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HH0-GT-YMQ">
|
||||
<rect key="frame" x="295" y="0.0" width="16" height="45"/>
|
||||
<rect key="frame" x="295" y="0.0" width="16" height="44"/>
|
||||
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="16"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.45000000000000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1kD-ZW-dUX">
|
||||
<rect key="frame" x="0.0" y="0.0" width="361" height="45"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="361" height="44"/>
|
||||
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
|
||||
<connections>
|
||||
<action selector="birthdatyAction:" destination="-1" eventType="touchUpInside" id="YMH-Kb-4wA"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.94117647058823528" green="0.93333333333333335" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="QLP-jb-2xt" firstAttribute="top" secondItem="ZfF-HQ-Th2" secondAttribute="top" id="0oB-Hh-CyN"/>
|
||||
<constraint firstItem="aXB-DB-CmS" firstAttribute="top" secondItem="ZfF-HQ-Th2" secondAttribute="top" id="1h4-Cc-mCx"/>
|
||||
<constraint firstAttribute="height" constant="45" id="42m-1v-hYj"/>
|
||||
<constraint firstAttribute="height" constant="44" id="42m-1v-hYj"/>
|
||||
<constraint firstItem="HH0-GT-YMQ" firstAttribute="leading" secondItem="hJf-t3-dDM" secondAttribute="trailing" constant="7" id="AaI-T3-N3k"/>
|
||||
<constraint firstItem="IdC-ao-2uy" firstAttribute="top" secondItem="ZfF-HQ-Th2" secondAttribute="top" id="CWZ-jx-e4u"/>
|
||||
<constraint firstAttribute="bottom" secondItem="QLP-jb-2xt" secondAttribute="bottom" id="FVP-Yt-wnc"/>
|
||||
@@ -361,7 +354,20 @@
|
||||
<constraint firstAttribute="bottom" secondItem="IdC-ao-2uy" secondAttribute="bottom" id="uMA-Sw-F9I"/>
|
||||
<constraint firstItem="aXB-DB-CmS" firstAttribute="leading" secondItem="IdC-ao-2uy" secondAttribute="trailing" constant="7" id="vZz-ho-etR"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="22"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="camera" translatesAutoresizingMaskIntoConstraints="NO" id="dug-aw-eCP">
|
||||
<rect key="frame" x="220" y="163" width="24" height="24"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="24" id="XTx-dH-ZRD"/>
|
||||
<constraint firstAttribute="width" constant="24" id="rg1-oL-aBs"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
|
||||
@@ -371,26 +377,24 @@
|
||||
<constraint firstItem="rwk-8l-Fr0" firstAttribute="top" secondItem="Yl8-1m-ydh" secondAttribute="bottom" constant="13" id="7sO-Ma-r5a"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="bottom" secondItem="c9G-Gk-N38" secondAttribute="bottom" id="9PC-34-Jrj"/>
|
||||
<constraint firstAttribute="top" secondItem="c9G-Gk-N38" secondAttribute="top" id="BvD-Ec-GXh"/>
|
||||
<constraint firstItem="18Z-Qm-Tls" firstAttribute="bottom" secondItem="7ME-m0-gvR" secondAttribute="bottom" id="E2I-Ep-G4y"/>
|
||||
<constraint firstItem="DoH-16-gCV" firstAttribute="top" secondItem="9Qo-ST-Hra" secondAttribute="bottom" constant="13" id="F1a-ov-Dzk"/>
|
||||
<constraint firstItem="c9G-Gk-N38" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="GiY-yF-XuD"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="c9G-Gk-N38" secondAttribute="trailing" id="Kv4-j1-CFp"/>
|
||||
<constraint firstItem="18Z-Qm-Tls" firstAttribute="leading" secondItem="7ME-m0-gvR" secondAttribute="trailing" constant="6" id="Ky5-S6-HnY"/>
|
||||
<constraint firstItem="DoH-16-gCV" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="17" id="MKB-f1-ACW"/>
|
||||
<constraint firstItem="ZfF-HQ-Th2" firstAttribute="top" secondItem="m33-I3-e3t" secondAttribute="bottom" constant="12" id="PIn-FH-T1G"/>
|
||||
<constraint firstItem="m33-I3-e3t" firstAttribute="leading" secondItem="Yl8-1m-ydh" secondAttribute="leading" id="Pni-gR-VnK"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="DoH-16-gCV" secondAttribute="trailing" constant="17" id="Q78-YE-s3n"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="ZfF-HQ-Th2" secondAttribute="trailing" constant="16" id="QwQ-hl-ZHm"/>
|
||||
<constraint firstItem="18Z-Qm-Tls" firstAttribute="top" secondItem="7ME-m0-gvR" secondAttribute="top" id="Sng-rv-4fq"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="GuU-b0-9BY" secondAttribute="trailing" constant="17" id="V6z-cY-UKl"/>
|
||||
<constraint firstItem="Yl8-1m-ydh" firstAttribute="leading" secondItem="K6o-ay-pNF" secondAttribute="leading" id="W1r-4i-Gsl"/>
|
||||
<constraint firstItem="9Qo-ST-Hra" firstAttribute="top" secondItem="ZfF-HQ-Th2" secondAttribute="bottom" constant="16" id="W89-fh-zW1"/>
|
||||
<constraint firstItem="K6o-ay-pNF" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="17" id="X49-ZJ-S7g"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="7ME-m0-gvR" secondAttribute="trailing" constant="82" id="YSd-ml-JpW"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="7ME-m0-gvR" secondAttribute="trailing" constant="16" id="YSd-ml-JpW"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="Yl8-1m-ydh" secondAttribute="trailing" constant="80" id="aKD-H4-XfQ"/>
|
||||
<constraint firstItem="dug-aw-eCP" firstAttribute="trailing" secondItem="2cZ-D5-6Hl" secondAttribute="trailing" id="bFt-Xv-DHB"/>
|
||||
<constraint firstItem="7ME-m0-gvR" firstAttribute="top" secondItem="K6o-ay-pNF" secondAttribute="bottom" constant="13" id="bzZ-DI-2Xy"/>
|
||||
<constraint firstItem="18Z-Qm-Tls" firstAttribute="centerY" secondItem="7ME-m0-gvR" secondAttribute="centerY" id="cni-UK-ZFW"/>
|
||||
<constraint firstItem="K6o-ay-pNF" firstAttribute="top" secondItem="2cZ-D5-6Hl" secondAttribute="bottom" constant="16" id="feg-oL-aLR"/>
|
||||
<constraint firstItem="dug-aw-eCP" firstAttribute="bottom" secondItem="2cZ-D5-6Hl" secondAttribute="bottom" id="jjO-3J-erZ"/>
|
||||
<constraint firstItem="8K8-1E-c7A" firstAttribute="width" secondItem="rwk-8l-Fr0" secondAttribute="width" id="lFy-gE-YdQ"/>
|
||||
<constraint firstItem="m33-I3-e3t" firstAttribute="top" secondItem="rwk-8l-Fr0" secondAttribute="bottom" constant="16" id="mt4-Xu-F5V"/>
|
||||
<constraint firstItem="2cZ-D5-6Hl" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="33" id="nCY-XC-XvW"/>
|
||||
@@ -401,7 +405,6 @@
|
||||
<constraint firstItem="2cZ-D5-6Hl" firstAttribute="centerX" secondItem="Q5M-cg-NOt" secondAttribute="centerX" id="sDr-FK-3Dg"/>
|
||||
<constraint firstItem="ZfF-HQ-Th2" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="16" id="sWS-vn-OZ6"/>
|
||||
<constraint firstItem="7ME-m0-gvR" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="17" id="wBT-Pi-H7k"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="18Z-Qm-Tls" secondAttribute="trailing" constant="16" id="xfw-xJ-gaS"/>
|
||||
<constraint firstItem="Yl8-1m-ydh" firstAttribute="top" secondItem="7ME-m0-gvR" secondAttribute="bottom" constant="16" id="zXO-XI-4hT"/>
|
||||
<constraint firstItem="rwk-8l-Fr0" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="17" id="zwx-KM-hFJ"/>
|
||||
</constraints>
|
||||
@@ -411,10 +414,13 @@
|
||||
<resources>
|
||||
<image name="Plus Circle" width="24" height="24"/>
|
||||
<image name="app_bg" width="375" height="812"/>
|
||||
<image name="login_sex_boy_nor" width="160" height="77"/>
|
||||
<image name="login_sex_boy_sel" width="160" height="77"/>
|
||||
<image name="login_sex_girl_nor" width="160" height="77"/>
|
||||
<image name="login_sex_girl_sel" width="160" height="77"/>
|
||||
<image name="camera" width="24" height="24"/>
|
||||
<image name="login_sex_boy_nor" width="137" height="72"/>
|
||||
<image name="login_sex_boy_sel" width="137" height="72"/>
|
||||
<image name="login_sex_girl_nor" width="137" height="72"/>
|
||||
<image name="login_sex_girl_sel" width="137" height="72"/>
|
||||
<image name="random" width="24" height="24"/>
|
||||
<image name="user_header_placehoulder" width="40" height="40"/>
|
||||
<systemColor name="systemBackgroundColor">
|
||||
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</systemColor>
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
@property (nonatomic,strong)UIButton *secondBtn;
|
||||
@property (nonatomic,strong)UIView *topView;
|
||||
|
||||
@property (nonatomic,strong)UIImageView *forgotImageView;
|
||||
@property (nonatomic,strong)UIScrollView *scrollView;
|
||||
@property (nonatomic,strong)QXLoginTextField *accountTextField;
|
||||
@property (nonatomic,strong)QXLoginTextField *codeTextField;
|
||||
@@ -83,28 +84,32 @@
|
||||
// self.scrollView.scrollEnabled = NO;
|
||||
// self.scrollView.backgroundColor = [UIColor clearColor];
|
||||
// [self.view addSubview:self.scrollView];
|
||||
// forgot_pwd
|
||||
|
||||
self.forgotImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"forgot_pwd"]];
|
||||
self.forgotImageView.frame = CGRectMake((SCREEN_WIDTH-128)/2, NavContentHeight+20, 128, 128);
|
||||
[self.view addSubview:self.forgotImageView];
|
||||
/// 获取验证码
|
||||
self.accountTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, NavContentHeight+15, SCREEN_WIDTH-32, 44) type:(LoginTextTypeAccount)];
|
||||
self.accountTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.accountTextField addRoundedCornersWithRadius:11];
|
||||
self.accountTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.forgotImageView.bottom+15, SCREEN_WIDTH-32, 44) type:(LoginTextTypeAccount)];
|
||||
self.accountTextField.backgroundColor = RGB16(0xECEAF4);
|
||||
[self.accountTextField addRoundedCornersWithRadius:22];
|
||||
[self.view addSubview:self.accountTextField];
|
||||
|
||||
self.codeTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(self.accountTextField.left, self.accountTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypeCode)];
|
||||
self.codeTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
self.codeTextField.backgroundColor = RGB16(0xECEAF4);
|
||||
self.codeTextField.delegate = self;
|
||||
[self.codeTextField addRoundedCornersWithRadius:11];
|
||||
[self.codeTextField addRoundedCornersWithRadius:22];
|
||||
[self.view addSubview:self.codeTextField];
|
||||
|
||||
// 修改新密码
|
||||
self.passwordTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(self.accountTextField.left, self.codeTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypePassword)];
|
||||
self.passwordTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.passwordTextField addRoundedCornersWithRadius:11];
|
||||
self.passwordTextField.backgroundColor = RGB16(0xECEAF4);
|
||||
[self.passwordTextField addRoundedCornersWithRadius:22];
|
||||
[self.view addSubview:self.passwordTextField];
|
||||
|
||||
self.repasswordTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(self.accountTextField.left, self.passwordTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypeRepassword)];
|
||||
self.repasswordTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.repasswordTextField addRoundedCornersWithRadius:11];
|
||||
self.repasswordTextField.backgroundColor = RGB16(0xECEAF4);
|
||||
[self.repasswordTextField addRoundedCornersWithRadius:22];
|
||||
[self.view addSubview:self.repasswordTextField];
|
||||
|
||||
// self.firstCommitBtn = [[UIButton alloc] initWithFrame:CGRectMake(38, self.codeTextField.bottom+20, SCREEN_WIDTH-38*2, 42)];
|
||||
|
||||
@@ -69,21 +69,25 @@
|
||||
}
|
||||
|
||||
-(void)initSubViews{
|
||||
// self.logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@""]];
|
||||
// [self.view addSubview:self.logoImageView];
|
||||
|
||||
self.backBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, kSafeAreaTop+5, 40, 40)];
|
||||
[self.backBtn setImage:[UIImage imageNamed:@"back"] forState:(UIControlStateNormal)];
|
||||
[self.backBtn addTarget:self action:@selector(backAction) forControlEvents:(UIControlEventTouchUpInside)];
|
||||
[self.view addSubview:self.backBtn];
|
||||
|
||||
self.isCodeLogin = YES;
|
||||
self.welcomeLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, kSafeAreaTop+86, SCREEN_WIDTH-32, 36)];
|
||||
self.welcomeLabel.font = [UIFont boldSystemFontOfSize:24];
|
||||
self.welcomeLabel.text = QXText(@"欢迎来到羽声");
|
||||
self.welcomeLabel.textColor = QXConfig.textColor;
|
||||
[self.view addSubview:self.welcomeLabel];
|
||||
// self.isCodeLogin = YES;
|
||||
// self.welcomeLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, kSafeAreaTop+86, SCREEN_WIDTH-32, 36)];
|
||||
// self.welcomeLabel.font = [UIFont boldSystemFontOfSize:24];
|
||||
//// self.welcomeLabel.text = QXText(@"欢迎来到秘地");
|
||||
//// welcome_midi
|
||||
// self.welcomeLabel.textColor = QXConfig.textColor;
|
||||
// [self.view addSubview:self.welcomeLabel];
|
||||
|
||||
self.subTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, self.welcomeLabel.bottom+20, SCREEN_WIDTH-32, 27)];
|
||||
self.logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"welcome_midi"]];
|
||||
self.logoImageView.frame = CGRectMake(16, NavContentHeight+19, 170, 120);
|
||||
[self.view addSubview:self.logoImageView];
|
||||
|
||||
self.subTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, self.logoImageView.bottom+15, SCREEN_WIDTH-32, 27)];
|
||||
self.subTitleLabel.font = [UIFont boldSystemFontOfSize:18];
|
||||
self.subTitleLabel.text = QXText(@"验证码登录");
|
||||
self.subTitleLabel.textColor = QXConfig.textColor;
|
||||
@@ -91,19 +95,19 @@
|
||||
|
||||
|
||||
self.accountTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.subTitleLabel.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypeAccount)];
|
||||
self.accountTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.accountTextField addRoundedCornersWithRadius:11];
|
||||
self.accountTextField.backgroundColor = RGB16(0xF0EEF7);
|
||||
[self.accountTextField addRoundedCornersWithRadius:22];
|
||||
[self.view addSubview:self.accountTextField];
|
||||
|
||||
self.codeTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.accountTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypeCode)];
|
||||
self.codeTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.codeTextField addRoundedCornersWithRadius:11];
|
||||
self.codeTextField.backgroundColor = RGB16(0xF0EEF7);
|
||||
[self.codeTextField addRoundedCornersWithRadius:22];
|
||||
self.codeTextField.delegate = self;
|
||||
[self.view addSubview:self.codeTextField];
|
||||
|
||||
self.passwordTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.accountTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypePassword)];
|
||||
self.passwordTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.passwordTextField addRoundedCornersWithRadius:11];
|
||||
self.passwordTextField.backgroundColor = RGB16(0xF0EEF7);
|
||||
[self.passwordTextField addRoundedCornersWithRadius:22];
|
||||
[self.view addSubview:self.passwordTextField];
|
||||
self.passwordTextField.hidden = YES;
|
||||
|
||||
@@ -244,33 +248,33 @@
|
||||
model.preferredStatusBarStyle = UIStatusBarStyleDarkContent;
|
||||
model.logoImage = [UIImage imageNamed:@"login_logo"];
|
||||
model.logoFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
|
||||
frame.origin = CGPointMake((SCREEN_WIDTH - 240) * .5, 75 + kSafeAreaTop);
|
||||
frame.size = CGSizeMake(240, 170);
|
||||
frame.origin = CGPointMake((SCREEN_WIDTH - 88) * .5, 150+ kSafeAreaTop);
|
||||
frame.size = CGSizeMake(88, 88);
|
||||
return frame;
|
||||
};
|
||||
model.sloganText = [[NSAttributedString alloc] initWithString:@"本机号码" attributes:@{NSForegroundColorAttributeName : RGB16(0x666666),NSFontAttributeName : [UIFont systemFontOfSize:12]}];
|
||||
model.sloganFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
|
||||
frame.origin.y = 329+kSafeAreaTop+40;
|
||||
frame.origin.y = 280+kSafeAreaTop+40;
|
||||
return frame;
|
||||
};
|
||||
model.numberColor = QXConfig.textColor;
|
||||
model.numberFont = [UIFont boldSystemFontOfSize:30];
|
||||
model.numberFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
|
||||
frame.origin.y = kSafeAreaTop+329;
|
||||
frame.origin.y = kSafeAreaTop+280;
|
||||
return frame;
|
||||
};
|
||||
model.loginBtnText = [[NSAttributedString alloc] initWithString:@"一键登录" attributes:@{NSForegroundColorAttributeName : QXConfig.textColor,NSFontAttributeName : [UIFont systemFontOfSize:15]}];
|
||||
model.loginBtnText = [[NSAttributedString alloc] initWithString:@"一键登录" attributes:@{NSForegroundColorAttributeName : QXConfig.btnTextColor,NSFontAttributeName : [UIFont systemFontOfSize:15]}];
|
||||
model.loginBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
|
||||
frame.origin.y = 427+kSafeAreaTop;
|
||||
frame.origin.y = 380+kSafeAreaTop;
|
||||
frame.origin.x = 38;
|
||||
frame.size = CGSizeMake(SCREEN_WIDTH-76, 42);
|
||||
return frame;
|
||||
};
|
||||
model.loginBtnBgImgs = @[[UIImage imageNamed:@"login_btn_bg"],[UIImage imageNamed:@"login_btn_bg"],[UIImage imageNamed:@"login_btn_bg"]];
|
||||
model.loginBtnBgImgs = @[[[UIImage imageNamed:@"login_btn_bg"] imageByTintColor:QXConfig.themeColor],[[UIImage imageNamed:@"login_btn_bg"]imageByTintColor:QXConfig.themeColor],[[UIImage imageNamed:@"login_btn_bg"]imageByTintColor:QXConfig.themeColor]];
|
||||
|
||||
model.changeBtnTitle = [[NSAttributedString alloc] initWithString:@"其他手机号登录" attributes:@{NSForegroundColorAttributeName : QXConfig.textColor,NSFontAttributeName : [UIFont systemFontOfSize:15]}];
|
||||
model.changeBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
|
||||
frame.origin.y = 427+kSafeAreaTop+12+42;
|
||||
frame.origin.y = 380+kSafeAreaTop+12+42;
|
||||
frame.origin.x = 38;
|
||||
frame.size = CGSizeMake(SCREEN_WIDTH-76, 42);
|
||||
return frame;
|
||||
@@ -284,7 +288,7 @@
|
||||
model.privacyTwo = @[[NSString stringWithFormat:@"%@",QXText(@"《隐私政策》")],[NSString stringWithFormat:@"%@%@?id=4",ServerUrl,QXAppProtocol]];
|
||||
model.privacyOperatorPreText = @"《";
|
||||
model.privacyOperatorSufText = @"》";
|
||||
model.privacyColors = @[RGB16(0x333333),RGB16(0xFF8ACC)];
|
||||
model.privacyColors = @[RGB16(0x333333),QXConfig.themeColor];
|
||||
model.privacyAlignment = NSTextAlignmentCenter;
|
||||
|
||||
|
||||
|
||||
@@ -119,8 +119,8 @@
|
||||
}];
|
||||
[attr yy_setFont:[UIFont systemFontOfSize:12] range:NSMakeRange(0, str.length)];
|
||||
[attr yy_setColor:RGB16(0x333333) range:NSMakeRange(0, str.length)];
|
||||
[attr yy_setColor:RGB16(0xFF8ACC) range:[str rangeOfString:QXText(@"《用户使用协议》")]];
|
||||
[attr yy_setColor:RGB16(0xFF8ACC) range:[str rangeOfString:QXText(@"《隐私政策》")]];
|
||||
[attr yy_setColor:QXConfig.themeColor range:[str rangeOfString:QXText(@"《用户使用协议》")]];
|
||||
[attr yy_setColor:QXConfig.themeColor range:[str rangeOfString:QXText(@"《隐私政策》")]];
|
||||
_textLabel = [[YYLabel alloc] initWithFrame:CGRectMake(self.agreeBtn.right, 0, self.width-80-25, self.height)];
|
||||
_textLabel.attributedText = attr;
|
||||
_textLabel.userInteractionEnabled = YES;
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
self.codeBtn = [[UIButton alloc] init];
|
||||
self.codeBtn.needEventInterval = 0.5;
|
||||
[self.codeBtn setTitle:QXText(@"获取验证码") forState:(UIControlStateNormal)];
|
||||
[self.codeBtn setTitleColor:RGB16(0xFF8ACC) forState:(UIControlStateNormal)];
|
||||
[self.codeBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)];
|
||||
self.codeBtn.titleLabel.font = [UIFont systemFontOfSize:16];
|
||||
[self.codeBtn addTarget:self action:@selector(codeAction:) forControlEvents:(UIControlEventTouchUpInside)];
|
||||
self.codeBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentTrailing;
|
||||
|
||||
@@ -330,7 +330,7 @@
|
||||
if (!_roomNameLabel) {
|
||||
_roomNameLabel = [[UILabel alloc] init];
|
||||
_roomNameLabel.font = [UIFont boldSystemFontOfSize:16];
|
||||
_roomNameLabel.textColor = QXConfig.textColor;
|
||||
_roomNameLabel.textColor = RGB16A(0x000000, 0.45);
|
||||
_roomNameLabel.text = QXText(@"房间标题");
|
||||
}
|
||||
return _roomNameLabel;
|
||||
@@ -340,7 +340,7 @@
|
||||
_textFieldbgView = [[UIView alloc] init];
|
||||
_textFieldbgView.layer.masksToBounds = YES;
|
||||
_textFieldbgView.layer.cornerRadius = 11;
|
||||
_textFieldbgView.backgroundColor = [UIColor colorWithHexString:@"#EFF2F8"];
|
||||
_textFieldbgView.backgroundColor = [UIColor colorWithHexString:@"#F0EEF7"];
|
||||
}
|
||||
return _textFieldbgView;
|
||||
}
|
||||
@@ -372,7 +372,7 @@
|
||||
if (!_roomNoticeLabel) {
|
||||
_roomNoticeLabel = [[UILabel alloc] init];
|
||||
_roomNoticeLabel.font = [UIFont boldSystemFontOfSize:15];
|
||||
_roomNoticeLabel.textColor = QXConfig.textColor;
|
||||
_roomNoticeLabel.textColor = RGB16A(0x000000, 0.45);
|
||||
_roomNoticeLabel.text = QXText(@"房间公告");
|
||||
}
|
||||
return _roomNoticeLabel;
|
||||
@@ -399,7 +399,7 @@
|
||||
-(UIView *)noticeBgView{
|
||||
if (!_noticeBgView) {
|
||||
_noticeBgView = [[UIView alloc] init];
|
||||
_noticeBgView.backgroundColor = RGB16(0xEFF2F8);
|
||||
_noticeBgView.backgroundColor = RGB16(0xF0EEF7);
|
||||
[_noticeBgView addRoundedCornersWithRadius:11];
|
||||
}
|
||||
return _noticeBgView;
|
||||
@@ -427,7 +427,7 @@
|
||||
_randomBtn = [[UIButton alloc] init];
|
||||
[_randomBtn setTitle:QXText(@"随机名称") forState:(UIControlStateNormal)];
|
||||
_randomBtn.titleLabel.font = [UIFont systemFontOfSize:14];
|
||||
[_randomBtn setTitleColor:RGB16(0xFF8ACC) forState:(UIControlStateNormal)];
|
||||
[_randomBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)];
|
||||
[_randomBtn addTarget:self action:@selector(getRandomName) forControlEvents:UIControlEventTouchUpInside];
|
||||
}
|
||||
return _randomBtn;
|
||||
@@ -437,7 +437,7 @@
|
||||
_submitBtn = [[UIButton alloc] init];
|
||||
[_submitBtn setTitle:QXText(@"提交审核") forState:UIControlStateNormal];
|
||||
_submitBtn.titleLabel.font = [UIFont systemFontOfSize:15];
|
||||
[_submitBtn setTitleColor:QXConfig.textColor forState:UIControlStateNormal];
|
||||
[_submitBtn setTitleColor:QXConfig.btnTextColor forState:UIControlStateNormal];
|
||||
_submitBtn.backgroundColor = QXConfig.themeColor;
|
||||
_submitBtn.layer.masksToBounds = YES;
|
||||
_submitBtn.layer.cornerRadius = 21;
|
||||
@@ -449,9 +449,9 @@
|
||||
-(UILabel *)warningLabel{
|
||||
if (!_warningLabel) {
|
||||
_warningLabel = [[UILabel alloc] init];
|
||||
_warningLabel.backgroundColor = RGB16(0x333333);
|
||||
[_warningLabel addRoundedCornersWithRadius:3];
|
||||
_warningLabel.textColor = UIColor.whiteColor;
|
||||
// _warningLabel.backgroundColor = RGB16(0x333333);
|
||||
// [_warningLabel addRoundedCornersWithRadius:3];
|
||||
_warningLabel.textColor = RGB16(0xEEA24C);
|
||||
_warningLabel.font = [UIFont systemFontOfSize:11];
|
||||
_warningLabel.textAlignment = NSTextAlignmentCenter;
|
||||
_warningLabel.text = QXText(@"创建房间需要审核，通过后可开启直播");
|
||||
|
||||
@@ -34,14 +34,14 @@
|
||||
self.navigationItem.title = QXText(@"每日任务");
|
||||
UIButton*recordBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
|
||||
[recordBtn setTitle:QXText(@"礼盒记录") forState:(UIControlStateNormal)];
|
||||
[recordBtn setTitleColor:RGB16(0xFF8ACC) forState:(UIControlStateNormal)];
|
||||
[recordBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)];
|
||||
recordBtn.titleLabel.font = [UIFont systemFontOfSize:16];
|
||||
[recordBtn addTarget:self action:@selector(recordAction) forControlEvents:(UIControlEventTouchUpInside)];
|
||||
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:recordBtn];
|
||||
}
|
||||
- (void)initSubViews{
|
||||
self.bgImageHidden = YES;
|
||||
self.view.backgroundColor = RGB16(0xF8E3C8);
|
||||
self.view.backgroundColor = RGB16(0xD7CDFF);
|
||||
self.tableView.tableHeaderView = self.topView;
|
||||
[self.view addSubview:self.tableView];
|
||||
}
|
||||
|
||||
@@ -111,6 +111,7 @@
|
||||
self.realTextField = [[QXLoginTextField alloc] init];
|
||||
self.realTextField.type = LoginTextTypeRealName;
|
||||
self.realTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.realTextField addRoundedCornersWithRadius:11];
|
||||
[self.view addSubview:self.realTextField];
|
||||
[self.realTextField mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.mas_equalTo(16);
|
||||
@@ -122,6 +123,7 @@
|
||||
self.idNumberTextField = [[QXLoginTextField alloc] init];
|
||||
self.idNumberTextField.type = LoginTextTypeIdNumber;
|
||||
self.idNumberTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.idNumberTextField addRoundedCornersWithRadius:11];
|
||||
[self.view addSubview:self.idNumberTextField];
|
||||
[self.idNumberTextField mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.mas_equalTo(16);
|
||||
@@ -257,7 +259,7 @@
|
||||
weakSelf.realNamedict = dict;
|
||||
[weakSelf startFace];
|
||||
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
|
||||
|
||||
showToast(msg);
|
||||
}];
|
||||
|
||||
// [QXGlobal shareGlobal].isRealName = YES;
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
- (void)awakeFromNib {
|
||||
[super awakeFromNib];
|
||||
// Initialization code
|
||||
self.bgView.layer.borderColor = RGB16(0x333333).CGColor;
|
||||
self.bgView.layer.borderColor = QXConfig.themeColor.CGColor;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
// Initialization code
|
||||
self.roomDetailBtn.backgroundColor = QXConfig.themeColor;
|
||||
[self.roomDetailBtn setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)];
|
||||
self.moneyLabel.textColor = QXConfig.themeColor;
|
||||
}
|
||||
-(void)setType:(NSInteger)type{
|
||||
_type = type;
|
||||
|
||||
@@ -248,7 +248,7 @@
|
||||
</collectionViewCell>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="my_cproom_head_bg" width="65" height="65"/>
|
||||
<image name="my_cproom_head_bg" width="68" height="68"/>
|
||||
<image name="my_cproom_rank" width="14" height="14"/>
|
||||
<image name="my_cproom_value" width="14" height="14"/>
|
||||
<image name="my_room_cp" width="46" height="20"/>
|
||||
|
||||
@@ -20,8 +20,9 @@
|
||||
self.roomDetailBtn.backgroundColor = QXConfig.themeColor;
|
||||
[self.roomDetailBtn setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)];
|
||||
|
||||
[self.roomSubsidyBtn setTitleColor:UIColor.whiteColor forState:(UIControlStateNormal)];
|
||||
self.roomSubsidyBtn.backgroundColor = RGB16(0x333333);
|
||||
[self.roomSubsidyBtn setTitleColor:RGB16(0xC58600) forState:(UIControlStateNormal)];
|
||||
self.roomSubsidyBtn.backgroundColor = RGB16A(0xDEB52E, 0.25);
|
||||
self.moneyLabel.textColor = QXConfig.themeColor;
|
||||
}
|
||||
-(void)setBgImageCount:(NSInteger)bgImageCount{
|
||||
_bgImageCount = bgImageCount;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
self.titleLabel.text = model.task_name;
|
||||
NSString*subTitle = [NSString stringWithFormat:@"金币+%@",model.gold_reward];
|
||||
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:subTitle];
|
||||
[attr yy_setColor:RGB16(0xE24171) range:[subTitle rangeOfString:[NSString stringWithFormat:@"+%@",model.gold_reward]]];
|
||||
[attr yy_setColor:RGB16(0xFF8827) range:[subTitle rangeOfString:[NSString stringWithFormat:@"+%@",model.gold_reward]]];
|
||||
self.subTitleLabel.attributedText = attr;
|
||||
[self.iconImageView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
|
||||
if (model.task_status.intValue == 1) {
|
||||
@@ -60,7 +60,8 @@
|
||||
[super awakeFromNib];
|
||||
// Initialization code
|
||||
[self.finishBtn addRoundedCornersWithRadius:15];
|
||||
self.finishBtn.layer.borderColor = RGB16(0xE24171).CGColor;
|
||||
[self.finishBtn setTitleColor:RGB16(0xC134EE) forState:(UIControlStateNormal)];
|
||||
self.finishBtn.layer.borderColor = RGB16(0xC134EE).CGColor;
|
||||
self.finishBtn.layer.borderWidth = 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
}
|
||||
-(void)initSubviews{
|
||||
self.cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(0, 0, self.width, 169+kSafeAreaTop+16) delegate:self placeholderImage:nil];
|
||||
self.cycleScrollView.backgroundColor = QXConfig.themeColor;
|
||||
self.cycleScrollView.backgroundColor = [UIColor clearColor];
|
||||
self.cycleScrollView.imageURLStringsGroup = @[[QXGlobal shareGlobal].loginModel.avatar?[QXGlobal shareGlobal].loginModel.avatar:@""];
|
||||
self.cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
|
||||
[self addSubview:self.cycleScrollView];
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
self.titleLabel = [[UILabel alloc] init];
|
||||
self.titleLabel.text = QXText(@"金币余额");
|
||||
self.titleLabel.font = [UIFont boldSystemFontOfSize:16];
|
||||
self.titleLabel.textColor = QXConfig.textColor;
|
||||
self.titleLabel.textColor = RGB16(0xffffff);
|
||||
[self addSubview:self.titleLabel];
|
||||
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.equalTo(self).offset(16);
|
||||
@@ -65,15 +65,18 @@
|
||||
switch (type) {
|
||||
case QXWalletTopViewTypeRecharge:{
|
||||
self.cornImageView.image = [UIImage imageNamed:@"wallet_corn"];
|
||||
self.topBgImageView.image = [UIImage imageNamed:@"wallet_top_bg"];
|
||||
self.titleLabel.text = QXText(@"金币余额");
|
||||
}
|
||||
break;
|
||||
case QXWalletTopViewTypeWithDraw:{
|
||||
self.topBgImageView.image = [UIImage imageNamed:@"wallet_top_bg1"];
|
||||
self.cornImageView.image = [UIImage imageNamed:@"wallet_diamond"];
|
||||
self.titleLabel.text = QXText(@"我的钻石");
|
||||
}
|
||||
break;
|
||||
case QXWalletTopViewTypeDiamond:{
|
||||
self.topBgImageView.image = [UIImage imageNamed:@"wallet_top_bg1"];
|
||||
self.cornImageView.image = [UIImage imageNamed:@"wallet_diamond"];
|
||||
self.titleLabel.text = QXText(@"钻石余额");
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 6.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 991 B After Width: | Height: | Size: 979 B |
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 4.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 7.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 4.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 8.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 7.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 520 KiB After Width: | Height: | Size: 330 KiB |
@@ -5,7 +5,7 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Group 7242@2x.png",
|
||||
"filename" : "背景2@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 169 KiB |
BIN
QXLive/Other/Assets.xcassets/app_bg.imageset/背景2@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/app_bg.imageset/背景2@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 292 KiB |
@@ -5,7 +5,7 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "启动页.png",
|
||||
"filename" : "app_home_bg@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
BIN
QXLive/Other/Assets.xcassets/app_home_bg.imageset/app_home_bg@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/app_home_bg.imageset/app_home_bg@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 296 KiB |
@@ -5,12 +5,11 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame@2x.png",
|
||||
"filename" : "app_start_midi@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
BIN
QXLive/Other/Assets.xcassets/app_start_midi.imageset/app_start_midi@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/app_start_midi.imageset/app_start_midi@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 300 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 6.8 KiB |
@@ -5,12 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame 1758@2x.png",
|
||||
"filename" : "home_gift_bg@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame 1758@3x.png",
|
||||
"filename" : "home_gift_bg@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
BIN
QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 49 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@3x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 109 KiB |
@@ -5,12 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame 12@2x.png",
|
||||
"filename" : "去围观@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame 12@3x.png",
|
||||
"filename" : "去围观@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.2 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@3x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
@@ -5,12 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Group 6871@2x.png",
|
||||
"filename" : "排行榜@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Group 6871@3x.png",
|
||||
"filename" : "排行榜@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@3x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.6 KiB |
@@ -5,12 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "组 775@2x.png",
|
||||
"filename" : "编组 4@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "组 775@3x.png",
|
||||
"filename" : "编组 4@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@3x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.2 KiB |
@@ -5,11 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Group 25@2x.png",
|
||||
"filename" : "搜索@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "搜索@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@3x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
@@ -5,12 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Rectangle 69@2x.png",
|
||||
"filename" : "推荐底图@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Rectangle 69@3x.png",
|
||||
"filename" : "推荐底图@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.5 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.4 KiB |
BIN
QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@3x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.2 KiB |
@@ -5,12 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "my_rank_bg@2x.png",
|
||||
"filename" : "Rectangle 448@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "my_rank_bg@3x.png",
|
||||
"filename" : "Rectangle 448@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
|
||||
BIN
QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@2x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 71 KiB |
BIN
QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@3x.png
vendored
Normal file
BIN
QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 157 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 70 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 156 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.2 KiB |
@@ -1,22 +0,0 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame 1321316067@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame 1321316067@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.1 KiB |
@@ -1,22 +0,0 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame 1321316069@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Frame 1321316069@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user