Merge remote-tracking branch 'upstream/main'

2025-12-06 09:13:48 +08:00 · 2024-02-01 21:04:31 +08:00
parent 471ecd80e7 e24ccc16fa
commit a1cce4da82
25 changed files with 698 additions and 184 deletions
--- a/lib/pages/about/index.dart
+++ b/lib/pages/about/index.dart
@@ -133,6 +133,11 @@ class _AboutPageState extends State<AboutPage> {
              title: const Text('赞助'),
              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
            ),
+            ListTile(
+              onTap: () => _aboutController.logs(),
+              title: const Text('错误日志'),
+              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
+            ),
          ],
        ),
      ),
@@ -260,4 +265,9 @@ class AboutController extends GetxController {
      mode: LaunchMode.externalApplication,
    );
  }
+
+  // 日志
+  logs() {
+    Get.toNamed('/logs');
+  }
 }
--- a/lib/pages/dynamics/widgets/content_panel.dart
+++ b/lib/pages/dynamics/widgets/content_panel.dart
@@ -1,5 +1,6 @@
 // 内容
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/dynamics/result.dart';
@@ -80,7 +81,7 @@ class _ContentState extends State<Content> {
                            height: height,
                          ),
                        ),
-                        height > maxHeight
+                        height > Get.size.height * 0.9
                            ? const PBadge(
                                text: '长图',
                                right: 8,
--- a/lib/pages/dynamics/widgets/pic_panel.dart
+++ b/lib/pages/dynamics/widgets/pic_panel.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
@@ -87,7 +88,7 @@ Widget picWidget(item, context) {
              childAspectRatio: aspectRatio,
              children: list,
            ),
-            if (len == 1 && origAspectRatio < 0.4)
+            if (len == 1 && height > Get.size.height * 0.9)
              const PBadge(
                text: '长图',
                top: null,
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@@ -63,13 +63,16 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
  }

  void setTabConfig() async {
-    defaultTabs = tabsConfig;
+    defaultTabs = [...tabsConfig];
    tabbarSort = settingStorage.get(SettingBoxKey.tabbarSort,
        defaultValue: ['live', 'rcmd', 'hot', 'bangumi']);
+    defaultTabs.retainWhere(
+        (item) => tabbarSort.contains((item['type'] as TabType).id));
+    defaultTabs.sort((a, b) => tabbarSort
+        .indexOf((a['type'] as TabType).id)
+        .compareTo(tabbarSort.indexOf((b['type'] as TabType).id)));

-    tabs.value = defaultTabs
-        .where((i) => tabbarSort.contains((i['type'] as TabType).id))
-        .toList();
+    tabs.value = defaultTabs;

    if (tabbarSort.contains(TabType.rcmd.id)) {
      initialIndex.value = tabbarSort.indexOf(TabType.rcmd.id);
--- a/lib/pages/search_panel/widgets/article_panel.dart
+++ b/lib/pages/search_panel/widgets/article_panel.dart
@@ -25,16 +25,17 @@ Widget searchArticlePanel(BuildContext context, ctr, list) {
          padding: const EdgeInsets.fromLTRB(
              StyleString.safeSpace, 5, StyleString.safeSpace, 5),
          child: LayoutBuilder(builder: (context, boxConstraints) {
-            double width = (boxConstraints.maxWidth -
-                StyleString.cardSpace *
-                    6 /
-                    MediaQuery.textScalerOf(context).scale(2.0));
+            final double width = (boxConstraints.maxWidth -
+                    StyleString.cardSpace *
+                        6 /
+                        MediaQuery.textScalerOf(context).scale(1.0)) /
+                2;
            return Container(
              constraints: const BoxConstraints(minHeight: 88),
              height: width / StyleString.aspectRatio,
              child: Row(
                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
+                children: <Widget>[
                  if (list[index].imageUrls != null &&
                      list[index].imageUrls.isNotEmpty)
                    AspectRatio(
--- a/lib/pages/setting/pages/home_tabbar_set.dart
+++ b/lib/pages/setting/pages/home_tabbar_set.dart
@@ -22,6 +22,17 @@ class _TabbarSetPageState extends State<TabbarSetPage> {
    defaultTabs = tabsConfig;
    tabbarSort = settingStorage.get(SettingBoxKey.tabbarSort,
        defaultValue: ['live', 'rcmd', 'hot', 'bangumi']);
+    // 对 tabData 进行排序
+    defaultTabs.sort((a, b) {
+      int indexA = tabbarSort.indexOf((a['type'] as TabType).id);
+      int indexB = tabbarSort.indexOf((b['type'] as TabType).id);
+
+      // 如果类型在 sortOrder 中不存在，则放在末尾
+      if (indexA == -1) indexA = tabbarSort.length;
+      if (indexB == -1) indexB = tabbarSort.length;
+
+      return indexA.compareTo(indexB);
+    });
  }

  void saveEdit() {
--- a/lib/pages/setting/pages/logs.dart
+++ b/lib/pages/setting/pages/logs.dart
@@ -0,0 +1,201 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+import 'package:url_launcher/url_launcher.dart';
+import '../../../services/loggeer.dart';
+
+class LogsPage extends StatefulWidget {
+  const LogsPage({super.key});
+
+  @override
+  State<LogsPage> createState() => _LogsPageState();
+}
+
+class _LogsPageState extends State<LogsPage> {
+  late File logsPath;
+  late String fileContent;
+  List logsContent = [];
+
+  @override
+  void initState() {
+    getPath();
+    super.initState();
+  }
+
+  void getPath() async {
+    logsPath = await getLogsPath();
+    fileContent = await logsPath.readAsString();
+    logsContent = await parseLogs(fileContent);
+    setState(() {});
+  }
+
+  Future<List<Map<String, dynamic>>> parseLogs(String fileContent) async {
+    const String splitToken =
+        '======================================================================';
+    List contentList = fileContent.split(splitToken).map((item) {
+      return item
+          .replaceAll(
+              '============================== CATCHER 2 LOG ==============================',
+              'Pilipala错误日志 \n ********************')
+          .replaceAll('DEVICE INFO', '设备信息')
+          .replaceAll('APP INFO', '应用信息')
+          .replaceAll('ERROR', '错误信息')
+          .replaceAll('STACK TRACE', '错误堆栈');
+    }).toList();
+    List<Map<String, dynamic>> result = [];
+    for (String i in contentList) {
+      DateTime? date;
+      String body = i
+          .split("\n")
+          .map((l) {
+            if (l.startsWith("Crash occurred on")) {
+              date = DateTime.parse(
+                l.split("Crash occurred on")[1].trim().split('.')[0],
+              );
+              return "";
+            }
+            return l;
+          })
+          .where((dynamic l) => l.replaceAll("\n", "").trim().isNotEmpty)
+          .join("\n");
+      if (date != null || body != '') {
+        result.add({'date': date, 'body': body, 'expand': false});
+      }
+    }
+    return result.reversed.toList();
+  }
+
+  void copyLogs() async {
+    await Clipboard.setData(ClipboardData(text: fileContent));
+    if (context.mounted) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('复制成功')),
+      );
+    }
+  }
+
+  void feedback() {
+    launchUrl(
+      Uri.parse('https://github.com/guozhigq/pilipala/issues'),
+      // 系统自带浏览器打开
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
+  void clearLogsHandle() async {
+    if (await clearLogs()) {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('已清空')),
+        );
+        logsContent = [];
+        setState(() {});
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: false,
+        titleSpacing: 0,
+        title: Text('日志', style: Theme.of(context).textTheme.titleMedium),
+        actions: [
+          PopupMenuButton<String>(
+            onSelected: (String type) {
+              // 处理菜单项选择的逻辑
+              switch (type) {
+                case 'copy':
+                  copyLogs();
+                  break;
+                case 'feedback':
+                  feedback();
+                  break;
+                case 'clear':
+                  clearLogsHandle();
+                  break;
+                default:
+              }
+            },
+            itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
+              const PopupMenuItem<String>(
+                value: 'copy',
+                child: Text('复制日志'),
+              ),
+              const PopupMenuItem<String>(
+                value: 'feedback',
+                child: Text('错误反馈'),
+              ),
+              const PopupMenuItem<String>(
+                value: 'clear',
+                child: Text('清空日志'),
+              ),
+            ],
+          ),
+          const SizedBox(width: 6),
+        ],
+      ),
+      body: logsContent.isNotEmpty
+          ? ListView.builder(
+              itemCount: logsContent.length,
+              itemBuilder: (context, index) {
+                final log = logsContent[index];
+                return Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Row(
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: Text(
+                            log['date'].toString(),
+                            style: Theme.of(context).textTheme.titleMedium,
+                          ),
+                        ),
+                        TextButton.icon(
+                          onPressed: () async {
+                            await Clipboard.setData(
+                              ClipboardData(text: log['body']),
+                            );
+                            if (context.mounted) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text(
+                                    '已将 ${log['date'].toString()} 复制至剪贴板',
+                                  ),
+                                ),
+                              );
+                            }
+                          },
+                          icon: const Icon(Icons.copy_outlined, size: 16),
+                          label: const Text('复制'),
+                        )
+                      ],
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Card(
+                        elevation: 1,
+                        clipBehavior: Clip.antiAliasWithSaveLayer,
+                        child: Padding(
+                          padding: const EdgeInsets.all(12.0),
+                          child: SelectableText(log['body']),
+                        ),
+                      ),
+                    ),
+                    const Divider(indent: 12, endIndent: 12),
+                  ],
+                );
+              },
+            )
+          : const CustomScrollView(
+              slivers: <Widget>[
+                NoData(),
+              ],
+            ),
+    );
+  }
+}
--- a/lib/pages/video/detail/reply/view.dart
+++ b/lib/pages/video/detail/reply/view.dart
@@ -256,7 +256,12 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                      // 请求错误
                      return HttpError(
                        errMsg: data['msg'],
-                        fn: () => setState(() {}),
+                        fn: () {
+                          setState(() {
+                            _futureBuilderFuture =
+                                _videoReplyController.queryReplyList();
+                          });
+                        },
                      );
                    }
                  } else {
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@@ -784,7 +784,7 @@ InlineSpan buildContent(
                          height: height,
                        ),
                      ),
