Skip to content

pidan / FuSiLive

Go to a project
Commit 5b6fca5d by pierce
Options

Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

parents 5c45013c 5672d639
Expand all
Inline Side-by-side
Showing with 287 additions and 46 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Http/FUSHttpHelper.m
......@@ -142,7 +142,7 @@
}
// 打印解析结果
if(FUSConfig.sharedInstanced.devConfigs.enableHttpDebug){
NSLog(@"--->URL:%@\n%@",urlStr,dataDict);
NSLog(@"--->URL:%@\n%@",urlStr,[dataDict dictToUTF8String]);
}
// 判断空值
......@@ -343,7 +343,7 @@
}
// 打印解析结果
if(FUSConfig.sharedInstanced.devConfigs.enableHttpDebug){
NSLog(@"--->URL:%@\n%@",urlStr,dataDict);
NSLog(@"--->URL:%@\n%@",urlStr,[dataDict dictToUTF8String]);
}
// 判断空值
......@@ -965,7 +965,7 @@
}
// 打印解析结果
if(FUSConfig.sharedInstanced.devConfigs.enableHttpDebug){
NSLog(@"--->URL:%@\n%@",urlStr,dataDict);
NSLog(@"--->URL:%@\n%@",urlStr,[dataDict dictToUTF8String]);
}
// 判断空值
......
FuSiLive.xcodeproj/project.pbxproj
......@@ -8,6 +8,8 @@
/* Begin PBXBuildFile section */
008FEC472C296CBC00B1AF13 /* FZCustom01.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 008FEC462C296CB700B1AF13 /* FZCustom01.ttf */; };
00A035822C33F400007FAE44 /* FUSMissionCenterNoTaskCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A035802C33F400007FAE44 /* FUSMissionCenterNoTaskCell.m */; };
00A035832C33F400007FAE44 /* FUSMissionCenterNoTaskCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 00A035812C33F400007FAE44 /* FUSMissionCenterNoTaskCell.xib */; };
00A0C5602C2676010044A41D /* FUSLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 00A0C5542C2675FE0044A41D /* FUSLoginViewController.xib */; };
00A0C5612C2676010044A41D /* FUSForgetPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A0C5552C2675FE0044A41D /* FUSForgetPasswordViewController.m */; };
00A0C5622C2676010044A41D /* FUSMessageRegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A0C5572C2675FF0044A41D /* FUSMessageRegisterViewController.m */; };
......@@ -1409,6 +1411,9 @@
/* Begin PBXFileReference section */
008FEC462C296CB700B1AF13 /* FZCustom01.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FZCustom01.ttf; sourceTree = "<group>"; };
00A0357F2C33F3FF007FAE44 /* FUSMissionCenterNoTaskCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSMissionCenterNoTaskCell.h; sourceTree = "<group>"; };
00A035802C33F400007FAE44 /* FUSMissionCenterNoTaskCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSMissionCenterNoTaskCell.m; sourceTree = "<group>"; };
00A035812C33F400007FAE44 /* FUSMissionCenterNoTaskCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUSMissionCenterNoTaskCell.xib; sourceTree = "<group>"; };
00A0C5542C2675FE0044A41D /* FUSLoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUSLoginViewController.xib; sourceTree = "<group>"; };
00A0C5552C2675FE0044A41D /* FUSForgetPasswordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSForgetPasswordViewController.m; sourceTree = "<group>"; };
00A0C5562C2675FE0044A41D /* FUSForgetPasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSForgetPasswordViewController.h; sourceTree = "<group>"; };
......@@ -8237,6 +8242,9 @@
BED0F8712C0C49C80017B285 /* FUSTaskCenterTextTableViewCell.h */,
BED0F8722C0C49C80017B285 /* FUSTaskCenterTextTableViewCell.m */,
BED0F8732C0C49C80017B285 /* FUSTaskCenterTextTableViewCell.xib */,
00A0357F2C33F3FF007FAE44 /* FUSMissionCenterNoTaskCell.h */,
00A035802C33F400007FAE44 /* FUSMissionCenterNoTaskCell.m */,
00A035812C33F400007FAE44 /* FUSMissionCenterNoTaskCell.xib */,
);
path = TaskCenter;
sourceTree = "<group>";
......@@ -9073,6 +9081,7 @@
BED0F9AE2C0C49C90017B285 /* FUSVideoChatStateView.xib in Resources */,
BE818A8F2C22BD8F004C8C6B /* live_minimize_anim_19@2x.png in Resources */,
BEDC6EE82C09DAE800505F76 /* normal_reward_dew_img_1.png in Resources */,
00A035832C33F400007FAE44 /* FUSMissionCenterNoTaskCell.xib in Resources */,
BEDC6F742C09DAE900505F76 /* zone_voice_sign_play_btn_icon_anim_8@2x.png in Resources */,
00A29CC22C2570C7008B9072 /* Launch Screen.storyboard in Resources */,
BED0FC812C0C49CA0017B285 /* FUSTaskCenterHeaderSimpleTableViewCell.xib in Resources */,
......@@ -10109,6 +10118,7 @@
BED0F8B62C0C49C80017B285 /* FUSHomeVideoChatModel.m in Sources */,
BED0FBB52C0C49CA0017B285 /* FUSSettingNetworkCherkAlert.m in Sources */,
BED0FA1E2C0C49C90017B285 /* FUSFilterItemCell.m in Sources */,
00A035822C33F400007FAE44 /* FUSMissionCenterNoTaskCell.m in Sources */,
BED0F99F2C0C49C90017B285 /* FUSVideoChatSetItem.m in Sources */,
BED0FBC32C0C49CA0017B285 /* FUSSingleChatDataSourceHelper.m in Sources */,
BED0FB1D2C0C49CA0017B285 /* FUSNewsFeedHttpHelper.m in Sources */,
......
FuSiLive/Classes/BaoFang/Main/Model/FUSBaoFangBroadcastModel.m
......@@ -69,7 +69,7 @@
dispatch_async(dispatch_get_global_queue(0, 0), ^{
self.attr = [NSMutableAttributedString fus_attributeStringWithHTMLString:self.languageContent baseColor:@"ffffff" font:[UIFont fus_themeFont:13] needRTLTransfer:FUSRTL.isRTL imgHeight:33 imgWidth:0];
self.attr = [NSMutableAttributedString fus_attributeStringWithHTMLString:self.languageContent baseColor:@"222222" font:[UIFont fus_themeFont:13] needRTLTransfer:FUSRTL.isRTL imgHeight:33 imgWidth:0];
dispatch_async(dispatch_get_main_queue(), ^{
if (completed) {
......
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
......@@ -783,6 +783,10 @@
#define URL_LIVE_TASK_LIST DNS_FUS_API(@"/task/roomTaskList.html")
// 领取任务奖励
#define URL_GET_TASK_AWARD DNS_FUS_API(@"/task/receive.html")
// 任务中心奖励任务列表
#define URL_TASK_REWARD_RECEIVE_LIST DNS_FUS_API(@"/task/reward/receive/getList")
// 奖励领取任务接口
#define URL_TASK_REWARD_RECEIVE_GET DNS_FUS_API(@"/task/reward/receive/get")
// 完成任务需进入的直播间
#define URL_COMPLETE_TASK_ROOMID DNS_FUS_API(@"/task/getdata.html")
// 设置用户定位状态
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m
......@@ -107,8 +107,8 @@
make.right.equalTo(nickNameBgView);
make.centerY.equalTo(nickNameBgView.mas_centerY);
make.left.equalTo(self.levelLabel.mas_right).offset(6);
make.size.mas_equalTo(CGSizeMake(14, 14));
// make.height.offset(16);
// make.size.mas_equalTo(CGSizeMake(14, 14));
make.height.offset(14);
}];
UIButton *copyBgBtn = [UIButton buttonWithType:UIButtonTypeCustom];
......@@ -333,6 +333,7 @@
}];
self.vipMarkImgView.image = [UIImage fus_imageWithLevel:[model.level integerValue]];
// self.vipMarkImgView.image = [UIImage fus_imageWithLevel:35];
}
......
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/FUSImAnchorViewController.m
......@@ -288,7 +288,7 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
return;
}
FUSWKWebViewController *vc = [[FUSWKWebViewController alloc] init];
vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.withdrawAddress;
vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.accumulateAddress;
[self.navigationController pushViewController:vc animated:YES];
}
break;
......
FuSiLive/Classes/InstantMessaging/View/FUSIMInputToolbar.m
......@@ -331,7 +331,8 @@
NSString *text1 = [self.textInput.text substringToIndex:range.location];
if (emotion != nil) {
NSString *text2 = [text1 stringByAppendingString:[NSString stringWithFormat:@"[%@]",FUSLocalizationHelper.localString(emotion.epname)]];
// NSString *text2 = [text1 stringByAppendingString:[NSString stringWithFormat:@"[%@]",FUSLocalizationHelper.localString(emotion.epname)]];
NSString *text2 = [text1 stringByAppendingString:[NSString stringWithFormat:@"%@",FUSLocalizationHelper.localString(emotion.epname)]];
NSString *text3 = [self.textInput.text substringFromIndex:range.location];
self.textInput.text = [text2 stringByAppendingString:text3];
range.location += (text2.length - text1.length);
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/FUSIMEmojiButtonView.m
......@@ -129,7 +129,7 @@
[sendBtn setTitle:FUSLocalizationHelper.localString(@"发送") forState:UIControlStateNormal];
sendBtn.titleLabel.font = [UIFont fus_themeFont:15];
sendBtn.titleLabel.textAlignment = NSTextAlignmentCenter;
[sendBtn setTitleColor:[UIColor colorWithHex:@"#CCCCCC"] forState:UIControlStateNormal];
[sendBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[sendBtn addTarget:self action:@selector(sendBtnClick) forControlEvents:UIControlEventTouchUpInside];
[_bottomScrollerView addSubview:sendBtn];
}
......
FuSiLive/Classes/Login/Model/FUSSettingInitDataModel.h
......@@ -35,6 +35,12 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy) NSString *inviteTradeAddress;
/// Vip开通H5地址
@property (nonatomic, copy) NSString *vipOpenAddress;
/// 累计萤火H5地址
@property (nonatomic, copy) NSString *accumulateAddress;
/// 露水兑换（半屏）H5访问地址
@property (nonatomic, copy) NSString *dewHalfAddress;
/// 露水兑换（全屏）H5访问地址
@property (nonatomic, copy) NSString *dewFullfAddress;
@end
......
FuSiLive/Classes/Payment/Controller/FUSRechargeViewController.m
......@@ -18,6 +18,7 @@
#import "FUSPaymentManager.h"
#import "FUSPaymentRechargeModel.h"
#import "FUSPaymentHttpHelper.h"
#import "FUSCacheDataShare.h"
//
#import <FirebaseAnalytics/FirebaseAnalytics.h>
#import "FUSIMChatService.h"
......@@ -271,7 +272,7 @@
UIButton *recordBtn = [UIButton buttonWithType:UIButtonTypeCustom];
recordBtn.frame = CGRectMake(0, 0, 40, 40);
[recordBtn addTarget:self action:@selector(onRechargeButtonClickAction:) forControlEvents:UIControlEventTouchUpInside];
[recordBtn setImage:[UIImage imageNamed:@"LocalimageUrl_nav_right_btn_record"] forState:UIControlStateNormal];
[recordBtn setImage:[[UIImage imageNamed:@"LocalimageUrl_nav_right_btn_record"] imageByTintColor:[UIColor fus_textColorMedium]] forState:UIControlStateNormal];
UIBarButtonItem *recordBarItem = [[UIBarButtonItem alloc] initWithCustomView:recordBtn];
// UIBarButtonItem* spaceItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
......@@ -435,13 +436,13 @@
// webViewCtrl.webUrlString = [NSString stringWithFormat:@"%@?uid=%@&token=%@", URL_RECHARGE_RECORD_PAGE, userVerifyInfo.uid, userVerifyInfo.token];
// [self.navigationController pushViewController:webViewCtrl animated:YES];
FUSAccountRecordViewController *recordVc = [[FUSAccountRecordViewController alloc] init];
recordVc.recordType = FUSRecordTypeJewelAndDew;
[self.navigationController pushViewController:recordVc animated:YES];
// FUSAccountRecordViewController *recordVc = [[FUSAccountRecordViewController alloc] init];
// recordVc.recordType = FUSRecordTypeJewelAndDew;
// [self.navigationController pushViewController:recordVc animated:YES];
// FUSWKWebViewController *consumeVc = [[FUSWKWebViewController alloc] init];
// consumeVc.webUrlString = URL_WEB_HELP;
// [self.navigationController pushViewController:consumeVc animated:YES];
FUSWKWebViewController *consumeVc = [[FUSWKWebViewController alloc] init];
consumeVc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.gemTradeAddress;
[self.navigationController pushViewController:consumeVc animated:YES];
}
- (void)popViewController {
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSSingleLiveRecordV2TableViewCell.m
......@@ -403,6 +403,10 @@
}
}
}
//fusi:星星和评分按钮暂时不要
self.callCommentBtn.hidden = YES;
self.callAlreadyCommentBgView.hidden = YES;
}
#pragma mark - Action
......
FuSiLive/Classes/Zone/Models/FUSTaskCenterListModel.h
......@@ -17,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSInteger state;
// 任务id
@property (nonatomic, assign) NSInteger tid;
// 流水id
@property (nonatomic, assign) NSInteger sid;
// 奖励类型（3：宝石、4：萤火、5：露水）
@property (nonatomic, assign) NSInteger currency;
// 奖励数量
......
FuSiLive/Classes/Zone/Models/FUSZoneTaskInfoMModel.h
......@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSInteger succnum;
// 备注
@property (nonatomic, copy) NSString *remarks;
// 任务类型（:1：新手、2：邀请、3：日常、4：主播）
// 任务类型（:0：奖励领取、1：新手、2：邀请、3：日常、4：主播）
@property (nonatomic, copy) NSString *type;
// 任务列表
@property (nonatomic, strong) NSArray *tasklist;
......
FuSiLive/Classes/Zone/Other/FUSZoneHttpRequest.h
......@@ -11,6 +11,7 @@
#import "FUSZoneInfosModel.h"
#import "FUSUserInfosModel.h"
#import "FUSVideoCreditRecordModel.h"
#import "FUSZoneTaskInfoMModel.h"
typedef NS_ENUM(NSInteger, UserInfosType)
{
......@@ -250,6 +251,11 @@ typedef NS_ENUM(NSInteger, FUSZoneHttpUploadImageType)
+ (void)fus_requestZoneTaskParcelListSuccess:(void(^)(NSArray *taskDataArr, NSString *dailyWaitReceiveTotal))success failure:(void(^)(NSString *msg,int code))failure;
/// 任务中心奖励任务列表
+(void)fus_requestTaskRewardReceiveGetListSuccess:(void(^)(FUSZoneTaskInfoMModel *dataModel))success failure:(void(^)(NSString *msg,int code))failure;
/// 奖励领取任务接口
+(void)fus_requestTaskRewardReceiveGetTid:(NSString *)tid sid:(NSString *)sid pid:(NSString *)pid success:(void(^)(void))success failure:(void(^)(NSString *msg,int code))failure;
/**
获取任务奖励
......
FuSiLive/Classes/Zone/Other/FUSZoneHttpRequest.m
......@@ -699,6 +699,47 @@
}
}];
}
/// 任务中心奖励任务列表
+(void)fus_requestTaskRewardReceiveGetListSuccess:(void(^)(FUSZoneTaskInfoMModel *dataModel))success failure:(void(^)(NSString *msg,int code))failure{
[FUSHttpHelper postRequestBinaryWithUrl:URL_TASK_REWARD_RECEIVE_LIST params:nil success:^(NSDictionary * _Nullable dataDict, int code) {
FUSZoneTaskInfoMModel *dataModel = nil;
for (NSDictionary *taskListDic in dataDict[@"tasklist"]) {
dataModel = [FUSZoneTaskInfoMModel fus_modelWithDict:taskListDic];
NSMutableArray *tempTaskList = [[NSMutableArray alloc] init];
for (NSDictionary *tempTaskDict in taskListDic[@"tasklist"]) {
FUSTaskCenterListModel *taskCenterListModel = [FUSTaskCenterListModel fus_modelWithDict:tempTaskDict];
[tempTaskList addObject:taskCenterListModel];
}
dataModel.tasklist = tempTaskList;
break;
}
if (!dataModel) {
dataModel = [[FUSZoneTaskInfoMModel alloc] init];
dataModel.type = @"0";
dataModel.name = [NSString fus_versionLocalString:@"奖励领取"];
}
success(dataModel);
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
/// 奖励领取任务接口
+(void)fus_requestTaskRewardReceiveGetTid:(NSString *)tid sid:(NSString *)sid pid:(NSString *)pid success:(void(^)(void))success failure:(void(^)(NSString *msg,int code))failure{
NSDictionary *parms = @{@"tid":tid,
@"pid":pid,
@"sid":sid};
[FUSHttpHelper postRequestBinaryWithUrl:URL_TASK_REWARD_RECEIVE_GET params:parms success:^(NSDictionary * _Nullable dataDict, int code) {
success();
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
/**
完成任务奖励进入的直播间房间号
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSMissionCenterNoTaskCell.h 0 → 100644
//
// FUSMissionCenterNoTaskCell.h
// PersonalPage
//
// Created by pierce on 2023/8/3.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSMissionCenterNoTaskCell : UITableViewCell
@property (strong, nonatomic) IBOutlet UILabel *noTaskLabel;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/Zone/View/TaskCenter/FUSMissionCenterNoTaskCell.m 0 → 100644
//
// FUSMissionCenterNoTaskCell.m
// PersonalPage
//
// Created by pierce on 2023/8/3.
//
#import "FUSMissionCenterNoTaskCell.h"
@implementation FUSMissionCenterNoTaskCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
FuSiLive/Classes/Zone/View/TaskCenter/FUSMissionCenterNoTaskCell.xib 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="282" id="KGk-i7-Jjw" customClass="FUSMissionCenterNoTaskCell">
<rect key="frame" x="0.0" y="0.0" width="471" height="282"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="471" height="282"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="暫無可領取的獎勵" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9OR-VO-ez9">
<rect key="frame" x="0.0" y="0.0" width="471" height="282"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.36862745099999999" green="0.4039215686" blue="0.44705882349999998" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="9OR-VO-ez9" secondAttribute="trailing" id="7a9-1W-Tvs"/>
<constraint firstItem="9OR-VO-ez9" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="ZAU-4m-kmk"/>
<constraint firstItem="9OR-VO-ez9" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="mOw-mK-tud"/>
<constraint firstAttribute="bottom" secondItem="9OR-VO-ez9" secondAttribute="bottom" id="uDs-nn-dLm"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<outlet property="noTaskLabel" destination="9OR-VO-ez9" id="Dfs-bJ-gD6"/>
</connections>
<point key="canvasLocation" x="246.56488549618319" y="72.535211267605632"/>
</tableViewCell>
</objects>
</document>
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterHeaderSimpleTableViewCell.m
......@@ -19,6 +19,7 @@
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
self.taskNameLabel.textColor = [UIColor fus_textColorRich];
}
- (void)setTaskInfoModel:(FUSZoneTaskInfoMModel *)taskInfoModel {
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterHeaderSimpleTableViewCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -23,9 +23,9 @@
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<view alpha="0.10000000000000001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UsE-jb-O0d">
<view alpha="0.20000000000000001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UsE-jb-O0d">
<rect key="frame" x="20" y="43" width="290" height="1"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="0.65755208333333337" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="w75-bY-ocO"/>
</constraints>
......@@ -39,8 +39,8 @@
<constraint firstItem="UsE-jb-O0d" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="Zda-Np-xrd"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<outlet property="taskNameLabel" destination="FWv-iM-weK" id="hN3-9S-2SN"/>
</connections>
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterHeaderTableViewCell.m
......@@ -25,6 +25,9 @@
- (void)awakeFromNib {
[super awakeFromNib];
self.nameLabel.textColor = [UIColor fus_textColorRich];
self.remarkLabel.textColor = [UIColor fus_textColorMedium];
}
- (void)setTaskInfoModel:(FUSZoneTaskInfoMModel *)taskInfoModel {
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterListTableViewCell.m
......@@ -33,6 +33,8 @@
[super awakeFromNib];
// SaveBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
self.operationBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
self.taskNameLabel.textColor = [UIColor fus_textColorRich];
}
// 重写setter方法赋值
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterListTableViewCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -23,9 +23,9 @@
<color key="textColor" red="0.23529411764705882" green="0.68627450980392157" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="23y-Os-R55">
<rect key="frame" x="10" y="0.0" width="300" height="1"/>
<color key="backgroundColor" red="0.16078431372549018" green="0.16078431372549018" blue="0.16078431372549018" alpha="1" colorSpace="calibratedRGB"/>
<view alpha="0.10000000000000001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="23y-Os-R55">
<rect key="frame" x="20" y="70" width="290" height="1"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="rmc-nn-uiC"/>
</constraints>
......@@ -38,7 +38,7 @@
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<inset key="titleEdgeInsets" minX="8" minY="0.0" maxX="8" maxY="0.0"/>
<state key="normal" title="---">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="titleColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="operationBtnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Qun-4I-SO1"/>
......@@ -81,7 +81,7 @@
<constraint firstItem="jPO-cN-3hQ" firstAttribute="leading" secondItem="EoZ-uN-sDh" secondAttribute="trailing" id="Azo-Nv-WxT"/>
<constraint firstItem="VBv-Bq-UZB" firstAttribute="leading" secondItem="iwt-SR-z91" secondAttribute="trailing" constant="10" id="BgI-Yb-Ecc"/>
<constraint firstAttribute="trailing" secondItem="23y-Os-R55" secondAttribute="trailing" constant="10" id="Blj-a2-Z5g"/>
<constraint firstItem="23y-Os-R55" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="DaC-yq-RVq"/>
<constraint firstItem="23y-Os-R55" firstAttribute="bottom" secondItem="H2p-sc-9uM" secondAttribute="bottom" id="DaC-yq-RVq"/>
<constraint firstItem="OIs-kk-Wve" firstAttribute="centerY" secondItem="oRB-IO-xec" secondAttribute="centerY" id="ITc-sE-Hm2"/>
<constraint firstItem="iwt-SR-z91" firstAttribute="top" secondItem="oRB-IO-xec" secondAttribute="bottom" constant="6.5" id="IUA-Ca-FMF"/>
<constraint firstItem="iwt-SR-z91" firstAttribute="leading" secondItem="oRB-IO-xec" secondAttribute="leading" id="TWt-J1-Pgv"/>
......@@ -89,14 +89,14 @@
<constraint firstItem="EoZ-uN-sDh" firstAttribute="leading" secondItem="OIs-kk-Wve" secondAttribute="trailing" id="iB3-Op-78U"/>
<constraint firstItem="oRB-IO-xec" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" constant="-10" id="m5o-CY-8pw"/>
<constraint firstAttribute="trailing" secondItem="VBv-Bq-UZB" secondAttribute="trailing" constant="20" id="ng7-32-CVb"/>
<constraint firstItem="23y-Os-R55" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="qX4-lo-X4K"/>
<constraint firstItem="23y-Os-R55" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="qX4-lo-X4K"/>
<constraint firstItem="VBv-Bq-UZB" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="jPO-cN-3hQ" secondAttribute="trailing" constant="10" id="u0N-7O-80H"/>
<constraint firstItem="VBv-Bq-UZB" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="ubR-zD-sD5"/>
<constraint firstItem="jPO-cN-3hQ" firstAttribute="centerY" secondItem="OIs-kk-Wve" secondAttribute="centerY" id="wa6-lX-YMQ"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<outlet property="addlabel" destination="OIs-kk-Wve" id="Hau-Ec-WQD"/>
<outlet property="awardLabel" destination="jPO-cN-3hQ" id="52F-lQ-Sil"/>
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterProcessTableViewCell.m
......@@ -44,6 +44,7 @@
- (void)awakeFromNib {
[super awakeFromNib];
// self.operationBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
self.taskTitleLabel.textColor = [UIColor fus_textColorRich];
}
// 重写setter方法赋值
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterProcessTableViewCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -64,7 +64,9 @@
<constraint firstAttribute="width" constant="40" id="ZlU-VB-AeZ"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="去领取"/>
<state key="normal" title="去领取">
<color key="titleColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="operationBtnOnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="wJg-xt-TdL"/>
</connections>
......@@ -78,6 +80,13 @@
<color key="textColor" red="0.50196078430000002" green="0.50196078430000002" blue="0.50196078430000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view alpha="0.10000000000000001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qPl-w4-kgo">
<rect key="frame" x="20" y="70" width="290" height="1"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Ii3-Lh-hxW"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="tf8-FL-2d5" firstAttribute="leading" secondItem="02L-RB-ltf" secondAttribute="trailing" constant="-3" id="3Zf-JB-tVO"/>
......@@ -89,17 +98,20 @@
<constraint firstItem="8v6-UE-dIy" firstAttribute="top" secondItem="bfp-Ws-YBS" secondAttribute="bottom" constant="2" id="VJA-Te-U8A"/>
<constraint firstItem="tf8-FL-2d5" firstAttribute="centerY" secondItem="02L-RB-ltf" secondAttribute="centerY" id="fAf-Xl-UeK"/>
<constraint firstItem="RyB-oG-Lqu" firstAttribute="leading" secondItem="tf8-FL-2d5" secondAttribute="trailing" id="fpZ-ba-PCb"/>
<constraint firstAttribute="trailing" secondItem="qPl-w4-kgo" secondAttribute="trailing" constant="10" id="jiC-dH-ow9"/>
<constraint firstItem="8v6-UE-dIy" firstAttribute="leading" secondItem="bfp-Ws-YBS" secondAttribute="leading" id="jic-f7-1we"/>
<constraint firstItem="EyC-iH-DvF" firstAttribute="centerY" secondItem="bfp-Ws-YBS" secondAttribute="centerY" id="k87-Xj-98w"/>
<constraint firstAttribute="trailing" secondItem="RbH-RC-F8l" secondAttribute="trailing" constant="20" id="kCY-Jn-dJk"/>
<constraint firstItem="RyB-oG-Lqu" firstAttribute="centerY" secondItem="02L-RB-ltf" secondAttribute="centerY" constant="1" id="mcn-H3-lqV"/>
<constraint firstItem="RbH-RC-F8l" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="ord-es-ZRq"/>
<constraint firstItem="bfp-Ws-YBS" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" constant="-12" id="t0q-gY-y7o"/>
<constraint firstAttribute="bottom" secondItem="qPl-w4-kgo" secondAttribute="bottom" id="tl6-gc-NsH"/>
<constraint firstItem="qPl-w4-kgo" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="ucq-Eh-vfg"/>
<constraint firstItem="RbH-RC-F8l" firstAttribute="leading" secondItem="8v6-UE-dIy" secondAttribute="trailing" constant="10" id="usR-eI-zcI"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<outlet property="addLabel" destination="02L-RB-ltf" id="tdO-0T-it9"/>
<outlet property="awardImageView" destination="tf8-FL-2d5" id="Be4-Z0-KwH"/>
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterTableViewCell.m
......@@ -13,6 +13,7 @@
#import "FUSTaskCenterInvitationTableViewCell.h"
#import "FUSTaskCenterTextTableViewCell.h"
#import "FUSTaskCenterProcessTableViewCell.h"
#import "FUSMissionCenterNoTaskCell.h"
static NSString *const reuseIdentifyHeaderCell = @"headerCell";
static NSString *const reuseIdentifyListCell = @"listCell";
......@@ -20,6 +21,7 @@ static NSString *const reuseIdentifySimpleCell = @"simpleCell";
static NSString *const reuseIdentifyInvitationCell = @"invitationCell";
static NSString *const reuseIdentifyTextCell = @"textCell";
static NSString *const reuseIdentifyProcessCell = @"processCell";
static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell";
@interface FUSTaskCenterTableViewCell ()<UITableViewDataSource,UITableViewDelegate>
// 背景
......@@ -36,7 +38,7 @@ static NSString *const reuseIdentifyProcessCell = @"processCell";
[super awakeFromNib];
// UIImage *bgImage = [[UIImage imageNamed:@"invitation_award_bg"] resizableImageWithCapInsets:UIEdgeInsetsMake(56, 177, 56, 177)];
self.bgImageView.image = [UIImage imageNamed:@"invitation_award_bg"];
// self.bgImageView.image = [UIImage imageNamed:@"invitation_award_bg"];
self.taskTableView.delegate = self;
self.taskTableView.dataSource = self;
......@@ -51,6 +53,7 @@ static NSString *const reuseIdentifyProcessCell = @"processCell";
[self.taskTableView registerNib:[UINib nibWithNibName:@"FUSTaskCenterInvitationTableViewCell" bundle:nil] forCellReuseIdentifier:reuseIdentifyInvitationCell];
[self.taskTableView registerNib:[UINib nibWithNibName:@"FUSTaskCenterTextTableViewCell" bundle:nil] forCellReuseIdentifier:reuseIdentifyTextCell];
[self.taskTableView registerNib:[UINib nibWithNibName:@"FUSTaskCenterProcessTableViewCell" bundle:nil] forCellReuseIdentifier:reuseIdentifyProcessCell];
[self.taskTableView registerNib:[UINib nibWithNibName:@"FUSMissionCenterNoTaskCell" bundle:nil] forCellReuseIdentifier:reuseIdentifyNoTaskCell];
}
#pragma mark - Data
......@@ -69,11 +72,24 @@ static NSString *const reuseIdentifyProcessCell = @"processCell";
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
if (_currentModel.type.intValue == 2) {
if (_currentModel.type.integerValue == 2) {
return 1;
} else {
return _currentModel.tasklist.count + 1;
if (_currentModel.type.integerValue == 0) {
if (_currentModel.tasklist.count) {
return _currentModel.tasklist.count + 1;
} else {
return 2;
}
} else {
return _currentModel.tasklist.count + 1;
}
}
// if (_currentModel.type.intValue == 2) {
// return 1;
// } else {
// return _currentModel.tasklist.count + 1;
// }
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
......@@ -94,6 +110,11 @@ static NSString *const reuseIdentifyProcessCell = @"processCell";
};
return invitationCell;
} else {
if (_currentModel.type.intValue == 0) {
NSLog(@"32g4e3h43h34");
}
if (_currentModel.parent > 0) {
if (indexPath.row == 0) {
FUSTaskCenterHeaderTableViewCell *headerCell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyHeaderCell forIndexPath:indexPath];
......@@ -107,6 +128,14 @@ static NSString *const reuseIdentifyProcessCell = @"processCell";
};
return headerCell;
} else {
if (_currentModel.tasklist.count == 0) {
FUSMissionCenterNoTaskCell *cell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyNoTaskCell forIndexPath:indexPath];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
cell.noTaskLabel.text = [NSString fus_versionLocalString:@"暂无可领取的奖励"];
return cell;
}
FUSTaskCenterListModel *listModel = _currentModel.tasklist[indexPath.row - 1];
if (listModel.type == 0) {
FUSTaskCenterListTableViewCell *listCell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyListCell forIndexPath:indexPath];
......@@ -162,6 +191,14 @@ static NSString *const reuseIdentifyProcessCell = @"processCell";
simpleCell.taskInfoModel = _currentModel;
return simpleCell;
} else {
if (_currentModel.tasklist.count == 0) {
FUSMissionCenterNoTaskCell *cell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyNoTaskCell forIndexPath:indexPath];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
cell.noTaskLabel.text = [NSString fus_versionLocalString:@"暂无可领取的奖励"];
return cell;
}
FUSTaskCenterListModel *listModel = _currentModel.tasklist[indexPath.row - 1];
if (listModel.type == 0) {
FUSTaskCenterListTableViewCell *listCell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyListCell forIndexPath:indexPath];
......@@ -215,23 +252,51 @@ static NSString *const reuseIdentifyProcessCell = @"processCell";
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
if (_currentModel.type.intValue == 2) {
if (_currentModel.type.integerValue == 2) {
return 113;
} else {
if (_currentModel.parent > 0) {
if (indexPath.row == 0) {
return 98;
} else {
if (_currentModel.tasklist.count == 0) {
return 132;
}
return 79;
}
} else {
if (indexPath.row == 0) {
return 60;
} else {
if (_currentModel.tasklist.count == 0) {
return 132;
}
return 79;
}
}
}
// if (_currentModel.type.intValue == 2) {
// return 113;
// } else {
// if (_currentModel.parent > 0) {
// if (indexPath.row == 0) {
// return 98;
// } else {
// return 79;
// }
// } else {
// if (indexPath.row == 0) {
// return 60;
// } else {
// return 79;
// }
// }
// }
}
// 埋点// 任务类型（:1：新手、2：邀请、3：日常、4：主播）
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterTableViewCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -17,7 +17,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="108"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="invitation_award_bg" translatesAutoresizingMaskIntoConstraints="NO" id="LWc-0B-lGP">
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LWc-0B-lGP">
<rect key="frame" x="10" y="10" width="300" height="98"/>
</imageView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="eGI-j1-i70">
......@@ -36,8 +36,8 @@
<constraint firstItem="eGI-j1-i70" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="gIM-HN-b8o"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<outlet property="bgImageView" destination="LWc-0B-lGP" id="Hij-Yh-IAn"/>
<outlet property="taskTableView" destination="eGI-j1-i70" id="ARg-TI-YFV"/>
......@@ -45,7 +45,4 @@
<point key="canvasLocation" x="137.59999999999999" y="183.50824587706148"/>
</tableViewCell>
</objects>
<resources>
<image name="invitation_award_bg" width="347" height="146"/>
</resources>
</document>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment