Merge branch 'refs/heads/dev'

# Conflicts:
#	lib/common_widget/rank_song_row.dart
#	lib/models/universal_bean.dart
#	lib/view/music_view.dart
#	pubspec.lock
#	pubspec.yaml

lib/api/api_music_return.dart

@@ -41,9 +41,10 @@ class commentMusic {
     Response response = await dio.post(
         _postComment,
         data: {
-          'musicId': musicId,
+          'content': content,
-          'password': content,
+          'MusicId': musicId,
-          'Authorization': Authorization
+          'Authorization':Authorization
+
         },
         options: Options(headers:{'Authorization':Authorization,'Content-Type':'application/json;charset=UTF-8'})
     );
@@ -59,21 +60,26 @@ class getCommentApi {
     required String musicId,
     required String pageNo,
     required String pageSize,
-    required String Authorization
+    required String Authorization,
   }) async {
     Response response = await dio.get(
       _postComment,
-        queryParameters: {'musicId':musicId,'pageNo':pageNo,'pageSize':pageSize},
+      queryParameters: {
-        options: Options(headers:{'Authorization':Authorization,'Content-Type':'application/json;charset=UTF-8'})
+        'musicId': musicId,
+        'pageNo': pageNo,
+        'pageSize': pageSize,
+      },
+      options: Options(headers: {
+        'Authorization': Authorization,
+        'Content-Type': 'application/json;charset=UTF-8',
+      }),
     );
     print(response.data);
     return GetCommentBean.formMap(response.data);
   }
-
 }
 
 
 
 
 
-

lib/api/api_release.dart

@@ -35,8 +35,7 @@ class ReleaseApi {
         queryParameters: {'singerName':singerName,'name':name,'introduce':introduce},
         data: formData,
         options: Options(headers:{'Authorization':Authorization,
-          'Content-Type':'multipart/form-data;boundary=--------------------------741231434897925203274596',
+          })
-          'Content-Length':'2858240'})
     );
     print(response.data);
     return UniversalBean.formMap(response.data);

lib/models/getComment_bean.dart

