Skip to content

pidan / FuSiLive

Go to a project
Commit 423894b0 by suolong
Options

提交bug处理

parent f46eb385
Inline Side-by-side
Showing with 38 additions and 18 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
......@@ -720,6 +720,7 @@
00CD269C2F5956D100A07432 /* pk_multi_round_result_state_pending_animation@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 00CD26972F5956D100A07432 /* pk_multi_round_result_state_pending_animation@2x.png */; };
00CD269D2F5956D100A07432 /* pk_multi_round_result_state_draw_animation.webp in Resources */ = {isa = PBXBuildFile; fileRef = 00CD26962F5956D100A07432 /* pk_multi_round_result_state_draw_animation.webp */; };
00CD26BD2F5A877E00A07432 /* live_bottom_tool_gift_guide_animate.webp in Resources */ = {isa = PBXBuildFile; fileRef = 00CD26BC2F5A877E00A07432 /* live_bottom_tool_gift_guide_animate.webp */; };
00CD26BF2F5A877E00A07432 /* live_bottom_tool_gift_animate.webp in Resources */ = {isa = PBXBuildFile; fileRef = 00CD26BE2F5A877E00A07432 /* live_bottom_tool_gift_animate.webp */; };
00D25B962D3113CE00666959 /* FUSLiveRecordsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D25B8B2D3113CE00666959 /* FUSLiveRecordsController.swift */; };
00D25B972D3113CE00666959 /* FUSUserLiveAssessHistoryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00D25B8E2D3113CE00666959 /* FUSUserLiveAssessHistoryModel.m */; };
00D25B982D3113CE00666959 /* FUSLiveRecordsHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D25B912D3113CE00666959 /* FUSLiveRecordsHeaderView.swift */; };
......@@ -3134,6 +3135,7 @@
00CD26972F5956D100A07432 /* pk_multi_round_result_state_pending_animation@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pk_multi_round_result_state_pending_animation@2x.png"; sourceTree = "<group>"; };
00CD26982F5956D100A07432 /* pk_multi_round_result_state_red_win_animation.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = pk_multi_round_result_state_red_win_animation.webp; sourceTree = "<group>"; };
00CD26BC2F5A877E00A07432 /* live_bottom_tool_gift_guide_animate.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = live_bottom_tool_gift_guide_animate.webp; sourceTree = "<group>"; };
00CD26BE2F5A877E00A07432 /* live_bottom_tool_gift_animate.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = live_bottom_tool_gift_animate.webp; sourceTree = "<group>"; };
00D25B8B2D3113CE00666959 /* FUSLiveRecordsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveRecordsController.swift; sourceTree = "<group>"; };
00D25B8D2D3113CE00666959 /* FUSUserLiveAssessHistoryModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSUserLiveAssessHistoryModel.h; sourceTree = "<group>"; };
00D25B8E2D3113CE00666959 /* FUSUserLiveAssessHistoryModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSUserLiveAssessHistoryModel.m; sourceTree = "<group>"; };
......@@ -8768,6 +8770,7 @@
BEF675ED2C6B156500A670FB /* live_pk_background_image.png */,
00A1DCF62CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp */,
00CD26BC2F5A877E00A07432 /* live_bottom_tool_gift_guide_animate.webp */,
00CD26BE2F5A877E00A07432 /* live_bottom_tool_gift_animate.webp */,
004773252F5C281300E46A79 /* liveRoom_newComer_gift_animate.webp */,
BEF675EE2C6B156500A670FB /* live_treasure_box_bg_img.png */,
00E2A7C82F20B8C9003B779E /* pk_start_sound_go.mp3 */,
......@@ -10292,6 +10295,7 @@
BEF6775D2C6B156600A670FB /* PK_Win_Animation_16@2x.png in Resources */,
BEF6763B2C6B156500A670FB /* 2_live_activity_first_charge_bg_18.png in Resources */,
00CD26BD2F5A877E00A07432 /* live_bottom_tool_gift_guide_animate.webp in Resources */,
00CD26BF2F5A877E00A07432 /* live_bottom_tool_gift_animate.webp in Resources */,
BEF6777D2C6B156600A670FB /* PK_Win_Animation_48@2x.png in Resources */,
BEF677622C6B156600A670FB /* PK_Win_Animation_21@2x.png in Resources */,
BEF676182C6B156500A670FB /* 1_live_activity_first_charge_bg_13.png in Resources */,
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/FUSHomeView.m
......@@ -354,7 +354,14 @@
case FUSHomeNaviViewClickTypeRank:{
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.needHideWebTitleBar = YES;
[wkwVC fus_hideCloseBtn];
wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.rankAddress;
__weak typeof(wkwVC) weakWebVC = wkwVC;
wkwVC.closeWebViewHandler = ^(NSInteger cidType) {
if (cidType == 14) {
[weakWebVC.navigationController popViewControllerAnimated:YES];
}
};
[self.parentController.navigationController pushViewController:wkwVC animated:YES];
}
break;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.m
......@@ -1452,6 +1452,10 @@ static NSInteger const kFUSShowTimeBuyVerifyMinimumDelayMs = 1000;
UIView *rootView = strongSelf.liveVC.view ?: [UIViewController fus_topViewController].view;
NSString *channelId = [dataModel.roomData.channelId description] ?: @"";
NSString *roundId = [dataModel.roomData.roundId description] ?: @"";
NSString *anchorUid = [dataModel.roomData.roomId description];
if ([NSString isNull:anchorUid]) {
anchorUid = roomId;
}
[strongSelf.liveVC fus_setupScrollEnable:NO];
strongSelf.liveVC.backgroundImageView.hidden = YES;
......@@ -1466,7 +1470,7 @@ static NSInteger const kFUSShowTimeBuyVerifyMinimumDelayMs = 1000;
return;
}
if (action == FUSPayRoomEntryMainViewActionAvatar) {
[strongSelf fus_enterUserZoneWithUid:uid];
[strongSelf fus_enterUserZoneWithUid:anchorUid];
return;
}
if (action == FUSPayRoomEntryMainViewActionDismiss) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
......@@ -510,20 +510,10 @@
}
case FUSLiveBottomToolTypeGift:
{
if (isSelect){
image = [UIImage fus_liveGiftImage_normal];
// image = [FUSShowRoomCenterBunble imageNamed:@"live_chat_icon_gift_type2"];
// [self.giftBtn setImage:image forState:UIControlStateHighlighted];
self.giftBtn.customImageView.image = image;
}
else
{
image = [UIImage fus_liveGiftImage_normal];
// image = [FUSShowRoomCenterBunble imageNamed:@"live_chat_icon_gift_type2"];
// [self.giftBtn setImage:image forState:UIControlStateNormal];
self.giftBtn.customImageView.image = image;
image = [FUSShowRoomCenterBunble webpImageName:@"live_bottom_tool_gift_animate" scale:2];
self.giftBtn.customImageView.image = image;
if (!isSelect) {
btn = self.giftBtn;
}
break;
}
......@@ -1613,7 +1603,7 @@
if (!_giftBtn) {
_giftBtn = [FUSLiveBottomToolCustomImageSizeButton buttonWithType:UIButtonTypeCustom];
_giftBtn.tag = FUSLiveBottomToolTypeGift;
[_giftBtn fus_setImageInset:-6];
[_giftBtn fus_setImageInset:-2];
if (!_giftGuideImageView) {
NSData *resourceData = [NSData dataWithContentsOfFile:[[FUSShowRoomCenterBunble bundle] pathForResource:@"live_bottom_tool_gift_guide_animate.webp" ofType:nil]];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolWebpButton.swift
......@@ -29,8 +29,8 @@ import UIKit
/// 可以让图片大，但是按钮小的按钮
@objc public class FUSLiveBottomToolCustomImageSizeButton: UIButton {
@objc public lazy var customImageView: UIImageView = {
let imageView = UIImageView()
@objc public lazy var customImageView: YYAnimatedImageView = {
let imageView = YYAnimatedImageView()
imageView.isUserInteractionEnabled = false
self.addSubview(imageView)
......@@ -43,7 +43,8 @@ import UIKit
@objc public func fus_setImageInset(_ inset: CGFloat) {
self.customImageView.snp.remakeConstraints { make in
make.center.equalToSuperview()
make.centerX.equalToSuperview().offset(2)
make.centerY.equalToSuperview()
make.size.equalToSuperview().inset(inset)
}
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NovaList/FUSHomeNovaListViewController.m
......@@ -260,8 +260,15 @@
-(void)fus_rankBtnDidClicked:(UIButton *)btn{
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.needHideWebTitleBar = YES;
[wkwVC fus_hideCloseBtn];
wkwVC.closeToPopAllWebView = NO;
wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.rankAddress;
__weak typeof(wkwVC) weakWebVC = wkwVC;
wkwVC.closeWebViewHandler = ^(NSInteger cidType) {
if (cidType == 14) {
[weakWebVC.navigationController popViewControllerAnimated:YES];
}
};
[self.navigationController pushViewController:wkwVC animated:YES];
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
......@@ -361,7 +361,14 @@
- (FUSWKWebViewController *)fus_enterVIPVC {
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.needHideWebTitleBar = YES;
[wkwVC fus_hideCloseBtn];
wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.vipOpenAddress;
__weak typeof(wkwVC) weakWebVC = wkwVC;
wkwVC.closeWebViewHandler = ^(NSInteger cidType) {
if (cidType == 14) {
[weakWebVC.navigationController popViewControllerAnimated:YES];
}
};
return wkwVC;
}
......
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