-                      height > maxHeight
+                      height > Get.size.height * 0.9
                          ? const PBadge(
                              text: '长图',
                              right: 8,
--- a/lib/pages/whisper_detail/controller.dart
+++ b/lib/pages/whisper_detail/controller.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/msg.dart';
--- a/lib/pages/whisper_detail/widget/chat_item.dart
+++ b/lib/pages/whisper_detail/widget/chat_item.dart
@@ -5,7 +5,6 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:get/get_core/src/get_main.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -53,12 +52,13 @@ class ChatItem extends StatelessWidget {
  Widget build(BuildContext context) {
    bool isOwner =
        item.senderUid == GStrorage.userInfo.get('userInfoCache').mid;
-    bool isPic = item.msgType == MsgType.pic; // 图片
-    bool isText = item.msgType == MsgType.text; // 文本
+
+    bool isPic = item.msgType == MsgType.pic.value; // 图片
+    bool isText = item.msgType == MsgType.text.value; // 文本
    // bool isArchive = item.msgType == 11; // 投稿
    // bool isArticle = item.msgType == 12; // 专栏
-    bool isRevoke = item.msgType == MsgType.revoke; // 撤回消息
-    bool isShareV2 = item.msgType == MsgType.share_v2;
+    bool isRevoke = item.msgType == MsgType.revoke.value; // 撤回消息
+    bool isShareV2 = item.msgType == MsgType.share_v2.value;
    bool isSystem =
        item.msgType == 18 || item.msgType == 10 || item.msgType == 13;
    dynamic content = item.content ?? '';
@@ -72,7 +72,7 @@ class ChatItem extends StatelessWidget {
      var text = content['content'];
      if (e_infos != null) {
        final List<InlineSpan> children = [];
-        Map<String,String> emojiMap = {};
+        Map<String, String> emojiMap = {};
        for (var e in e_infos!) {
          emojiMap[e['text']] = e['url'];
        }
@@ -83,18 +83,22 @@ class ChatItem extends StatelessWidget {
            if (emojiMap.containsKey(emojiKey)) {
              children.add(WidgetSpan(
                child: NetworkImgLayer(
-                  width: 18, height: 18,
-                  src: emojiMap[emojiKey]!,),
+                  width: 18,
+                  height: 18,
+                  src: emojiMap[emojiKey]!,
+                ),
              ));
            }
            return '';
          },
          onNonMatch: (String text) {
-            children.add(TextSpan(text: text, style: TextStyle(
-              color: textColor(context),
-              letterSpacing: 0.6,
-              height: 1.5,
-            )));
+            children.add(TextSpan(
+                text: text,
+                style: TextStyle(
+                  color: textColor(context),
+                  letterSpacing: 0.6,
+                  height: 1.5,
+                )));
            return '';
          },
        );
@@ -123,11 +127,13 @@ class ChatItem extends StatelessWidget {
          return SystemNotice2(item: item);
        case MsgType.notify_text:
          return Text(
-            jsonDecode(content['content']).map((m) => m['text'] as String).join("\n"),
+            jsonDecode(content['content'])
+                .map((m) => m['text'] as String)
+                .join("\n"),
            style: TextStyle(
-                letterSpacing: 0.6,
-                height: 5,
-              color: Theme.of(context).colorScheme.outline.withOpacity(0.8)
+              letterSpacing: 0.6,
+              height: 5,
+              color: Theme.of(context).colorScheme.outline.withOpacity(0.8),
            ),
          );
        case MsgType.text:
@@ -166,9 +172,11 @@ class ChatItem extends StatelessWidget {
              Text(
                content['title'],
                style: TextStyle(
-                    letterSpacing: 0.6,
-                    height: 1.5,
-                    color: textColor(context), fontWeight: FontWeight.bold),
+                  letterSpacing: 0.6,
+                  height: 1.5,
+                  color: textColor(context),
+                  fontWeight: FontWeight.bold,
+                ),
              ),
              const SizedBox(height: 1),
              Text(
@@ -186,9 +194,11 @@ class ChatItem extends StatelessWidget {
          return Text(
            content['content'] ?? content.toString(),
            style: TextStyle(
-                letterSpacing: 0.6,
-                height: 1.5,
-                color: textColor(context), fontWeight: FontWeight.bold),
+              letterSpacing: 0.6,
+              height: 1.5,
+              color: textColor(context),
+              fontWeight: FontWeight.bold,
+            ),
          );
      }
    }