@@ -1,26 +1,30 @@
-
 class GetCommentBean {
   int? code;
   String? msg;
   int? total;
   List<CommentBean>? rows;
 
-  GetCommentBean.formMap(Map map) {
+  GetCommentBean.formMap(Map<String, dynamic> map) {
-    code = map['code'];
+    code = map['code'] as int?;
-    msg = map['msg'];
+    msg = map['msg'] as String?;
-    total = map['total'];
+
-
+    // 首先获取 data 字段，然后在 data 中查找 total 和 rows
-    List<dynamic>? rowList = map['rows'];
+    Map<String, dynamic>? data = map['data'];
-    if (rowList == null) return;
+    if (data != null) {
-
+      total = data['total'] as int?;
-    rows = rowList
+
-        .map((item) => CommentBean._formMap(item))
+      List<dynamic>? rowList = data['rows'];
-        .toList();
+      if (rowList != null) {
+        rows = rowList.map((item) => CommentBean.formMap(item as Map<String, dynamic>)).toList();
+      } else {
+        rows = []; // 如果 rows 为空，初始化为空列表
+      }
+    } else {
+      rows = []; // 如果 data 为空，初始化为空列表
+    }
   }
 }
 
-
-
 class CommentBean {
   int? id;
   String? content;
@@ -28,11 +32,11 @@ class CommentBean {
   String? username;
   String? avatar;
 
-  CommentBean._formMap(Map map) {
+  CommentBean.formMap(Map<String, dynamic> map) {
-    id = map['id'];
+    id = map['id'] as int?;
-    content = map['content'];
+    content = map['content'] as String? ?? 'No content';
-    time = map['time'];
+    time = map['time'] as String? ?? 'Unknown time';
-    username = map['username'];
+    username = map['username'] as String? ?? 'Anonymous';
-    avatar = map['avatar'];
+    avatar = map['avatar'] as String? ?? 'Default avatar';
   }
-}
+}

lib/view/commend_view.dart

@@ -8,6 +8,8 @@ import 'package:music_player_miao/widget/text_field.dart';
 
 
 class CommentView extends StatefulWidget {
+
+
   @override
   _CommentViewState createState() => _CommentViewState();
 
@@ -36,29 +38,33 @@ class _CommentViewState extends State<CommentView> {
   Future<void> _fetchSonglistData() async {
     try {
       GetCommentBean bean1 = await getCommentApi().getComment(
-          musicId: '1',
+        musicId: '1',
-          pageNo: '0',
+        pageNo: '0',
-          pageSize: '10',
+        pageSize: '10',
-          Authorization: AppData().currentToken);
+        Authorization: AppData().currentToken,
-        setState(() {
+      );
-          comments = bean1.rows!.map((rows) => rows.content!).toList();
-          commentTimes = bean1.rows!.map((rows) => rows.time!).toList();
-          commentHeader = bean1.rows!.map((rows) => rows.avatar!).toList();
-          commentName = bean1.rows!.map((rows) => rows.username!).toList();
-          playlistCount = comments.length;
-        });
 
-    } catch (error) {
+      // 检查 rows 是否为空
-      if (error != null) {
+      if (bean1.rows == null) {
-        print('Response data: $error');
+        print('No comments found');
-      } else {
+        return;
-        print('Error fetching songlist data: $error');
       }
+
+      setState(() {
+        comments = bean1.rows!.map((rows) => rows.content ?? 'No content').toList();
+        commentTimes = bean1.rows!.map((rows) => rows.time ?? 'Unknown time').toList();
+        commentHeader = bean1.rows!.map((rows) => rows.avatar ?? 'Default avatar').toList();
+        commentName = bean1.rows!.map((rows) => rows.username ?? 'Anonymous').toList();
+        playlistCount = comments.length;
+      });
+    } catch (error) {
+      print('Error fetching songlist data: $error');
     }
   }
 
 
 
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -164,17 +170,22 @@ class _CommentViewState extends State<CommentView> {
                     ),
                     IconButton(
                       onPressed: () {
-                        // setState(() {
+                        setState(() {
-                        //   ascendingOrder = !ascendingOrder;
+                          ascendingOrder = !ascendingOrder;
-                        //   comments.sort((a, b) {
+
-                        //     int compare = ascendingOrder
+                          // 使用时间排序索引列表
-                        //         ? commentTimes.indexOf(a).compareTo(
+                          List<int> sortedIndexes = List<int>.generate(comments.length, (i) => i);
-                        //         commentTimes.indexOf(b))
+                          sortedIndexes.sort((a, b) {
-                        //         : commentTimes.indexOf(b).compareTo(
+                            DateTime timeA = DateTime.parse(commentTimes[a]);
-                        //         commentTimes.indexOf(a));
+                            DateTime timeB = DateTime.parse(commentTimes[b]);
-                        //     return compare;
+                            return ascendingOrder ? timeA.compareTo(timeB) : timeB.compareTo(timeA);
-                        //   });
+                          });
-                        // });
+
+                          comments = [for (var i in sortedIndexes) comments[i]];
+                          commentTimes = [for (var i in sortedIndexes) commentTimes[i]];
+                          commentHeader = [for (var i in sortedIndexes) commentHeader[i]];
+                          commentName = [for (var i in sortedIndexes) commentName[i]];
+                        });
                       },
                       icon: Image.asset(
                         ascendingOrder
@@ -202,7 +213,7 @@ class _CommentViewState extends State<CommentView> {
                       Row(
                         children: [
                           CircleAvatar(
-                            backgroundImage: NetworkImage(commentHeader[index])
+                              backgroundImage: NetworkImage(commentHeader[index])
                           ),
                           const SizedBox(width: 10,),
                           Column(
@@ -284,21 +295,35 @@ class _CommentViewState extends State<CommentView> {
     );
   }
 
-  void submitComment() {
+  void submitComment() async {
-    String comment = commentController.text;
+    String comment = commentController.text.trim();
-    if (comment.isNotEmpty) {
+    if (comment.isEmpty) {
-      DateTime currentTime = DateTime.now();
+      print('Comment cannot be empty');
-      String formattedTime = "${currentTime.year}/${currentTime
+      Get.snackbar('错误', '评论不能为空');
-          .month}/${currentTime.day} ${currentTime.hour}:${currentTime.minute}";
+      return;
+    }
 
-      setState(() {
+    print('Submitting comment with content: $comment');
-        comments.add(comment);
+
-        commentTimes.add(formattedTime);
+    try {
-        commentName.add(AppData().currentUsername);
+      UniversalBean bean = await commentMusic().comment(
-        commentHeader.add(AppData().currentAvatar);
+        musicId: widget.initialSongIndex,
+        content: comment,
+        Authorization: AppData().currentToken,
+      );
+
+      // 处理响应结果
+      if (bean.code == 200) {
+        print('Comment submitted successfully');
         commentController.clear();
-        playlistCount++;
+        _fetchSonglistData(); // 刷新评论列表
-      });
+      } else {
+        print('Failed to submit comment: ${bean.msg}');
+        Get.snackbar('错误', bean.msg ?? '评论提交失败');
+      }
+    } catch (error) {
+      print('Error submitting comment: $error');
     }
   }
-}
+
+}

lib/view/music_view.dart

@@ -7,7 +7,11 @@ import '../../view_model/home_view_model.dart';
 import '../api/api_music_likes.dart';
 import '../api/api_collection.dart';
 import '../common/download_manager.dart';
+import '../api/api_music_list.dart';
+import '../api/api_collection.dart';
 import '../common_widget/Song_widegt.dart';
+import '../models/getMusicList_bean.dart';
+import '../view/commend_view.dart';
 import '../models/universal_bean.dart';
 
 class MusicView extends StatefulWidget {
@@ -408,7 +412,7 @@ class _MusicViewState extends State<MusicView> {
                           ),
                         ),
                         IconButton(
-                          onPressed: () async{
+                          onPressed: () async {
                             setState(() {
                               collectionsnot = !collectionsnot;
                               collection[currentSongIndex] = !collection[currentSongIndex];
@@ -436,7 +440,12 @@ class _MusicViewState extends State<MusicView> {
                         ),
                         IconButton(
                           onPressed: () {
-                            Image.asset("assets/img/music_good.png");
+                            Navigator.push(
+                              context,
+                              MaterialPageRoute(
+                                builder: (context) => CommentView(initialSongIndex: widget.initialSongIndex),
+                              ),
+                            );
                           },
                           icon: Image.asset(
                             "assets/img/music_commend_un.png",