Skip to content

pidan / FuSiLive

Go to a project
Commit 167d57d8 by suolong
Options

Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… 

Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
parents 00aee5e3 e70b84b1
Expand all
Inline Side-by-side
Showing with 36 additions and 8 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Http/FUSHttpHelper.m
...@@ -142,7 +142,8 @@ ...@@ -142,7 +142,8 @@
} }
// 打印解析结果 // 打印解析结果
if(FUSConfig.sharedInstanced.devConfigs.enableHttpDebug){ if(FUSConfig.sharedInstanced.devConfigs.enableHttpDebug){
NSLog(@"--->URL:%@\n%@",urlStr,[dataDict dictToUTF8String]); // NSLog(@"--->URL:%@\n%@",urlStr,[dataDict dictToUTF8String]);
NSLog(@"--->URL:%@\n%@",urlStr,dataDict);
} }
// 判断空值 // 判断空值
...@@ -351,7 +352,8 @@ ...@@ -351,7 +352,8 @@
} }
// 打印解析结果 // 打印解析结果
if(FUSConfig.sharedInstanced.devConfigs.enableHttpDebug){ if(FUSConfig.sharedInstanced.devConfigs.enableHttpDebug){
NSLog(@"--->URL:%@\n%@",urlStr,[dataDict dictToUTF8String]); // NSLog(@"--->URL:%@\n%@",urlStr,[dataDict dictToUTF8String]);
NSLog(@"--->URL:%@\n%@",urlStr,dataDict);
} }
// 判断空值 // 判断空值
...@@ -983,7 +985,8 @@ ...@@ -983,7 +985,8 @@
} }
// 打印解析结果 // 打印解析结果
if(FUSConfig.sharedInstanced.devConfigs.enableHttpDebug){ if(FUSConfig.sharedInstanced.devConfigs.enableHttpDebug){
NSLog(@"--->URL:%@\n%@",urlStr,[dataDict dictToUTF8String]); // NSLog(@"--->URL:%@\n%@",urlStr,[dataDict dictToUTF8String]);
NSLog(@"--->URL:%@\n%@",urlStr,dataDict);
} }
// 判断空值 // 判断空值
......
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 = 202506260028; CURRENT_PROJECT_VERSION = 202506260030;
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 = 202506260028; CURRENT_PROJECT_VERSION = 202506260030;
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.xcodeproj/project.pbxproj
...@@ -692,6 +692,7 @@ ...@@ -692,6 +692,7 @@
00CD269B2F5956D100A07432 /* pk_multi_round_result_state_blue_lose_animation.webp in Resources */ = {isa = PBXBuildFile; fileRef = 00CD26952F5956D100A07432 /* pk_multi_round_result_state_blue_lose_animation.webp */; }; 00CD269B2F5956D100A07432 /* pk_multi_round_result_state_blue_lose_animation.webp in Resources */ = {isa = PBXBuildFile; fileRef = 00CD26952F5956D100A07432 /* pk_multi_round_result_state_blue_lose_animation.webp */; };
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 */; }; 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 */; }; 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 */; };
00D25B962D3113CE00666959 /* FUSLiveRecordsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D25B8B2D3113CE00666959 /* FUSLiveRecordsController.swift */; }; 00D25B962D3113CE00666959 /* FUSLiveRecordsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D25B8B2D3113CE00666959 /* FUSLiveRecordsController.swift */; };
00D25B972D3113CE00666959 /* FUSUserLiveAssessHistoryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00D25B8E2D3113CE00666959 /* FUSUserLiveAssessHistoryModel.m */; }; 00D25B972D3113CE00666959 /* FUSUserLiveAssessHistoryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00D25B8E2D3113CE00666959 /* FUSUserLiveAssessHistoryModel.m */; };
00D25B982D3113CE00666959 /* FUSLiveRecordsHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D25B912D3113CE00666959 /* FUSLiveRecordsHeaderView.swift */; }; 00D25B982D3113CE00666959 /* FUSLiveRecordsHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D25B912D3113CE00666959 /* FUSLiveRecordsHeaderView.swift */; };
...@@ -3012,6 +3013,7 @@ ...@@ -3012,6 +3013,7 @@
00CD26962F5956D100A07432 /* pk_multi_round_result_state_draw_animation.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = pk_multi_round_result_state_draw_animation.webp; sourceTree = "<group>"; }; 00CD26962F5956D100A07432 /* pk_multi_round_result_state_draw_animation.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = pk_multi_round_result_state_draw_animation.webp; sourceTree = "<group>"; };
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>"; }; 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>"; }; 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>"; };
00D25B8B2D3113CE00666959 /* FUSLiveRecordsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveRecordsController.swift; 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>"; }; 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>"; }; 00D25B8E2D3113CE00666959 /* FUSUserLiveAssessHistoryModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSUserLiveAssessHistoryModel.m; sourceTree = "<group>"; };
...@@ -8404,6 +8406,7 @@ ...@@ -8404,6 +8406,7 @@
BEF675EC2C6B156500A670FB /* live_linkmic_bgImg.png */, BEF675EC2C6B156500A670FB /* live_linkmic_bgImg.png */,
BEF675ED2C6B156500A670FB /* live_pk_background_image.png */, BEF675ED2C6B156500A670FB /* live_pk_background_image.png */,
00A1DCF62CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp */, 00A1DCF62CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp */,
00CD26BC2F5A877E00A07432 /* live_bottom_tool_gift_guide_animate.webp */,
BEF675EE2C6B156500A670FB /* live_treasure_box_bg_img.png */, BEF675EE2C6B156500A670FB /* live_treasure_box_bg_img.png */,
00E2A7C82F20B8C9003B779E /* pk_start_sound_go.mp3 */, 00E2A7C82F20B8C9003B779E /* pk_start_sound_go.mp3 */,
00E2A7C92F20B8C9003B779E /* pk_start_sound_ready.mp3 */, 00E2A7C92F20B8C9003B779E /* pk_start_sound_ready.mp3 */,
...@@ -9897,6 +9900,7 @@ ...@@ -9897,6 +9900,7 @@
BEF678092C6B156600A670FB /* box_00003.png in Resources */, BEF678092C6B156600A670FB /* box_00003.png in Resources */,
BEF6775D2C6B156600A670FB /* PK_Win_Animation_16@2x.png in Resources */, BEF6775D2C6B156600A670FB /* PK_Win_Animation_16@2x.png in Resources */,
BEF6763B2C6B156500A670FB /* 2_live_activity_first_charge_bg_18.png in Resources */, BEF6763B2C6B156500A670FB /* 2_live_activity_first_charge_bg_18.png in Resources */,
00CD26BD2F5A877E00A07432 /* live_bottom_tool_gift_guide_animate.webp in Resources */,
BEF6777D2C6B156600A670FB /* PK_Win_Animation_48@2x.png in Resources */, BEF6777D2C6B156600A670FB /* PK_Win_Animation_48@2x.png in Resources */,
00A66C3E2CCA21F600F366E9 /* PK_Cover_Animation_12.png in Resources */, 00A66C3E2CCA21F600F366E9 /* PK_Cover_Animation_12.png in Resources */,
BEF677622C6B156600A670FB /* PK_Win_Animation_21@2x.png in Resources */, BEF677622C6B156600A670FB /* PK_Win_Animation_21@2x.png in Resources */,
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolManager.h
...@@ -19,9 +19,9 @@ typedef enum : NSInteger { ...@@ -19,9 +19,9 @@ typedef enum : NSInteger {
FUSLiveBottomToolTypeScreenShot, // 截图按钮 FUSLiveBottomToolTypeScreenShot, // 截图按钮
FUSLiveBottomToolTypeMessageBox, // 单聊消息盒子 FUSLiveBottomToolTypeMessageBox, // 单聊消息盒子
FUSLiveBottomToolTypePK, // PK按钮 FUSLiveBottomToolTypePK, // PK按钮
FUSLiveBottomToolTypeGameEntrance, // 游戏入口 FUSLiveBottomToolTypeGameEntrance, // 游戏入口,就是类似于转盘那个，需要网络请求icon的
FUSLiveBottomToolTypeInteractionGameEntrance, // 互动游戏入口 FUSLiveBottomToolTypeInteractionGameEntrance, // 互动游戏入口，就是有很多游戏的按钮
FUSLiveBottomToolTypePKGameEntrance, // PK游戏入口 FUSLiveBottomToolTypePKGameEntrance, // PK游戏入口，就是游戏pk才会突然出现那个，fusi没有
FUSLiveBottomToolTypeTask, // 任务入口 FUSLiveBottomToolTypeTask, // 任务入口
FUSLiveBottomToolTypeExchange, // 兑换入口 FUSLiveBottomToolTypeExchange, // 兑换入口
FUSLiveBottomToolTypeFirstCharge, // 首充按钮 FUSLiveBottomToolTypeFirstCharge, // 首充按钮
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LiveGame/Model/FUSLiveGameModel.h
...@@ -39,6 +39,8 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -39,6 +39,8 @@ NS_ASSUME_NONNULL_BEGIN
/// 游戏样式参数，参考之前网页与客户端约定那套样式 /// 游戏样式参数，参考之前网页与客户端约定那套样式
@property (nonatomic, copy) NSDictionary *popupStyle; @property (nonatomic, copy) NSDictionary *popupStyle;
@property (nonatomic, copy) NSString *popupStyleString;
@end @end
@interface FUSLivePlayModel : FUSBaseModel @interface FUSLivePlayModel : FUSBaseModel
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LiveGame/Model/FUSLiveGameModel.m
...@@ -20,6 +20,24 @@ ...@@ -20,6 +20,24 @@
@implementation FUSLiveGameModel @implementation FUSLiveGameModel
+ (NSDictionary *)modelCustomPropertyMapper {
return @{@"popupStyleString": @"popupStyle"};
}
- (void)setPopupStyleString:(NSString *)popupStyleString {
_popupStyleString = popupStyleString;
// 1. 将 JSON 字符串转换为 NSData
NSData *jsonData = [popupStyleString dataUsingEncoding:NSUTF8StringEncoding];
// 2. 使用 NSJSONSerialization 将 JSON 数据解析为 NSDictionary
NSError *error = nil;
id jsonObject = [NSJSONSerialization JSONObjectWithData:jsonData
options:NSJSONReadingMutableContainers
error:&error];
self.popupStyle = jsonObject;
}
@end @end
@implementation FUSLivePlayModel @implementation FUSLivePlayModel
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/FUSPKGiftBombInfoPanelView.swift
...@@ -57,6 +57,7 @@ class FUSPKGiftBombInfoPanelView: FUSBaseView { ...@@ -57,6 +57,7 @@ class FUSPKGiftBombInfoPanelView: FUSBaseView {
if giftBombModel.status != 1 { if giftBombModel.status != 1 {
// 系统不显示 // 系统不显示
self.isHidden = true self.isHidden = true
return
} }
self.isHidden = false self.isHidden = false
......
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