Browse Source

修复

newdev_shunjiawei
lxm 1 year ago
parent
commit
84bc1f243f
  1. 2
      lib/data/models/appconfig_model.g.dart
  2. 7
      lib/modules/agent/views/music_card.dart
  3. 6
      lib/modules/music/views/music_playlist_view.dart

2
lib/data/models/appconfig_model.g.dart

@ -57,7 +57,7 @@ Map<String, dynamic> _$DBAgentToJson(DBAgent instance) => <String, dynamic>{
DBMCPServer _$DBMCPServerFromJson(Map<String, dynamic> json) => DBMCPServer( DBMCPServer _$DBMCPServerFromJson(Map<String, dynamic> json) => DBMCPServer(
servername: json['servername'] as String, servername: json['servername'] as String,
url: json['url'] as String, url: json['url'] as String,
tools: json['tools'] as String, tools: json['tools'] as String? ?? '',
); );
Map<String, dynamic> _$DBMCPServerToJson(DBMCPServer instance) => Map<String, dynamic> _$DBMCPServerToJson(DBMCPServer instance) =>

7
lib/modules/agent/views/music_card.dart

@ -16,6 +16,7 @@ Widget buildMusicItem(BuildContext context, int id, String name, String url,
'artist': singer, 'artist': singer,
'coverUrl': image, 'coverUrl': image,
}; };
controller.musicStatus(); //刷新状态
return Container( return Container(
padding: const EdgeInsets.all(14), padding: const EdgeInsets.all(14),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -81,7 +82,7 @@ Widget buildMusicItem(BuildContext context, int id, String name, String url,
), ),
Obx(() { Obx(() {
final isThisPlaying = final isThisPlaying =
controller.isPlaying.value && controller.currentUrl.value == url; controller.isPlaying.value && controller.currentId.value == id;
// 只有当前播放的歌曲才显示进度 // 只有当前播放的歌曲才显示进度
final currentProgress = final currentProgress =
@ -97,7 +98,7 @@ Widget buildMusicItem(BuildContext context, int id, String name, String url,
onPlayPause: () async { onPlayPause: () async {
try { try {
if (controller.isPlaying.value) { if (controller.isPlaying.value) {
if (controller.currentUrl.value == url) { if (controller.currentId.value == id) {
// 当前歌曲正在播放,暂停它 // 当前歌曲正在播放,暂停它
await controller.musicPause(); await controller.musicPause();
} else { } else {
@ -105,7 +106,7 @@ Widget buildMusicItem(BuildContext context, int id, String name, String url,
await controller.musicPlay(song); await controller.musicPlay(song);
} }
} else { } else {
if (controller.currentUrl.value == url) { if (controller.currentid.value == id) {
// 当前歌曲已暂停,恢复播放 // 当前歌曲已暂停,恢复播放
await controller.musicResume(); await controller.musicResume();
} else { } else {

6
lib/modules/music/views/music_playlist_view.dart

@ -162,7 +162,7 @@ class MusicPlaylistView extends StatelessWidget {
// 播放按钮 // 播放按钮
Obx(() { Obx(() {
final isThisPlaying = final isThisPlaying =
controller.isPlaying.value && controller.currentUrl.value == url; controller.isPlaying.value && controller.currentId.value == url;
// 只有当前播放的歌曲才显示进度 // 只有当前播放的歌曲才显示进度
final currentProgress = isThisPlaying ? controller.progress.value : 0.0; final currentProgress = isThisPlaying ? controller.progress.value : 0.0;
@ -177,13 +177,13 @@ class MusicPlaylistView extends StatelessWidget {
onPlayPause: () async { onPlayPause: () async {
try { try {
if (controller.isPlaying.value) { if (controller.isPlaying.value) {
if (controller.currentUrl.value == url) { if (controller.currentId.value == id) {
await controller.musicPause(); await controller.musicPause();
} else { } else {
await controller.musicPlay(song); await controller.musicPlay(song);
} }
} else { } else {
if (controller.currentUrl.value == url) { if (controller.currentId.value == Id) {
await controller.musicResume(); await controller.musicResume();
} else { } else {
await controller.musicPlay(song); await controller.musicPlay(song);

Loading…
Cancel
Save