调整部分样式

lib/global/download_manager.dart

@@ -144,7 +144,7 @@ class DownloadManager {
       if (ObjUtil.isEmpty(musicModel.value.coverUrl)) {
         var thumbnails = playerModel.videoDetails?.thumbnail?.thumbnails;
         if (thumbnails != null && thumbnails.isNotEmpty) {
-          musicModel.value.coverUrl = thumbnails[0].url;
+          musicModel.value.coverUrl = thumbnails.last.url;
         }
       }
       if (ObjUtil.isEmpty(musicModel.value.musicType)) {

lib/modules/launch/launch_controller.dart

@@ -33,8 +33,7 @@ class LaunchController extends GetxController with GetSingleTickerProviderStateM
     _appLifecycleReactor = AppLifecycleReactor();
     _appLifecycleReactor.listenToAppStateChanges();
 
-    // 监听网络变化
+    Get.put(NetworkConnectivityService());
-    Get.putAsync(() async => NetworkConnectivityService());
 
     _startTimer();
   }

lib/modules/sideb/album_song_list/album_song_list_controller.dart

@@ -141,10 +141,7 @@ class AlbumSongListController extends GetxController {
     if (musicList.isNotEmpty) {
       int index = 0;
       if (type == 1) {
-        if (musicPlayerController.getMusicModel() != null) {
+        index = NumUtil.getRandomNumber(0, musicList.length);
-          int currentIndex = musicList.indexWhere((e) => e.value.videoId == musicPlayerController.getMusicModel()!.value.videoId);
-          index = NumUtil.getRandomNumberExcludingCurrent(0, musicList.length, currentIndex);
-        }
       }
       List<MusicModel> playList = await _next(musicList[index].value.videoId, playlistId: musicList[index].value.playlistId);
       musicPlayerController.playMusic(playList[index].videoId, playList: playList);

lib/modules/sideb/album_song_list/album_song_list_view.dart

@@ -105,11 +105,16 @@ class AlbumSongListView extends StatelessWidget {
               ),
               SizedBox(height: 10.h),
               Row(
+                children: [
+                  Expanded(
+                    child: Row(
                       children: [
                         _buildPlayAll(Assets.sideBPlaylistPlayAll, 'Play all', 0),
                         SizedBox(width: 10.w),
-                  _buildPlayAll(Assets.sideBPlaylistPlayAllRandom, 'Shuffle Playback', 1),
+                        _buildPlayAll(Assets.sideBPlaylistPlayAllRandom, 'Shuffle', 1),
-                  const Spacer(),
+                      ],
+                    ),
+                  ),
                   ClipOval(
                     child: Material(
                       color: Colors.transparent,
@@ -138,10 +143,10 @@ class AlbumSongListView extends StatelessWidget {
   }
 
   Widget _buildPlayAll(String img, String label, int type) {
-    return GestureDetector(
+    return IntrinsicWidth(
+      child: GestureDetector(
         onTap: () => controller.onTapPlayAll(type),
         child: Container(
-        width: 100.w,
           height: 32.h,
           padding: const EdgeInsets.symmetric(horizontal: 4).w,
           decoration: BoxDecoration(
@@ -156,7 +161,18 @@ class AlbumSongListView extends StatelessWidget {
                 height: 24.w,
               ),
               SizedBox(width: 4.w),
-            Expanded(
+              Flexible(
+                child: Visibility(
+                  visible: type == 0,
+                  replacement: Text(
+                    label,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 13.sp,
+                    ),
+                  ),
                   child: Obx(() {
                     return Text(
                       '$label (${controller.musicList.length})',
@@ -164,14 +180,16 @@ class AlbumSongListView extends StatelessWidget {
                       overflow: TextOverflow.ellipsis,
                       style: TextStyle(
                         color: Colors.white,
-                    fontSize: 14.sp,
+                        fontSize: 13.sp,
                       ),
                     );
                   }),
                 ),
+              ),
             ],
           ),
         ),
+      ),
     );
   }
 

lib/modules/sideb/controllers/music_player_controller.dart

@@ -222,12 +222,13 @@ class MusicPlayerController extends GetxController {
 
   /// 开始/结束拖动进度条
   Future<void> seekStartEnd(int value) async {
-    if (processingState.value == ProcessingState.buffering || processingState.value == ProcessingState.ready) {
     if (value == 0) {
+      if (processingState.value == ProcessingState.ready) {
         _seekFrontPlaying = _player.playing;
         if (_player.playing) {
           _player.pause();
         }
+      }
     } else {
       // 拖动前如果是播放状态，拖动完成后恢复播放
       if (_seekFrontPlaying) {
@@ -235,7 +236,6 @@ class MusicPlayerController extends GetxController {
       }
     }
   }
-  }
 
   /// 播放/暂停
   Future<void> playPause() async {

lib/modules/sideb/custom_playlist/custom_playlist_controller.dart

@@ -65,10 +65,7 @@ class CustomPlaylistController extends GetxController {
     if (musicList.isNotEmpty) {
       int index = 0;
       if (type == 1) {
-        if (musicPlayerController.getMusicModel() != null) {
+        index = NumUtil.getRandomNumber(0, musicList.length);
-          int currentIndex = musicList.indexWhere((e) => e.value.videoId == musicPlayerController.getMusicModel()!.value.videoId);
-          index = NumUtil.getRandomNumberExcludingCurrent(0, musicList.length, currentIndex);
-        }
       }
       musicPlayerController.playMusic(musicList[index].value.videoId, playList: musicList.map((e) => e.value).toList());
     }

lib/modules/sideb/custom_playlist/custom_playlist_view.dart

@@ -140,7 +140,7 @@ class CustomPlaylistView extends StatelessWidget {
                   children: [
                     _buildPlayAll(Assets.sideBPlaylistPlayAll, 'Play all', 0),
                     SizedBox(width: 10.w),
-                    _buildPlayAll(Assets.sideBPlaylistPlayAllRandom, 'Shuffle Playback', 1),
+                    _buildPlayAll(Assets.sideBPlaylistPlayAllRandom, 'Shuffle', 1),
                   ],
                 ),
               ),
@@ -216,12 +216,16 @@ class CustomPlaylistView extends StatelessWidget {
   }
 
   Widget _buildPlayAll(String img, String label, int type) {
-    return GestureDetector(
+    return IntrinsicWidth(
+      child: GestureDetector(
         onTap: () => controller.onTapPlayAll(type),
         child: Container(
-        width: 100.w,
           height: 32.h,
           padding: const EdgeInsets.symmetric(horizontal: 4).w,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(16).r,
+            color: const Color(0x1A80F988),
+          ),
           child: Row(
             children: [
               Image.asset(
@@ -230,7 +234,18 @@ class CustomPlaylistView extends StatelessWidget {
                 height: 24.w,
               ),
               SizedBox(width: 4.w),
-            Expanded(
+              Flexible(
+                child: Visibility(
+                  visible: type == 0,
+                  replacement: Text(
+                    label,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 13.sp,
+                    ),
+                  ),
                   child: Obx(() {
                     return Text(
                       '$label (${controller.musicList.length})',
@@ -238,14 +253,16 @@ class CustomPlaylistView extends StatelessWidget {
                       overflow: TextOverflow.ellipsis,
                       style: TextStyle(
                         color: Colors.white,
-                    fontSize: 14.sp,
+                        fontSize: 13.sp,
                       ),
                     );
                   }),
                 ),
+              ),
             ],
           ),
         ),
+      ),
     );
   }
 

lib/modules/sideb/home/home_view.dart

@@ -137,8 +137,8 @@ class HomeView extends GetView<HomeController> {
         gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
           crossAxisCount: 3,
           mainAxisSpacing: 0,
-          crossAxisSpacing: 10.h,
+          crossAxisSpacing: 12.w,
-          childAspectRatio: 60.w / (1.sw - 16.w),
+          childAspectRatio: 60.w / (1.sw - 48.w),
         ),
         itemBuilder: (context, index) {
           final musicModel = browseGroupModel.browseList![index];

lib/modules/sideb/widgets/music_appbar.dart

@@ -71,7 +71,7 @@ class MusicAppbar extends StatelessWidget {
           width: 42.w,
           height: 42.w,
           decoration: BoxDecoration(
-            color: const Color(0x26FFFFFF),
+            color: const Color(0x66000000),
             borderRadius: BorderRadius.circular(42.w),
             border: isBackBorder ? Border.all(color: const Color(0x4DFFFFFF), width: 1.w) : null,
           ),

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.3+13
+version: 1.0.4+14
 
 environment:
   sdk: '>=3.4.1 <4.0.0'