piaocbn2j
/
MTMusic
1
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 调整播放器样式, 启用页面保持, 添加下拉刷新

Browse Source
chen
Spark 3 months ago
parent fc613ee961
commit 38921f848f
5 changed files with 584 additions and 476 deletions
Show Stats Download Patch File Download Diff File

178
lib/view/home_view.dart
Unescape View File

@ -20,27 +20,35 @@ class HomeView extends StatefulWidget {
State<HomeView> createState() => _HomeViewState();
}
class _HomeViewState extends State<HomeView> {
// 使用 GetX 框架的依赖注入，将 HomeViewModel 实例注册为 homeVM。
// Get.put() 方法会创建 HomeViewModel 的实例，并将其保存在 GetX 的依赖管理器中，方便后续使用。
class _HomeViewState extends State<HomeView>
with AutomaticKeepAliveClientMixin {
final homeVM = Get.put(HomeViewModel());
// 创建一个 TextEditingController，用于控制和监听搜索输入框的文本变化。
// 这个控制器可以用于获取输入框的内容、清空输入框等操作。
final TextEditingController _controller = TextEditingController();
// 定义一个布尔变量 _isSearching，用于表示当前是否处于搜索状态。
// 当用户在搜索框中输入内容时，_isSearching 会变为 true；当输入框为空时，_isSearching 会变为 false。
bool _isSearching = false;
final downloadManager = Get.put(DownloadManager());
List<Song> selectedSongs = [];
@override
bool get wantKeepAlive => true;
@override
void initState() {
super.initState();
_fetchSonglistData();
}
List<Song> selectedSongs = [];
Future<void> _onRefresh() async {
try {
// 重新获取数据
await _fetchSonglistData();
} catch (e) {
print('Refresh error: $e');
// 可以在这里添加错误提示
}
}
Future<void> _fetchSonglistData() async {
try {
MusicListBean bean1 =
await GetMusic().getMusic1(Authorization: AppData().currentToken);
MusicListBean bean2 =
@ -79,8 +87,10 @@ class _HomeViewState extends State<HomeView> {
collection: bean3.collectOrNot!),
];
});
} catch (e) {
print('Error occurred while fetching song list: $e');
}
}
///轮播图
List<Map> imgList = [
@ -107,23 +117,32 @@ class _HomeViewState extends State<HomeView> {
// 循环处理每个搜索结果，通过 id 请求详细信息
for (var data in bean.data!) {
if (data.id != null) { // 确保 id 不为 null
if (data.id != null) {
// 确保 id 不为 null
// 使用每个歌曲的 id 获取详细信息，并返回一个 Future
songDetailsFutures.add(
GetMusicDetail().getMusicDetail(
songDetailsFutures.add(GetMusicDetail()
.getMusicDetail(
songId: data.id!,
Authorization: AppData().currentToken,
).then((details) {
)
.then((details) {
if (details != null) {
// 将详细歌曲信息封装成 Song 对象
return Song(
artistPic: details.artistPic ?? '', // 歌手封面图
title: data.name ?? '', // 歌曲名称
artist: details.artist ?? '', // 歌手名称
musicurl: details.musicurl ?? '', // 歌曲路径
pic: details.pic ?? '', // 封面图片路径
id: details.id, // 歌曲 ID
likes: details.likes, // 是否喜欢
artistPic: details.artistPic ?? '',
// 歌手封面图
title: data.name ?? '',
// 歌曲名称
artist: details.artist ?? '',
// 歌手名称
musicurl: details.musicurl ?? '',
// 歌曲路径
pic: details.pic ?? '',
// 封面图片路径
id: details.id,
// 歌曲 ID
likes: details.likes,
// 是否喜欢
collection: details.collection, // 是否收藏
);
}
@ -131,8 +150,7 @@ class _HomeViewState extends State<HomeView> {
}).catchError((error) {
print("Error occurred while fetching song details: $error");
return null; // 异常处理，返回 null
})
);
}));
} else {
print("Song ID is null for song: ${data.name}");
}
@ -142,7 +160,10 @@ class _HomeViewState extends State<HomeView> {
List<Song?> songDetailsList = await Future.wait(songDetailsFutures);
// 过滤掉 null 值
List<Song> validSongDetails = songDetailsList.where((song) => song != null).cast<Song>().toList();
List<Song> validSongDetails = songDetailsList
.where((song) => song != null)
.cast<Song>()
.toList();
// 最后更新 UI，一次性更新 _filteredData
setState(() {
@ -175,6 +196,8 @@ class _HomeViewState extends State<HomeView> {
@override
Widget build(BuildContext context) {
super.build(context);
///轮播图
var MySwiperWidget = Swiper(
itemBuilder: (BuildContext context, int index) {
@ -205,9 +228,7 @@ class _HomeViewState extends State<HomeView> {
child: Scaffold(
resizeToAvoidBottomInset: false,
backgroundColor: Colors.transparent,
body: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
body: Column(
children: [
///头部
Container(
@ -217,24 +238,21 @@ class _HomeViewState extends State<HomeView> {
children: [
Text(
'喵听',
style:
TextStyle(fontSize: 35, fontWeight: FontWeight.bold),
),
SizedBox(
width: 10,
style: TextStyle(fontSize: 35, fontWeight: FontWeight.bold),
),
SizedBox(width: 10),
Text(
'你的云端音乐库',
style:
TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
),
],
),
),
const SizedBox(height: 10,),
const SizedBox(height: 10),
///搜索
Container(
padding: const EdgeInsets.only(left: 20, right: 20, top: 10),
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
child: Column(
children: [
Container(
@ -305,8 +323,10 @@ class _HomeViewState extends State<HomeView> {
MaterialPageRoute(
// 创建一个新的页面（MusicView），并将当前歌曲和索引作为参数传递给它
builder: (context) => MusicView(
songList: _filteredData, // 传递当前列表项对应的歌曲对象，包含歌曲的详细信息
initialSongIndex: index, // 传递当前歌曲在歌曲列表中的索引，用于在新页面中显示或操作
songList: _filteredData,
// 传递当前列表项对应的歌曲对象，包含歌曲的详细信息
initialSongIndex:
index, // 传递当前歌曲在歌曲列表中的索引，用于在新页面中显示或操作
),
),
);
@ -319,18 +339,35 @@ class _HomeViewState extends State<HomeView> {
),
),
const SizedBox(height: 10,),
const SizedBox(
height: 10,
),
///推荐+轮播图
Expanded(
child: RefreshIndicator(
onRefresh: _onRefresh,
color: const Color(0xff429482),
backgroundColor: Colors.white,
child: SingleChildScrollView(
physics: const AlwaysScrollableScrollPhysics(),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
///推荐+轮播图
Container(
padding: const EdgeInsets.only(left: 20, right: 20, top: 10),
padding:
const EdgeInsets.only(left: 20, right: 20, top: 10),
child: const Text(
'每日推荐',
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
style: TextStyle(
fontSize: 20, fontWeight: FontWeight.w500),
),
),
const SizedBox(height: 5,),
const SizedBox(height: 5),
Container(
padding: const EdgeInsets.only(left: 20, right: 20, top: 5),
padding: const EdgeInsets.symmetric(
horizontal: 20, vertical: 5),
height: 186,
width: double.infinity,
child: MySwiperWidget,
@ -341,13 +378,17 @@ class _HomeViewState extends State<HomeView> {
///精选歌曲
Container(
alignment: Alignment.topLeft,
padding: const EdgeInsets.only(left: 20, right: 20, top: 5),
padding:
const EdgeInsets.only(left: 20, right: 20, top: 5),
child: const Text(
'精选歌曲',
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
style: TextStyle(
fontSize: 20, fontWeight: FontWeight.w500),
),
),
const SizedBox(height: 5,),
const SizedBox(
height: 5,
),
ListView.builder(
padding: EdgeInsets.zero,
itemCount: selectedSongs.length,
@ -358,11 +399,13 @@ class _HomeViewState extends State<HomeView> {
leading: Image.network(selectedSongs[index].pic),
title: Text(
selectedSongs[index].title,
style: const TextStyle(fontSize: 18, color: Colors.black),
style: const TextStyle(
fontSize: 18, color: Colors.black),
),
subtitle: Text(
selectedSongs[index].artist,
style: const TextStyle(fontSize: 16, color: Colors.black),
style: const TextStyle(
fontSize: 16, color: Colors.black),
),
trailing: InkWell(
onTap: () {
@ -377,12 +420,17 @@ class _HomeViewState extends State<HomeView> {
builder: (context) => MusicView(
songList: selectedSongs,
initialSongIndex: index,
onSongStatusChanged: (index, isCollected, isLiked) {
onSongStatusChanged:
(index, isCollected, isLiked) {
setState(() {
// 更新父组件中的数据
selectedSongs[index].collection = isCollected;
selectedSongs[index].collection =
isCollected;
selectedSongs[index].likes = isLiked;
downloadManager.updateSongInfo(selectedSongs[index].id, isCollected, isLiked);
downloadManager.updateSongInfo(
selectedSongs[index].id,
isCollected,
isLiked);
});
},
),
@ -393,16 +441,23 @@ class _HomeViewState extends State<HomeView> {
},
),
const SizedBox(height: 10,),
const SizedBox(
height: 10,
),
///精选歌单
Container(
padding: const EdgeInsets.only(left: 20, right: 20, top: 5),
padding:
const EdgeInsets.only(left: 20, right: 20, top: 5),
child: const Text(
'精选歌单',
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
style: TextStyle(
fontSize: 20, fontWeight: FontWeight.w500),
),
),
const SizedBox(
height: 5,
),
const SizedBox(height: 5,),
SizedBox(
height: 180,
child: ListView.builder(
@ -423,6 +478,10 @@ class _HomeViewState extends State<HomeView> {
),
),
),
),
],
),
),
);
}
@ -433,7 +492,8 @@ class _HomeViewState extends State<HomeView> {
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(30)),
),
builder: (context) => StatefulBuilder( // 使用StatefulBuilder以便动态修改状态
builder: (context) => StatefulBuilder(
// 使用StatefulBuilder以便动态修改状态
builder: (context, setState) {
bool likesnot = false; // 初始状态，假设未点赞
@ -479,11 +539,11 @@ class _HomeViewState extends State<HomeView> {
Column(
children: [
IconButton(
onPressed: (){},
onPressed: () {},
icon: Image.asset("assets/img/list_good.png"),
iconSize: 60,
),
Text("点赞")
const Text("点赞")
],
),
Column(

44
lib/view/music_view.dart
Unescape View File

@ -33,6 +33,7 @@ class _MusicViewState extends State<MusicView> with SingleTickerProviderStateMix
AppData appData = AppData();
late int currentSongIndex;
late AudioPlayer _audioPlayer;
StreamSubscription? _playerStateSubscription;
final downloadManager = Get.put(DownloadManager());
@ -69,24 +70,24 @@ class _MusicViewState extends State<MusicView> with SingleTickerProviderStateMix
vsync: this,
);
// 2. 监听播放器状态来控制动画
_audioPlayer.playerStateStream.listen((state) {
_playerStateSubscription = _audioPlayer.playerStateStream.listen((state) {
if (!_isDisposed) {
if (state.playing) {
// 当开始播放时，从当前角度继续旋转
_rotationController.repeat();
} else {
// 当暂停时，保持当前角度停止
_rotationController.stop(canceled: false);
_rotationController.stop();
}
}
});
}
@override
void dispose() {
_isDisposed = true;
_audioPlayer.dispose();
_playerStateSubscription?.cancel();
_rotationController.stop();
_rotationController.dispose();
_audioPlayer.dispose();
super.dispose();
}
@ -104,6 +105,7 @@ class _MusicViewState extends State<MusicView> with SingleTickerProviderStateMix
}
Future<void> _updateCurrentSong() async {
if (_isDisposed) return;
// 立即更新UI和歌曲信息
setState(() {
_isLoading = true;
@ -216,15 +218,23 @@ class _MusicViewState extends State<MusicView> with SingleTickerProviderStateMix
}
void playOrPause() async {
if (_isDisposed) return; // 添加状态检查
if (_audioPlayer.playing) {
await _audioPlayer.pause();
_rotationController.stop(canceled: false);
if (!_isDisposed) { // 再次检查状态
_rotationController.stop();
}
} else {
await _audioPlayer.play();
if (!_isDisposed) { // 再次检查状态
_rotationController.repeat();
}
}
if (!_isDisposed) {
setState(() {});
}
}
void playNextSong() {
if (currentSongIndex < widget.songList.length - 1) {
@ -605,6 +615,9 @@ class _MusicViewState extends State<MusicView> with SingleTickerProviderStateMix
),
),
),
const SizedBox(
height: 10,
),
Expanded(
child: ListView.builder(
itemCount: music.length,
@ -641,21 +654,6 @@ class _MusicViewState extends State<MusicView> with SingleTickerProviderStateMix
},
),
),
ElevatedButton(
onPressed: () => Navigator.pop(context),
style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xff429482),
padding: const EdgeInsets.symmetric(vertical: 14),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.zero,
),
),
child: const Text(
"关闭",
style: TextStyle(color: Colors.black, fontSize: 20),
),
),
],
),
);

129
lib/view/rank_view.dart
Unescape View File

@ -15,7 +15,7 @@ class RankView extends StatefulWidget {
State<RankView> createState() => _RankViewState();
}
class _RankViewState extends State<RankView> {
class _RankViewState extends State<RankView> with AutomaticKeepAliveClientMixin {
final rankVM = Get.put(RankViewModel());
List rankNames = [];
List rankSingerName = [];
@ -25,13 +25,21 @@ class _RankViewState extends State<RankView> {
final downloadManager = Get.put(DownloadManager());
@override
bool get wantKeepAlive => true;
@override
void initState() {
super.initState();
_fetchSonglistData();
}
Future<void> _onRefresh() async {
await _fetchSonglistData();
}
Future<void> _fetchSonglistData() async {
try {
RankBean bean2 = await GetRank().getRank(Authorization: AppData().currentToken);
setState(() {
rankNames = bean2.data!.map((data) => data.name!).toList();
@ -57,10 +65,15 @@ class _RankViewState extends State<RankView> {
}
}
});
} catch (e) {
// 可以添加错误处理逻辑
print('Error fetching data: $e');
}
}
@override
Widget build(BuildContext context) {
super.build(context);
return Container(
decoration: const BoxDecoration(
image: DecorationImage(
@ -74,20 +87,19 @@ class _RankViewState extends State<RankView> {
body: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(
height: 40,
),
const SizedBox(height: 40),
//头部
const Center(
child: Column(
children: [
SizedBox(
height: 10,
),
Text(
'喵听排行榜',
style: TextStyle(fontSize: 22, fontWeight: FontWeight.w400),
),
SizedBox(
height: 10,
),
SizedBox(height: 10),
Text(
'Top50',
style: TextStyle(
@ -95,19 +107,15 @@ class _RankViewState extends State<RankView> {
fontSize: 40,
fontWeight: FontWeight.w500),
),
SizedBox(
height: 10,
),
Text(
'2023/12/12更新 1期',
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
),
// SizedBox(height: 10),
// Text(
// '2023/12/12更新 1期',
// style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
// ),
],
),
),
const SizedBox(
height: 10,
),
const SizedBox(height: 10),
Container(
decoration: const BoxDecoration(
color: Colors.white,
@ -119,7 +127,25 @@ class _RankViewState extends State<RankView> {
child: Row(
children: [
IconButton(
onPressed: () {},
onPressed: () {
// 播放全部
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MusicView(
songList: songs,
initialSongIndex: 0,
onSongStatusChanged: (index, isCollected, isLiked) {
setState(() {
songs[index].collection = isCollected;
songs[index].likes = isLiked;
downloadManager.updateSongInfo(songs[index].id, isCollected, isLiked);
});
},
),
),
);
},
icon: Image.asset(
"assets/img/button_play.png",
width: 20,
@ -130,9 +156,7 @@ class _RankViewState extends State<RankView> {
'播放全部',
style: TextStyle(fontSize: 16),
),
const SizedBox(
width: 5,
),
const SizedBox(width: 5),
const Text(
'50',
style: TextStyle(fontSize: 16),
@ -141,8 +165,11 @@ class _RankViewState extends State<RankView> {
),
),
Expanded(
child: RefreshIndicator(
onRefresh: _onRefresh,
color: const Color(0xff429482),
child: SingleChildScrollView(
physics: const BouncingScrollPhysics(),
physics: const AlwaysScrollableScrollPhysics(), // 修改为始终可滚动
child: Container(
color: Colors.white,
child: Column(
@ -165,7 +192,6 @@ class _RankViewState extends State<RankView> {
initialSongIndex: index,
onSongStatusChanged: (index, isCollected, isLiked) {
setState(() {
// 更新父组件中的数据
songs[index].collection = isCollected;
songs[index].likes = isLiked;
downloadManager.updateSongInfo(songs[index].id, isCollected, isLiked);
@ -180,8 +206,7 @@ class _RankViewState extends State<RankView> {
Row(
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
width: 25,
@ -196,28 +221,21 @@ class _RankViewState extends State<RankView> {
),
),
),
const SizedBox(
width: 10,
),
const SizedBox(width: 10),
ClipRRect(
borderRadius:
BorderRadius.circular(10),
borderRadius: BorderRadius.circular(10),
child: Image.network(
rankCoverPath[index],
width: 60,
height: 60,
fit: BoxFit.cover,
),
),
const SizedBox(
width: 20,
),
const SizedBox(width: 20),
SizedBox(
width: 170,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
rankNames[index],
@ -225,27 +243,26 @@ class _RankViewState extends State<RankView> {
style: const TextStyle(
color: Colors.black,
fontSize: 16,
fontWeight:
FontWeight.w400),
fontWeight: FontWeight.w400
),
),
Text(
rankSingerName[index],
maxLines: 1,
style: const TextStyle(
color: Colors.black,
fontSize: 14),
fontSize: 14
),
)
],
),
),
const SizedBox(
width: 18,
),
const SizedBox(width: 18),
],
),
IconButton(
onPressed: () {
_bottomSheet(context, index); // 传递当前的 index
_bottomSheet(context, index);
},
icon: Image.asset(
'assets/img/More.png',
@ -253,37 +270,38 @@ class _RankViewState extends State<RankView> {
height: 25,
errorBuilder: (context, error, stackTrace) {
print('Error loading image: $error');
return const Icon(Icons.error, size: 25); // 使用 const
return const Icon(Icons.error, size: 25);
},
),
),
const SizedBox(
height: 20,
)
],
),
const SizedBox(
height: 10,
)
const SizedBox(height: 10)
],
));
}),
),
);
},
),
],
),
),
),
),
)
],
),
),
);
}
Future _bottomSheet(BuildContext context, int index){
Future _bottomSheet(BuildContext context, int index) {
return showModalBottomSheet(
context: context,
backgroundColor: Colors.white,
shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(30))),
builder: (context) =>Container(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(30))
),
builder: (context) => Container(
height: 150,
padding: const EdgeInsets.only(top: 20),
child: Column(
@ -349,7 +367,6 @@ class _RankViewState extends State<RankView> {
],
),
)
);
}
}

6
lib/view/release_view.dart
Unescape View File

@ -23,17 +23,19 @@ class SongInfo {
SongInfo({required this.songName, required this.artistName});
}
class _ReleaseViewState extends State<ReleaseView> {
class _ReleaseViewState extends State<ReleaseView> with AutomaticKeepAliveClientMixin {
List<File> coverImages = [];
List<SongInfo> songInfoList = [];
late File selectedMp3File;
@override
bool get wantKeepAlive => true;
@override
Widget build(BuildContext context) {
super.build(context);
return Scaffold(
resizeToAvoidBottomInset: false,
backgroundColor: Colors.transparent,

43
lib/view/user/user_view.dart
Unescape View File

@ -24,7 +24,7 @@ class UserView extends StatefulWidget {
State<UserView> createState() => _UserViewState();
}
class _UserViewState extends State<UserView> {
class _UserViewState extends State<UserView> with AutomaticKeepAliveClientMixin {
final homeVM = Get.put(HomeViewModel());
final TextEditingController _controller = TextEditingController();
int playlistCount = 0;
@ -36,6 +36,9 @@ class _UserViewState extends State<UserView> {
final downloadManager = Get.put(DownloadManager());
@override
bool get wantKeepAlive => true;
@override
void initState() {
super.initState();
@ -61,6 +64,7 @@ class _UserViewState extends State<UserView> {
@override
Widget build(BuildContext context) {
super.build(context);
return Container(
decoration: const BoxDecoration(
image: DecorationImage(
@ -123,7 +127,12 @@ class _UserViewState extends State<UserView> {
children: [
InkWell(
onTap: () {
Get.to(const MyMusicView());
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const MyMusicView(),
),
);
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -159,7 +168,12 @@ class _UserViewState extends State<UserView> {
//我的收藏和本地下载分界
InkWell(
onTap: () async {
final result = await Get.to(const MyDownloadView());
final result = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MyDownloadView(),
),
);
if (result == true) {
setState(() {
@ -252,7 +266,14 @@ class _UserViewState extends State<UserView> {
InkWell(
onTap: () {
print('点击成功');
Get.to(MyMusicView(songlistIdd: playlistid[index]));
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MyMusicView(
songlistIdd: playlistid[index]
),
),
);
},
child: Row(
children: [
@ -304,7 +325,12 @@ class _UserViewState extends State<UserView> {
children: [
InkWell(
onTap: () {
Get.to(const MyWorkView());
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const MyWorkView(),
),
);
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -365,7 +391,12 @@ class _UserViewState extends State<UserView> {
IconButton(
onPressed: () async {
Navigator.pop(context);
bool result = await Get.to(const UserInfo());
bool result = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const UserInfo(),
),
);
if (result) {
setState(() {
avatar = AppData().currentAvatar;

Write Preview
Loading…
Cancel
Save