Skip to content

pidan / FuSiLive

Go to a project
Commit 2e534f08 by pierce
Options

fixed bugs

parent b427d222
Expand all
Inline Side-by-side
Showing with 31 additions and 14 deletions
DevelopmentPods/FUSCommon/FUSCommon.podspec
......@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
'FUSCommonBundle' => ['FUSCommon/Assets/*.xcassets',
'FUSCommon/Assets/*.plist',
'FUSCommon/Assets/LOTResource/**/*.{json,mp3,png}',
'FUSCommon/Assets/Sounds/*.mp3',
'FUSCommon/Assets/Anims/**/*.png',
'FUSCommon/Classes/**/*.xib',
'FUSCommon/FUSRouter/Routers/**/*.xib']
......
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/FUSDewAwardAnimationView.m
......@@ -79,6 +79,11 @@
[largeLotAnimView playWithCompletion:^(BOOL animationFinished) {
[weakSelf removeFromSuperview];
}];
BOOL soundSwitch = [FUSSoundAndVibrateHelper systemSoundOpen];
if (soundSwitch && FUSConfig.sharedInstanced.liveConfigs.isAnchor == NO) {
[FUSSoundAndVibrateHelper playSoundEffect:@"check_in_success" bundle:[FUSCommonBundle bundle] ofType:@"mp3"];
}
}
@end
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSPublicViews/ImagePicker/Model/FUSAssetModel.h
......@@ -31,4 +31,9 @@
*/
@property (nonatomic, strong) NSString *videoDuration;
/**
缩略图
*/
@property (nonatomic, strong) UIImage *thumbnail;
@end
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/project.pbxproj
......@@ -883,7 +883,6 @@
BEDEDC4C2C66076900B4B0B0 /* FUSDailyCheckInCardView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BEDEDC342C66075400B4B0B0 /* FUSDailyCheckInCardView.xib */; };
BEDEDC4D2C66076900B4B0B0 /* FUSDailyCheckInView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BEDEDC372C66075400B4B0B0 /* FUSDailyCheckInView.xib */; };
BEDEDC4E2C66076900B4B0B0 /* FUSSingleDailyCheckInView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BEDEDC3A2C66075400B4B0B0 /* FUSSingleDailyCheckInView.xib */; };
BEDEDC502C660F8300B4B0B0 /* check_in_success.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BEDEDC4F2C660F8300B4B0B0 /* check_in_success.mp3 */; };
BEF0A6142CF5C4E200C0578D /* FUSSocialBindSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF0A6132CF5C4E200C0578D /* FUSSocialBindSettingViewController.m */; };
BEF0A6152CF5C4E200C0578D /* FUSSocialBindSettingViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF0A6122CF5C4E200C0578D /* FUSSocialBindSettingViewController.h */; };
/* End PBXBuildFile section */
......@@ -1771,7 +1770,6 @@
BEDEDC382C66075400B4B0B0 /* FUSSingleDailyCheckInView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSSingleDailyCheckInView.h; sourceTree = "<group>"; };
BEDEDC392C66075400B4B0B0 /* FUSSingleDailyCheckInView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSSingleDailyCheckInView.m; sourceTree = "<group>"; };
BEDEDC3A2C66075400B4B0B0 /* FUSSingleDailyCheckInView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUSSingleDailyCheckInView.xib; sourceTree = "<group>"; };
BEDEDC4F2C660F8300B4B0B0 /* check_in_success.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = check_in_success.mp3; sourceTree = "<group>"; };
BEF0A6122CF5C4E200C0578D /* FUSSocialBindSettingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSSocialBindSettingViewController.h; sourceTree = "<group>"; };
BEF0A6132CF5C4E200C0578D /* FUSSocialBindSettingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSSocialBindSettingViewController.m; sourceTree = "<group>"; };
C73EF9B6903BB9ABD9479E07 /* Pods-FUSUserCenterModule.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FUSUserCenterModule.release.xcconfig"; path = "Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule.release.xcconfig"; sourceTree = "<group>"; };
......@@ -2397,7 +2395,6 @@
BED65D1B2C62203800668116 /* common */,
BED65C6A2C60B86E00668116 /* zone_bottom_view_mask_img.png */,
BE4096C02C7C380A00CE2FE8 /* Info.plist */,
BEDEDC4F2C660F8300B4B0B0 /* check_in_success.mp3 */,
BED65D032C621A4F00668116 /* startPageVideo.mp4 */,
BED65C2B2C60B85A00668116 /* FUSUserCenterAssets.xcassets */,
);
......@@ -4092,7 +4089,6 @@
BE3625872C6B32130004606D /* 1_zone_details_animation_6@3x.png in Resources */,
BE3625C72C6B32130004606D /* news_feed_like_anim_1@2x.png in Resources */,
BE3625A92C6B32130004606D /* CheckInSuccessAnimation_24@2x.png in Resources */,
BEDEDC502C660F8300B4B0B0 /* check_in_success.mp3 in Resources */,
BE3625D82C6B32130004606D /* zone_audio_call_btn_anim_8@2x.png in Resources */,
BE3625F52C6B32130004606D /* zone_video_call_btn_anim_18@2x.png in Resources */,
BED65C602C60B85B00668116 /* zone_voice_sign_play_btn_icon_anim_2@2x.png in Resources */,
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/FUSImagePicker/Controller/FUSPhotoViewController.m
......@@ -439,6 +439,8 @@
if ([FUSImagePickerManager sharedManager].phAssetType == PHAssetMediaTypeVideo) {
[_confirmBtn setTitle:[NSString stringWithFormat:@"%@(%ld)", self.confirmBtnTitle, [[[FUSImagePickerManager sharedManager]selectedPhotos]count]] forState:UIControlStateNormal];
[_confirmBtn sizeToFit];
_confirmBtn.width = _confirmBtn.width + 50;
_confirmBtn.frame = CGRectMake(0, 0, _confirmBtn.width, _confirmBtn.frame.size.height + 4);
} else {
[_confirmBtn setTitle:[NSString stringWithFormat:@"%@(%ld)",self.confirmBtnTitle,[[[FUSImagePickerManager sharedManager]selectedPhotos]count]] forState:UIControlStateNormal];
}
......@@ -448,11 +450,15 @@
if ([FUSImagePickerManager sharedManager].phAssetType == PHAssetMediaTypeVideo) {
[_confirmBtn setTitle:[NSString stringWithFormat:@"%@", self.confirmBtnTitle] forState:UIControlStateNormal];
[_confirmBtn sizeToFit];
_confirmBtn.width = _confirmBtn.width + 50;
_confirmBtn.frame = CGRectMake(0, 0, _confirmBtn.width, _confirmBtn.frame.size.height + 4);
} else {
[_confirmBtn setTitle:[NSString stringWithFormat:@"%@",self.confirmBtnTitle] forState:UIControlStateNormal];
}
}
}
#pragma mark - Method
......@@ -584,7 +590,7 @@
}
// 图片 和 视频
if (([FUSImagePickerManager sharedManager].assetType == FUSAssetTypePhotoVideo || [FUSImagePickerManager sharedManager].assetType == FUSAssetTypePhotoVideoOnlyOne)&&
if (([FUSImagePickerManager sharedManager].assetType == FUSAssetTypePhotoVideo || [FUSImagePickerManager sharedManager].assetType == FUSAssetTypePhotoVideoOnlyOne || [FUSImagePickerManager sharedManager].assetType == FUSAssetTypeVideo)&&
imagePickerVC.imagePickerDelegate &&
[imagePickerVC.imagePickerDelegate respondsToSelector:@selector(fus_imagePicker:didFinishSelectWithImageVideoArray:)]) {
......@@ -631,7 +637,7 @@
FUSLogInfo(@"超过最大图片个数");
NSString *content = [NSString fus_localString:@"张图片"];
NSInteger count = 0;
NSInteger count = [FUSImagePickerManager sharedManager].limit;
if ([FUSImagePickerManager sharedManager].assetType == FUSAssetTypeVideo) {
count = [[FUSImagePickerManager sharedManager]limit];
content = [NSString fus_localString:@"个视频"];
......@@ -1218,6 +1224,7 @@
__weak typeof(cell) weakCell = cell;
cell.requestId = [[FUSImagePickerManager sharedManager] requestImageForAsset:asset targetSize:size contentMode:PHImageContentModeAspectFill options:options loadingView:self.view loadiCloudHandler:nil resultHandler:^(UIImage * _Nullable result) {
if (result) {
model.thumbnail = result;
[weakCell fus_setupImage:result];
}
}];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/FUSNewsFeedReplyInputView.m
......@@ -251,6 +251,8 @@
self.imagePickerVc.imagePickerDelegate = self;
self.imagePickerVc.showRecordBtn = NO;
[[UIViewController fus_topViewController] presentViewController:self.imagePickerVc animated:YES completion:nil];
// _imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:9 delegate:nil];
// _imagePickerVc.showSelectBtn = NO;
......@@ -304,8 +306,8 @@
// weakSelf.superview.hidden = NO;
// [weakSelf.inputTextView becomeFirstResponder];
// }];
[[UIViewController fus_topViewController] presentViewController:self.imagePickerVc animated:YES completion:nil];
//
// [[UIViewController fus_topViewController] presentViewController:self.imagePickerVc animated:YES completion:nil];
}
- (void)setSendTopicId:(NSString *)topicId commentId:(NSString *__nullable)commentId toReplyId:(NSString *__nullable)toReplyId replyName:(NSString *__nullable)replyName {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/DailyCheckIn/View/FUSDailyCheckInView.m
......@@ -325,13 +325,13 @@
self.getAwardDesLabel.text = model.tips;
[self.getAwardImageView setWebImageWithSubURLString:model.icon placeholder:[FUSUserCenterBunble imageNamed:@"checkIn_placeholder"] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
BOOL soundSwitch = [FUSSoundAndVibrateHelper systemSoundOpen];
if (soundSwitch && FUSConfig.sharedInstanced.liveConfigs.isAnchor == NO) {
[FUSSoundAndVibrateHelper playSoundEffect:@"check_in_success" bundle:[FUSUserCenterBunble bundle] ofType:@"mp3"];
[FUSSoundAndVibrateHelper playSoundEffect:@"check_in_success" bundle:[FUSCommonBundle bundle] ofType:@"mp3"];
}
});
// });
}];
self.getAwardAmountLabel.text = [NSString stringWithFormat:@"+%@",model.award];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/DailyCheckIn/View/FUSSingleDailyCheckInView.m
......@@ -193,7 +193,7 @@
// BOOL soundSwitch = [FUSSoundAndVibrateHelper systemSoundOpen];
// if (soundSwitch && FUSConfig.sharedInstanced.liveConfigs.isAnchor == NO) {
//
// [FUSSoundAndVibrateHelper playSoundEffect:@"check_in_success" bundle:[FUSUserCenterBunble bundle] ofType:@"mp3"];
// [FUSSoundAndVibrateHelper playSoundEffect:@"check_in_success" bundle:[FUSCommonBundle bundle] ofType:@"mp3"];
// }
// });
// }];
......
Podfile.lock
......@@ -374,7 +374,7 @@ SPEC CHECKSUMS:
FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSCommon: e454e7b391ab8f8954d471eb13c11e238bfea615
FUSCommon: e33dade81aa6ab79fe5240e9e66128cb7fc7b6a8
FUSFoundation: 866b0d08a170e406461ef7cf3990887e45898b61
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
......
Pods/Local Podspecs/FUSCommon.podspec.json
......@@ -33,6 +33,7 @@
"FUSCommon/Assets/*.xcassets",
"FUSCommon/Assets/*.plist",
"FUSCommon/Assets/LOTResource/**/*.{json,mp3,png}",
"FUSCommon/Assets/Sounds/*.mp3",
"FUSCommon/Assets/Anims/**/*.png",
"FUSCommon/Classes/**/*.xib",
"FUSCommon/FUSRouter/Routers/**/*.xib"
......
Pods/Manifest.lock
......@@ -374,7 +374,7 @@ SPEC CHECKSUMS:
FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSCommon: e454e7b391ab8f8954d471eb13c11e238bfea615
FUSCommon: e33dade81aa6ab79fe5240e9e66128cb7fc7b6a8
FUSFoundation: 866b0d08a170e406461ef7cf3990887e45898b61
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
......
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
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