Skip to content

pidan / FuSiLive

Go to a project
Commit 0fef18ce by ludi
Options

修复一些bug

parent 0f8db65f
Inline Side-by-side
Showing with 21 additions and 11 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/MediaPreview/FUSMediaPreviewCell.m
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
self.previewImageView.contentMode = UIViewContentModeScaleAspectFit; self.previewImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.previewImageScrollView addSubview:self.previewImageView]; [self.previewImageScrollView addSubview:self.previewImageView];
self.playView = [[FUSStreamVideoPlayView alloc] initWithFrame:self.bgView.bounds]; self.playView = [[FUSByteStreamVideoPlayView alloc] initWithFrame:self.bgView.bounds];
self.playView.contentMode = UIViewContentModeScaleAspectFit; self.playView.contentMode = UIViewContentModeScaleAspectFit;
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
self.playView.playingStatusDidChangedHandler = ^(FUSVideoPlayerPlayState playStatus) { self.playView.playingStatusDidChangedHandler = ^(FUSVideoPlayerPlayState playStatus) {
......
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 = 202506260041; CURRENT_PROJECT_VERSION = 202506260043;
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 = 202506260041; CURRENT_PROJECT_VERSION = 202506260043;
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/NewLive/Main/Other/FUSLiveHttpHelper.m
...@@ -2305,7 +2305,8 @@ ...@@ -2305,7 +2305,8 @@
success:(void (^)(NSArray<FUSLiveStickerModel *> *list))success success:(void (^)(NSArray<FUSLiveStickerModel *> *list))success
failure:(void (^)(NSString *msg, int code))failure { failure:(void (^)(NSString *msg, int code))failure {
NSDictionary *params = @{@"roomId":roomId}; NSDictionary *params = @{@"roomId":roomId,
@"beautyVersion": @"443"};
[FUSHttpHelper postRequestBinaryWithUrl:FUSShowRoomURLs.fus_URL_LIVE_STICKER_LIST params:params success:^(NSDictionary *dataDict, int code) { [FUSHttpHelper postRequestBinaryWithUrl:FUSShowRoomURLs.fus_URL_LIVE_STICKER_LIST params:params success:^(NSDictionary *dataDict, int code) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
...@@ -1296,7 +1296,7 @@ BDAlphaPlayerMetalViewDelegate ...@@ -1296,7 +1296,7 @@ BDAlphaPlayerMetalViewDelegate
emitter.horizontalOffsetRange = 80; emitter.horizontalOffsetRange = 80;
emitter.intervalTime = .1; emitter.intervalTime = .1;
[emitter fus_regisetCellWithName:NSStringFromClass([FUSEmitterViewCell class]) reuseIdentifier:EMITTER_REUSE_IDENTIFIER]; [emitter fus_regisetCellWithName:NSStringFromClass([FUSEmitterViewCell class]) reuseIdentifier:EMITTER_REUSE_IDENTIFIER];
[_contentView addSubview:emitter]; [[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:emitter];
self.emitter = emitter; self.emitter = emitter;
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/FUSPKScoreProgressView.swift
...@@ -172,8 +172,8 @@ class FUSPKScoreProgressView: FUSBaseView { ...@@ -172,8 +172,8 @@ class FUSPKScoreProgressView: FUSBaseView {
} }
self.giftBombProgressLightImageView.snp.makeConstraints { make in self.giftBombProgressLightImageView.snp.makeConstraints { make in
make.centerY.equalToSuperview().offset(-0.5) make.centerY.equalToSuperview()
make.centerX.equalTo(self.rightProgress.snp.left).offset(0) make.centerX.equalTo(self.rightProgress.snp.left).offset(-1)
} }
leftBtn.snp.makeConstraints { make in leftBtn.snp.makeConstraints { make in
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/View/FUSPKScoreProgressLargeSmallView.swift
...@@ -185,8 +185,8 @@ class FUSPKScoreProgressLargeSmallView: FUSBaseView { ...@@ -185,8 +185,8 @@ class FUSPKScoreProgressLargeSmallView: FUSBaseView {
} }
self.giftBombProgressLightImageView.snp.makeConstraints { make in self.giftBombProgressLightImageView.snp.makeConstraints { make in
make.centerY.equalToSuperview().offset(-0.5) make.centerY.equalToSuperview()
make.centerX.equalTo(self.leftProgress.snp.right).offset(0) make.centerX.equalTo(self.leftProgress.snp.right).offset(-1)
} }
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m
...@@ -720,7 +720,10 @@ FUSImagePickerViewControllerDelegate> ...@@ -720,7 +720,10 @@ FUSImagePickerViewControllerDelegate>
#pragma mark - UICollectionViewDelegate #pragma mark - UICollectionViewDelegate
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
FUSPublishPhotoCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath]; FUSPublishPhotoCollectionViewCell *cell = (FUSPublishPhotoCollectionViewCell *)[collectionView cellForItemAtIndexPath:indexPath];
if (!cell) {
return;
}
// [self.view endEditing:YES]; // [self.view endEditing:YES];
[self.inputTextView resignFirstResponder]; [self.inputTextView resignFirstResponder];
...@@ -769,11 +772,17 @@ FUSImagePickerViewControllerDelegate> ...@@ -769,11 +772,17 @@ FUSImagePickerViewControllerDelegate>
for (int i = 0; i < _images.count - 1; i++) { for (int i = 0; i < _images.count - 1; i++) {
WGUploadFileModel *model = _images[i]; WGUploadFileModel *model = _images[i];
// 去除令牌后缀
NSURLComponents *pathURLComponents = [[NSURLComponents alloc] initWithURL:model.videoLocalUrl resolvingAgainstBaseURL:NO];
pathURLComponents.fragment = nil;
NSURL *pathURL = pathURLComponents.URL;
FUSMediaPreviewModel *media = [[FUSMediaPreviewModel alloc] init]; FUSMediaPreviewModel *media = [[FUSMediaPreviewModel alloc] init];
media.mediaType = FUSMediaPreviewModelTypeVideo; media.mediaType = FUSMediaPreviewModelTypeVideo;
media.image = model.image; media.image = model.image;
media.coverImg = model.image; media.coverImg = model.image;
media.mediaUrl = model.videoLocalUrl.absoluteString; // media.mediaUrl = model.videoLocalUrl.absoluteString;
media.mediaUrl = pathURL.absoluteString;
if (i == indexPath.row) { if (i == indexPath.row) {
CGRect frame = [collectionView convertRect:cell.frame toView:[UIApplication sharedApplication].keyWindow]; CGRect frame = [collectionView convertRect:cell.frame toView:[UIApplication sharedApplication].keyWindow];
media.mediaFrame = frame; media.mediaFrame = frame;
......
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