From 6d61d28be6a60d7d3787fb710df6d214857fad42 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Tue, 11 Jun 2024 20:06:32 +0800 Subject: [PATCH] =?UTF-8?q?#944=201.=20=E6=AD=8C=E6=9B=B2=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A2=9E=E5=8A=A0=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE?= =?UTF-8?q?=202.=20=E6=88=91=E7=9A=84=E4=B9=90=E5=BA=93=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=E9=BB=91=E6=9A=97=E6=A8=A1=E5=BC=8F=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=202.=20=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XPRoomMusicLibraryEmptyTableViewCell.m | 1 + .../View/XPRoomMusicLibraryViewController.m | 3 +- .../View/XPRoomTransferMusicViewController.m | 38 +++++++++++++++++-- YuMi/ar.lproj/Localizable.strings | 2 + YuMi/en.lproj/Localizable.strings | 3 +- YuMi/zh-Hans.lproj/Localizable.strings | 2 + YuMi/zh-Hant.lproj/Localizable.strings | 2 + 7 files changed, 45 insertions(+), 6 deletions(-) diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m index 8f265225..c4b5c4b0 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m @@ -31,6 +31,7 @@ #pragma mark - Private Method - (void)initSubViews { self.selectionStyle = UITableViewCellSelectionStyleNone; + self.backgroundColor = [UIColor clearColor]; [self.contentView addSubview:self.emptyImageView]; [self.contentView addSubview:self.titleLabel]; [self.contentView addSubview:self.addButton]; diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m index 5fc1b8dc..dbeda4c5 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m @@ -224,7 +224,8 @@ UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey; } #pragma mark - XPRoomMusicLibraryEmptyTableViewCellDelegate -- (void)xPRoomMusicLibraryEmptyTableViewCell:(XPRoomMusicLibraryEmptyTableViewCell *)cell didClickAdd:(UIButton *)sender { +- (void)xPRoomMusicLibraryEmptyTableViewCell:(XPRoomMusicLibraryEmptyTableViewCell *)cell + didClickAdd:(UIButton *)sender { XPRoomTransferMusicViewController * transferVC = [[XPRoomTransferMusicViewController alloc] init]; [self.navigationController pushViewController:transferVC animated:YES]; } diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m index dbeb311a..fe76e4da 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m @@ -22,6 +22,9 @@ #import "NSArray+Safe.h" ///Model #import "Music+CoreDataClass.h" + +static NSInteger spacing = 47 * 2; + @interface XPRoomTransferMusicViewController () ///容器 @property (nonatomic,strong) UIStackView *stackView; @@ -43,6 +46,7 @@ @property (nonatomic,strong) UIButton *musicCountButton; ///保存 @property (nonatomic,strong) UIButton *saveButton; +@property (nonatomic,strong) UIButton *copyButton; @property (nonatomic,strong) HTTPServer *httpServer; @property (strong, nonatomic) NSString *ipAddress; ///歌曲的个数 @@ -73,7 +77,8 @@ [self.stackView addArrangedSubview:self.descriptionLabel]; [self.stackView addArrangedSubview:self.musicCountButton]; [self.stackView addArrangedSubview:self.saveButton]; - + [self.stackView addArrangedSubview:self.copyButton]; + [self.wifiView addSubview:self.wifiImaegView]; [self.wifiView addSubview:self.wifiLabel]; } @@ -103,7 +108,7 @@ }]; [self.ipLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - 47 * 2); + make.width.mas_equalTo(KScreenWidth - spacing); }]; [self.singleTypeLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -115,7 +120,7 @@ }]; [self.descriptionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - 47 * 2); + make.width.mas_equalTo(KScreenWidth - spacing); }]; [self.musicCountButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -123,8 +128,12 @@ }]; [self.saveButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth - 47* 2, 45)); + make.size.mas_equalTo(CGSizeMake(KScreenWidth - spacing, 45)); }]; + + [self.copyButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.mas_equalTo(CGSizeMake(KScreenWidth - spacing, 45)); + }]; } - (void)monitorNet { @@ -257,6 +266,13 @@ [self.navigationController popViewControllerAnimated:YES]; } +- (void)didTapCopyButton { + UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; + pasteboard.string = self.ipLabel.text; + + [self showSuccessToast:YMLocalizedString(@"XPRoomTransferMusicViewController20")]; +} + #pragma mark - Getters And Setters - (UIStackView *)stackView { if (!_stackView) { @@ -354,6 +370,20 @@ return _musicCountButton; } +- (UIButton *)copyButton { + if (!_copyButton) { + _copyButton = [[UIButton alloc] init]; + [_copyButton setTitle:YMLocalizedString(@"XPRoomTransferMusicViewController19") forState:UIControlStateNormal]; + [_copyButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; + _copyButton.titleLabel.font = [UIFont systemFontOfSize:16]; + [_copyButton addTarget:self action:@selector(didTapCopyButton) forControlEvents:UIControlEventTouchUpInside]; + _copyButton.layer.cornerRadius = 45/2; + _copyButton.layer.masksToBounds = YES; + [_copyButton setBackgroundColor:[DJDKMIMOMColor alertBackgroundColor]]; + } + return _copyButton; +} + - (UIButton *)saveButton { if (!_saveButton) { _saveButton = [[UIButton alloc] init]; diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 51c545a1..307c26ee 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -1946,6 +1946,8 @@ ineHeadView12" = "الحمل"; "XPRoomTransferMusicViewController16" = "يمكنك استيراد وحذف الأغاني على الصفحة المفتوحة\nيرجى عدم الخروج من الصفحة حتى يتم استيراد الأغاني بالكامل"; "XPRoomTransferMusicViewController17" = "تم استيراد 0 أغنية"; "XPRoomTransferMusicViewController18" = "حفظ"; +"XPRoomTransferMusicViewController19" = "نسخ الوصلة"; +"XPRoomTransferMusicViewController20" = "تم النسخ بنجاح"; "XPRoomBackMusicPlayerView1" = "التكرار قائمة"; "XPRoomBackMusicPlayerView2" = "لا توجد أغاني تعمل حاليًا"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 74daaab2..0ca59053 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -1684,7 +1684,8 @@ "You can import and delete songs on the opened webpage. \nPlease do not leave the current page until the song import is complete."; "XPRoomTransferMusicViewController17" = "0 songs imported"; "XPRoomTransferMusicViewController18" = "Imported 0 songs"; -"XPRoomTransferMusicViewController19" = "Save"; +"XPRoomTransferMusicViewController19" = "Copy Link"; +"XPRoomTransferMusicViewController20" = "Copied successfully"; "XPRoomBackMusicPlayerView1" = "Loop Playlist"; "XPRoomBackMusicPlayerView2" = "No Music Playing"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 641d0e36..e815ddca 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -1297,6 +1297,8 @@ "XPRoomTransferMusicViewController16" = "可在打开的网页上导入和删除歌曲\n歌曲导入完成前,请不要退出当前页面"; "XPRoomTransferMusicViewController17" = "已导入0首歌曲"; "XPRoomTransferMusicViewController18" = "保存"; +"XPRoomTransferMusicViewController19" = "复制链接"; +"XPRoomTransferMusicViewController20" = "复制成功"; "XPRoomBackMusicPlayerView1" = "列表循环"; "XPRoomBackMusicPlayerView2" = "暂无音乐播放"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index 6ed00ce8..ee8a05ef 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -1300,6 +1300,8 @@ "XPRoomTransferMusicViewController16" = "可在打開的網頁上導入和刪除歌曲\n歌曲導入完成前,請不要退出當前頁面"; "XPRoomTransferMusicViewController17" = "已導入0首歌曲"; "XPRoomTransferMusicViewController18" = "保存"; +"XPRoomTransferMusicViewController19" = "複製連結"; +"XPRoomTransferMusicViewController20" = "複製成功"; "XPRoomBackMusicPlayerView1" = "列表循環"; "XPRoomBackMusicPlayerView2" = "暫無音樂播放";