Skip to content

pidan / FuSiLive

Go to a project
Commit 3058fb14 by pidan
Options

修复线上闪退

parent 53528c31
Inline Side-by-side
Showing with 26 additions and 12 deletions
DevelopmentPods/FUSBDAlphaPlayer/FUSBDAlphaPlayer/Classes/BDAlphaPlayerMetalView.m
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
self.mtkView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; self.mtkView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
self.mtkView.backgroundColor = UIColor.clearColor; self.mtkView.backgroundColor = UIColor.clearColor;
self.mtkView.device = MTLCreateSystemDefaultDevice(); self.mtkView.device = MTLCreateSystemDefaultDevice();
if (@available(iOS 15.0, *)) { if (@available(iOS 16.0, *)) {
self.mtkView.colorPixelFormat = MTLPixelFormatRGBA8Unorm; self.mtkView.colorPixelFormat = MTLPixelFormatRGBA8Unorm;
} else { } else {
self.mtkView.colorPixelFormat = MTLPixelFormatBGRA8Unorm; self.mtkView.colorPixelFormat = MTLPixelFormatBGRA8Unorm;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/AlertView/FUSSevenDayCheckinAlertView.m
...@@ -229,8 +229,9 @@ ...@@ -229,8 +229,9 @@
NSUserDefaults *userDefault = [[NSUserDefaults alloc] initWithSuiteName:[FUSCacheDataShare shareStore].userDetailInfo.uid]; NSUserDefaults *userDefault = [[NSUserDefaults alloc] initWithSuiteName:[FUSCacheDataShare shareStore].userDetailInfo.uid];
NSInteger currentTime = (NSInteger)[[NSDate date] timeIntervalSince1970]; NSInteger currentTime = (NSInteger)[[NSDate date] timeIntervalSince1970];
[userDefault setInteger:currentTime + model.nextTime forKey:FUSSevenDayCheckinStore_nextCheckInTimeUDKey]; [userDefault setInteger:currentTime + model.nextTime forKey:FUSSevenDayCheckinStore_nextCheckInTimeUDKey];
if (weakSelf.dismissHandler) {
weakSelf.dismissHandler(); weakSelf.dismissHandler();
}
[weakSelf removeFromSuperview]; [weakSelf removeFromSuperview];
FUSCheckInRewardItemModel *rewardModel = model.rewardList.firstObject; FUSCheckInRewardItemModel *rewardModel = model.rewardList.firstObject;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m
...@@ -1787,18 +1787,18 @@ typedef NS_ENUM(NSInteger, FUSStreamState) { ...@@ -1787,18 +1787,18 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
[weakSelf.endedView fus_updateLikeBtnWithIsLike:NO]; [weakSelf.endedView fus_updateLikeBtnWithIsLike:NO];
[[[FUSLiveHelper shareInstance] roomInfoModel] setLiked:@"0"]; [[[FUSLiveHelper shareInstance] roomInfoModel] setLiked:@"0"];
[FUSDialogView fus_showDialog:[NSString fus_localString:@"取消追踪成功"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"取消追踪成功"]];
[[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_FocusBaoFang_Refresh object:@{@"roomId":[[[FUSLiveHelper shareInstance] roomInfoModel] roomId],@"like":@(NO)}]; [[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_FocusBaoFang_Refresh object:@{@"roomId":[[[FUSLiveHelper shareInstance] roomInfoModel] roomId] ?: @"",@"like":@(NO)}];
} failure:^(NSString *msg, int code) { } failure:^(NSString *msg, int code) {
[FUSDialogView fus_showDialog:msg]; [FUSDialogView fus_showDialog:msg];
}]; }];
} else { } else {
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_ENDROOM_FOLLOW label:nil parameters:@{@"fid":[[[FUSLiveHelper shareInstance] roomInfoModel] roomId]}]; [FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_ENDROOM_FOLLOW label:nil parameters:@{@"fid":[[[FUSLiveHelper shareInstance] roomInfoModel] roomId] ?: @""}];
// 未追踪,执行追踪 // 未追踪,执行追踪
[FUSLiveHttpHelper fus_likeRoomWithRoomId:[[[FUSLiveHelper shareInstance] roomInfoModel] roomId] success:^{ [FUSLiveHttpHelper fus_likeRoomWithRoomId:[[[FUSLiveHelper shareInstance] roomInfoModel] roomId] success:^{
[weakSelf.endedView fus_updateLikeBtnWithIsLike:YES]; [weakSelf.endedView fus_updateLikeBtnWithIsLike:YES];
[[[FUSLiveHelper shareInstance] roomInfoModel] setLiked:@"1"]; [[[FUSLiveHelper shareInstance] roomInfoModel] setLiked:@"1"];
[FUSDialogView fus_showDialog:[NSString fus_localString:@"追踪成功"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"追踪成功"]];
[[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_FocusBaoFang_Refresh object:@{@"roomId":[[[FUSLiveHelper shareInstance] roomInfoModel] roomId],@"like":@(YES)}]; [[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_FocusBaoFang_Refresh object:@{@"roomId":[[[FUSLiveHelper shareInstance] roomInfoModel] roomId] ?: @"",@"like":@(YES)}];
} failure:^(NSString *msg, int code) { } failure:^(NSString *msg, int code) {
[FUSDialogView fus_showDialog:msg]; [FUSDialogView fus_showDialog:msg];
}]; }];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHttpHelper.m
...@@ -2577,6 +2577,11 @@ ...@@ -2577,6 +2577,11 @@
/// @param succeed 成功 /// @param succeed 成功
/// @param failure 失败 /// @param failure 失败
+ (void)fus_requestLivePraiseSendWithRoomId:(NSString *)roomId num:(NSInteger)num succeed:(void (^)(void))succeed failure:(void (^)(NSString *, NSInteger))failure{ + (void)fus_requestLivePraiseSendWithRoomId:(NSString *)roomId num:(NSInteger)num succeed:(void (^)(void))succeed failure:(void (^)(NSString *, NSInteger))failure{
if ([NSString isNullWithString:roomId]) {
return;
}
NSDictionary *parm = @{@"roomId": roomId, NSDictionary *parm = @{@"roomId": roomId,
@"num":[NSString stringWithFormat:@"%ld",num]}; @"num":[NSString stringWithFormat:@"%ld",num]};
[FUSHttpHelper postRequestBinaryWithUrl:FUSShowRoomURLs.fus_URL_ROOM_PRAISE_SEND params:parm success:^(NSDictionary * _Nullable dataDict, int code) { [FUSHttpHelper postRequestBinaryWithUrl:FUSShowRoomURLs.fus_URL_ROOM_PRAISE_SEND params:parm success:^(NSDictionary * _Nullable dataDict, int code) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FunctionViewHelper/FUSLiveChatDataSourceHelper.m
...@@ -1700,11 +1700,15 @@ ...@@ -1700,11 +1700,15 @@
for (NSString *remindKey in FUSLiveHelper.shareInstance.roomInfoModel.reminderKeys) { for (NSString *remindKey in FUSLiveHelper.shareInstance.roomInfoModel.reminderKeys) {
NSString *remindStr = FUSCacheDataShare.shareStore.roomRemindDict[remindKey]; NSString *remindStr = FUSCacheDataShare.shareStore.roomRemindDict[remindKey];
if (![NSString isNullWithString:remindStr]) {
NSString *shownStr = [remindStr stringByReplacingOccurrencesOfString:@"{anchornick}" withString:anchornick];
shownStr = [shownStr stringByReplacingOccurrencesOfString:@"{usernick}" withString:usernick]; NSString *shownStr = [remindStr stringByReplacingOccurrencesOfString:@"{anchornick}" withString:anchornick];
[message appendString:shownStr]; shownStr = [shownStr stringByReplacingOccurrencesOfString:@"{usernick}" withString:usernick];
[message appendString:@"<br>"]; if (![NSString isNullWithString:remindStr]) {
[message appendString:remindStr];
[message appendString:@"<br>"];
}
}
} }
model.type = STR(CID_ACTIVE_SYSTEM_WARNING); model.type = STR(CID_ACTIVE_SYSTEM_WARNING);
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceListView.m
...@@ -183,6 +183,10 @@ ...@@ -183,6 +183,10 @@
- (void)fus_loadData { - (void)fus_loadData {
if ([NSString isNullWithString:FUSLiveHelper.shareInstance.roomInfoModel.roomId]) {
return;
}
NSDictionary *params = @{ NSDictionary *params = @{
@"roomId":FUSLiveHelper.shareInstance.roomInfoModel.roomId, @"roomId":FUSLiveHelper.shareInstance.roomInfoModel.roomId,
@"type":@(self.isVipOnly ? 1 : 0), @"type":@(self.isVipOnly ? 1 : 0),
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLivePortraitView.m
...@@ -816,7 +816,7 @@ ...@@ -816,7 +816,7 @@
// [self.likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_tick_btn"] forState:UIControlStateNormal]; // [self.likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_tick_btn"] forState:UIControlStateNormal];
[FUSDialogView fus_showDialog:[NSString fus_localString:@"追踪成功"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"追踪成功"]];
[[FUSLiveHelper shareInstance]roomInfoModel].liked = @"1"; [[FUSLiveHelper shareInstance]roomInfoModel].liked = @"1";
[[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_FocusBaoFang_Refresh object:@{@"roomId":self.currentModel.roomId,@"like":@(YES)}]; [[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_FocusBaoFang_Refresh object:@{@"roomId":self.currentModel.roomId ?: @"",@"like":@(YES)}];
} }
} }
......
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