#944

1. 歌曲上传增加复制按钮 2. 我的乐库修复了黑暗模式手机的显示问题 2. 补充复制按钮多语言
2024-06-11 20:06:32 +08:00
parent b512494392
commit 6d61d28be6
7 changed files with 45 additions and 6 deletions
--- 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];
--- 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];
 }
--- 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 ()<MyHTTPConnectionDelegate>
 ///容器
@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,6 +77,7 @@
 	[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];
--- 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" = "لا توجد أغاني تعمل حاليًا";
--- 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";
--- 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" = "暂无音乐播放";
--- 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" = "暫無音樂播放";