feat: 热搜词跳转直播

feat: 私信支持显示自动推送回复

.github/workflows/main.yml

@@ -1,15 +1,15 @@
-name: build_apk
+name: Pilipala Release
 
 # action事件触发
 on:
   push:
     # push tag时触发
     tags:
-      - 'v*.*.*'
+      - "v*.*.*"
 
 # 可以有多个jobs
 jobs:
-    build_apk:
+  android:
     # 运行环境 ubuntu-latest window-latest mac-latest
     runs-on: ubuntu-latest
 
@@ -48,13 +48,19 @@ jobs:
           KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
 
       - name: flutter build apk
-              # 对应 android/app/build.gradle signingConfigs中的配置项
         run: flutter build apk --release --split-per-abi
         env:
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
 
+      - name: flutter build apk
+        run: flutter build apk --release
+        env:
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
+
       - name: 获取版本号
         id: version
         run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT
@@ -63,22 +69,89 @@ jobs:
       #   id: date
       #   run: echo "date=$(date +'%m%d')" >>$GITHUB_OUTPUT
 
-            - name: 重命名应用 Pili-arm64-v8a-*.*.*.0101.apk
+      - name: 重命名应用
         run: |
           # DATE=${{ steps.date.outputs.date }}
-                for file in build/app/outputs/flutter-apk/app-*-release.apk; do
+          for file in build/app/outputs/flutter-apk/app-*.apk; do
-                  if [[ $file =~ app-(.*)-release.apk ]]; then
+            if [[ $file =~ app-(.?*)release.apk ]]; then
-                    new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}-${{ steps.version.outputs.version }}.apk"
+              new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}${{ steps.version.outputs.version }}.apk"
               mv "$file" "$new_file_name"
             fi
           done
 
-            - name: 构建和发布release
+      - name: 上传
+        uses: actions/upload-artifact@v3
+        with:
+          name: Pilipala-Release
+          path: |
+            build/app/outputs/flutter-apk/Pili-*.apk
+
+  iOS:
+    runs-on: macos-latest
+
+    steps:
+      - name: 代码迁出
+        uses: actions/checkout@v4
+
+      - name: 安装Flutter
+        if: steps.cache-flutter.outputs.cache-hit != 'true'
+        uses: subosito/flutter-action@v2.10.0
+        with:
+          cache: true
+          flutter-version: 3.16.5
+
+      - name: flutter build ipa
+        run: |
+          flutter build ios --release --no-codesign 
+          ln -sf ./build/ios/iphoneos Payload
+          zip -r9 app.ipa Payload/runner.app
+
+      - name: 获取版本号
+        id: version
+        run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT
+
+      - name: 重命名应用
+        run: |
+          DATE=${{ steps.date.outputs.date }}
+          for file in app.ipa; do
+            new_file_name="build/Pili-${{ steps.version.outputs.version }}.ipa"
+            mv "$file" "$new_file_name"
+          done
+
+      - name: 上传
+        uses: actions/upload-artifact@v3
+        with:
+          if-no-files-found: error
+          name: Pilipala-Release
+          path: |
+            build/Pili-*.ipa
+
+  upload:
+    runs-on: ubuntu-latest
+
+    needs:
+      - android
+      - iOS
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: Pilipala-Release
+          path: ./Pilipala-Release
+
+      - name: Install dependencies
+        run: sudo apt-get install tree -y
+
+      - name: Get version
+        id: version
+        run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT
+
+      - name: Upload Release
         uses: ncipollo/release-action@v1
         with:
-                  # release title
           name: v${{ steps.version.outputs.version }}
-                  artifacts: "build/app/outputs/flutter-apk/Pili-*.apk"
-                  bodyFile: "change_log/${{steps.version.outputs.version}}.md"
           token: ${{ secrets.GIT_TOKEN }}
+          omitBodyDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
           allowUpdates: true
