diff --git a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj index ded65a1..335fc42 100644 --- a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj +++ b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj @@ -2690,6 +2690,11 @@ GCC_NO_COMMON_BLOCKS = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "yinmeng-ios/Info.plist"; + INFOPLIST_KEY_CFBundleDisplayName = Mew; + INFOPLIST_KEY_NSCameraUsageDescription = "“Mew”需要您的同意,才能访问进行拍照并上传您的图片，便于他人查看"; + INFOPLIST_KEY_NSMicrophoneUsageDescription = "\"Mew\"需要您的同意，才可以进行语音聊天"; + INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "“Mew”需要您的同意,才可以存储相片到相册"; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "“Mew”需要您的同意,才可以访问相册并选择您需要上传的图片，便于他人查看"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -2730,6 +2735,11 @@ GCC_NO_COMMON_BLOCKS = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "yinmeng-ios/Info.plist"; + INFOPLIST_KEY_CFBundleDisplayName = Mew; + INFOPLIST_KEY_NSCameraUsageDescription = "“Mew”需要您的同意,才能访问进行拍照并上传您的图片，便于他人查看"; + INFOPLIST_KEY_NSMicrophoneUsageDescription = "\"Mew\"需要您的同意，才可以进行语音聊天"; + INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "“Mew”需要您的同意,才可以存储相片到相册"; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "“Mew”需要您的同意,才可以访问相册并选择您需要上传的图片，便于他人查看"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/Contents.json new file mode 100644 index 0000000..c50d586 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mew_launch_logo@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mew_launch_logo@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@2x.png new file mode 100644 index 0000000..280b298 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@3x.png new file mode 100644 index 0000000..d3f47e0 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Base.lproj/LaunchScreen.storyboard b/yinmeng-ios/yinmeng-ios/Base.lproj/LaunchScreen.storyboard index 865e932..23de06d 100644 --- a/yinmeng-ios/yinmeng-ios/Base.lproj/LaunchScreen.storyboard +++ b/yinmeng-ios/yinmeng-ios/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,11 @@ - - + + + - + + + @@ -11,15 +14,60 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + diff --git a/yinmeng-ios/yinmeng-ios/Info.plist b/yinmeng-ios/yinmeng-ios/Info.plist index 64de112..6a6654d 100644 --- a/yinmeng-ios/yinmeng-ios/Info.plist +++ b/yinmeng-ios/yinmeng-ios/Info.plist @@ -2,14 +2,6 @@ - NSCameraUsageDescription - “Mew”需要您的同意,才能访问进行拍照并上传您的图片，便于他人查看 - NSPhotoLibraryUsageDescription - “Mew”需要您的同意,才可以访问相册并选择您需要上传的图片，便于他人查看 - NSPhotoLibraryAddUsageDescription - “Mew”需要您的同意,才可以存储相片到相册 - NSMicrophoneUsageDescription - "Mew"需要您的同意，才可以进行语音聊天 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/AudioPlayerManager.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/AudioPlayerManager.m index 882b958..3d59559 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/AudioPlayerManager.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/AudioPlayerManager.m @@ -94,7 +94,7 @@ static AudioPlayerManager *_instance = nil; NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:musicUrl]]; NSURLSessionDownloadTask *download = [manager downloadTaskWithRequest:request progress:^(NSProgress * _Nonnull downloadProgress) { } destination:^NSURL * _Nonnull(NSURL * _Nonnull targetPath, NSURLResponse * _Nonnull response) { - NSString *filePath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"mineSkillCardVoice"] stringByAppendingPathComponent:fileName]; + NSString *filePath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"userVoice"] stringByAppendingPathComponent:fileName]; return [NSURL fileURLWithPath:filePath]; } completionHandler:^(NSURLResponse * _Nonnull response, NSURL * _Nullable filePath, NSError * _Nullable error) { if (!error) { diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.m index 8701564..2215ffc 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.m @@ -15,6 +15,7 @@ #import "ThemeColor.h" #import "YMMacro.h" #import "YMHUDTool.h" +#import "YMIButton.h" @interface MewPlayVoiceView() @property (nonatomic, strong) UIImageView *bgImageView; @@ -26,7 +27,7 @@ /// 唱片机柄 @property (nonatomic, strong) UIImageView *playVoiceImageView; /// 发布声音秀 -@property (nonatomic, strong) UIButton *pushVoiceButton; +@property (nonatomic, strong) YMIButton *pushVoiceButton; @property (nonatomic, strong) UIView *optionVoiceBgView; /// 暂停 @@ -87,9 +88,12 @@ return; } - if (!self.stopVoiceButton.selected) { - [self playDiscAnimation:YES]; - } + self.stopVoiceButton.selected = YES; + [self playDiscAnimation:YES]; +// self.playVoiceButton.selected = NO; +// if (!self.stopVoiceButton.selected) { +// [self playDiscAnimation:YES]; +// } [self.delegate didSelectMewPlayVoiceViewWithTarget:2]; } @@ -183,17 +187,17 @@ return _playVoiceButton; } -- (UIButton *)pushVoiceButton { +- (YMIButton *)pushVoiceButton { if (!_pushVoiceButton) { - _pushVoiceButton = [[UIButton alloc] init]; + _pushVoiceButton = [[YMIButton alloc] initWithImagePosition:XPButtonImagePositionRight]; [_pushVoiceButton setImage:[UIImage imageNamed:@"mew_home_push_voice"] forState:UIControlStateNormal]; [_pushVoiceButton setTitle:@"发布声音秀" forState:UIControlStateNormal]; _pushVoiceButton.layer.cornerRadius = 52.0/2; _pushVoiceButton.layer.masksToBounds = YES; UIImage *backgroundImage = [UIImage gradientColorImageFromColors:@[ [ThemeColor colorWithHexString:@"#FF60FD"], - [ThemeColor colorWithHexString:@"#69EBFF"], - [ThemeColor colorWithHexString:@"#8974FF"] + [ThemeColor colorWithHexString:@"##8974FF"], + [ThemeColor colorWithHexString:@"#69EBFF"] ] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(200, 52)]; _pushVoiceButton.backgroundColor = [UIColor colorWithPatternImage:backgroundImage]; [_pushVoiceButton addTarget:self action:@selector(pushVoiceButtonAction) forControlEvents:UIControlEventTouchUpInside]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.h b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.h index a2ca462..488b0a8 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.h +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.h @@ -7,10 +7,14 @@ #import #import -@class FansInfoModel; +@class UserInfoModel; NS_ASSUME_NONNULL_BEGIN +@protocol MewRightFollowVoiceViewDelegate +- (void)didSelectRightFollowVoiceUser:(UserInfoModel *)userInfo; +@end + typedef void(^follownRefresh)(void); @interface MewRightFollowVoiceView : UIView @@ -18,7 +22,7 @@ typedef void(^follownRefresh)(void); @property (nonatomic, copy) follownRefresh loadFollownRefresh; /// 加载更多 @property (nonatomic, copy) follownRefresh moreFollownRefresh; -@property (nonatomic, strong) NSArray *fansListModel; +@property (nonatomic, strong) NSArray *fansListModel; @property (nonatomic, strong, readonly) UICollectionView *followCollectionView; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m index ad3ffdd..19c6b51 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m @@ -14,6 +14,7 @@ #import "YMMacro.h" #import "ThemeColor.h" #import "FansInfoModel.h" +#import "UserInfoModel.h" #import "NSArray+Safe.h" @interface MewRightFollowVoiceView() @@ -40,7 +41,7 @@ } #pragma mark - Set -- (void)setFansListModel:(NSArray *)fansListModel { +- (void)setFansListModel:(NSArray *)fansListModel { _fansListModel = fansListModel; [self.followCollectionView reloadData]; } @@ -52,7 +53,7 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { MewRightFollowVoiceCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([MewRightFollowVoiceCollectionCell class]) forIndexPath:indexPath]; - FansInfoModel *model = [self.fansListModel safeObjectAtIndex1:indexPath.row]; + UserInfoModel *model = [self.fansListModel safeObjectAtIndex1:indexPath.row]; cell.avater = model.avatar; cell.nick = model.nick; cell.sex = model.gender; @@ -60,6 +61,11 @@ } +- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { + if () { + + } +} #pragma mark - Init View