Merge branch 'design'

lib/pages/video/detail/reply/controller.dart

@@ -21,11 +21,9 @@ class VideoReplyController extends GetxController {
   // rpid 请求楼中楼回复
   String? rpid;
   RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
-  // 当前页
-  int currentPage = 0;
+  String nextOffset = "";
   bool isLoadingMore = false;
   RxString noMore = ''.obs;
-  int ps = 20;
   RxInt count = 0.obs;
   // 当前回复的回复
   ReplyItemModel? currentReplyItem;
@@ -57,7 +55,7 @@ class VideoReplyController extends GetxController {
     }
     isLoadingMore = true;
     if (type == 'init') {
-      currentPage = 0;
+      nextOffset = '';
       noMore.value = '';
     }
     if (noMore.value == '没有更多了') {
@@ -66,28 +64,20 @@ class VideoReplyController extends GetxController {
     }
     final res = await ReplyHttp.replyList(
       oid: aid!,
-      pageNum: currentPage + 1,
-      ps: ps,
+      nextOffset: nextOffset,
       type: ReplyType.video.index,
       sort: _sortType.index,
     );
     if (res['status']) {
       final List<ReplyItemModel> replies = res['data'].replies;
+      nextOffset = res['data'].cursor.paginationReply.nextOffset ?? "";
       if (replies.isNotEmpty) {
         noMore.value = '加载中...';
-
-        /// 第一页回复数小于20
-        if (currentPage == 0 && replies.length < 18) {
-          noMore.value = '没有更多了';
-        }
-        currentPage++;
-
-        if (replyList.length == res['data'].page.acount) {
+        if (res['data'].cursor.isEnd == true) {
           noMore.value = '没有更多了';
         }
       } else {
-        // 未登录状态replies可能返回null
-        noMore.value = currentPage == 0 ? '还没有评论' : '没有更多了';
+        noMore.value = nextOffset == "" ? '还没有评论' : '没有更多了';
       }
       if (type == 'init') {
         // 添加置顶回复
@@ -99,7 +89,7 @@ class VideoReplyController extends GetxController {
           }
         }
         replies.insertAll(0, res['data'].topReplies);
-        count.value = res['data'].page.count;
+        count.value = res['data'].cursor.allCount;
         replyList.value = replies;
       } else {
         replyList.addAll(replies);
@@ -130,7 +120,7 @@ class VideoReplyController extends GetxController {
       }
       sortTypeTitle.value = _sortType.titles;
       sortTypeLabel.value = _sortType.labels;
-      currentPage = 0;
+      nextOffset = "";
       noMore.value = '';
       replyList.clear();
       queryReplyList(type: 'init');

lib/pages/video/detail/reply/widgets/reply_item.dart

@@ -238,28 +238,53 @@ class ReplyItem extends StatelessWidget {
         // title
         Container(
           margin: const EdgeInsets.only(top: 10, left: 45, right: 6, bottom: 4),
-          child: Text.rich(
-            style: const TextStyle(height: 1.75),
-            maxLines:
-                replyItem!.content!.isText! && replyLevel == '1' ? 3 : 999,
-            overflow: TextOverflow.ellipsis,
-            TextSpan(
-              children: [
-                if (replyItem!.isTop!)
-                  const WidgetSpan(
-                    alignment: PlaceholderAlignment.top,
-                    child: PBadge(
-                      text: 'TOP',
-                      size: 'small',
-                      stack: 'normal',
-                      type: 'line',
-                      fs: 9,
+          child: LayoutBuilder(
+              builder: (BuildContext context, BoxConstraints boxConstraints) {
+            String text = replyItem?.content?.message ?? '';
+            bool didExceedMaxLines = false;
+            final double maxWidth = boxConstraints.maxWidth;
+            TextPainter? textPainter;
+            final int maxLines =
+                replyItem!.content!.isText! && replyLevel == '1' ? 6 : 999;
+            try {
+              textPainter = TextPainter(
+                text: TextSpan(text: text),
+                maxLines: maxLines,
+                textDirection: Directionality.of(context),
+              );
+              textPainter.layout(maxWidth: maxWidth);
+              didExceedMaxLines = textPainter.didExceedMaxLines;
+            } catch (e) {
+              debugPrint('Error while measuring text: $e');
+              didExceedMaxLines = false;
+            }
+            return Text.rich(
+              style: const TextStyle(height: 1.75),
+              TextSpan(
+                children: [
+                  if (replyItem!.isTop!)
+                    const WidgetSpan(
+                      alignment: PlaceholderAlignment.top,
+                      child: PBadge(
+                        text: 'TOP',
+                        size: 'small',
+                        stack: 'normal',
+                        type: 'line',
+                        fs: 9,
+                      ),
                     ),
+                  buildContent(
+                    context,
+                    replyItem!,
+                    replyReply,
+                    null,
+                    didExceedMaxLines,
+                    textPainter,
                   ),
-                buildContent(context, replyItem!, replyReply, null),
-              ],
-            ),
-          ),
+                ],
+              ),
+            );
+          }),
         ),
         // 操作区域
         bottonAction(context, replyItem!.replyControl, replySave),
@@ -465,8 +490,8 @@ class ReplyItemRow extends StatelessWidget {
                                 fs: 9,
                               ),
                             ),
-                          buildContent(
-                              context, replies![i], replyReply, replyItem),
+                          buildContent(context, replies![i], replyReply,
+                              replyItem, false, null),
                         ],
                       ),
                     ),
@@ -508,7 +533,13 @@ class ReplyItemRow extends StatelessWidget {
 }
 
 InlineSpan buildContent(
-    BuildContext context, replyItem, replyReply, fReplyItem) {
+  BuildContext context,
+  replyItem,
+  replyReply,
+  fReplyItem,
+  bool didExceedMaxLines,
+  TextPainter? textPainter,
+) {
   final String routePath = Get.currentRoute;
   bool isVideoPage = routePath.startsWith('/video');
   ColorScheme colorScheme = Theme.of(context).colorScheme;
@@ -519,6 +550,25 @@ InlineSpan buildContent(
   final content = replyItem.content;
   final List<InlineSpan> spanChilds = <InlineSpan>[];
 
+  if (didExceedMaxLines && content.message != '') {
+    final textSize = textPainter!.size;
+    var position = textPainter.getPositionForOffset(
+      Offset(
+        textSize.width,
+        textSize.height,
+      ),
+    );
+    final endOffset = textPainter.getOffsetBefore(position.offset);
+
+    if (endOffset != null && endOffset > 0) {
+      content.message = content.message.substring(0, endOffset);
+    } else {
+      content.message = content.message.substring(0, position.offset);
+    }
+  } else {
+    content.message = content.message2;
+  }
+
   // 投票
   if (content.vote.isNotEmpty) {
     content.message.splitMapJoin(RegExp(r"\{vote:.*?\}"),
@@ -547,13 +597,6 @@ InlineSpan buildContent(
     });
   }
   content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
-  content.message = content.message
-      .replaceAll('&amp;', '&')
-      .replaceAll('&lt;', '<')
-      .replaceAll('&gt;', '>')
-      .replaceAll('&quot;', '"')
-      .replaceAll('&apos;', "'")
-      .replaceAll('&nbsp;', ' ');
   // 构建正则表达式
   final List<String> specialTokens = [
     ...content.emote.keys,
@@ -874,6 +917,18 @@ InlineSpan buildContent(
       }
     }
   }
+
+  if (didExceedMaxLines) {
+    spanChilds.add(
+      TextSpan(
+        text: '\n查看更多',
+        style: TextStyle(
+          color: colorScheme.primary,
+        ),
+      ),
+    );
+  }
+
   // 图片渲染
   if (content.pictures.isNotEmpty) {
     final List<String> picList = <String>[];