Skip to content

pidan / FuSiLive

Go to a project
Commit 0f8db65f by ludi
Options

修复一些bug

parent f48c2f6c
Inline Side-by-side
Showing with 215 additions and 163 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/MediaPreview/FUSBaseMediaPreview.m
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
cell.cellShownAnimationDoneHandler = nil; cell.cellShownAnimationDoneHandler = nil;
} }
// [cell fus_setupMediaCellWithModel:self.mediaList[indexPath.row]]; [cell fus_setupMediaCellWithModel:self.mediaList[indexPath.row]];
// FUSLogDebug(@"=====model_mid：%@",model.mid); // FUSLogDebug(@"=====model_mid：%@",model.mid);
return cell; return cell;
......
DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.m
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
} }
+ (NSString *)fus_newsfeedInput { + (NSString *)fus_newsfeedInput {
return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/fusi/moving/news.html"]; // return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/fusi/moving/news.html"];
return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/moving/news.html"];
} }
/// 邀请有奖-下载帮助页地址 /// 邀请有奖-下载帮助页地址
......
FuSiLive.xcodeproj/project.pbxproj
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260040; CURRENT_PROJECT_VERSION = 202506260041;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
...@@ -938,7 +938,7 @@ ...@@ -938,7 +938,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260040; CURRENT_PROJECT_VERSION = 202506260041;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSHomeAnchorListSmallCell.m
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
@property (nonatomic, strong) UIButton *locationBtn; @property (nonatomic, strong) UIButton *locationBtn;
///用户名 ///用户名
@property (nonatomic, strong) UILabel *nickNameLabel; @property (nonatomic, strong) UILabel *nickNameLabel;
/// 直播主题
@property (nonatomic, strong) UILabel *themeLabel;
/// 这个是龟龟左上角new的那个图标，找了一万年没找到 /// 这个是龟龟左上角new的那个图标，找了一万年没找到
@property (nonatomic, strong) FUSBaoFangTagView *tagView; @property (nonatomic, strong) FUSBaoFangTagView *tagView;
///pk标识动画 ///pk标识动画
...@@ -80,13 +82,22 @@ ...@@ -80,13 +82,22 @@
make.width.offset(40); make.width.offset(40);
}]; }];
self.themeLabel = [[UILabel alloc] init];
self.themeLabel.font = [UIFont fus_themeMediumFont:12];
self.themeLabel.textColor = [UIColor fus_textColorVeryLight];
[self.bgImageView addSubview:self.themeLabel];
[self.themeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset(8);
make.bottom.offset(-9);
}];
self.nickNameLabel = [[UILabel alloc] init]; self.nickNameLabel = [[UILabel alloc] init];
self.nickNameLabel.font = [UIFont fus_themeBoldFont:16]; self.nickNameLabel.font = [UIFont fus_themeBoldFont:16];
self.nickNameLabel.textColor = [UIColor fus_textColorVeryLight]; self.nickNameLabel.textColor = [UIColor fus_textColorVeryLight];
[self.bgImageView addSubview:self.nickNameLabel]; [self.bgImageView addSubview:self.nickNameLabel];
[self.nickNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.nickNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset(8); make.left.equalTo(self.themeLabel.mas_left);
make.bottom.offset(-9); make.bottom.equalTo(self.themeLabel.mas_top).offset(-4);
}]; }];
self.locationBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.locationBtn = [UIButton buttonWithType:UIButtonTypeCustom];
...@@ -179,6 +190,8 @@ ...@@ -179,6 +190,8 @@
} }
if (model.fus_itemType == 0) { if (model.fus_itemType == 0) {
self.themeLabel.hidden = NO;
self.themeLabel.text = model.introduce;
self.nickNameLabel.hidden = NO; self.nickNameLabel.hidden = NO;
self.nickNameLabel.text = model.nickname; self.nickNameLabel.text = model.nickname;
self.bottomAlphaBgView.hidden = NO; self.bottomAlphaBgView.hidden = NO;
...@@ -235,6 +248,7 @@ ...@@ -235,6 +248,7 @@
}else if (model.fus_itemType == 1 || model.fus_itemType == 2 || model.fus_itemType == 3){ }else if (model.fus_itemType == 1 || model.fus_itemType == 2 || model.fus_itemType == 3){
// 不是正常主播的卡片 // 不是正常主播的卡片
self.themeLabel.hidden = YES;
self.nickNameLabel.hidden = YES; self.nickNameLabel.hidden = YES;
self.locationBtn.hidden = YES; self.locationBtn.hidden = YES;
self.hotNumBtn.hidden = YES; self.hotNumBtn.hidden = YES;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKControlWebView.swift
...@@ -34,7 +34,7 @@ class FUSPKControlWebView: FUSPKControlSubBaseView { ...@@ -34,7 +34,7 @@ class FUSPKControlWebView: FUSPKControlSubBaseView {
contentView.addSubview(webView) contentView.addSubview(webView)
webView.snp.makeConstraints { make in webView.snp.makeConstraints { make in
make.left.bottom.right.equalToSuperview() make.left.bottom.right.equalToSuperview()
make.top.equalTo(naviView.snp.bottom) make.top.equalTo(naviView.snp.bottom).offset(8)
} }
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKUserContributionLogInLiveAlertView.swift
...@@ -20,7 +20,7 @@ class FUSPKUserContributionLogInLiveAlertView: FUSPKControlSubBaseView { ...@@ -20,7 +20,7 @@ class FUSPKUserContributionLogInLiveAlertView: FUSPKControlSubBaseView {
let scoreProgressView = FUSPKScoreProgressLargeSmallView(frame: CGRectMake(0, 0, UIView.fus_screenW(), FUSPKScoreProgressLargeSmallView.viewHeight)) let scoreProgressView = FUSPKScoreProgressLargeSmallView(frame: CGRectMake(0, 0, UIView.fus_screenW(), FUSPKScoreProgressLargeSmallView.viewHeight))
let tableView = UITableView(frame: .zero, style: .plain) let tableView = UITableView(frame: .zero, style: .plain)
private let emptyView = FUSEmptyView(frame: CGRectMake(0, 0, UIView.fus_screenW(), 400)) private let emptyView = UIView(frame: CGRectMake(0, 0, UIView.fus_screenW(), 400))
/// 当前页 /// 当前页
var currentPage: Int = 1 var currentPage: Int = 1
...@@ -75,7 +75,13 @@ class FUSPKUserContributionLogInLiveAlertView: FUSPKControlSubBaseView { ...@@ -75,7 +75,13 @@ class FUSPKUserContributionLogInLiveAlertView: FUSPKControlSubBaseView {
emptyView.backgroundColor = .clear emptyView.backgroundColor = .clear
self.emptyView.fus_setEmptyViewIcon(.fus_emptyImg(), title: .fus_localString("暂无数据"), buttonTittle: "") let emptyShowView = FUSEmptyView(frame: CGRectMake(0, 0, 240, 240))
emptyShowView.fus_setEmptyViewIcon(.fus_emptyImg(), title: .fus_localString("暂无数据"), buttonTittle: "")
emptyView.addSubview(emptyShowView)
emptyShowView.snp.makeConstraints { make in
make.center.equalToSuperview()
make.size.equalTo(emptyShowView.size)
}
} }
override func bindViewModel() { override func bindViewModel() {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/ViewModel/FUSPKControlViewModel.swift
...@@ -166,7 +166,7 @@ extension FUSPKControlViewType { ...@@ -166,7 +166,7 @@ extension FUSPKControlViewType {
switch self { switch self {
case .base, .contribution, .pkRecord, .pkDescription, .contributionLogListInMatch: case .base, .contribution, .pkRecord, .pkDescription, .contributionLogListInMatch:
return 620 + UIView.fus_SafeBottom() return 620 + UIView.fus_SafeBottom()
case .pkMode, .searchPlayer, .matching, .opponent, .setting: case .searchPlayer, .matching, .opponent, .setting:
return 428 + UIView.fus_SafeBottom() return 428 + UIView.fus_SafeBottom()
case .contributionListInMatch: case .contributionListInMatch:
return 513 + UIView.fus_SafeBottom() return 513 + UIView.fus_SafeBottom()
...@@ -176,8 +176,8 @@ extension FUSPKControlViewType { ...@@ -176,8 +176,8 @@ extension FUSPKControlViewType {
return 495 + UIView.fus_SafeBottom() return 495 + UIView.fus_SafeBottom()
case .punishActivate: case .punishActivate:
return 240 + UIView.fus_SafeBottom() return 240 + UIView.fus_SafeBottom()
case .pkGamePlay: case .pkGamePlay, .pkMode:
return 528 + UIView.fus_SafeBottom() return 442 + UIView.fus_SafeBottom()
default: default:
return 0 return 0
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailPhotoHeaderView.m
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
@interface FUSNewsFeedDetailPhotoHeaderView () <FUSRecycleViewDataSource,FUSRecycleViewDelegate> @interface FUSNewsFeedDetailPhotoHeaderView () <FUSRecycleViewDataSource,FUSRecycleViewDelegate>
/// 内容的Label /// 内容的Label
@property (nonatomic, strong) UILabel *contentLabel; @property (nonatomic, strong) YYLabel *contentLabel;
/// 滚动 /// 滚动
@property (nonatomic, strong) FUSRecycleView *recycleView; @property (nonatomic, strong) FUSRecycleView *recycleView;
...@@ -76,10 +76,17 @@ ...@@ -76,10 +76,17 @@
- (void)layoutSubviews { - (void)layoutSubviews {
YYTextLayout *layout = [YYTextLayout layoutWithContainerSize:CGSizeMake(UIView.fus_screenW - FUSNFDPHVContentLeftMargin * 2, CGFLOAT_MAX) text:self.contentLabel.attributedText];
CGRect contentLabelRect = layout.textBoundingRect;
self.contentLabel.x = FUSNFDPHVContentLeftMargin; self.contentLabel.x = FUSNFDPHVContentLeftMargin;
self.contentLabel.y = FUSNFDPHVContentTopMargin; self.contentLabel.y = FUSNFDPHVContentTopMargin;
if (self.model.headerContentHeight <= 0) { if (self.model.headerContentHeight <= 0) {
if (contentLabelRect.size.width > 0) {
self.contentLabel.size = contentLabelRect.size;
}else {
self.contentLabel.size = [self.model.subtitle sizeWithFont:[UIFont fus_themeFont:14] maxWidth:UIView.fus_screenW - FUSNFDPHVContentLeftMargin * 2]; self.contentLabel.size = [self.model.subtitle sizeWithFont:[UIFont fus_themeFont:14] maxWidth:UIView.fus_screenW - FUSNFDPHVContentLeftMargin * 2];
}
self.model.headerContentHeight = self.contentLabel.size.height; self.model.headerContentHeight = self.contentLabel.size.height;
} else { } else {
self.contentLabel.width = UIView.fus_screenW - FUSNFDPHVContentLeftMargin * 2; self.contentLabel.width = UIView.fus_screenW - FUSNFDPHVContentLeftMargin * 2;
...@@ -108,7 +115,8 @@ ...@@ -108,7 +115,8 @@
} else { } else {
self.unlockPriceView.hidden = YES; self.unlockPriceView.hidden = YES;
} }
self.contentLabel.text = model.subtitle; // self.contentLabel.text = model.subtitle;
self.contentLabel.attributedText = [FUSFormatContentHelper fus_createContentAttributedStringWithHTMLString:model.subtitle font:[UIFont fus_themeFont:14] defaultColor:[UIColor fus_textColorMedium] imageSize:CGSizeMake(14, 14)];
self.photoCountLabel.hidden = model.images.count <= 1; self.photoCountLabel.hidden = model.images.count <= 1;
self.photoCountLabel.text = [NSString stringWithFormat:@"%d/%d",1,(int)self.model.images.count]; self.photoCountLabel.text = [NSString stringWithFormat:@"%d/%d",1,(int)self.model.images.count];
[self.recycleView reloadData]; [self.recycleView reloadData];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailVideoHeaderView.m
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
@interface FUSNewsFeedDetailVideoHeaderView () @interface FUSNewsFeedDetailVideoHeaderView ()
/// 内容的Label /// 内容的Label
@property (nonatomic, strong) UILabel *contentLabel; @property (nonatomic, strong) YYLabel *contentLabel;
/// 滚动 /// 滚动
@property (nonatomic, strong) UIImageView *bottomMaskImageView; @property (nonatomic, strong) UIImageView *bottomMaskImageView;
...@@ -120,10 +120,17 @@ ...@@ -120,10 +120,17 @@
- (void)layoutSubviews { - (void)layoutSubviews {
YYTextLayout *layout = [YYTextLayout layoutWithContainerSize:CGSizeMake(UIView.fus_screenW - FUSNFDVHVContentLeftMargin * 2, CGFLOAT_MAX) text:self.contentLabel.attributedText];
CGRect contentLabelRect = layout.textBoundingRect;
self.contentLabel.x = FUSNFDVHVContentLeftMargin; self.contentLabel.x = FUSNFDVHVContentLeftMargin;
self.contentLabel.y = FUSNFDVHVContentTopMargin; self.contentLabel.y = FUSNFDVHVContentTopMargin;
if (self.model.headerContentHeight <= 0) { if (self.model.headerContentHeight <= 0) {
if (contentLabelRect.size.width > 0) {
self.contentLabel.size = contentLabelRect.size;
}else {
self.contentLabel.size = [self.model.subtitle sizeWithFont:[UIFont fus_themeFont:14] maxWidth:UIView.fus_screenW - FUSNFDVHVContentLeftMargin * 2]; self.contentLabel.size = [self.model.subtitle sizeWithFont:[UIFont fus_themeFont:14] maxWidth:UIView.fus_screenW - FUSNFDVHVContentLeftMargin * 2];
}
self.model.headerContentHeight = self.contentLabel.size.height; self.model.headerContentHeight = self.contentLabel.size.height;
} else { } else {
self.contentLabel.width = UIView.fus_screenW - FUSNFDVHVContentLeftMargin * 2; self.contentLabel.width = UIView.fus_screenW - FUSNFDVHVContentLeftMargin * 2;
...@@ -163,7 +170,8 @@ ...@@ -163,7 +170,8 @@
} else { } else {
self.unlockPriceView.hidden = YES; self.unlockPriceView.hidden = YES;
} }
self.contentLabel.text = model.subtitle; // self.contentLabel.text = model.subtitle;
self.contentLabel.attributedText = [FUSFormatContentHelper fus_createContentAttributedStringWithHTMLString:model.subtitle font:[UIFont fus_themeFont:14] defaultColor:[UIColor fus_textColorMedium] imageSize:CGSizeMake(14, 14)];
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self.videoView.preImageView setWebImageWithSubURLString:self.model.videos.firstObject.cover placeholder:nil completion:^(UIImage * _Nullable result, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) { [self.videoView.preImageView setWebImageWithSubURLString:self.model.videos.firstObject.cover placeholder:nil completion:^(UIImage * _Nullable result, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
...@@ -519,162 +519,177 @@ static NSString *const reuseIdentifyCell = @"cell"; ...@@ -519,162 +519,177 @@ static NSString *const reuseIdentifyCell = @"cell";
*/ */
- (void)fus_enterCorrespondingTaskAccordingtoTaskModel:(FUSTaskCenterListModel *)model sender:(UIButton *)sender TypeModel:(FUSZoneTaskInfoMModel *)typeModel{ - (void)fus_enterCorrespondingTaskAccordingtoTaskModel:(FUSTaskCenterListModel *)model sender:(UIButton *)sender TypeModel:(FUSZoneTaskInfoMModel *)typeModel{
if ([model.jumpurl isEqualToString:@"yazhai://_bind_phone"]) {
// 绑定手机号
if (model.state == 0 || model.state == 1 || model.state == -1) {
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
FUSPhoneAuthViewController *phoneBindingVc = [[FUSPhoneAuthViewController alloc]init];
phoneBindingVc.phoneBindingSuccessBlock = ^{
};
[self.navigationController pushViewController:phoneBindingVc animated:YES];
} else {
[self fus_getTaskAward:model.tid];
}
} else if ([model.jumpurl isEqualToString:@"yazhai://_account_set"]) {
// 绑定账号
if (model.state == 0 || model.state == 1 || model.state == -1) {
FUSSettingViewController *settingVC = [[FUSSettingViewController alloc] init];
[self.navigationController pushViewController:settingVC animated:YES];
} else {
[self fus_getTaskAward:model.tid];
}
} else if ([model.jumpurl isEqualToString:@"yazhai://_live_started"]) {
// 开启直播
if (model.state == 0 || model.state == 1 || model.state == -1) {
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
[FUSRouter.liveRouter fus_pushLive];
} else {
[self fus_getTaskAward:model.tid];
}
} else if ([model.jumpurl isEqualToString:@"yazhai://_room_share"]) {
// 进入直播间
if (model.state == 0 || model.state == 1 || model.state == -1) {
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
[self fus_getCurrentLiveroomFirstHot:model];
} else {
[self fus_getTaskAward:model.tid];
}
} else if ([model.jumpurl isEqualToString:@"yazhai://_invite_h5_share"]) {
// 分享H5
if (model.state == 0 || model.state == 1 || model.state == -1) {
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.shouldShowShareBtn = NO;
wkwVC.shouldIncludeIdentifyInfo = YES;
wkwVC.from = FUSFromInvitShare;
wkwVC.webUrlString = FUSCommonWebURLs.fus_agentInviteShare;
[self.navigationController pushViewController:wkwVC animated:YES];
} else {
[self fus_getTaskAward:model.tid];
}
} else if ([model.jumpurl isEqualToString:@"yazhai://_room_chat"]) {
// 进入直播间
if (model.state == 0 || model.state == 1 || model.state == -1) { if (model.state == 0 || model.state == 1 || model.state == -1) {
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}]; MJWeakSelf
[self fus_getCurrentLiveroomFirstHot:model]; [[FUSRouter userRouter] fus_handleTaskJumpActionWithJumpType:model.jumpurl tid:model.tid url:model.url success:^{
} else { [weakSelf fus_requestTaskCenterData];
[self fus_getTaskAward:model.tid];
}
} else if ([model.jumpurl isEqualToString:@"yazhai://_room_chip"]) {
// 进入直播间
if (model.state == 0 || model.state == 1 || model.state == -1) {
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_IS_ENTER_LIVEROOM_FROM_TASKCENTER];
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
[self fus_getCurrentLiveroomFirstHot:model];
} else {
[self fus_getTaskAward:model.tid];
}
} else if ([model.jumpurl isEqualToString:@"yazhai://_bind_invitecode"]) {
// 绑定邀请码
if (model.state == 0 || model.state == 1 || model.state == -1) {
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
FUSBoundAgentInfoView *agentView = [[FUSBoundAgentInfoView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH)];
agentView.bindingInvitationCodeSuccessBlock = ^{
[self fus_requestTaskCenterData];
};
agentView.leftTime = [self calculateLeftTime];
[agentView showWithView:[UIApplication sharedApplication].keyWindow];
} else {
[self fus_getTaskAward:model.tid];
}
} else if ([model.jumpurl isEqualToString:@"yazhai://_check_in"]) {
[FUSZoneHttpRequest fus_requestTodayTaskCheckInSuccess:^(FUSCheckInModel *model) {
if (model) {
[self fus_showDailyCheckInView:model];
}
} failure:^(NSString *msg, int code) {
[FUSDialogView fus_showDialog:msg];
}]; }];
} else if ([model.jumpurl isEqualToString:@"yazhai://_jump_url"]) {
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.webUrlString = model.url;
wkwVC.shouldIncludeIdentifyInfo = YES;
[self.navigationController pushViewController:wkwVC animated:YES];
} else if ([model.jumpurl isEqualToString:@"yazhai://_app_share"]) {
if (model.state == 0 || model.state == 1 || model.state == -1) {
[self fus_requestShareContent:[NSString stringWithFormat:@"%ld",(long)model.tid]];
} else {
[self fus_getTaskAward:model.tid];
}
} else if ([model.jumpurl isEqualToString:@"yazhai://_room_recharge"]) {
if (model.state == 0 || model.state == 1 || model.state == -1) {
[FUSRechargeViewController fus_showRechargeViewControllerForRootVC:self];
} else { } else {
[self fus_getTaskAward:model.tid]; if (model.missionType == 0
} || model.missionType == 4) {
}else if ([model.jumpurl isEqualToString:@"yazhai://_room_gift_panel"] || [self fus_getTaskRewardReceive:model];
[model.jumpurl isEqualToString:@"yazhai://_send_specify_gift"]) {
if (model.state == 0 || model.state == 1 || model.state == -1) {
[self fus_getCurrentLiveroomFirstHot:model];
} else { } else {
[self fus_getTaskAward:model.tid]; [self fus_getTaskAward:model.tid];
} }
}else if ([model.jumpurl isEqualToString:@"yazhai://_app_store_review"]) {
if (model.state == 0 || model.state == 1 || model.state == -1) {
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_UPDATE_REVIEW params:nil success:nil failure:nil];
NSURL *itunesStoreUrl = nil;
if (@available(iOS 11.0, *)) {
itunesStoreUrl = [NSURL URLWithString:[NSString stringWithFormat:@"itms-apps://itunes.apple.com/cn/app/id%@?mt=8&action=write-review",FUSConfig.sharedInstanced.appConfigs.appId]];
}else{
itunesStoreUrl = [NSURL URLWithString:[NSString stringWithFormat:@"http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=%@&pageNumber=0&sortOrdering=2&type=Purple+Software&mt=8",FUSConfig.sharedInstanced.appConfigs.appId]];
}
if ([[UIApplication sharedApplication] canOpenURL:itunesStoreUrl]) {
[[UIApplication sharedApplication] openURL:itunesStoreUrl];
} }
[self fus_requestTaskCenterData]; // if ([model.jumpurl isEqualToString:@"yazhai://_bind_phone"]) {
} else { // // 绑定手机号
[self fus_getTaskAward:model.tid]; // if (model.state == 0 || model.state == 1 || model.state == -1) {
} // [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
} else if ([model.jumpurl isEqualToString:@"yazhai://_jump_room"]) { // FUSPhoneAuthViewController *phoneBindingVc = [[FUSPhoneAuthViewController alloc]init];
// phoneBindingVc.phoneBindingSuccessBlock = ^{
// 进入直播间 //
if (model.state == 0 || model.state == 1 || model.state == -1) { // };
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_IS_ENTER_LIVEROOM_FROM_TASKCENTER]; // [self.navigationController pushViewController:phoneBindingVc animated:YES];
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}]; // } else {
[self fus_getCurrentLiveroomFirstHot:model]; // [self fus_getTaskAward:model.tid];
} else { // }
[self fus_getTaskAward:model.tid]; //
} // } else if ([model.jumpurl isEqualToString:@"yazhai://_account_set"]) {
} // // 绑定账号
else { // if (model.state == 0 || model.state == 1 || model.state == -1) {
if (typeModel.type.integerValue == 0 || typeModel.type.integerValue == 4) { // FUSSettingViewController *settingVC = [[FUSSettingViewController alloc] init];
[self fus_getTaskRewardReceive:model]; // [self.navigationController pushViewController:settingVC animated:YES];
}else { // } else {
[self fus_getTaskAward:model.tid]; // [self fus_getTaskAward:model.tid];
} // }
} //
// } else if ([model.jumpurl isEqualToString:@"yazhai://_live_started"]) {
// // 开启直播
// if (model.state == 0 || model.state == 1 || model.state == -1) {
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
//
// [FUSRouter.liveRouter fus_pushLive];
// } else {
// [self fus_getTaskAward:model.tid];
// }
//
// } else if ([model.jumpurl isEqualToString:@"yazhai://_room_share"]) {
//
// // 进入直播间
// if (model.state == 0 || model.state == 1 || model.state == -1) {
//
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
// [self fus_getCurrentLiveroomFirstHot:model];
// } else {
// [self fus_getTaskAward:model.tid];
// }
//
// } else if ([model.jumpurl isEqualToString:@"yazhai://_invite_h5_share"]) {
// // 分享H5
// if (model.state == 0 || model.state == 1 || model.state == -1) {
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
// FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
// wkwVC.shouldShowShareBtn = NO;
// wkwVC.shouldIncludeIdentifyInfo = YES;
// wkwVC.from = FUSFromInvitShare;
// wkwVC.webUrlString = FUSCommonWebURLs.fus_agentInviteShare;
// [self.navigationController pushViewController:wkwVC animated:YES];
// } else {
// [self fus_getTaskAward:model.tid];
// }
//
// } else if ([model.jumpurl isEqualToString:@"yazhai://_room_chat"]) {
// // 进入直播间
// if (model.state == 0 || model.state == 1 || model.state == -1) {
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
// [self fus_getCurrentLiveroomFirstHot:model];
// } else {
// [self fus_getTaskAward:model.tid];
// }
//
// } else if ([model.jumpurl isEqualToString:@"yazhai://_room_chip"]) {
// // 进入直播间
// if (model.state == 0 || model.state == 1 || model.state == -1) {
// [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_IS_ENTER_LIVEROOM_FROM_TASKCENTER];
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
// [self fus_getCurrentLiveroomFirstHot:model];
// } else {
// [self fus_getTaskAward:model.tid];
// }
// } else if ([model.jumpurl isEqualToString:@"yazhai://_bind_invitecode"]) {
// // 绑定邀请码
// if (model.state == 0 || model.state == 1 || model.state == -1) {
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
// FUSBoundAgentInfoView *agentView = [[FUSBoundAgentInfoView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH)];
// agentView.bindingInvitationCodeSuccessBlock = ^{
// [self fus_requestTaskCenterData];
// };
// agentView.leftTime = [self calculateLeftTime];
// [agentView showWithView:[UIApplication sharedApplication].keyWindow];
// } else {
// [self fus_getTaskAward:model.tid];
// }
// } else if ([model.jumpurl isEqualToString:@"yazhai://_check_in"]) {
// [FUSZoneHttpRequest fus_requestTodayTaskCheckInSuccess:^(FUSCheckInModel *model) {
// if (model) {
// [self fus_showDailyCheckInView:model];
// }
// } failure:^(NSString *msg, int code) {
// [FUSDialogView fus_showDialog:msg];
// }];
// } else if ([model.jumpurl isEqualToString:@"yazhai://_jump_url"]) {
// FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
// wkwVC.webUrlString = model.url;
// wkwVC.shouldIncludeIdentifyInfo = YES;
// [self.navigationController pushViewController:wkwVC animated:YES];
// } else if ([model.jumpurl isEqualToString:@"yazhai://_app_share"]) {
// if (model.state == 0 || model.state == 1 || model.state == -1) {
// [self fus_requestShareContent:[NSString stringWithFormat:@"%ld",(long)model.tid]];
// } else {
// [self fus_getTaskAward:model.tid];
// }
// } else if ([model.jumpurl isEqualToString:@"yazhai://_room_recharge"]) {
// if (model.state == 0 || model.state == 1 || model.state == -1) {
// [FUSRechargeViewController fus_showRechargeViewControllerForRootVC:self];
// } else {
// [self fus_getTaskAward:model.tid];
// }
// }else if ([model.jumpurl isEqualToString:@"yazhai://_room_gift_panel"] ||
// [model.jumpurl isEqualToString:@"yazhai://_send_specify_gift"]) {
// if (model.state == 0 || model.state == 1 || model.state == -1) {
// [self fus_getCurrentLiveroomFirstHot:model];
// } else {
// [self fus_getTaskAward:model.tid];
// }
// }else if ([model.jumpurl isEqualToString:@"yazhai://_app_store_review"]) {
// if (model.state == 0 || model.state == 1 || model.state == -1) {
//
// [FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_UPDATE_REVIEW params:nil success:nil failure:nil];
// NSURL *itunesStoreUrl = nil;
// if (@available(iOS 11.0, *)) {
// itunesStoreUrl = [NSURL URLWithString:[NSString stringWithFormat:@"itms-apps://itunes.apple.com/cn/app/id%@?mt=8&action=write-review",FUSConfig.sharedInstanced.appConfigs.appId]];
// }else{
// itunesStoreUrl = [NSURL URLWithString:[NSString stringWithFormat:@"http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=%@&pageNumber=0&sortOrdering=2&type=Purple+Software&mt=8",FUSConfig.sharedInstanced.appConfigs.appId]];
// }
// if ([[UIApplication sharedApplication] canOpenURL:itunesStoreUrl]) {
// [[UIApplication sharedApplication] openURL:itunesStoreUrl];
// }
//
// [self fus_requestTaskCenterData];
// } else {
// [self fus_getTaskAward:model.tid];
// }
// } else if ([model.jumpurl isEqualToString:@"yazhai://_jump_room"]) {
//
// // 进入直播间
// if (model.state == 0 || model.state == 1 || model.state == -1) {
// [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_IS_ENTER_LIVEROOM_FROM_TASKCENTER];
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_TASKCENTER_TOCOMPLETE label:@"" parameters:@{@"taskid":@(model.tid)}];
// [self fus_getCurrentLiveroomFirstHot:model];
// } else {
// [self fus_getTaskAward:model.tid];
// }
// }
// else {
// if (typeModel.type.integerValue == 0 || typeModel.type.integerValue == 4) {
// [self fus_getTaskRewardReceive:model];
// }else {
// [self fus_getTaskAward:model.tid];
// }
// }
} }
- (CGFloat)calculateLeftTime { - (CGFloat)calculateLeftTime {
......
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