+          artifacts: Pilipala-Release/*

android/app/build.gradle

@@ -58,11 +58,10 @@ android {
         applicationId "com.guozhigq.pilipala"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        // minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        minSdkVersion 19
+        minSdkVersion 21
         multiDexEnabled true
     }
 

change_log/1.0.18.0130.md

@@ -0,0 +1,16 @@
+## 1.0.18
+
+
+### 功能
+
+
+### 修复
+
+
+### 优化
+
+  
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.19.0131.md

@@ -0,0 +1,15 @@
+## 1.0.19
+
+
+### 修复
++ 视频404、评论加载错误
++ bvav转换
+
+### 优化
++ 视频详情页内存占用
+
+  
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

ios/Podfile.lock

@@ -13,8 +13,13 @@ PODS:
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
+  - flutter_mailer (0.0.1):
+    - Flutter
   - flutter_volume_controller (0.0.1):
     - Flutter
+  - fluttertoast (0.0.2):
+    - Flutter
+    - Toast
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
@@ -49,6 +54,7 @@ PODS:
     - Flutter
   - system_proxy (0.0.1):
     - Flutter
+  - Toast (4.1.0)
   - url_launcher_ios (0.0.1):
     - Flutter
   - volume_controller (0.0.1):
@@ -68,7 +74,9 @@ DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
+  - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`)
   - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`)
+  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - gt3_flutter_plugin (from `.symlinks/plugins/gt3_flutter_plugin/ios`)
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
   - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
@@ -93,6 +101,7 @@ SPEC REPOS:
     - FMDB
     - GT3Captcha-iOS
     - ReachabilitySwift
+    - Toast
 
 EXTERNAL SOURCES:
   appscheme:
@@ -109,8 +118,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
     :path: Flutter
+  flutter_mailer:
+    :path: ".symlinks/plugins/flutter_mailer/ios"
   flutter_volume_controller:
     :path: ".symlinks/plugins/flutter_volume_controller/ios"
+  fluttertoast:
+    :path: ".symlinks/plugins/fluttertoast/ios"
   gt3_flutter_plugin:
     :path: ".symlinks/plugins/gt3_flutter_plugin/ios"
   media_kit_libs_ios_video:
@@ -156,7 +169,9 @@ SPEC CHECKSUMS:
   connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
   flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
+  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   gt3_flutter_plugin: bfa1f26e9a09dc00401514be5ed437f964cabf23
   GT3Captcha-iOS: 5e3b1077834d8a9d6f4d64a447a30af3e14affe6
@@ -173,6 +188,7 @@ SPEC CHECKSUMS:
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   status_bar_control: 7c84146799e6a076315cc1550f78ef53aae3e446
   system_proxy: bec1a5c5af67dd3e3ebf43979400a8756c04cc44
+  Toast: ec33c32b8688982cecc6348adeae667c1b9938da
   url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47

lib/http/api.dart

@@ -185,7 +185,7 @@ class Api {
   static const String searchDefault = '/x/web-interface/wbi/search/default';
 
   // 搜索关键词
-  static const String serachSuggest =
+  static const String searchSuggest =
       'https://s.search.bilibili.com/main/suggest';
 
   // 分类搜索

lib/http/init.dart

@@ -8,6 +8,7 @@ import 'package:dio/io.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 // import 'package:dio_http2_adapter/dio_http2_adapter.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/utils/id_utils.dart';
 import '../utils/storage.dart';
 import '../utils/utils.dart';
 import 'constants.dart';
@@ -77,10 +78,11 @@ class Request {
   static setOptionsHeaders(userInfo, bool status) {
     if (status) {
       dio.options.headers['x-bili-mid'] = userInfo.mid.toString();
+      dio.options.headers['x-bili-aurora-eid'] =
+          IdUtils.genAuroraEid(userInfo.mid);
     }
     dio.options.headers['env'] = 'prod';
     dio.options.headers['app-key'] = 'android64';
-    dio.options.headers['x-bili-aurora-eid'] = 'UlMFQVcABlAH';
     dio.options.headers['x-bili-aurora-zone'] = 'sh001';
     dio.options.headers['referer'] = 'https://www.bilibili.com/';
   }
@@ -177,8 +179,14 @@ class Request {
       );
       return response;
     } on DioException catch (e) {
-      print('get error: $e');
+      Response errResponse = Response(
-      return Future.error(await ApiInterceptor.dioError(e));
+        data: {
+          'message': await ApiInterceptor.dioError(e)
+        }, // 将自定义 Map 数据赋值给 Response 的 data 属性
+        statusCode: 200,
+        requestOptions: RequestOptions(),
+      );
+      return errResponse;
     }
   }
 
@@ -199,8 +207,14 @@ class Request {
       // print('post success: ${response.data}');
       return response;
     } on DioException catch (e) {
-      print('post error: $e');
+      Response errResponse = Response(
-      return Future.error(await ApiInterceptor.dioError(e));
+        data: {
+          'message': await ApiInterceptor.dioError(e)
+        }, // 将自定义 Map 数据赋值给 Response 的 data 属性
+        statusCode: 200,
+        requestOptions: RequestOptions(),
+      );
+      return errResponse;
     }
   }
 

lib/http/interceptor.dart

@@ -5,7 +5,6 @@ import 'package:dio/dio.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
 import '../utils/storage.dart';
-// import 'package:get/get.dart' hide Response;
 
 class ApiInterceptor extends Interceptor {
   @override
@@ -70,35 +69,28 @@ class ApiInterceptor extends Interceptor {
       case DioExceptionType.sendTimeout:
         return '发送请求超时，请检查网络设置';
       case DioExceptionType.unknown:
-        final String res = await checkConect();
+        final String res = await checkConnect();
-        return '$res \n 网络异常，请稍后重试！';
+        return '$res，网络异常！';
-      // default:
-      //   return 'Dio异常';
     }
   }
 
-  static Future<String> checkConect() async {
+  static Future<String> checkConnect() async {
     final ConnectivityResult connectivityResult =
         await Connectivity().checkConnectivity();
-    if (connectivityResult == ConnectivityResult.mobile) {
+    switch (connectivityResult) {
-      return 'connected with mobile network';
+      case ConnectivityResult.mobile:
-    } else if (connectivityResult == ConnectivityResult.wifi) {
+        return '正在使用移动流量';
-      return 'connected with wifi network';
+      case ConnectivityResult.wifi:
-    } else if (connectivityResult == ConnectivityResult.ethernet) {
+        return '正在使用wifi';
-      // I am connected to a ethernet network.
+      case ConnectivityResult.ethernet:
-      return '';
+        return '正在使用局域网';
-    } else if (connectivityResult == ConnectivityResult.vpn) {
+      case ConnectivityResult.vpn:
-      // I am connected to a vpn network.
+        return '正在使用代理网络';
-      // Note for iOS and macOS:
+      case ConnectivityResult.other:
-      // There is no separate network interface type for [vpn].
+        return '正在使用其他网络';
-      // It returns [other] on any device (also simulator)
+      case ConnectivityResult.none:
-      return '';
+        return '未连接到任何网络';
-    } else if (connectivityResult == ConnectivityResult.other) {
+      default:
-      // I am connected to a network which is not in the above mentioned networks.
-      return '';
-    } else if (connectivityResult == ConnectivityResult.none) {
-      return 'not connected to any network';
-    } else {
         return '';
     }
   }

lib/http/search.dart

@@ -36,7 +36,7 @@ class SearchHttp {
 
   // 获取搜索建议
   static Future searchSuggest({required term}) async {
-    var res = await Request().get(Api.serachSuggest,
+    var res = await Request().get(Api.searchSuggest,
         data: {'term': term, 'main_ver': 'v1', 'highlight': term});
     if (res.data is String) {
       Map<String, dynamic> resultMap = json.decode(res.data);

lib/http/video.dart

@@ -224,10 +224,11 @@ class VideoHttp {
   // 获取投币状态
   static Future hasCoinVideo({required String bvid}) async {
     var res = await Request().get(Api.hasCoinVideo, data: {'bvid': bvid});
+    print('res: $res');
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': true, 'data': []};
+      return {'status': false, 'data': []};
     }
   }
 
@@ -361,7 +362,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': true, 'data': []};
+      return {'status': false, 'data': []};
     }
   }
 
@@ -377,7 +378,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': true, 'data': []};
+      return {'status': false, 'data': []};
     }
   }
 
@@ -433,6 +434,8 @@ class VideoHttp {
     });
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
+    } else {
+      return {'status': false, 'data': null, 'msg': res.data['message']};
     }
   }
 
@@ -447,11 +450,13 @@ class VideoHttp {
       'up_mid': upMid,
     });
     var res = await Request().get(Api.aiConclusion, data: params);
-    if (res.data['code'] == 0) {
+    if (res.data['code'] == 0 && res.data['data']['code'] == 0) {
       return {
         'status': true,
         'data': AiConclusionModel.fromJson(res.data['data']),
       };
+    } else {
+      return {'status': false, 'data': []};
     }
   }
 }

lib/main.dart

@@ -21,6 +21,8 @@ import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc.
+import 'package:catcher_2/catcher_2.dart';
+import './services/loggeer.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -32,7 +34,32 @@ void main() async {
     await setupServiceLocator();
     Request();
     await Request.setCookie();
+
+    // 异常捕获 logo记录
+    final Catcher2Options debugConfig = Catcher2Options(
+      SilentReportMode(),
+      [
+        FileHandler(await getLogsPath()),
+        ConsoleHandler(
+          enableDeviceParameters: false,
+          enableApplicationParameters: false,
+        )
+      ],
+    );
+
+    final Catcher2Options releaseConfig = Catcher2Options(
+      SilentReportMode(),
+      [FileHandler(await getLogsPath())],
+    );
+
+    Catcher2(
+      debugConfig: debugConfig,
+      releaseConfig: releaseConfig,
+      runAppFunction: () {
         runApp(const MyApp());
+      },
+    );
+
     // 小白条、导航栏沉浸
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(

lib/models/common/dynamic_badge_mode.dart

@@ -0,0 +1,9 @@
+enum DynamicBadgeMode { hidden, point, number }
+
+extension DynamicBadgeModeDesc on DynamicBadgeMode {
+  String get description => ['隐藏', '红点', '数字'][index];
+}
+
+extension DynamicBadgeModeCode on DynamicBadgeMode {
+  int get code => [0, 1, 2][index];
+}

lib/models/github/latest.dart

@@ -17,8 +17,9 @@ class LatestDataModel {
     url = json['url'];
     tagName = json['tag_name'];
     createdAt = json['created_at'];
-    assets =
+    assets = json['assets'] != null
-        json['assets'].map<AssetItem>((e) => AssetItem.fromJson(e)).toList();
+        ? json['assets'].map<AssetItem>((e) => AssetItem.fromJson(e)).toList()
+        : [];
     body = json['body'];
   }
 }

lib/models/home/rcmd/result.dart

@@ -1,8 +1,3 @@
-import 'package:hive/hive.dart';
-
-part 'result.g.dart';
-
-@HiveType(typeId: 0)
 class RecVideoItemAppModel {
   RecVideoItemAppModel({
     this.id,
@@ -27,47 +22,27 @@ class RecVideoItemAppModel {
     this.adInfo,
   });
 
-  @HiveField(0)
   int? id;
-  @HiveField(1)
   int? aid;
-  @HiveField(2)
   String? bvid;
-  @HiveField(3)
   int? cid;
-  @HiveField(4)
   String? pic;
-  @HiveField(5)
   RcmdStat? stat;
-  @HiveField(6)
   String? duration;
-  @HiveField(7)
   String? title;
-  @HiveField(8)
   int? isFollowed;
-  @HiveField(9)
   RcmdOwner? owner;
-  @HiveField(10)
   RcmdReason? rcmdReason;
-  @HiveField(11)
   String? goto;
-  @HiveField(12)
   int? param;
-  @HiveField(13)
   String? uri;
-  @HiveField(14)
   String? talkBack;
   // 番剧
-  @HiveField(15)
   String? bangumiView;
-  @HiveField(16)
   String? bangumiFollow;
-  @HiveField(17)
   String? bangumiBadge;
 
-  @HiveField(18)
   String? cardType;
-  @HiveField(19)
   Map? adInfo;
 
   RecVideoItemAppModel.fromJson(Map<String, dynamic> json) {
@@ -102,18 +77,14 @@ class RecVideoItemAppModel {
   }
 }
 
-@HiveType(typeId: 1)
 class RcmdStat {
   RcmdStat({
     this.view,
     this.like,
     this.danmu,
   });
-  @HiveField(0)
   String? view;
-  @HiveField(1)
   String? like;
-  @HiveField(2)
   String? danmu;
 
   RcmdStat.fromJson(Map<String, dynamic> json) {
@@ -122,13 +93,10 @@ class RcmdStat {
   }
 }
 
-@HiveType(typeId: 2)
 class RcmdOwner {
   RcmdOwner({this.name, this.mid});
 
-  @HiveField(0)
   String? name;
-  @HiveField(1)
   int? mid;
 
   RcmdOwner.fromJson(Map<String, dynamic> json) {
@@ -141,13 +109,11 @@ class RcmdOwner {
   }
 }
 
-@HiveType(typeId: 8)
 class RcmdReason {
   RcmdReason({
     this.content,
   });
 
-  @HiveField(0)
   String? content;
 
   RcmdReason.fromJson(Map<String, dynamic> json) {

lib/models/home/rcmd/result.g.dart

@@ -1,209 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'result.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class RecVideoItemAppModelAdapter extends TypeAdapter<RecVideoItemAppModel> {
-  @override
-  final int typeId = 0;
-
-  @override
-  RecVideoItemAppModel read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return RecVideoItemAppModel(
-      id: fields[0] as int?,
-      aid: fields[1] as int?,
-      bvid: fields[2] as String?,
-      cid: fields[3] as int?,
-      pic: fields[4] as String?,
-      stat: fields[5] as RcmdStat?,
-      duration: fields[6] as String?,
-      title: fields[7] as String?,
-      isFollowed: fields[8] as int?,
-      owner: fields[9] as RcmdOwner?,
-      rcmdReason: fields[10] as RcmdReason?,
-      goto: fields[11] as String?,
-      param: fields[12] as int?,
-      uri: fields[13] as String?,
-      talkBack: fields[14] as String?,
-      bangumiView: fields[15] as String?,
-      bangumiFollow: fields[16] as String?,
-      bangumiBadge: fields[17] as String?,
-      cardType: fields[18] as String?,
-      adInfo: (fields[19] as Map?)?.cast<dynamic, dynamic>(),
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, RecVideoItemAppModel obj) {
-    writer
-      ..writeByte(20)
-      ..writeByte(0)
-      ..write(obj.id)
-      ..writeByte(1)
-      ..write(obj.aid)
-      ..writeByte(2)
-      ..write(obj.bvid)
-      ..writeByte(3)
-      ..write(obj.cid)
-      ..writeByte(4)
-      ..write(obj.pic)
-      ..writeByte(5)
-      ..write(obj.stat)
-      ..writeByte(6)
-      ..write(obj.duration)
-      ..writeByte(7)
-      ..write(obj.title)
-      ..writeByte(8)
-      ..write(obj.isFollowed)
-      ..writeByte(9)
-      ..write(obj.owner)
-      ..writeByte(10)
-      ..write(obj.rcmdReason)
-      ..writeByte(11)
-      ..write(obj.goto)
-      ..writeByte(12)
-      ..write(obj.param)
-      ..writeByte(13)
-      ..write(obj.uri)
-      ..writeByte(14)
-      ..write(obj.talkBack)
-      ..writeByte(15)
-      ..write(obj.bangumiView)
-      ..writeByte(16)
-      ..write(obj.bangumiFollow)
-      ..writeByte(17)
-      ..write(obj.bangumiBadge)
-      ..writeByte(18)
-      ..write(obj.cardType)
-      ..writeByte(19)
-      ..write(obj.adInfo);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is RecVideoItemAppModelAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
-class RcmdStatAdapter extends TypeAdapter<RcmdStat> {
-  @override
-  final int typeId = 1;
-
-  @override
-  RcmdStat read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return RcmdStat(
-      view: fields[0] as String?,
-      like: fields[1] as String?,
-      danmu: fields[2] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, RcmdStat obj) {
-    writer
-      ..writeByte(3)
-      ..writeByte(0)
-      ..write(obj.view)
-      ..writeByte(1)
-      ..write(obj.like)
-      ..writeByte(2)
-      ..write(obj.danmu);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is RcmdStatAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
-class RcmdOwnerAdapter extends TypeAdapter<RcmdOwner> {
-  @override
-  final int typeId = 2;
-
-  @override
-  RcmdOwner read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return RcmdOwner(
-      name: fields[0] as String?,
-      mid: fields[1] as int?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, RcmdOwner obj) {
-    writer
-      ..writeByte(2)
-      ..writeByte(0)
-      ..write(obj.name)
-      ..writeByte(1)
-      ..write(obj.mid);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is RcmdOwnerAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
-class RcmdReasonAdapter extends TypeAdapter<RcmdReason> {
-  @override
-  final int typeId = 8;
-
-  @override
-  RcmdReason read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return RcmdReason(
-      content: fields[0] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, RcmdReason obj) {
-    writer
-      ..writeByte(1)
-      ..writeByte(0)
-      ..write(obj.content);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is RcmdReasonAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}

lib/models/msg/session.dart

@@ -166,7 +166,7 @@ class SessionMsgDataModel {
   int? hasMore;
   int? minSeqno;
   int? maxSeqno;
-  List? eInfos;
+  List<dynamic>? eInfos;
 
   SessionMsgDataModel.fromJson(Map<String, dynamic> json) {
     messages = json['messages']

lib/models/search/hot.dart

@@ -1,14 +1,8 @@
-import 'package:hive/hive.dart';
-
-part 'hot.g.dart';
-
-@HiveType(typeId: 6)
 class HotSearchModel {
   HotSearchModel({
     this.list,
   });
 
-  @HiveField(0)
   List<HotSearchItem>? list;
 
   HotSearchModel.fromJson(Map<String, dynamic> json) {
@@ -18,7 +12,6 @@ class HotSearchModel {
   }
 }
 
-@HiveType(typeId: 7)
 class HotSearchItem {
   HotSearchItem({
     this.keyword,
@@ -27,20 +20,19 @@ class HotSearchItem {
     this.icon,
   });
 
-  @HiveField(0)
   String? keyword;
-  @HiveField(1)
   String? showName;
   // 4/5热 11话题 8普通 7直播
-  @HiveField(2)
   int? wordType;
-  @HiveField(3)
   String? icon;
+  List? liveId;
 
   HotSearchItem.fromJson(Map<String, dynamic> json) {
     keyword = json['keyword'];
     showName = json['show_name'];
     wordType = json['word_type'];
     icon = json['icon'];
+    liveId = json['live_id'];
+    liveId = json['live_id'];
   }
 }

lib/models/search/hot.g.dart

@@ -1,84 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'hot.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class HotSearchModelAdapter extends TypeAdapter<HotSearchModel> {
-  @override
-  final int typeId = 6;
-
-  @override
-  HotSearchModel read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return HotSearchModel(
-      list: (fields[0] as List?)?.cast<HotSearchItem>(),
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, HotSearchModel obj) {
-    writer
-      ..writeByte(1)
-      ..writeByte(0)
-      ..write(obj.list);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is HotSearchModelAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
-class HotSearchItemAdapter extends TypeAdapter<HotSearchItem> {
-  @override
-  final int typeId = 7;
-
-  @override
-  HotSearchItem read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return HotSearchItem(
-      keyword: fields[0] as String?,
-      showName: fields[1] as String?,
-      wordType: fields[2] as int?,
-      icon: fields[3] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, HotSearchItem obj) {
-    writer
-      ..writeByte(4)
-      ..writeByte(0)
-      ..write(obj.keyword)
-      ..writeByte(1)
-      ..write(obj.showName)
-      ..writeByte(2)
-      ..write(obj.wordType)
-      ..writeByte(3)
-      ..write(obj.icon);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is HotSearchItemAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}

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');
+  }
 }

lib/pages/danmaku/view.dart

@@ -35,6 +35,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
   late double opacityVal;
   late double fontSizeVal;
   late double danmakuDurationVal;
+  late double strokeWidth;
   int latestAddedPosition = -1;
 
   @override
@@ -65,6 +66,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
     showArea = playerController.showArea;
     opacityVal = playerController.opacityVal;
     fontSizeVal = playerController.fontSizeVal;
+    strokeWidth = playerController.strokeWidth;
     danmakuDurationVal = playerController.danmakuDurationVal;
   }
 
@@ -136,6 +138,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
               hideBottom: blockTypes.contains(4),
               duration:
                   danmakuDurationVal / playerController.playbackSpeed,
+              strokeWidth: strokeWidth,
               // initDuration /
               //     (danmakuSpeedVal * widget.playerController.playbackSpeed),
             ),

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,

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,

lib/pages/home/controller.dart

@@ -5,6 +5,7 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/tab_type.dart';
 import 'package:pilipala/utils/storage.dart';
+import '../../http/index.dart';
 
 class HomeController extends GetxController with GetTickerProviderStateMixin {
   bool flag = false;
@@ -24,6 +25,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
   late bool hideSearchBar;
   late List defaultTabs;
   late List<String> tabbarSort;
+  RxString defaultSearch = ''.obs;
 
   @override
   void onInit() {
@@ -35,6 +37,9 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
     setTabConfig();
     hideSearchBar =
         setting.get(SettingBoxKey.hideSearchBar, defaultValue: true);
+    if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
+      searchDefault();
+    }
   }
 
   void onRefresh() {
@@ -58,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
+    tabs.value = defaultTabs;
-        .where((i) => tabbarSort.contains((i['type'] as TabType).id))
-        .toList();
 
     if (tabbarSort.contains(TabType.rcmd.id)) {
       initialIndex.value = tabbarSort.indexOf(TabType.rcmd.id);
@@ -94,4 +102,11 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
       }
     });
   }
+
+  void searchDefault() async {
+    var res = await Request().get(Api.searchDefault);
+    if (res.data['code'] == 0) {
+      defaultSearch.value = res.data['data']['name'];
+    }
+  }
 }

lib/pages/home/view.dart

@@ -5,7 +5,6 @@ import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/pages/mine/index.dart';
-import 'package:pilipala/pages/search/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import './controller.dart';
 
@@ -144,6 +143,7 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
             padding: EdgeInsets.fromLTRB(14, top + 6, 14, 0),
             child: UserInfoWidget(
               top: top,
+              ctr: ctr,
               userLogin: isUserLoggedIn,
               userFace: ctr?.userFace.value,
               callback: () => callback!(),
@@ -162,18 +162,20 @@ class UserInfoWidget extends StatelessWidget {
     required this.userLogin,
     required this.userFace,
     required this.callback,
+    required this.ctr,
   }) : super(key: key);
 
   final double top;
   final RxBool userLogin;
   final String? userFace;
   final VoidCallback? callback;
+  final HomeController? ctr;
 
   @override
   Widget build(BuildContext context) {
     return Row(
       children: [
-        const SearchBar(),
+        SearchBar(ctr: ctr),
         if (userLogin.value) ...[
           const SizedBox(width: 4),
           ClipRect(
@@ -335,11 +337,15 @@ class CustomChip extends StatelessWidget {
 }
 
 class SearchBar extends StatelessWidget {
-  const SearchBar({super.key});
+  const SearchBar({
+    Key? key,
+    required this.ctr,
+  }) : super(key: key);
+
+  final HomeController? ctr;
 
   @override
   Widget build(BuildContext context) {
-    final SSearchController searchController = Get.put(SSearchController());
     final ColorScheme colorScheme = Theme.of(context).colorScheme;
     return Expanded(
       child: Container(
@@ -353,7 +359,10 @@ class SearchBar extends StatelessWidget {
           color: colorScheme.onSecondaryContainer.withOpacity(0.05),
           child: InkWell(
             splashColor: colorScheme.primaryContainer.withOpacity(0.3),
-            onTap: () => Get.toNamed('/search'),
+            onTap: () => Get.toNamed(
+              '/search',
+              parameters: {'hintText': ctr!.defaultSearch.value},
+            ),
             child: Row(
               children: [
                 const SizedBox(width: 14),
@@ -362,16 +371,14 @@ class SearchBar extends StatelessWidget {
                   color: colorScheme.onSecondaryContainer,
                 ),
                 const SizedBox(width: 10),
-                Expanded(
+                Obx(
-                  child: Obx(
                   () => Text(
-                      searchController.defaultSearch.value,
+                    ctr!.defaultSearch.value,
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                     style: TextStyle(color: colorScheme.outline),
                   ),
                 ),
-                ),
               ],
             ),
           ),

lib/pages/main/controller.dart

@@ -11,6 +11,7 @@ import 'package:pilipala/pages/home/view.dart';
 import 'package:pilipala/pages/media/index.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
+import '../../models/common/dynamic_badge_mode.dart';
 
 class MainController extends GetxController {
   List<Widget> pages = <Widget>[
@@ -65,6 +66,7 @@ class MainController extends GetxController {
   int selectedIndex = 0;
   Box userInfoCache = GStrorage.userInfo;
   RxBool userLogin = false.obs;
+  late Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
 
   @override
   void onInit() {
@@ -75,8 +77,13 @@ class MainController extends GetxController {
     hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true);
     var userInfo = userInfoCache.get('userInfoCache');
     userLogin.value = userInfo != null;
+    dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(
+        SettingBoxKey.dynamicBadgeMode,
+        defaultValue: DynamicBadgeMode.number.code)];
+    if (dynamicBadgeType.value != DynamicBadgeMode.hidden) {
       getUnreadDynamic();
     }
+  }
 
   void onBackPressed(BuildContext context) {
     if (_lastPressedAt == null ||

lib/pages/main/view.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/models/common/dynamic_badge_mode.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/media/index.dart';
@@ -127,12 +128,22 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                         destinations: <Widget>[
                           ..._mainController.navigationBars.map((e) {
                             return NavigationDestination(
-                              icon: Badge(
+                              icon: Obx(
-                                label: Text(e['count'].toString()),
+                                () => Badge(
-                                padding: const EdgeInsets.fromLTRB(6, 0, 6, 0),
+                                  label:
-                                isLabelVisible: e['count'] > 0,
+                                      _mainController.dynamicBadgeType.value ==
+                                              DynamicBadgeMode.number
+                                          ? Text(e['count'].toString())
+                                          : null,
+                                  padding:
+                                      const EdgeInsets.fromLTRB(6, 0, 6, 0),
+                                  isLabelVisible:
+                                      _mainController.dynamicBadgeType.value !=
+                                              DynamicBadgeMode.hidden &&
+                                          e['count'] > 0,
                                   child: e['icon'],
                                 ),
+                              ),
                               selectedIcon: e['selectIcon'],
                               label: e['label'],
                             );
@@ -148,12 +159,22 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                         items: [
                           ..._mainController.navigationBars.map((e) {
                             return BottomNavigationBarItem(
-                              icon: Badge(
+                              icon: Obx(
-                                label: Text(e['count'].toString()),
+                                () => Badge(
-                                padding: const EdgeInsets.fromLTRB(6, 0, 6, 0),
+                                  label:
-                                isLabelVisible: e['count'] > 0,
+                                      _mainController.dynamicBadgeType.value ==
+                                              DynamicBadgeMode.number
+                                          ? Text(e['count'].toString())
+                                          : null,
+                                  padding:
+                                      const EdgeInsets.fromLTRB(6, 0, 6, 0),
+                                  isLabelVisible:
+                                      _mainController.dynamicBadgeType.value !=
+                                              DynamicBadgeMode.hidden &&
+                                          e['count'] > 0,
                                   child: e['icon'],
                                 ),
+                              ),
                               activeIcon: e['selectIcon'],
                               label: e['label'],
                             );

lib/pages/mine/view.dart

@@ -64,7 +64,7 @@ class _MinePageState extends State<MinePage> {
             ),
           ),
           IconButton(
-            onPressed: () => Get.toNamed('/setting'),
+            onPressed: () => Get.toNamed('/setting', preventDuplicates: false),
             icon: const Icon(
               CupertinoIcons.slider_horizontal_3,
             ),

lib/pages/rcmd/controller.dart

@@ -13,7 +13,6 @@ class RcmdController extends GetxController {
   RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
   bool isLoadingMore = true;
   OverlayEntry? popupDialog;
-  Box recVideo = GStrorage.recVideo;
   Box setting = GStrorage.setting;
   RxInt crossAxisCount = 2.obs;
   late bool enableSaveLastData;
@@ -24,15 +23,6 @@ class RcmdController extends GetxController {
     super.onInit();
     crossAxisCount.value =
         setting.get(SettingBoxKey.customRows, defaultValue: 2);
-    // 读取app端缓存内容
-    // if (recVideo.get('cacheList') != null &&
-    //     recVideo.get('cacheList').isNotEmpty) {
-    //   List<RecVideoItemAppModel> list = [];
-    //   for (var i in recVideo.get('cacheList')) {
-    //     list.add(i);
-    //   }
-    //   videoList.value = list;
-    // }
     enableSaveLastData =
         setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false);
     defaultRcmdType =
@@ -77,7 +67,6 @@ class RcmdController extends GetxController {
       } else if (type == 'onLoad') {
         appVideoList.addAll(res['data']);
       }
-      recVideo.put('cacheList', res['data']);
       _currentPage += 1;
     }
     isLoadingMore = false;

lib/pages/search/controller.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:get/get_rx/src/rx_workers/utils/debouncer.dart';
 import 'package:hive/hive.dart';
-import 'package:pilipala/http/index.dart';
 import 'package:pilipala/http/search.dart';
 import 'package:pilipala/models/search/hot.dart';
 import 'package:pilipala/models/search/suggest.dart';
@@ -27,13 +26,10 @@ class SSearchController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-    if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
-      searchDefault();
-    }
     // 其他页面跳转过来
     if (Get.parameters.keys.isNotEmpty) {
       if (Get.parameters['keyword'] != null) {
-        onClickKeyword(Get.parameters['keyword']!);
+        onClickKeyword(Get.parameters['keyword']!, null);
       }
       if (Get.parameters['hintText'] != null) {
         hintText = Get.parameters['hintText']!;
@@ -92,7 +88,12 @@ class SSearchController extends GetxController {
   }
 
   // 点击热搜关键词
-  void onClickKeyword(String keyword) {
+  void onClickKeyword(String keyword, item) {
+    if (item != null && item.wordType == 7) {
+      Get.toNamed('/liveRoom?roomid=${item.liveId.first}',
+          arguments: {'liveItem': null, 'heroTag': '${item.liveId.first}'});
+      return;
+    }
     searchKeyWord.value = keyword;
     controller.value.text = keyword;
     // 移动光标
@@ -130,12 +131,4 @@ class SSearchController extends GetxController {
     historyList.refresh();
     histiryWord.put('cacheList', []);
   }
-
-  void searchDefault() async {
-    var res = await Request().get(Api.searchDefault);
-    if (res.data['code'] == 0) {
-      searchKeyWord.value =
-          hintText = defaultSearch.value = res.data['data']['name'];
-    }
-  }
 }

lib/pages/search/view.dart

@@ -115,8 +115,8 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                   customBorder: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(4),
                   ),
-                  onTap: () => ssCtr
+                  onTap: () => ssCtr.onClickKeyword(
-                      .onClickKeyword(ssCtr.searchSuggestList[index].term!),
+                      ssCtr.searchSuggestList[index].term!, null),
                   child: Padding(
                     padding: const EdgeInsets.only(left: 20, top: 9, bottom: 9),
                     child: ssCtr.searchSuggestList[index].textRich,
@@ -178,11 +178,11 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                           width: width,
                           // ignore: invalid_use_of_protected_member
                           hotSearchList: _searchController.hotSearchList.value,
-                          onClick: (keyword) async {
+                          onClick: (keyword, item) async {
                             _searchController.searchFocusNode.unfocus();
                             await Future.delayed(
                                 const Duration(milliseconds: 150));
-                            _searchController.onClickKeyword(keyword);
+                            _searchController.onClickKeyword(keyword, item);
                           },
                         ),
                       );
@@ -192,17 +192,9 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                         fn: () => setState(() {}),
                       );
                     }
-                  } else {
-                    // 缓存数据
-                    if (_searchController.hotSearchList.isNotEmpty) {
-                      return HotKeyword(
-                        width: width,
-                        hotSearchList: _searchController.hotSearchList,
-                      );
                   } else {
                     return const SizedBox();
                   }
-                  }
                 },
               );
             },

lib/pages/search/widgets/hot_keyword.dart

@@ -26,7 +26,7 @@ class HotKeyword extends StatelessWidget {
               borderRadius: BorderRadius.circular(3),
               clipBehavior: Clip.hardEdge,
               child: InkWell(
-                onTap: () => onClick!(i.keyword),
+                onTap: () => onClick!(i.keyword, i),
                 child: Padding(
                   padding: EdgeInsets.only(
                       left: 2,

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 -
+            final double width = (boxConstraints.maxWidth -
                     StyleString.cardSpace *
                         6 /
-                    MediaQuery.textScalerOf(context).scale(2.0));
+                        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(

lib/pages/search_panel/widgets/video_panel.dart

@@ -90,7 +90,7 @@ class SearchVideoPanel extends StatelessWidget {
                   style: ButtonStyle(
                     padding: MaterialStateProperty.all(EdgeInsets.zero),
                   ),
-                  onPressed: () => controller.onShowFilterDialog(),
+                  onPressed: () => controller.onShowFilterDialog(ctr),
                   icon: Icon(
                     Icons.filter_list_outlined,
                     size: 18,
@@ -175,7 +175,7 @@ class VideoPanelController extends GetxController {
     super.onInit();
   }
 
-  onShowFilterDialog() {
+  onShowFilterDialog(searchPanelCtr) {
     SmartDialog.show(
       animationType: SmartAnimationType.centerFade_otherSlide,
       builder: (BuildContext context) {
@@ -199,7 +199,8 @@ class VideoPanelController extends GetxController {
                       SmartDialog.dismiss();
                       SmartDialog.showToast("「${i['label']}」的筛选结果");
                       SearchPanelController ctr =
-                          Get.find<SearchPanelController>(tag: 'video');
+                          Get.find<SearchPanelController>(
+                              tag: 'video${searchPanelCtr.keyword!}');
                       ctr.duration.value = i['value'];
                       SmartDialog.showLoading(msg: 'loooad');
                       await ctr.onRefresh();

lib/pages/search_result/view.dart

@@ -86,7 +86,8 @@ class _SearchResultPageState extends State<SearchResultPage>
                 onTap: (index) {
                   if (index == _searchResultController!.tabIndex) {
                     Get.find<SearchPanelController>(
-                            tag: SearchType.values[index].type)
+                            tag: SearchType.values[index].type +
+                                _searchResultController!.keyword!)
                         .animateToTop();
                   }
 

lib/pages/setting/controller.dart

@@ -7,6 +7,9 @@ import 'package:pilipala/models/common/theme_type.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/login.dart';
 import 'package:pilipala/utils/storage.dart';
+import '../../models/common/dynamic_badge_mode.dart';
+import '../main/index.dart';
+import 'widgets/select_dialog.dart';
 
 class SettingController extends GetxController {
   Box userInfoCache = GStrorage.userInfo;
@@ -19,6 +22,7 @@ class SettingController extends GetxController {
   RxInt picQuality = 10.obs;
   Rx<ThemeType> themeType = ThemeType.system.obs;
   var userInfo;
+  Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
 
   @override
   void onInit() {
@@ -33,6 +37,9 @@ class SettingController extends GetxController {
         setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
     themeType.value = ThemeType.values[setting.get(SettingBoxKey.themeMode,
         defaultValue: ThemeType.system.code)];
+    dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(
+        SettingBoxKey.dynamicBadgeMode,
+        defaultValue: DynamicBadgeMode.number.code)];
   }
 
   loginOut() async {
@@ -76,4 +83,31 @@ class SettingController extends GetxController {
     feedBackEnable.value = !feedBackEnable.value;
     setting.put(SettingBoxKey.feedBackEnable, feedBackEnable.value);
   }
+
+  // 设置动态未读标记
+  setDynamicBadgeMode(BuildContext context) async {
+    DynamicBadgeMode? result = await showDialog(
+      context: context,
+      builder: (context) {
+        return SelectDialog<DynamicBadgeMode>(
+          title: '动态未读标记',
+          value: dynamicBadgeType.value,
+          values: DynamicBadgeMode.values.map((e) {
+            return {'title': e.description, 'value': e};
+          }).toList(),
+        );
+      },
+    );
+    if (result != null) {
+      dynamicBadgeType.value = result;
+      setting.put(SettingBoxKey.dynamicBadgeMode, result.code);
+      MainController mainController = Get.put(MainController());
+      mainController.dynamicBadgeType.value =
+          DynamicBadgeMode.values[result.code];
+      if (mainController.dynamicBadgeType.value != DynamicBadgeMode.hidden) {
+        mainController.getUnreadDynamic();
+      }
+      SmartDialog.showToast('设置成功');
+    }
+  }
 }

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() {

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(),
+              ],
+            ),
+    );
+  }
+}

lib/pages/setting/style_setting.dart

@@ -10,6 +10,7 @@ import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/pages/setting/widgets/slide_dialog.dart';
 import 'package:pilipala/utils/storage.dart';
 
+import '../../models/common/dynamic_badge_mode.dart';
 import 'controller.dart';
 import 'widgets/switch_item.dart';
 
@@ -241,6 +242,14 @@ class _StyleSettingState extends State<StyleSetting> {
                 '当前模式：${settingController.themeType.value.description}',
                 style: subTitleStyle)),
           ),
+          ListTile(
+            dense: false,
+            onTap: () => settingController.setDynamicBadgeMode(context),
+            title: Text('动态未读标记', style: titleStyle),
+            subtitle: Obx(() => Text(
+                '当前标记样式：${settingController.dynamicBadgeType.value.description}',
+                style: subTitleStyle)),
+          ),
           ListTile(
             dense: false,
             onTap: () => Get.toNamed('/colorSetting'),

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

@@ -148,8 +148,10 @@ class VideoIntroController extends GetxController {
   // 获取投币状态
   Future queryHasCoinVideo() async {
     var result = await VideoHttp.hasCoinVideo(bvid: bvid);
+    if (result['status']) {
       hasCoin.value = result["data"]['multiply'] == 0 ? false : true;
     }
+  }
 
   // 获取收藏状态
   Future queryHasFavVideo() async {
@@ -208,6 +210,10 @@ class VideoIntroController extends GetxController {
 
   // （取消）点赞
   Future actionLikeVideo() async {
+    if (userInfo == null) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
     var result = await VideoHttp.likeVideo(bvid: bvid, type: !hasLike.value);
     if (result['status']) {
       // hasLike.value = result["data"] == 1 ? true : false;
@@ -570,10 +576,12 @@ class VideoIntroController extends GetxController {
       cid: lastPlayCid.value,
       upMid: videoDetail.value.owner!.mid!,
     );
+    SmartDialog.dismiss();
     if (res['status']) {
       modelResult = res['data'].modelResult;
+    } else {
+      SmartDialog.showToast("当前视频可能暂不支持AI视频总结");
     }
-    SmartDialog.dismiss();
     return res;
   }
 }

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

@@ -4,7 +4,7 @@ import 'package:pilipala/http/video.dart';
 
 class ReleatedController extends GetxController {
   // 视频aid
-  String bvid = Get.parameters['bvid']!;
+  String bvid = Get.parameters['bvid'] ?? "";
   // 推荐视频列表
   List relatedVideoList = [];
 

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 {

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

@@ -1,5 +1,6 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -539,18 +540,6 @@ InlineSpan buildContent(
   // replyReply 查看二楼回复（回复详情）回调
   // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示
   final content = replyItem.content;
-  if (content.emote.isEmpty &&
-      content.atNameToMid.isEmpty &&
-      content.jumpUrl.isEmpty &&
-      content.vote.isEmpty &&
-      content.pictures.isEmpty) {
-    return TextSpan(
-      text: content.message,
-      recognizer: TapGestureRecognizer()
-        ..onTap =
-            () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem),
-    );
-  }
   final List<InlineSpan> spanChilds = <InlineSpan>[];
   bool hasMatchMember = false;
 
@@ -582,156 +571,114 @@ InlineSpan buildContent(
     });
   }
   // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
-  if (content.message.contains('&amp;')) {
+  content.message = content.message.replaceAll('&amp;', '&')
-    content.message = content.message.replaceAll('&amp;', '&');
+      .replaceAll('&lt;', '<')
+      .replaceAll('&gt;', '>')
+      .replaceAll('&quot;', '"')
+      .replaceAll('&apos;', "'")
+      .replaceAll('&nbsp;', ' ');
+  // print("content.jumpUrl.keys:" + content.jumpUrl.keys.toString());
+  // 构建正则表达式
+  final List<String> specialTokens = [
+    ...content.emote.keys,
+    ...content.atNameToMid.keys.map((e) => '@$e'),
+    ...content.jumpUrl.keys.map((e) =>
+        e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')),
+  ];
+
+  String patternStr =
+      specialTokens.map(RegExp.escape).join('|');
+  if (patternStr.isNotEmpty) {
+    patternStr += "|";
   }
-  // 匹配表情
+  patternStr += r'(\b\d{1,2}[:：]\d{2}\b)';
+  final RegExp pattern = RegExp(patternStr);
+  List<String> matchedStrs = [];
+  void addPlainTextSpan(str){
+    spanChilds.add(TextSpan(
+        text: str,
+        recognizer: TapGestureRecognizer()
+          ..onTap = () =>
+              replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
+  }
+  // 分割文本并处理每个部分
   content.message.splitMapJoin(
-    RegExp(r"\[.*?\]"),
+    pattern,
     onMatch: (Match match) {
-      final String matchStr = match[0]!;
+      String matchStr = match[0]!;
-      if (content.emote.isNotEmpty &&
+      if (content.emote.containsKey(matchStr)) {
-          matchStr.indexOf('[') == matchStr.lastIndexOf('[') &&
+        // 处理表情
-          matchStr.indexOf(']') == matchStr.lastIndexOf(']')) {
         final int size = content.emote[matchStr]['meta']['size'];
-        if (content.emote.keys.contains(matchStr)) {
+        spanChilds.add(WidgetSpan(
-          spanChilds.add(
-            WidgetSpan(
           child: NetworkImgLayer(
             src: content.emote[matchStr]['url'],
             type: 'emote',
             width: size * 20,
             height: size * 20,
           ),
-            ),
+        ));
-          );
+      } else if (matchStr.startsWith("@") &&
-        } else {
+          content.atNameToMid.containsKey(matchStr.substring(1))) {
-          spanChilds.add(TextSpan(
+        // 处理@用户
-              text: matchStr,
+        final String userName = matchStr.substring(1);
-              recognizer: TapGestureRecognizer()
+        final int userId = content.atNameToMid[userName];
-                ..onTap = () =>
-                    replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
-          return matchStr;
-        }
-      } else {
-        spanChilds.add(TextSpan(
-            text: matchStr,
-            recognizer: TapGestureRecognizer()
-              ..onTap = () =>
-                  replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
-        return matchStr;
-      }
-      return '';
-    },
-    onNonMatch: (String str) {
-      // 匹配@用户
-      String matchMember = str;
-      if (content.atNameToMid.isNotEmpty) {
-        final List atNameToMidKeys = content.atNameToMid.keys.toList();
-        RegExp reg = RegExp(atNameToMidKeys.map((key) => key).join('|'));
-        // if (!content.message.contains(':')) {
-        //   reg = RegExp(r"@.*( |:)");
-        // }
-
-        // 只@用户没有内容
-        if (!content.message.contains(':') ||
-            (content.atNameToMid.length == 1 &&
-                content.message == '@${content.members.first.uname}')) {
-          reg = RegExp(r"@.*( |:|$)");
-        }
-        matchMember = str.splitMapJoin(
-          reg,
-          onMatch: (Match match) {
-            if (match[0] != null) {
-              hasMatchMember = true;
-              content.atNameToMid.forEach((key, value) {
-                if (str.contains('回复')) {
         spanChilds.add(
           TextSpan(
-                      text: '回复 ',
+            text: matchStr,
             style: TextStyle(
-                        fontSize:
-                            Theme.of(context).textTheme.titleSmall!.fontSize,
-                      ),
-                    ),
-                  );
-                }
-                spanChilds.add(
-                  TextSpan(
-                    text: '@$key',
-                    style: TextStyle(
-                      fontSize:
-                          Theme.of(context).textTheme.titleSmall!.fontSize,
               color: Theme.of(context).colorScheme.primary,
             ),
             recognizer: TapGestureRecognizer()
               ..onTap = () {
-                        final String heroTag = Utils.makeHeroTag(value);
+                final String heroTag = Utils.makeHeroTag(userId);
                 Get.toNamed(
-                          '/member?mid=$value',
+                  '/member?mid=$userId',
                   arguments: {'face': '', 'heroTag': heroTag},
                 );
               },
           ),
         );
-              });
+      } else if (RegExp(r'^\b[0-9]{1,2}[:：][0-9]{2}\b$').hasMatch(matchStr)) {
+        spanChilds.add(
+          TextSpan(
+            text: ' $matchStr ',
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.primary,
+            ),
+            recognizer: TapGestureRecognizer()
+              ..onTap = () {
+                // 跳转到指定位置
+                try {
+                  matchStr = matchStr.replaceAll('：', ':');
+                  SmartDialog.showToast('跳转至：$matchStr');
+                  Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
+                      .plPlayerController
+                      .seekTo(
+                        Duration(seconds: Utils.duration(matchStr)),
+                      );
+                } catch (e) {
+                  SmartDialog.showToast('跳转失败: $e');
                 }
-            return '';
-          },
-          onNonMatch: (String str) {
-            if (!str.contains('@')) {
-              spanChilds.add(TextSpan(text: str));
-            }
-            print(str);
-            return str;
               },
+          ),
         );
       } else {
-        matchMember = str;
+        // print("matchStr=$matchStr");
-      }
-
-      // 匹配 jumpUrl
-      String matchUrl = matchMember;
-      if (content.jumpUrl.isNotEmpty) {
-        final List urlKeys = content.jumpUrl.keys.toList().reversed.toList();
-        for (int index = 0; index < urlKeys.length; index++) {
-          var i = urlKeys[index];
-          if (i.contains('?')) {
-            urlKeys[index] = i.replaceAll('?', '\\?');
-          }
-          if (i.contains('+')) {
-            urlKeys[index] = i.replaceAll('+', '\\+');
-          }
-          if (i.contains('*')) {
-            urlKeys[index] = i.replaceAll('*', '\\*');
-          }
-        }
-        if (hasMatchMember) {
-          matchMember = matchMember.split('回复 @ :').length > 1
-              ? matchMember.split('回复 @ :')[1]
-              : matchMember;
-        }
-        matchUrl = matchMember.splitMapJoin(
-          /// RegExp.escape() 转义特殊字符
-          RegExp(urlKeys.map((key) => key).join("|")),
-          // RegExp('What does the fox say\\?'),
-          onMatch: (Match match) {
-            final String matchStr = match[0]!;
         String appUrlSchema = '';
-            if (content.jumpUrl[matchStr] != null) {
-              appUrlSchema = content.jumpUrl[matchStr]['app_url_schema'];
-            }
-            // 默认不显示关键词
         final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
             defaultValue: false) as bool;
-            if (content.jumpUrl[matchStr] != null) {
+        if (content.jumpUrl[matchStr] != null &&
+            !matchedStrs.contains(matchStr)) {
+          appUrlSchema = content.jumpUrl[matchStr]['app_url_schema'];
+          if (appUrlSchema.startsWith('bilibili://search') && !enableWordRe) {
+            addPlainTextSpan(matchStr);
+            return "";
+          }
           spanChilds.add(
             TextSpan(
               text: content.jumpUrl[matchStr]['title'],
               style: TextStyle(
-                    color: enableWordRe
+                color: Theme.of(context).colorScheme.primary,
-                        ? Theme.of(context).colorScheme.primary
-                        : null,
               ),
               recognizer: TapGestureRecognizer()
                 ..onTap = () {
@@ -757,8 +704,7 @@ InlineSpan buildContent(
                       );
                     }
                   } else {
-                        if (appUrlSchema.startsWith('bilibili://search') &&
+                    if (appUrlSchema.startsWith('bilibili://search')) {
-                            enableWordRe) {
                       Get.toNamed('/searchResult', parameters: {
                         'keyword': content.jumpUrl[matchStr]['title']
                       });
@@ -767,9 +713,7 @@ InlineSpan buildContent(
                 },
             ),
           );
-            }
+          if (appUrlSchema.startsWith('bilibili://search')) {
-
-            if (appUrlSchema.startsWith('bilibili://search') && enableWordRe) {
             spanChilds.add(
               WidgetSpan(
                 child: Icon(
@@ -781,59 +725,17 @@ InlineSpan buildContent(
               ),
             );
           }
+          // 只显示一次
+          matchedStrs.add(matchStr);
+        } else {
+          addPlainTextSpan(matchStr);
+        }
+      }
       return '';
     },
-          onNonMatch: (String str) {
+    onNonMatch: (String nonMatchStr) {
-            spanChilds.add(TextSpan(
+      addPlainTextSpan(nonMatchStr);
-                text: str,
+      return nonMatchStr;
-                recognizer: TapGestureRecognizer()
-                  ..onTap = () => replyReply(
-                      replyItem.root == 0 ? replyItem : fReplyItem)));
-            return str;
-          },
-        );
-      }
-      str = matchUrl.splitMapJoin(
-        RegExp(r'\b\d{2}:\d{2}\b'),
-        onMatch: (Match match) {
-          String matchStr = match[0]!;
-          spanChilds.add(
-            TextSpan(
-              text: ' $matchStr ',
-              style: TextStyle(
-                color: Theme.of(context).colorScheme.primary,
-              ),
-              recognizer: TapGestureRecognizer()
-                ..onTap = () {
-                  // 跳转到指定位置
-                  try {
-                    Get.find<VideoDetailController>(
-                            tag: Get.arguments['heroTag'])
-                        .plPlayerController
-                        .seekTo(
-                          Duration(seconds: Utils.duration(matchStr)),
-                        );
-                  } catch (_) {}
-                },
-            ),
-          );
-          return '';
-        },
-        onNonMatch: (str) {
-          return str;
-        },
-      );
-
-      if (content.atNameToMid.isEmpty && content.jumpUrl.isEmpty) {
-        if (str != '') {
-          spanChilds.add(TextSpan(
-              text: str,
-              recognizer: TapGestureRecognizer()
-                ..onTap = () =>
-                    replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
-        }
-      }
-      return str;
     },
   );
 
@@ -841,10 +743,10 @@ InlineSpan buildContent(
   if (content.pictures.isNotEmpty) {
     final List<String> picList = <String>[];
     final int len = content.pictures.length;
+    spanChilds.add(const TextSpan(text: '\n'));
     if (len == 1) {
       Map pictureItem = content.pictures.first;
       picList.add(pictureItem['img_src']);
-      spanChilds.add(const TextSpan(text: '\n'));
       spanChilds.add(
         WidgetSpan(
           child: LayoutBuilder(
@@ -880,7 +782,7 @@ InlineSpan buildContent(
                           height: height,
                         ),
                       ),
-                      height > maxHeight
+                      height > Get.size.height * 0.9
                           ? const PBadge(
                               text: '长图',
                               right: 8,

lib/pages/video/detail/view.dart

@@ -61,6 +61,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   final Floating floating = Floating();
   // 生命周期监听
   late final AppLifecycleListener _lifecycleListener;
+  bool isShowing = true;
 
   @override
   void initState() {
@@ -216,15 +217,15 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       videoIntroController.isPaused = true;
       plPlayerController!.removeStatusLister(playerListener);
       plPlayerController!.pause();
-      plPlayerController!.danmakuController?.pause();
-      plPlayerController!.danmakuController?.clear();
     }
+    setState(() => isShowing = false);
     super.didPushNext();
   }
 
   @override
   // 返回当前页面时
   void didPopNext() async {
+    setState(() => isShowing = true);
     videoDetailController.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
     videoDetailController.playerInit(autoplay: autoplay);
@@ -280,19 +281,13 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
     final double pinnedHeaderHeight =
         statusBarHeight + kToolbarHeight + videoHeight;
-    if (MediaQuery.of(context).orientation == Orientation.landscape ||
-        plPlayerController?.isFullScreen.value == true) {
-      enterFullScreen();
-    } else {
-      exitFullScreen();
-    }
     Widget childWhenDisabled = SafeArea(
       top: MediaQuery.of(context).orientation == Orientation.portrait &&
           plPlayerController?.isFullScreen.value == true,
       bottom: MediaQuery.of(context).orientation == Orientation.portrait &&
           plPlayerController?.isFullScreen.value == true,
-      left: plPlayerController?.isFullScreen.value != true,
+      left: false, //plPlayerController?.isFullScreen.value != true,
-      right: plPlayerController?.isFullScreen.value != true,
+      right: false, //plPlayerController?.isFullScreen.value != true,
       child: Stack(
         children: [
           Scaffold(
@@ -309,10 +304,18 @@ class _VideoDetailPageState extends State<VideoDetailPage>
             body: ExtendedNestedScrollView(
               controller: _extendNestCtr,
               headerSliverBuilder:
-                  (BuildContext context, bool innerBoxIsScrolled) {
+                  (BuildContext context2, bool innerBoxIsScrolled) {
                 return <Widget>[
                   Obx(
-                    () => SliverAppBar(
+                    () {
+                      if (MediaQuery.of(context).orientation ==
+                              Orientation.landscape ||
+                          plPlayerController?.isFullScreen.value == true) {
+                        enterFullScreen();
+                      } else {
+                        exitFullScreen();
+                      }
+                      return SliverAppBar(
                         automaticallyImplyLeading: false,
                         // 假装使用一个非空变量，避免Obx检测不到而罢工
                         pinned: videoDetailController.autoPlay.value ^
@@ -333,8 +336,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                         backgroundColor: Colors.black,
                         flexibleSpace: FlexibleSpaceBar(
                           background: PopScope(
-                            canPop:
+                              canPop: plPlayerController?.isFullScreen.value !=
-                                plPlayerController?.isFullScreen.value != true,
+                                  true,
                               onPopInvoked: (bool didPop) {
                                 if (plPlayerController?.isFullScreen.value ==
                                     true) {
@@ -349,11 +352,13 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                               child: LayoutBuilder(
                                 builder: (BuildContext context,
                                     BoxConstraints boxConstraints) {
-                                final double maxWidth = boxConstraints.maxWidth;
+                                  final double maxWidth =
+                                      boxConstraints.maxWidth;
                                   final double maxHeight =
                                       boxConstraints.maxHeight;
                                   return Stack(
                                     children: <Widget>[
+                                      if (isShowing)
                                         FutureBuilder(
                                           future: _futureBuilderFuture,
                                           builder: (BuildContext context,
@@ -361,9 +366,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                             if (snapshot.hasData &&
                                                 snapshot.data['status']) {
                                               return Obx(
-                                            () => !videoDetailController
+                                                () =>
+                                                    !videoDetailController
                                                             .autoPlay.value
-                                                ? const SizedBox()
+                                                        ? nil
                                                         : PLVideoPlayer(
                                                             controller:
                                                                 plPlayerController!,
@@ -372,13 +378,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                                     .headerControl,
                                                             danmuWidget: Obx(
                                                               () => PlDanmaku(
-                                                        key: Key(
+                                                                key: Key(videoDetailController
-                                                            videoDetailController
                                                                     .danmakuCid
                                                                     .value
                                                                     .toString()),
-                                                        cid:
+                                                                cid: videoDetailController
-                                                            videoDetailController
                                                                     .danmakuCid
                                                                     .value,
                                                                 playerController:
@@ -445,40 +449,32 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                           onPressed: () async {
                                                             var res = await UserHttp
                                                                 .toViewLater(
-                                                                  bvid:
+                                                                    bvid: videoDetailController
-                                                                      videoDetailController
                                                                         .bvid);
-                                                          SmartDialog.showToast(
+                                                            SmartDialog
+                                                                .showToast(
                                                                     res['msg']);
                                                           },
                                                           icon: const Icon(Icons
                                                               .history_outlined),
                                                         ),
-                                                      const SizedBox(width: 14)
+                                                        const SizedBox(
+                                                            width: 14)
                                                       ],
                                                     ),
                                                   ),
                                                   Positioned(
                                                     right: 12,
                                                     bottom: 10,
-                                                  child: TextButton.icon(
+                                                    child: IconButton(
-                                                    style: ButtonStyle(
+                                                        tooltip: '播放',
-                                                      backgroundColor:
-                                                          MaterialStateProperty
-                                                              .resolveWith(
-                                                                  (states) {
-                                                        return Colors.white
-                                                            .withOpacity(0.8);
-                                                      }),
-                                                    ),
                                                         onPressed: () =>
                                                             handlePlay(),
-                                                    icon: const Icon(
+                                                        icon: Image.asset(
-                                                      Icons.play_circle_outline,
+                                                          'assets/images/play.png',
-                                                      size: 20,
+                                                          width: 60,
-                                                    ),
+                                                          height: 60,
-                                                    label: const Text('轻触封面播放'),
+                                                        )),
-                                                  ),
                                                   ),
                                                 ],
                                               )),
@@ -489,7 +485,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                 },
                               )),
                         ),
-                    ),
+                      );
+                    },
                   ),
                 ];
               },
@@ -500,7 +497,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
               // },
               /// 不收回
               pinnedHeaderSliverHeightBuilder: () {
-                return plPlayerController?.isFullScreen.value == true
+                return MediaQuery.of(context).orientation ==
+                            Orientation.landscape ||
+                        plPlayerController?.isFullScreen.value == true
                     ? MediaQuery.sizeOf(context).height
                     : pinnedHeaderHeight;
               },

lib/pages/video/detail/widgets/header_control.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:math';
 
 import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
@@ -724,6 +725,8 @@ class _HeaderControlState extends State<HeaderControl> {
     double fontSizeVal = widget.controller!.fontSizeVal;
     // 弹幕速度
     double danmakuDurationVal = widget.controller!.danmakuDurationVal;
+    // 弹幕描边
+    double strokeWidth = widget.controller!.strokeWidth;
 
     final DanmakuController danmakuController =
         widget.controller!.danmakuController!;
@@ -857,6 +860,44 @@ class _HeaderControlState extends State<HeaderControl> {
                       ),
                     ),
                   ),
+                  Text('描边粗细 $strokeWidth'),
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      top: 0,
+                      bottom: 6,
+                      left: 10,
+                      right: 10,
+                    ),
+                    child: SliderTheme(
+                      data: SliderThemeData(
+                        trackShape: MSliderTrackShape(),
+                        thumbColor: Theme.of(context).colorScheme.primary,
+                        activeTrackColor: Theme.of(context).colorScheme.primary,
+                        trackHeight: 10,
+                        thumbShape: const RoundSliderThumbShape(
+                            enabledThumbRadius: 6.0),
+                      ),
+                      child: Slider(
+                        min: 0,
+                        max: 3,
+                        value: strokeWidth,
+                        divisions: 6,
+                        label: '$strokeWidth',
+                        onChanged: (double val) {
+                          strokeWidth = val;
+                          widget.controller!.strokeWidth = val;
+                          setState(() {});
+                          try {
+                            final DanmakuOption currentOption =
+                                danmakuController.option;
+                            final DanmakuOption updatedOption =
+                            currentOption.copyWith(strokeWidth: val);
+                            danmakuController.updateOption(updatedOption);
+                          } catch (_) {}
+                        },
+                      ),
+                    ),
+                  ),
                   Text('字体大小 ${(fontSizeVal * 100).toStringAsFixed(1)}%'),
                   Padding(
                     padding: const EdgeInsets.only(

lib/pages/whisper_detail/controller.dart

@@ -1,3 +1,4 @@
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/msg.dart';
 import 'package:pilipala/models/msg/session.dart';
@@ -8,6 +9,8 @@ class WhisperDetailController extends GetxController {
   late String face;
   late String mid;
   RxList<MessageItem> messageList = <MessageItem>[].obs;
+  //表情转换图片规则
+  List<dynamic>? eInfos;
 
   @override
   void onInit() {
@@ -22,6 +25,9 @@ class WhisperDetailController extends GetxController {
     var res = await MsgHttp.sessionMsg(talkerId: talkerId);
     if (res['status']) {
       messageList.value = res['data'].messages;
+      if (messageList.isNotEmpty && res['data'].eInfos != null) {
+        eInfos = res['data'].eInfos;
+      }
     }
     return res;
   }

lib/pages/whisper_detail/view.dart

@@ -110,12 +110,16 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
                           if (i == 0) {
                             return Column(
                               children: [
-                                ChatItem(item: messageList[i]),
+                                ChatItem(
+                                    item: messageList[i],
+                                    e_infos: _whisperDetailController.eInfos),
                                 const SizedBox(height: 12),
                               ],
                             );
                           } else {
-                            return ChatItem(item: messageList[i]);
+                            return ChatItem(
+                                item: messageList[i],
+                                e_infos: _whisperDetailController.eInfos);
                           }
                         },
                       ),

lib/pages/whisper_detail/widget/chat_item.dart

@@ -1,38 +1,370 @@
 // ignore_for_file: must_be_immutable
 
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/storage.dart';
 
+import '../../../http/search.dart';
+
+enum MsgType {
+  invalid(value: 0, label: "空空的~"),
+  text(value: 1, label: "文本消息"),
+  pic(value: 2, label: "图片消息"),
+  audio(value: 3, label: "语音消息"),
+  share(value: 4, label: "分享消息"),
+  revoke(value: 5, label: "撤回消息"),
+  custom_face(value: 6, label: "自定义表情"),
+  share_v2(value: 7, label: "分享v2消息"),
+  sys_cancel(value: 8, label: "系统撤销"),
+  mini_program(value: 9, label: "小程序"),
+  notify_msg(value: 10, label: "业务通知"),
+  archive_card(value: 11, label: "投稿卡片"),
+  article_card(value: 12, label: "专栏卡片"),
+  pic_card(value: 13, label: "图片卡片"),
+  common_share(value: 14, label: "异形卡片"),
+  auto_reply_push(value: 16, label: "自动回复推送"),
+  notify_text(value: 18, label: "文本提示");
+
+  final int value;
+  final String label;
+  const MsgType({required this.value, required this.label});
+  static MsgType parse(int value) {
+    return MsgType.values
+        .firstWhere((e) => e.value == value, orElse: () => MsgType.invalid);
+  }
+}
+
 class ChatItem extends StatelessWidget {
   dynamic item;
+  List? e_infos;
 
   ChatItem({
     super.key,
     this.item,
+    this.e_infos,
   });
 
   @override
   Widget build(BuildContext context) {
     bool isOwner =
         item.senderUid == GStrorage.userInfo.get('userInfoCache').mid;
-    bool isPic = item.msgType == 2; // 图片
-    bool isText = item.msgType == 1; // 文本
-    // bool isAchive = item.msgType == 11; // 投稿
-    // bool isArticle = item.msgType == 12; // 专栏
-    bool isRevoke = item.msgType == 5; // 撤回消息
 
-    bool isSystem =
+    bool isPic = item.msgType == MsgType.pic.value; // 图片
-        item.msgType == 18 || item.msgType == 10 || item.msgType == 13;
+    bool isText = item.msgType == MsgType.text.value; // 文本
-    int msgType = item.msgType;
+    // bool isArchive = item.msgType == 11; // 投稿
+    // bool isArticle = item.msgType == 12; // 专栏
+    bool isRevoke = item.msgType == MsgType.revoke.value; // 撤回消息
+    bool isShareV2 = item.msgType == MsgType.share_v2.value;
+    bool isSystem = item.msgType == MsgType.notify_text.value ||
+        item.msgType == MsgType.notify_msg.value ||
+        item.msgType == MsgType.pic_card.value ||
+        item.msgType == MsgType.auto_reply_push.value;
     dynamic content = item.content ?? '';
+    Color textColor(BuildContext context) {
+      return isOwner
+          ? Theme.of(context).colorScheme.onPrimary
+          : Theme.of(context).colorScheme.onSecondaryContainer;
+    }
+
+    Widget richTextMessage(BuildContext context) {
+      var text = content['content'];
+      if (e_infos != null) {
+        final List<InlineSpan> children = [];
+        Map<String, String> emojiMap = {};
+        for (var e in e_infos!) {
+          emojiMap[e['text']] = e['url'];
+        }
+        text.splitMapJoin(
+          RegExp(r"\[.+?\]"),
+          onMatch: (Match match) {
+            final String emojiKey = match[0]!;
+            if (emojiMap.containsKey(emojiKey)) {
+              children.add(WidgetSpan(
+                child: NetworkImgLayer(
+                  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,
+                )));
+            return '';
+          },
+        );
+        return RichText(
+          text: TextSpan(
+            children: children,
+          ),
+        );
+      } else {
+        return Text(
+          text,
+          style: TextStyle(
+            letterSpacing: 0.6,
+            color: textColor(context),
+            height: 1.5,
+          ),
+        );
+      }
+    }
+
+    Widget messageContent(BuildContext context) {
+      switch (MsgType.parse(item.msgType)) {
+        case MsgType.notify_msg:
+          return SystemNotice(item: item);
+        case MsgType.pic_card:
+          return SystemNotice2(item: item);
+        case MsgType.notify_text:
+          return Text(
+            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),
+            ),
+          );
+        case MsgType.text:
+          return richTextMessage(context);
+        case MsgType.pic:
+          return NetworkImgLayer(
+            width: 220,
+            height: 220 * content['height'] / content['width'],
+            src: content['url'],
+          );
+        case MsgType.share_v2:
+          return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              GestureDetector(
+                onTap: () async {
+                  SmartDialog.showLoading();
+                  var bvid = content["bvid"];
+                  final int cid = await SearchHttp.ab2c(bvid: bvid);
+                  final String heroTag = Utils.makeHeroTag(bvid);
+                  SmartDialog.dismiss<dynamic>().then(
+                    (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
+                        arguments: <String, String?>{
+                          'pic': content['thumb'],
+                          'heroTag': heroTag,
+                        }),
+                  );
+                },
+                child: NetworkImgLayer(
+                  width: 220,
+                  height: 220 * 9 / 16,
+                  src: content['thumb'],
+                ),
+              ),
+              const SizedBox(height: 6),
+              Text(
+                content['title'],
+                style: TextStyle(
+                  letterSpacing: 0.6,
+                  height: 1.5,
+                  color: textColor(context),
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const SizedBox(height: 1),
+              Text(
+                content['author'],
+                style: TextStyle(
+                  letterSpacing: 0.6,
+                  height: 1.5,
+                  color: textColor(context).withOpacity(0.6),
+                  fontSize: 12,
+                ),
+              ),
+            ],
+          );
+        case MsgType.archive_card:
+          return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              GestureDetector(
+                onTap: () async {
+                  SmartDialog.showLoading();
+                  var bvid = content["bvid"];
+                  final int cid = await SearchHttp.ab2c(bvid: bvid);
+                  final String heroTag = Utils.makeHeroTag(bvid);
+                  SmartDialog.dismiss<dynamic>().then(
+                        (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
+                        arguments: <String, String?>{
+                          'pic': content['thumb'],
+                          'heroTag': heroTag,
+                        }),
+                  );
+                },
+                child: NetworkImgLayer(
+                  width: 220,
+                  height: 220 * 9 / 16,
+                  src: content['cover'],
+                ),
+              ),
+              const SizedBox(height: 6),
+              Text(
+                content['title'],
+                style: TextStyle(
+                  letterSpacing: 0.6,
+                  height: 1.5,
+                  color: textColor(context),
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const SizedBox(height: 1),
+              Text(
+                Utils.timeFormat(content['times']),
+                style: TextStyle(
+                  letterSpacing: 0.6,
+                  height: 1.5,
+                  color: textColor(context).withOpacity(0.6),
+                  fontSize: 12,
+                ),
+              ),
+            ],
+          );
+        case MsgType.auto_reply_push:
+          return Container(
+              constraints: const BoxConstraints(
+                maxWidth: 300.0, // 设置最大宽度为200.0
+              ),
+              decoration: BoxDecoration(
+                color: Theme.of(context)
+                    .colorScheme
+                    .secondaryContainer
+                    .withOpacity(0.4),
+                borderRadius: const BorderRadius.only(
+                  topLeft: Radius.circular(16),
+                  topRight: Radius.circular(16),
+                  bottomLeft: Radius.circular(6),
+                  bottomRight: Radius.circular(16),
+                ),
+              ),
+              margin: const EdgeInsets.all(12),
+              padding: const EdgeInsets.all(12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    content['main_title'],
+                    style: TextStyle(
+                      letterSpacing: 0.6,
+                      height: 1.5,
+                      color: textColor(context),
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  for (var i in content['sub_cards']) ...<Widget>[
+                    const SizedBox(height: 6),
+                    GestureDetector(
+                        onTap: () async {
+                          RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}',
+                              caseSensitive: false);
+                          Iterable<Match> matches =
+                              bvRegex.allMatches(i['jump_url']);
+                          if (matches.isNotEmpty) {
+                            Match match = matches.first;
+                            String bvid = match.group(0)!;
+                            try {
+                              SmartDialog.showLoading();
+                              final int cid = await SearchHttp.ab2c(bvid: bvid);
+                              final String heroTag = Utils.makeHeroTag(bvid);
+                              SmartDialog.dismiss<dynamic>().then(
+                                (e) => Get.toNamed<dynamic>(
+                                    '/video?bvid=$bvid&cid=$cid',
+                                    arguments: <String, String?>{
+                                      'pic': i['cover_url'],
+                                      'heroTag': heroTag,
+                                    }),
+                              );
+                            } catch (err) {
+                              SmartDialog.dismiss();
+                              SmartDialog.showToast(err.toString());
+                            }
+                          } else {
+                            SmartDialog.showToast('未匹配到 BV 号');
+                            Get.toNamed('/webview',
+                                arguments: {'url': i['jump_url']});
+                          }
+                        },
+                        child: Row(
+                          children: [
+                            NetworkImgLayer(
+                              width: 130,
+                              height: 130 * 9 / 16,
+                              src: i['cover_url'],
+                            ),
+                            const SizedBox(width: 6),
+                            Expanded(
+                                child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(
+                                  i['field1'],
+                                  maxLines: 2,
+                                  style: TextStyle(
+                                    letterSpacing: 0.6,
+                                    height: 1.5,
+                                    color: textColor(context),
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                                Text(
+                                  i['field2'],
+                                  style: TextStyle(
+                                    letterSpacing: 0.6,
+                                    height: 1.5,
+                                    color: textColor(context).withOpacity(0.6),
+                                    fontSize: 12,
+                                  ),
+                                ),
+                                Text(
+                                  Utils.timeFormat(int.parse(i['field3'])),
+                                  style: TextStyle(
+                                    letterSpacing: 0.6,
+                                    height: 1.5,
+                                    color: textColor(context).withOpacity(0.6),
+                                    fontSize: 12,
+                                  ),
+                                ),
+                              ],
+                            )),
+                          ],
+                        )),
+                  ],
+                ],
+              ));
+        default:
+          return Text(
+            content['content'] ?? content.toString(),
+            style: TextStyle(
+              letterSpacing: 0.6,
+              height: 1.5,
+              color: textColor(context),
+              fontWeight: FontWeight.bold,
+            ),
+          );
+      }
+    }
+
     return isSystem
-        ? (msgType == 10
+        ? messageContent(context)
-            ? SystemNotice(item: item)
-            : msgType == 13
-                ? SystemNotice2(item: item)
-                : const SizedBox())
         : isRevoke
             ? const SizedBox()
             : Row(
@@ -66,27 +398,7 @@ class ChatItem extends StatelessWidget {
                           ? CrossAxisAlignment.end
                           : CrossAxisAlignment.start,
                       children: [
-                        isText
+                        messageContent(context),
-                            ? Text(
-                                content['content'],
-                                style: TextStyle(
-                                    color: isOwner
-                                        ? Theme.of(context)
-                                            .colorScheme
-                                            .onPrimary
-                                        : Theme.of(context)
-                                            .colorScheme
-                                            .onSecondaryContainer),
-                              )
-                            : isPic
-                                ? NetworkImgLayer(
-                                    width: 220,
-                                    height: 220 *
-                                        content['height'] /
-                                        content['width'],
-                                    src: content['url'],
-                                  )
-                                : const SizedBox(),
                         SizedBox(height: isPic ? 7 : 2),
                         Row(
                           mainAxisSize: MainAxisSize.min,

lib/plugin/pl_player/controller.dart

@@ -221,6 +221,7 @@ class PlPlayerController {
   late double showArea;
   late double opacityVal;
   late double fontSizeVal;
+  late double strokeWidth;
   late double danmakuDurationVal;
   late List<double> speedsList;
   // 缓存
@@ -275,6 +276,9 @@ class PlPlayerController {
     // 弹幕时间
     danmakuDurationVal =
         localCache.get(LocalCacheKey.danmakuDuration, defaultValue: 4.0);
+    // 描边粗细
+    strokeWidth =
+        localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5);
     playRepeat = PlayRepeat.values.toList().firstWhere(
           (e) =>
               e.value ==
@@ -1086,6 +1090,7 @@ class PlPlayerController {
       localCache.put(LocalCacheKey.danmakuOpacity, opacityVal);
       localCache.put(LocalCacheKey.danmakuFontScale, fontSizeVal);
       localCache.put(LocalCacheKey.danmakuDuration, danmakuDurationVal);
+      localCache.put(LocalCacheKey.strokeWidth, strokeWidth);
       if (_videoPlayerController != null) {
         var pp = _videoPlayerController!.platform as NativePlayer;
         await pp.setProperty('audio-files', '');

lib/router/app_pages.dart

@@ -3,6 +3,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/pages/setting/pages/logs.dart';
 
 import '../pages/about/index.dart';
 import '../pages/blacklist/index.dart';
@@ -151,6 +152,8 @@ class Routes {
     // 用户专栏
     CustomGetPage(
         name: '/memberSeasons', page: () => const MemberSeasonsPage()),
+    // 日志
+    CustomGetPage(name: '/logs', page: () => const LogsPage()),
   ];
 }
 

lib/services/audio_handler.dart

@@ -147,8 +147,8 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
       processingState: AudioProcessingState.idle,
       playing: false,
     ));
-    _item.removeLast();
     if (_item.isNotEmpty) {
+      _item.removeLast();
       setMediaItem(_item.last);
     }
     if (_item.isEmpty) {

lib/services/loggeer.dart

@@ -0,0 +1,56 @@
+// final _loggerFactory =
+
+import 'dart:io';
+
+import 'package:logger/logger.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:path/path.dart' as p;
+
+final _loggerFactory = PiliLogger();
+
+PiliLogger getLogger<T>() {
+  return _loggerFactory;
+}
+
+class PiliLogger extends Logger {
+  PiliLogger() : super();
+
+  @override
+  void log(Level level, dynamic message,
+      {Object? error, StackTrace? stackTrace, DateTime? time}) async {
+    if (level == Level.error) {
+      String dir = (await getApplicationDocumentsDirectory()).path;
+      // 创建logo文件
+      final String filename = p.join(dir, ".pili_logs");
+      // 添加至文件末尾
+      await File(filename).writeAsString(
+        "**${DateTime.now()}** \n $message \n $stackTrace",
+        mode: FileMode.writeOnlyAppend,
+      );
+    }
+    super.log(level, "$message", error: error, stackTrace: stackTrace);
+  }
+}
+
+Future<File> getLogsPath() async {
+  String dir = (await getApplicationDocumentsDirectory()).path;
+  final String filename = p.join(dir, ".pili_logs");
+  final file = File(filename);
+  if (!await file.exists()) {
+    await file.create();
+  }
+  return file;
+}
+
+Future<bool> clearLogs() async {
+  String dir = (await getApplicationDocumentsDirectory()).path;
+  final String filename = p.join(dir, ".pili_logs");
+  final file = File(filename);
+  try {
+    await file.writeAsString('');
+  } catch (e) {
+    print('Error clearing file: $e');
+    return false;
+  }
+  return true;
+}

lib/utils/id_utils.dart

@@ -1,50 +1,65 @@
-// ignore_for_file: constant_identifier_names
+// ignore_for_file: constant_identifier_names, non_constant_identifier_names
 
-import 'dart:math';
+import 'dart:convert';
-
-import 'package:flutter/material.dart';
 
 class IdUtils {
-  static const String TABLE =
+  static final XOR_CODE = BigInt.parse('23442827791579');
-      'fZodR9XQDSUm21yCkr6zBqiveYah8bt4xsWpHnJE7jL5VG3guMTKNPAwcF';
+  static final MASK_CODE = BigInt.parse('2251799813685247');
-  static const List<int> S = [11, 10, 3, 8, 4, 6]; // 位置编码表
+  static final MAX_AID = BigInt.one << (BigInt.from(51)).toInt();
-  static const int XOR = 177451812; // 固定异或值
+  static final BASE = BigInt.from(58);
-  static const int ADD = 8728348608; // 固定加法值
+
-  static const List<String> r = [
+  static const data =
+      'FcwAPNKTMug3GV5Lj7EJnHpWsx4tb8haYeviqBz6rkCy12mUSDQX9RdoZf';
+
+  /// av转bv
+  static String av2bv(int aid) {
+    List<String> bytes = [
       'B',
       'V',
       '1',
-    '',
+      '0',
-    '',
+      '0',
-    '4',
+      '0',
-    '',
+      '0',
-    '1',
+      '0',
-    '',
+      '0',
-    '7',
+      '0',
-    '',
+      '0',
-    ''
+      '0'
     ];
-
+    int bvIndex = bytes.length - 1;
-  /// av转bv
+    BigInt tmp = (MAX_AID | BigInt.from(aid)) ^ XOR_CODE;
-  static String av2bv(int av) {
+    while (tmp > BigInt.zero) {
-    int x_ = (av ^ XOR) + ADD;
+      bytes[bvIndex] = data[(tmp % BASE).toInt()];
-    List<String> newR = [];
+      tmp = tmp ~/ BASE;
-    newR.addAll(r);
+      bvIndex -= 1;
-    for (int i = 0; i < S.length; i++) {
-      newR[S[i]] =
-          TABLE.characters.elementAt((x_ / pow(58, i).toInt() % 58).toInt());
     }
-    return newR.join();
+    String tmpSwap = bytes[3];
+    bytes[3] = bytes[9];
+    bytes[9] = tmpSwap;
+
+    tmpSwap = bytes[4];
+    bytes[4] = bytes[7];
+    bytes[7] = tmpSwap;
+
+    return bytes.join();
   }
 
-  /// bv转bv
+  /// bv转av
-  static int bv2av(String bv) {
+  static int bv2av(String bvid) {
-    int r = 0;
+    List<String> bvidArr = bvid.split('');
-    for (int i = 0; i < S.length; i++) {
+    final tmpValue = bvidArr[3];
-      r += (TABLE.indexOf(bv.characters.elementAt(S[i])).toInt()) *
+    bvidArr[3] = bvidArr[9];
-          pow(58, i).toInt();
+    bvidArr[9] = tmpValue;
-    }
+
-    return (r - ADD) ^ XOR;
+    final tmpValue2 = bvidArr[4];
+    bvidArr[4] = bvidArr[7];
+    bvidArr[7] = tmpValue2;
+
+    bvidArr.removeRange(0, 3);
+    BigInt tmp = bvidArr.fold(BigInt.zero,
+        (pre, bvidChar) => pre * BASE + BigInt.from(data.indexOf(bvidChar)));
+    return ((tmp & MASK_CODE) ^ XOR_CODE).toInt();
   }
 
   // 匹配
@@ -72,4 +87,19 @@ class IdUtils {
     }
     return result;
   }
+
+  // eid生成
+  static String? genAuroraEid(int uid) {
+    if (uid == 0) {
+      return null;
+    }
+    String uidString = uid.toString();
+    List<int> resultBytes = List.generate(
+      uidString.length,
+      (i) => uidString.codeUnitAt(i) ^ "ad1va46a7lza".codeUnitAt(i % 12),
+    );
+    String auroraEid = base64Url.encode(resultBytes);
+    auroraEid = auroraEid.replaceAll(RegExp(r'=*$', multiLine: true), '');
+    return auroraEid;
+  }
 }

lib/utils/storage.dart

@@ -3,13 +3,10 @@ import 'dart:io';
 
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:pilipala/models/home/rcmd/result.dart';
 import 'package:pilipala/models/model_owner.dart';
-import 'package:pilipala/models/search/hot.dart';
 import 'package:pilipala/models/user/info.dart';
 
 class GStrorage {
-  static late final Box<dynamic> recVideo;
   static late final Box<dynamic> userInfo;
   static late final Box<dynamic> historyword;
   static late final Box<dynamic> localCache;
@@ -21,13 +18,6 @@ class GStrorage {
     final String path = dir.path;
     await Hive.initFlutter('$path/hive');
     regAdapter();
-    // 首页推荐视频
-    recVideo = await Hive.openBox(
-      'recVideo',
-      compactionStrategy: (int entries, int deletedEntries) {
-        return deletedEntries > 12;
-      },
-    );
     // 登录用户信息
     userInfo = await Hive.openBox(
       'userInfo',
@@ -54,15 +44,9 @@ class GStrorage {
   }
 
   static void regAdapter() {
-    Hive.registerAdapter(RecVideoItemAppModelAdapter());
-    Hive.registerAdapter(RcmdReasonAdapter());
-    Hive.registerAdapter(RcmdStatAdapter());
-    Hive.registerAdapter(RcmdOwnerAdapter());
     Hive.registerAdapter(OwnerAdapter());
     Hive.registerAdapter(UserInfoDataAdapter());
     Hive.registerAdapter(LevelInfoAdapter());
-    Hive.registerAdapter(HotSearchModelAdapter());
-    Hive.registerAdapter(HotSearchItemAdapter());
   }
 
   static Future<void> lazyInit() async {
@@ -73,8 +57,6 @@ class GStrorage {
   static Future<void> close() async {
     // user.compact();
     // user.close();
-    recVideo.compact();
-    recVideo.close();
     userInfo.compact();
     userInfo.close();
     historyword.compact();
@@ -145,7 +127,8 @@ class SettingBoxKey {
       enableMYBar = 'enableMYBar',
       hideSearchBar = 'hideSearchBar', // 收起顶栏
       hideTabBar = 'hideTabBar', // 收起底栏
-      tabbarSort = 'tabbarSort'; // 首页tabbar
+      tabbarSort = 'tabbarSort', // 首页tabbar
+      dynamicBadgeMode = 'dynamicBadgeMode';
 }
 
 class LocalCacheKey {
@@ -158,12 +141,13 @@ class LocalCacheKey {
       wbiKeys = 'wbiKeys',
       timeStamp = 'timeStamp',
 
-      // 弹幕相关设置 屏蔽类型 显示区域 透明度 字体大小 弹幕时间
+      // 弹幕相关设置 屏蔽类型 显示区域 透明度 字体大小 弹幕时间 描边粗细
       danmakuBlockType = 'danmakuBlockType',
       danmakuShowArea = 'danmakuShowArea',
       danmakuOpacity = 'danmakuOpacity',
       danmakuFontScale = 'danmakuFontScale',
       danmakuDuration = 'danmakuDuration',
+      strokeWidth = 'strokeWidth',
 
       // 代理host port
       systemProxyHost = 'systemProxyHost',

lib/utils/utils.dart

@@ -276,6 +276,7 @@ class Utils {
       // [arm64-v8a]
       String abi = androidInfo.supportedAbis.first;
       late String downloadUrl;
+      if (data.assets.isNotEmpty) {
         for (var i in data.assets) {
           if (i.downloadUrl.contains(abi)) {
             downloadUrl = i.downloadUrl;
@@ -288,6 +289,7 @@ class Utils {
         );
       }
     }
+  }
 
   // 时间戳转时间
   static tampToSeektime(number) {

pubspec.lock

@@ -209,6 +209,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
+  catcher_2:
+    dependency: "direct main"
+    description:
+      name: catcher_2
+      sha256: ca94d45ffb52bf4b16a425cdff6734ae8443d36d5f06c276f1c2a593120b11ed
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.1.0"
   characters:
     dependency: transitive
     description:
@@ -492,10 +500,11 @@ packages:
   floating:
     dependency: "direct main"
     description:
-      name: floating
+      path: "."
-      sha256: d9d563089e34fbd714ffdcdd2df447ec41b40c9226dacae6b4f78847aef8b991
+      ref: main
-      url: "https://pub.flutter-io.cn"
+      resolved-ref: d2d8421c4d80f6113f832404109853684721e11a
-    source: hosted
+      url: "https://github.com/guozhigq/floating.git"
+    source: git
     version: "2.0.1"
   flutter:
     dependency: "direct main"
@@ -547,6 +556,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_mailer:
+    dependency: transitive
+    description:
+      name: flutter_mailer
+      sha256: "4fffaa35e911ff5ec2e5a4ebbca62c372e99a154eb3bb2c0bf79f09adf6ecf4c"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.2"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -589,6 +606,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  fluttertoast:
+    dependency: transitive
+    description:
+      name: fluttertoast
+      sha256: dfdde255317af381bfc1c486ed968d5a43a2ded9c931e87cbecd88767d6a71c1
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "8.2.4"
   font_awesome_flutter:
     dependency: "direct main"
     description:
@@ -781,6 +806,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
+  logger:
+    dependency: "direct main"
+    description:
+      name: logger
+      sha256: "6bbb9d6f7056729537a4309bda2e74e18e5d9f14302489cc1e93f33b3fe32cac"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.2+1"
   logging:
     dependency: transitive
     description:
@@ -789,6 +822,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
+  mailer:
+    dependency: transitive
+    description:
+      name: mailer
+      sha256: "57f6dd1496699999a7bfd0aa6be0645384f477f4823e16d4321c40a434346382"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "6.0.1"
   matcher:
     dependency: transitive
     description:
@@ -951,7 +992,7 @@ packages:
     source: hosted
     version: "2.0.1"
   path:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path
       sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
@@ -1214,6 +1255,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.3.8"
+  sentry:
+    dependency: transitive
+    description:
+      name: sentry
+      sha256: "5686ed515bb620dc52b4ae99a6586fe720d443591183cf1f620ec5d1f0eec100"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "7.15.0"
   share_plus:
     dependency: "direct main"
     description:

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.17+1017
+version: 1.0.19+1019
 
 environment:
   sdk: ">=2.19.6 <3.0.0"
@@ -124,7 +124,10 @@ dependencies:
   # 代理
   system_proxy: ^0.1.0
   # pip
-  floating: ^2.0.1
+  floating:
+    git:
+      url: https://github.com/guozhigq/floating.git
+      ref: main
   # html解析
   html: ^0.15.4
   # html渲染
@@ -134,7 +137,9 @@ dependencies:
   uuid: ^3.0.7
   scrollable_positioned_list: ^0.3.8
   nil: ^1.1.1
-
+  catcher_2: ^1.1.0
+  logger: ^2.0.2+1
+  path: 1.8.3
 
 dev_dependencies:
   flutter_test:
@@ -205,6 +210,5 @@ flutter:
     #   fonts:
     #     - asset: assets/fonts/HarmonyOS_Sans_SC_Regular.ttf
 
-  
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages