Merge branch 'main' into feature-ad

lib/models/search/result.dart

@@ -437,8 +437,7 @@ class SearchArticleItemModel {
     pubTime = json['pub_time'];
     like = json['like'];
     title = Em.regTitle(json['title']);
-    subTitle =
+    subTitle = json['title'].replaceAll(RegExp(r'<[^>]*>'), '');
-        Em.decodeHtmlEntities(json['title'].replaceAll(RegExp(r'<[^>]*>'), ''));
     rankOffset = json['rank_offset'];
     mid = json['mid'];
     imageUrls = json['image_urls'];

lib/pages/history/widgets/item.dart

@@ -185,7 +185,7 @@ class HistoryItem extends StatelessWidget {
                                             ? '已看完'
                                             : '${Utils.timeFormat(videoItem.progress!)}/${Utils.timeFormat(videoItem.duration!)}',
                                         right: 6.0,
-                                        bottom: 8.0,
+                                        bottom: 6.0,
                                         type: 'gray',
                                       ),
                                     // 右上角
@@ -258,27 +258,6 @@ class HistoryItem extends StatelessWidget {
                               ),
                             ),
                           ),
-                          videoItem.progress != 0
-                              ? Positioned(
-                                  left: 3,
-                                  right: 3,
-                                  bottom: 0,
-                                  child: ClipRRect(
-                                    borderRadius: BorderRadius.only(
-                                      bottomLeft: Radius.circular(
-                                          StyleString.imgRadius.x),
-                                      bottomRight: Radius.circular(
-                                          StyleString.imgRadius.x),
-                                    ),
-                                    child: LinearProgressIndicator(
-                                      value: videoItem.progress == -1
-                                          ? 100
-                                          : videoItem.progress /
-                                              videoItem.duration,
-                                    ),
-                                  ),
-                                )
-                              : const SizedBox()
                         ],
                       ),
                       VideoContent(videoItem: videoItem, ctr: ctr)

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

@@ -149,17 +149,14 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                 delegate: _MySliverPersistentHeaderDelegate(
                   child: Container(
                     height: 40,
-                    padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
+                    padding: const EdgeInsets.fromLTRB(12, 6, 6, 0),
-                    color: Theme.of(context).colorScheme.surface,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        Obx(
+                        Text(
-                          () => Text(
                           '${_videoReplyController.sortTypeLabel.value}评论',
                           style: const TextStyle(fontSize: 13),
                         ),
-                        ),
                         SizedBox(
                           height: 35,
                           child: TextButton.icon(

lib/utils/em.dart

@@ -19,17 +19,7 @@ class Em {
       return regCate(matchStr);
     }, onNonMatch: (String str) {
       if (str != '') {
-        str = decodeHtmlEntities(str);
+        str = str
-        Map map = {'type': 'text', 'text': str};
-        res.add(map);
-      }
-      return str;
-    });
-    return res;
-  }
-
-  static String decodeHtmlEntities(String title) {
-    return title
             .replaceAll('&lt;', '<')
             .replaceAll('&gt;', '>')
             .replaceAll('&#34;', '"')
@@ -37,7 +27,12 @@ class Em {
             .replaceAll('&quot;', '"')
             .replaceAll('&apos;', "'")
             .replaceAll('&nbsp;', " ")
-        .replaceAll('&amp;', "&")
+            .replaceAll('&amp;', "&");
-        .replaceAll('&#x27;', "'");
+        Map map = {'type': 'text', 'text': str};
+        res.add(map);
+      }
+      return str;
+    });
+    return res;
   }
 }