fix: up投稿动态页增加未登录风控提示

Merge pull request #514 from orz12/fix-audio-fucus-interrupt
fix: 修复焦点恢复时错误播放的问题
2024-02-17 17:32:13 +08:00 · 2024-02-17 16:47:13 +08:00 · 2024-02-17 15:09:52 +08:00 · 2024-02-16 21:46:48 +08:00 · 2024-02-16 20:20:37 +08:00 · 2024-02-16 18:23:34 +08:00
180 changed files with 6607 additions and 3661 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -1,84 +1,157 @@
-name: build_apk
+name: Pilipala Release

 # action事件触发
 on:
  push:
    # push tag时触发
    tags:
-      - 'v*.*.*'
+      - "v*.*.*"

 # 可以有多个jobs
 jobs:
-    build_apk:
-        # 运行环境 ubuntu-latest window-latest mac-latest
-        runs-on: ubuntu-latest
+  android:
+    # 运行环境 ubuntu-latest window-latest mac-latest
+    runs-on: ubuntu-latest

-        # 每个jobs中可以有多个steps
-        steps:
-            - name: 代码迁出
-              uses: actions/checkout@v3
+    # 每个jobs中可以有多个steps
+    steps:
+      - name: 代码迁出
+        uses: actions/checkout@v3

-            - name: 构建Java环境
-              uses: actions/setup-java@v3
-              with:
-                  distribution: "zulu"
-                  java-version: "17"
-                  token: ${{secrets.GIT_TOKEN}}
+      - name: 构建Java环境
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "17"
+          token: ${{secrets.GIT_TOKEN}}

-            - name: 检查缓存
-              uses: actions/cache@v2
-              id: cache-flutter
-              with:
-                  path: /root/flutter-sdk # Flutter SDK 的路径
-                  key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
+      - name: 检查缓存
+        uses: actions/cache@v2
+        id: cache-flutter
+        with:
+          path: /root/flutter-sdk # Flutter SDK 的路径
+          key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}

-            - name: 安装Flutter
-              if: steps.cache-flutter.outputs.cache-hit != 'true'
-              uses: subosito/flutter-action@v2
-              with:
-                  flutter-version: 3.16.4
-                  channel: any
+      - name: 安装Flutter
+        if: steps.cache-flutter.outputs.cache-hit != 'true'
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: 3.16.5
+          channel: any

-            - name: 下载项目依赖
-              run: flutter pub get
+      - name: 下载项目依赖
+        run: flutter pub get

-            - name: 解码生成 jks
-              run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks
-              env:
-                  KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+      - name: 解码生成 jks
+        run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks
+        env:
+          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 --split-per-abi
+        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
+      - 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: date
-            #   run: echo "date=$(date +'%m%d')" >>$GITHUB_OUTPUT
+      - name: 获取版本号
+        id: version
+        run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT

-            - name: 重命名应用 Pili-arm64-v8a-*.*.*.0101.apk
-              run: |
-                # DATE=${{ steps.date.outputs.date }}
-                for file in build/app/outputs/flutter-apk/app-*-release.apk; do
-                  if [[ $file =~ app-(.*)-release.apk ]]; then
-                    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: 获取当前日期
+      #   id: date
+      #   run: echo "date=$(date +'%m%d')" >>$GITHUB_OUTPUT

-            - name: 构建和发布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 }}
-                  allowUpdates: true
+      - name: 重命名应用
+        run: |
+          # DATE=${{ steps.date.outputs.date }}
+          for file in build/app/outputs/flutter-apk/app-*.apk; do
+            if [[ $file =~ app-(.?*)release.apk ]]; then
+              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: 上传
+        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:
+          name: v${{ steps.version.outputs.version }}
+          token: ${{ secrets.GIT_TOKEN }}
+          omitBodyDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
+          allowUpdates: true
+          artifacts: Pilipala-Release/*
--- a/.gitignore
+++ b/.gitignore
@ -21,6 +21,29 @@ migrate_working_dir/
 # is commented out by default.
 #.vscode/

+# Flutter repo-specific
+/bin/cache/
+/bin/internal/bootstrap.bat
+/bin/internal/bootstrap.sh
+/bin/mingit/
+/dev/benchmarks/mega_gallery/
+/dev/bots/.recipe_deps
+/dev/bots/android_tools/
+/dev/devicelab/ABresults*.json
+/dev/docs/doc/
+/dev/docs/api_docs.zip
+/dev/docs/flutter.docs.zip
+/dev/docs/lib/
+/dev/docs/pubspec.yaml
+/dev/integration_tests/**/xcuserdata
+/dev/integration_tests/**/Pods
+/packages/flutter/coverage/
+version
+analysis_benchmark.json
+
+# packages file containing multi-root paths
+.packages.generated
+
 # Flutter/Dart/Pub related
 **/doc/api/
 **/ios/Flutter/.last_build_id
@ -31,14 +54,83 @@ migrate_working_dir/
 .pub-cache/
 .pub/
 /build/
-
-# Symbolication related
-app.*.symbols
+flutter_*.png
+linked_*.ds
+unlinked.ds
+unlinked_spec.ds

 # Obfuscation related
 app.*.map.json

-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
+# Android related
+**/android/**/gradle-wrapper.jar
+.gradle/
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+**/android/key.properties
+*.jks
+
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/.last_build_id
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/ephemeral
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/Flutter/flutter_export_environment.sh
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# macOS
+**/Flutter/ephemeral/
+**/Pods/
+**/macos/Flutter/GeneratedPluginRegistrant.swift
+**/macos/Flutter/ephemeral
+**/xcuserdata/
+
+# Windows
+**/windows/flutter/generated_plugin_registrant.cc
+**/windows/flutter/generated_plugin_registrant.h
+**/windows/flutter/generated_plugins.cmake
+
+# Linux
+**/linux/flutter/generated_plugin_registrant.cc
+**/linux/flutter/generated_plugin_registrant.h
+**/linux/flutter/generated_plugins.cmake
+
+# Coverage
+coverage/
+
+# Symbols
+app.*.symbols
+
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/dev/ci/**/Gemfile.lock
+!.vscode/settings.json
--- a/android/app/build.gradle
+++ b/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
    }

@ -95,3 +94,14 @@ flutter {
 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
+
+ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3]
+import com.android.build.OutputFile
+android.applicationVariants.all { variant ->
+  variant.outputs.each { output ->
+    def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+    if (abiVersionCode != null) {
+      output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode
+    }
+  }
+}
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -67,9 +67,9 @@
                <action android:name="android.intent.action.MAIN"/>
                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
-
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEARCH" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
                <data android:scheme="bilibili" android:host="forward" />
--- a/assets/images/live/default_bg.webp
+++ b/assets/images/live/default_bg.webp
--- a/change_log/1.0.17.0125.md
+++ b/change_log/1.0.17.0125.md
@ -0,0 +1,39 @@
+## 1.0.17
+
+
+### 功能
+ 视频全屏时隐藏进度条
+ 动态内容增加投稿跳转
+ 未开启自动播放时点击封面播放
+ 弹幕发送标识
+ 定时关闭
+ 推荐视频卡片拉黑up功能
+ 首页tabbar编辑排序
+
+### 修复
+ 连续跳转搜索页未刷新
+ 搜索结果为空时页面异常
+ 评论区链接解析
+ 视频全屏状态栏背景色
+ 私信对话气泡位置
+ 设置up关注分组样式
+ 每次推荐请求数据相同
+ iOS代理网络异常
+ 双击切换播放状态无声
+ 设置自定义倍速白屏
+ 免登录查看1080p
+
+### 优化
+ 首页web端推荐观看数展示
+ 首页web端推荐接口更新
+ 首页样式
+ 搜索页跳转
+ 弹幕资源优化
+ 图片渲染占用内存优化（部分）
+ 两次返回退出应用
+ schame 补充
+  
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。
--- a/change_log/1.0.18.0130.md
+++ b/change_log/1.0.18.0130.md
@ -0,0 +1,16 @@
+## 1.0.18
+
+
+### 功能
+
+
+### 修复
+
+
+### 优化
+
+  
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。
--- a/change_log/1.0.19.0131.md
+++ b/change_log/1.0.19.0131.md
@ -0,0 +1,15 @@
+## 1.0.19
+
+
+### 修复
+ 视频404、评论加载错误
+ bvav转换
+
+### 优化
+ 视频详情页内存占用
+
+  
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。
--- a/ios/Podfile.lock
+++ b/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
--- a/lib/common/widgets/content_container.dart
+++ b/lib/common/widgets/content_container.dart
@ -20,7 +20,7 @@ class ContentContainer extends StatelessWidget {
      builder: (BuildContext context, BoxConstraints constraints) {
        return SingleChildScrollView(
          clipBehavior: childClipBehavior ?? Clip.hardEdge,
-          physics: isScrollable ? null : NeverScrollableScrollPhysics(),
+          physics: isScrollable ? null : const NeverScrollableScrollPhysics(),
          child: ConstrainedBox(
            constraints: constraints.copyWith(
              minHeight: constraints.maxHeight,
@ -34,7 +34,7 @@ class ContentContainer extends StatelessWidget {
                      child: contentWidget!,
                    )
                  else
-                    Spacer(),
+                    const Spacer(),
                  if (bottomWidget != null) bottomWidget!,
                ],
              ),
--- a/lib/common/widgets/custom_toast.dart
+++ b/lib/common/widgets/custom_toast.dart
@ -2,16 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/utils/storage.dart';

-Box setting = GStrorage.setting;
+Box<dynamic> setting = GStrorage.setting;

 class CustomToast extends StatelessWidget {
+  const CustomToast({super.key, required this.msg});
+
  final String msg;
-  const CustomToast({Key? key, required this.msg}) : super(key: key);

  @override
  Widget build(BuildContext context) {
-    double toastOpacity =
-        setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0);
+    final double toastOpacity =
+        setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0) as double;
    return Container(
      margin:
          EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom + 30),
--- a/lib/common/widgets/html_render.dart
+++ b/lib/common/widgets/html_render.dart
@ -1,45 +1,46 @@
-import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:get/get.dart';
+import 'network_img_layer.dart';

 // ignore: must_be_immutable
 class HtmlRender extends StatelessWidget {
-  String? htmlContent;
-  final int? imgCount;
-  final List? imgList;
-
-  HtmlRender({
+  const HtmlRender({
    this.htmlContent,
    this.imgCount,
    this.imgList,
    super.key,
  });

+  final String? htmlContent;
+  final int? imgCount;
+  final List<String>? imgList;
+
  @override
  Widget build(BuildContext context) {
    return Html(
      data: htmlContent,
-      onLinkTap: (url, buildContext, attributes) => {},
+      onLinkTap: (String? url, Map<String, String> buildContext, attributes) {},
      extensions: [
        TagExtension(
-          tagsToExtend: {"img"},
-          builder: (extensionContext) {
+          tagsToExtend: <String>{'img'},
+          builder: (ExtensionContext extensionContext) {
            try {
-              Map attributes = extensionContext.attributes;
-              List key = attributes.keys.toList();
-              String? imgUrl = key.contains('src')
-                  ? attributes['src']
-                  : attributes['data-src'];
-              if (imgUrl!.startsWith('//')) {
+              final Map<String, dynamic> attributes =
+                  extensionContext.attributes;
+              final List<dynamic> key = attributes.keys.toList();
+              String imgUrl = key.contains('src')
+                  ? attributes['src'] as String
+                  : attributes['data-src'] as String;
+              if (imgUrl.startsWith('//')) {
                imgUrl = 'https:$imgUrl';
              }
              if (imgUrl.startsWith('http://')) {
                imgUrl = imgUrl.replaceAll('http://', 'https://');
              }
              imgUrl = imgUrl.contains('@') ? imgUrl.split('@').first : imgUrl;
-              bool isEmote = imgUrl.contains('/emote/');
-              bool isMall = imgUrl.contains('/mall/');
+              final bool isEmote = imgUrl.contains('/emote/');
+              final bool isMall = imgUrl.contains('/mall/');
              if (isMall) {
                return const SizedBox();
              }
@ -58,38 +59,37 @@ class HtmlRender extends StatelessWidget {
                src: imgUrl,
              );
            } catch (err) {
-              print(err);
              return const SizedBox();
            }
          },
        ),
      ],
      style: {
-        "html": Style(
+        'html': Style(
          fontSize: FontSize.medium,
          lineHeight: LineHeight.percent(140),
        ),
-        "body": Style(margin: Margins.zero, padding: HtmlPaddings.zero),
-        "a": Style(
+        'body': Style(margin: Margins.zero, padding: HtmlPaddings.zero),
+        'a': Style(
          color: Theme.of(context).colorScheme.primary,
          textDecoration: TextDecoration.none,
        ),
-        "p": Style(
+        'p': Style(
          margin: Margins.only(bottom: 10),
        ),
-        "span": Style(
+        'span': Style(
          fontSize: FontSize.medium,
          height: Height(1.65),
        ),
-        "div": Style(height: Height.auto()),
-        "li > p": Style(
+        'div': Style(height: Height.auto()),
+        'li > p': Style(
          display: Display.inline,
        ),
-        "li": Style(
+        'li': Style(
          padding: HtmlPaddings.only(bottom: 4),
          textAlign: TextAlign.justify,
        ),
-        "img": Style(margin: Margins.only(top: 4, bottom: 4)),
+        'img': Style(margin: Margins.only(top: 4, bottom: 4)),
      },
    );
  }
--- a/lib/common/widgets/http_error.dart
+++ b/lib/common/widgets/http_error.dart
@ -22,20 +22,27 @@ class HttpError extends StatelessWidget {
              "assets/images/error.svg",
              height: 200,
            ),
-            const SizedBox(height: 20),
+            const SizedBox(height: 30),
            Text(
              errMsg ?? '请求异常',
              textAlign: TextAlign.center,
              style: Theme.of(context).textTheme.titleSmall,
            ),
-            const SizedBox(height: 30),
-            OutlinedButton.icon(
+            const SizedBox(height: 20),
+            FilledButton.tonal(
              onPressed: () {
                fn!();
              },
-              icon: const Icon(Icons.arrow_forward_outlined, size: 20),
-              label: Text(btnText ?? '点击重试'),
-            )
+              style: ButtonStyle(
+                backgroundColor: MaterialStateProperty.resolveWith((states) {
+                  return Theme.of(context).colorScheme.primary.withAlpha(20);
+                }),
+              ),
+              child: Text(
+                btnText ?? '点击重试',
+                style: TextStyle(color: Theme.of(context).colorScheme.primary),
+              ),
+            ),
          ],
        ),
      ),
--- a/lib/common/widgets/live_card.dart
+++ b/lib/common/widgets/live_card.dart
@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/utils/utils.dart';
+import '../../utils/utils.dart';
+import '../constants.dart';
+import 'network_img_layer.dart';

 class LiveCard extends StatelessWidget {
  // ignore: prefer_typing_uninitialized_variables
-  final liveItem;
+  final dynamic liveItem;

  const LiveCard({
    Key? key,
@ -14,7 +14,7 @@ class LiveCard extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    String heroTag = Utils.makeHeroTag(liveItem.roomid);
+    final String heroTag = Utils.makeHeroTag(liveItem.roomid);

    return Card(
      elevation: 0,
@ -23,7 +23,6 @@ class LiveCard extends StatelessWidget {
        borderRadius: BorderRadius.circular(0),
        side: BorderSide(
          color: Theme.of(context).dividerColor.withOpacity(0.08),
-          width: 1,
        ),
      ),
      margin: EdgeInsets.zero,
@ -33,15 +32,16 @@ class LiveCard extends StatelessWidget {
          children: [
            AspectRatio(
              aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                double maxWidth = boxConstraints.maxWidth;
-                double maxHeight = boxConstraints.maxHeight;
+              child: LayoutBuilder(builder:
+                  (BuildContext context, BoxConstraints boxConstraints) {
+                final double maxWidth = boxConstraints.maxWidth;
+                final double maxHeight = boxConstraints.maxHeight;
                return Stack(
                  children: [
                    Hero(
                      tag: heroTag,
                      child: NetworkImgLayer(
-                        src: liveItem.cover,
+                        src: liveItem.cover as String,
                        type: 'emote',
                        width: maxWidth,
                        height: maxHeight,
@ -58,7 +58,7 @@ class LiveCard extends StatelessWidget {
                          // view: liveItem.stat.view,
                          // danmaku: liveItem.stat.danmaku,
                          // duration: liveItem.duration,
-                          online: liveItem.online,
+                          online: liveItem.online as int,
                        ),
                      ),
                    ),
@ -90,7 +90,7 @@ class LiveContent extends StatelessWidget {
        mainAxisAlignment: MainAxisAlignment.spaceBetween,
        children: [
          Text(
-            liveItem.title,
+            liveItem.title as String,
            textAlign: TextAlign.start,
            style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
            maxLines: 2,
@ -99,7 +99,7 @@ class LiveContent extends StatelessWidget {
          SizedBox(
            width: double.infinity,
            child: Text(
-              liveItem.uname,
+              liveItem.uname as String,
              maxLines: 1,
              style: TextStyle(
                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
@ -114,9 +114,9 @@ class LiveContent extends StatelessWidget {
 }

 class LiveStat extends StatelessWidget {
-  final int? online;
+  const LiveStat({super.key, required this.online});

-  const LiveStat({Key? key, required this.online}) : super(key: key);
+  final int? online;

  @override
  Widget build(BuildContext context) {
@ -136,7 +136,7 @@ class LiveStat extends StatelessWidget {
      ),
      child: Row(
        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
+        children: <Widget>[
          // Row(
          // children: [
          // StatView(
--- a/lib/common/widgets/network_img_layer.dart
+++ b/lib/common/widgets/network_img_layer.dart
@ -1,78 +1,101 @@
-import 'package:flutter/material.dart';
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/utils/storage.dart';
+import 'package:pilipala/utils/extension.dart';
+import '../../utils/storage.dart';
+import '../constants.dart';

-Box setting = GStrorage.setting;
+Box<dynamic> setting = GStrorage.setting;

 class NetworkImgLayer extends StatelessWidget {
-  final String? src;
-  final double? width;
-  final double? height;
-  final double? cacheW;
-  final double? cacheH;
-  final String? type;
-  final Duration? fadeOutDuration;
-  final Duration? fadeInDuration;
-  final int? quality;
-
  const NetworkImgLayer({
-    Key? key,
+    super.key,
    this.src,
    required this.width,
    required this.height,
-    this.cacheW,
-    this.cacheH,
    this.type,
    this.fadeOutDuration,
    this.fadeInDuration,
    // 图片质量 默认1%
    this.quality,
-  }) : super(key: key);
+    this.origAspectRatio,
+  });
+
+  final String? src;
+  final double width;
+  final double height;
+  final String? type;
+  final Duration? fadeOutDuration;
+  final Duration? fadeInDuration;
+  final int? quality;
+  final double? origAspectRatio;

  @override
  Widget build(BuildContext context) {
-    double pr = MediaQuery.of(context).devicePixelRatio;
-    int picQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
+    final String imageUrl =
+        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? 100}q.webp';
+    int? memCacheWidth, memCacheHeight;
+    double aspectRatio = (width / height).toDouble();

-    // double pr = 2;
-    return src != ''
+    void setMemCacheSizes() {
+      if (aspectRatio > 1) {
+        memCacheHeight = height.cacheSize(context);
+      } else if (aspectRatio < 1) {
+        memCacheWidth = width.cacheSize(context);
+      } else {
+        if (origAspectRatio != null && origAspectRatio! > 1) {
+          memCacheWidth = width.cacheSize(context);
+        } else if (origAspectRatio != null && origAspectRatio! < 1) {
+          memCacheHeight = height.cacheSize(context);
+        } else {
+          memCacheWidth = width.cacheSize(context);
+          memCacheHeight = height.cacheSize(context);
+        }
+      }
+    }
+
+    setMemCacheSizes();
+
+    if (memCacheWidth == null && memCacheHeight == null) {
+      memCacheWidth = width.toInt();
+    }
+
+    return src != '' && src != null
        ? ClipRRect(
-            clipBehavior: Clip.hardEdge,
-            borderRadius: BorderRadius.circular(type == 'avatar'
-                ? 50
-                : type == 'emote'
-                    ? 0
-                    : StyleString.imgRadius.x),
+            clipBehavior: Clip.antiAlias,
+            borderRadius: BorderRadius.circular(
+              type == 'avatar'
+                  ? 50
+                  : type == 'emote'
+                      ? 0
+                      : StyleString.imgRadius.x,
+            ),
            child: CachedNetworkImage(
-              imageUrl:
-                  '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? picQuality}q.webp',
-              width: width ?? double.infinity,
-              height: height ?? double.infinity,
-              alignment: Alignment.center,
-              maxWidthDiskCache: ((cacheW ?? width!) * pr).toInt(),
-              // maxHeightDiskCache: (cacheH ?? height!).toInt(),
-              memCacheWidth: ((cacheW ?? width!) * pr).toInt(),
-              // memCacheHeight: (cacheH ?? height!).toInt(),
+              imageUrl: imageUrl,
+              width: width,
+              height: height,
+              memCacheWidth: memCacheWidth,
+              memCacheHeight: memCacheHeight,
              fit: BoxFit.cover,
              fadeOutDuration:
-                  fadeOutDuration ?? const Duration(milliseconds: 200),
+                  fadeOutDuration ?? const Duration(milliseconds: 120),
              fadeInDuration:
-                  fadeInDuration ?? const Duration(milliseconds: 200),
-              // filterQuality: FilterQuality.high,
-              errorWidget: (context, url, error) => placeholder(context),
-              placeholder: (context, url) => placeholder(context),
+                  fadeInDuration ?? const Duration(milliseconds: 120),
+              filterQuality: FilterQuality.high,
+              errorWidget: (BuildContext context, String url, Object error) =>
+                  placeholder(context),
+              placeholder: (BuildContext context, String url) =>
+                  placeholder(context),
            ),
          )
        : placeholder(context);
  }

-  Widget placeholder(context) {
+  Widget placeholder(BuildContext context) {
    return Container(
-      width: width ?? double.infinity,
-      height: height ?? double.infinity,
-      clipBehavior: Clip.hardEdge,
+      width: width,
+      height: height,
+      clipBehavior: Clip.antiAlias,
      decoration: BoxDecoration(
        color: Theme.of(context).colorScheme.onInverseSurface.withOpacity(0.4),
        borderRadius: BorderRadius.circular(type == 'avatar'
@ -82,13 +105,16 @@ class NetworkImgLayer extends StatelessWidget {
                : StyleString.imgRadius.x),
      ),
      child: Center(
-          child: Image.asset(
-        type == 'avatar'
-            ? 'assets/images/noface.jpeg'
-            : 'assets/images/loading.png',
-        width: 300,
-        height: 300,
-      )),
+        child: Image.asset(
+          type == 'avatar'
+              ? 'assets/images/noface.jpeg'
+              : 'assets/images/loading.png',
+          width: width,
+          height: height,
+          cacheWidth: width.cacheSize(context),
+          cacheHeight: height.cacheSize(context),
+        ),
+      ),
    );
  }
 }
--- a/lib/common/widgets/overlay_pop.dart
+++ b/lib/common/widgets/overlay_pop.dart
@ -1,16 +1,17 @@
 import 'package:flutter/material.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/utils/download.dart';
+import '../../utils/download.dart';
+import '../constants.dart';
+import 'network_img_layer.dart';

 class OverlayPop extends StatelessWidget {
+  const OverlayPop({super.key, this.videoItem, this.closeFn});
+
  final dynamic videoItem;
  final Function? closeFn;
-  const OverlayPop({super.key, this.videoItem, this.closeFn});

  @override
  Widget build(BuildContext context) {
-    double imgWidth = MediaQuery.of(context).size.width - 8 * 2;
+    final double imgWidth = MediaQuery.sizeOf(context).width - 8 * 2;
    return Container(
      margin: const EdgeInsets.symmetric(horizontal: 8),
      decoration: BoxDecoration(
@ -19,7 +20,6 @@ class OverlayPop extends StatelessWidget {
      ),
      child: Column(
        mainAxisSize: MainAxisSize.min,
-        mainAxisAlignment: MainAxisAlignment.start,
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          Stack(
@ -27,7 +27,7 @@ class OverlayPop extends StatelessWidget {
              NetworkImgLayer(
                width: imgWidth,
                height: imgWidth / StyleString.aspectRatio,
-                src: videoItem.pic!,
+                src: videoItem.pic! as String,
                quality: 100,
              ),
              Positioned(
@ -61,7 +61,7 @@ class OverlayPop extends StatelessWidget {
                children: [
                  Expanded(
                    child: Text(
-                      videoItem.title!,
+                      videoItem.title! as String,
                    ),
                  ),
                  const SizedBox(width: 4),
@ -69,7 +69,10 @@ class OverlayPop extends StatelessWidget {
                    tooltip: '保存封面图',
                    onPressed: () async {
                      await DownloadUtils.downloadImg(
-                          videoItem.pic ?? videoItem.cover);
+                        videoItem.pic != null
+                            ? videoItem.pic as String
+                            : videoItem.cover as String,
+                      );
                      // closeFn!();
                    },
                    icon: const Icon(Icons.download, size: 20),
--- a/lib/common/widgets/pull_to_refresh_header.dart
+++ b/lib/common/widgets/pull_to_refresh_header.dart
@ -17,8 +17,8 @@ class PullToRefreshHeader extends StatelessWidget {
    this.info,
    this.lastRefreshTime, {
    this.color,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });

  final PullToRefreshScrollNotificationInfo? info;
  final DateTime? lastRefreshTime;
@ -28,7 +28,7 @@ class PullToRefreshHeader extends StatelessWidget {
  Widget build(BuildContext context) {
    final PullToRefreshScrollNotificationInfo? infos = info;
    if (infos == null) {
-      return Container();
+      return const SizedBox();
    }
    String text = '';
    if (infos.mode == PullToRefreshIndicatorMode.armed) {
@ -65,7 +65,6 @@ class PullToRefreshHeader extends StatelessWidget {
            top: top,
            child: Row(
              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
              children: <Widget>[
                Expanded(
                  child: Container(
--- a/lib/common/widgets/stat/danmu.dart
+++ b/lib/common/widgets/stat/danmu.dart
@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';

 class StatDanMu extends StatelessWidget {
  final String? theme;
-  final int? danmu;
+  final dynamic danmu;
  final String? size;

  const StatDanMu({Key? key, this.theme, this.danmu, this.size})
--- a/lib/common/widgets/stat/view.dart
+++ b/lib/common/widgets/stat/view.dart
@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';

 class StatView extends StatelessWidget {
  final String? theme;
-  final int? view;
+  final dynamic view;
  final String? size;

  const StatView({Key? key, this.theme, this.view, this.size})
--- a/lib/common/widgets/video_card_h.dart
+++ b/lib/common/widgets/video_card_h.dart
@ -1,17 +1,29 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:flutter/material.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/common/widgets/badge.dart';
-import 'package:pilipala/common/widgets/stat/danmu.dart';
-import 'package:pilipala/common/widgets/stat/view.dart';
-import 'package:pilipala/http/search.dart';
-import 'package:pilipala/http/user.dart';
-import 'package:pilipala/utils/utils.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
+import '../../http/search.dart';
+import '../../http/user.dart';
+import '../../http/video.dart';
+import '../../utils/utils.dart';
+import '../constants.dart';
+import 'badge.dart';
+import 'network_img_layer.dart';
+import 'stat/danmu.dart';
+import 'stat/view.dart';

 // 视频卡片 - 水平布局
 class VideoCardH extends StatelessWidget {
+  const VideoCardH({
+    super.key,
+    required this.videoItem,
+    this.longPress,
+    this.longPressEnd,
+    this.source = 'normal',
+    this.showOwner = true,
+    this.showView = true,
+    this.showDanmaku = true,
+    this.showPubdate = false,
+  });
  // ignore: prefer_typing_uninitialized_variables
  final videoItem;
  final Function()? longPress;
@ -22,23 +34,11 @@ class VideoCardH extends StatelessWidget {
  final bool showDanmaku;
  final bool showPubdate;

-  const VideoCardH({
-    Key? key,
-    required this.videoItem,
-    this.longPress,
-    this.longPressEnd,
-    this.source = 'normal',
-    this.showOwner = true,
-    this.showView = true,
-    this.showDanmaku = true,
-    this.showPubdate = false,
-  }) : super(key: key);
-
  @override
  Widget build(BuildContext context) {
-    int aid = videoItem.aid;
-    String bvid = videoItem.bvid;
-    String heroTag = Utils.makeHeroTag(aid);
+    final int aid = videoItem.aid;
+    final String bvid = videoItem.bvid;
+    final String heroTag = Utils.makeHeroTag(aid);
    return GestureDetector(
      onLongPress: () {
        if (longPress != null) {
@ -53,7 +53,7 @@ class VideoCardH extends StatelessWidget {
      child: InkWell(
        onTap: () async {
          try {
-            int cid =
+            final int cid =
                videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
            Get.toNamed('/video?bvid=$bvid&cid=$cid',
                arguments: {'videoItem': videoItem, 'heroTag': heroTag});
@ -65,11 +65,11 @@ class VideoCardH extends StatelessWidget {
          padding: const EdgeInsets.fromLTRB(
              StyleString.safeSpace, 5, StyleString.safeSpace, 5),
          child: LayoutBuilder(
-            builder: (context, boxConstraints) {
-              double width = (boxConstraints.maxWidth -
+            builder: (BuildContext context, BoxConstraints boxConstraints) {
+              final double width = (boxConstraints.maxWidth -
                      StyleString.cardSpace *
                          6 /
-                          MediaQuery.of(context).textScaleFactor) /
+                          MediaQuery.textScalerOf(context).scale(1.0)) /
                  2;
              return Container(
                constraints: const BoxConstraints(minHeight: 88),
@ -77,29 +77,28 @@ class VideoCardH extends StatelessWidget {
                child: Row(
                  mainAxisAlignment: MainAxisAlignment.start,
                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
+                  children: <Widget>[
                    AspectRatio(
                      aspectRatio: StyleString.aspectRatio,
                      child: LayoutBuilder(
-                        builder: (context, boxConstraints) {
-                          double maxWidth = boxConstraints.maxWidth;
-                          double maxHeight = boxConstraints.maxHeight;
+                        builder: (BuildContext context,
+                            BoxConstraints boxConstraints) {
+                          final double maxWidth = boxConstraints.maxWidth;
+                          final double maxHeight = boxConstraints.maxHeight;
                          return Stack(
                            children: [
                              Hero(
                                tag: heroTag,
                                child: NetworkImgLayer(
-                                  src: videoItem.pic,
+                                  src: videoItem.pic as String,
                                  width: maxWidth,
                                  height: maxHeight,
                                ),
                              ),
                              PBadge(
                                text: Utils.timeFormat(videoItem.duration!),
-                                top: null,
                                right: 6.0,
                                bottom: 6.0,
-                                left: null,
                                type: 'gray',
                              ),
                              // if (videoItem.rcmdReason != null &&
@ -159,7 +158,7 @@ class VideoContent extends StatelessWidget {
          children: [
            if (videoItem.title is String) ...[
              Text(
-                videoItem.title,
+                videoItem.title as String,
                textAlign: TextAlign.start,
                style: const TextStyle(
                  fontWeight: FontWeight.w500,
@ -172,9 +171,9 @@ class VideoContent extends StatelessWidget {
                maxLines: 2,
                text: TextSpan(
                  children: [
-                    for (var i in videoItem.title) ...[
+                    for (final i in videoItem.title) ...[
                      TextSpan(
-                        text: i['text'],
+                        text: i['text'] as String,
                        style: TextStyle(
                          fontWeight: FontWeight.w500,
                          letterSpacing: 0.3,
@ -216,7 +215,7 @@ class VideoContent extends StatelessWidget {
              Row(
                children: [
                  Text(
-                    videoItem.owner.name,
+                    videoItem.owner.name as String,
                    style: TextStyle(
                      fontSize:
                          Theme.of(context).textTheme.labelMedium!.fontSize,
@ -230,14 +229,14 @@ class VideoContent extends StatelessWidget {
                if (showView) ...[
                  StatView(
                    theme: 'gray',
-                    view: videoItem.stat.view,
+                    view: videoItem.stat.view as int,
                  ),
                  const SizedBox(width: 8),
                ],
                if (showDanmaku)
                  StatDanMu(
                    theme: 'gray',
-                    danmu: videoItem.stat.danmaku,
+                    danmu: videoItem.stat.danmaku as int,
                  ),

                const Spacer(),
@ -267,7 +266,6 @@ class VideoContent extends StatelessWidget {
                    height: 24,
                    child: PopupMenuButton<String>(
                      padding: EdgeInsets.zero,
-                      tooltip: '稍后再看',
                      icon: Icon(
                        Icons.more_vert_outlined,
                        color: Theme.of(context).colorScheme.outline,
@ -281,11 +279,11 @@ class VideoContent extends StatelessWidget {
                        PopupMenuItem<String>(
                          onTap: () async {
                            var res = await UserHttp.toViewLater(
-                                bvid: videoItem.bvid);
+                                bvid: videoItem.bvid as String);
                            SmartDialog.showToast(res['msg']);
                          },
                          value: 'pause',
-                          height: 35,
+                          height: 40,
                          child: const Row(
                            children: [
                              Icon(Icons.watch_later_outlined, size: 16),
@ -294,6 +292,60 @@ class VideoContent extends StatelessWidget {
                            ],
                          ),
                        ),
+                        const PopupMenuDivider(),
+                        PopupMenuItem<String>(
+                          onTap: () async {
+                            SmartDialog.show(
+                              useSystem: true,
+                              animationType:
+                                  SmartAnimationType.centerFade_otherSlide,
+                              builder: (BuildContext context) {
+                                return AlertDialog(
+                                  title: const Text('提示'),
+                                  content: Text(
+                                      '确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
+                                      '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
+                                  actions: [
+                                    TextButton(
+                                      onPressed: () => SmartDialog.dismiss(),
+                                      child: Text(
+                                        '点错了',
+                                        style: TextStyle(
+                                            color: Theme.of(context)
+                                                .colorScheme
+                                                .outline),
+                                      ),
+                                    ),
+                                    TextButton(
+                                      onPressed: () async {
+                                        var res = await VideoHttp.relationMod(
+                                          mid: videoItem.owner.mid,
+                                          act: 5,
+                                          reSrc: 11,
+                                        );
+                                        SmartDialog.dismiss();
+                                        SmartDialog.showToast(res['code'] == 0
+                                            ? '成功'
+                                            : res['msg']);
+                                      },
+                                      child: const Text('确认'),
+                                    )
+                                  ],
+                                );
+                              },
+                            );
+                          },
+                          value: 'pause',
+                          height: 40,
+                          child: Row(
+                            children: [
+                              const Icon(Icons.block, size: 16),
+                              const SizedBox(width: 6),
+                              Text('拉黑：${videoItem.owner.name}',
+                                  style: const TextStyle(fontSize: 13))
+                            ],
+                          ),
+                        ),
                      ],
                    ),
                  ),
--- a/lib/common/widgets/video_card_v.dart
+++ b/lib/common/widgets/video_card_v.dart
@ -1,17 +1,19 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:flutter/material.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/common/widgets/badge.dart';
-import 'package:pilipala/common/widgets/stat/danmu.dart';
-import 'package:pilipala/common/widgets/stat/view.dart';
-import 'package:pilipala/http/dynamics.dart';
-import 'package:pilipala/http/search.dart';
-import 'package:pilipala/http/user.dart';
-import 'package:pilipala/models/common/search_type.dart';
-import 'package:pilipala/utils/id_utils.dart';
-import 'package:pilipala/utils/utils.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
+import '../../models/model_rec_video_item.dart';
+import 'stat/danmu.dart';
+import 'stat/view.dart';
+import '../../http/dynamics.dart';
+import '../../http/search.dart';
+import '../../http/user.dart';
+import '../../http/video.dart';
+import '../../models/common/search_type.dart';
+import '../../utils/id_utils.dart';
+import '../../utils/utils.dart';
+import '../constants.dart';
+import 'badge.dart';
+import 'network_img_layer.dart';

 // 视频卡片 - 垂直布局
 class VideoCardV extends StatelessWidget {
@ -159,12 +161,12 @@ class VideoCardV extends StatelessWidget {
                          height: maxHeight,
                        ),
                      ),
-                      if (videoItem.duration != null)
+                      if (videoItem.duration > 0)
                        if (crossAxisCount == 1) ...[
                          PBadge(
                            bottom: 10,
                            right: 10,
-                            text: videoItem.duration,
+                            text: Utils.timeFormat(videoItem.duration),
                          )
                        ] else ...[
                          PBadge(
@ -172,7 +174,7 @@ class VideoCardV extends StatelessWidget {
                            right: 7,
                            size: 'small',
                            type: 'gray',
-                            text: videoItem.duration,
+                            text: Utils.timeFormat(videoItem.duration),
                          )
                        ],
                    ],
@ -217,15 +219,10 @@ class VideoContent extends StatelessWidget {
                ),
                if (videoItem.goto == 'av' && crossAxisCount == 1) ...[
                  const SizedBox(width: 10),
-                  WatchLater(
+                  VideoPopupMenu(
                    size: 32,
                    iconSize: 18,
-                    callFn: () async {
-                      int aid = videoItem.param;
-                      var res =
-                          await UserHttp.toViewLater(bvid: IdUtils.av2bv(aid));
-                      SmartDialog.showToast(res['msg']);
-                    },
+                    videoItem: videoItem,
                  ),
                ],
              ],
@ -301,15 +298,10 @@ class VideoContent extends StatelessWidget {
                  const Spacer(),
                ],
                if (videoItem.goto == 'av' && crossAxisCount != 1) ...[
-                  WatchLater(
+                  VideoPopupMenu(
                    size: 24,
                    iconSize: 14,
-                    callFn: () async {
-                      int aid = videoItem.param;
-                      var res =
-                          await UserHttp.toViewLater(bvid: IdUtils.av2bv(aid));
-                      SmartDialog.showToast(res['msg']);
-                    },
+                    videoItem: videoItem,
                  ),
                ] else ...[
                  const SizedBox(height: 24)
@ -333,34 +325,45 @@ class VideoStat extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return RichText(
-      maxLines: 1,
-      text: TextSpan(
-        style: TextStyle(
-          fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-          color: Theme.of(context).colorScheme.outline,
+    return Row(
+      children: [
+        StatView(
+          theme: 'gray',
+          view: videoItem.stat.view,
        ),
-        children: [
-          if (videoItem.stat.view != '-')
-            TextSpan(text: '${videoItem.stat.view}观看'),
-          if (videoItem.stat.danmu != '-')
-            TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
-        ],
-      ),
+        const SizedBox(width: 8),
+        StatDanMu(
+          theme: 'gray',
+          danmu: videoItem.stat.danmu,
+        ),
+        if (videoItem is RecVideoItemModel) ...<Widget>[
+          const Spacer(),
+          RichText(
+            maxLines: 1,
+            text: TextSpan(
+                style: TextStyle(
+                  fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+                  color: Theme.of(context).colorScheme.outline,
+                ),
+                text: Utils.formatTimestampToRelativeTime(videoItem.pubdate)),
+          ),
+          const SizedBox(width: 4),
+        ]
+      ],
    );
  }
 }

-class WatchLater extends StatelessWidget {
+class VideoPopupMenu extends StatelessWidget {
  final double? size;
  final double? iconSize;
-  final Function? callFn;
+  final dynamic videoItem;

-  const WatchLater({
+  const VideoPopupMenu({
    Key? key,
    required this.size,
    required this.iconSize,
-    this.callFn,
+    required this.videoItem,
  }) : super(key: key);

  @override
@ -370,7 +373,6 @@ class WatchLater extends StatelessWidget {
      height: size,
      child: PopupMenuButton<String>(
        padding: EdgeInsets.zero,
-        tooltip: '稍后再看',
        icon: Icon(
          Icons.more_vert_outlined,
          color: Theme.of(context).colorScheme.outline,
@ -381,9 +383,13 @@ class WatchLater extends StatelessWidget {
        onSelected: (String type) {},
        itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
          PopupMenuItem<String>(
-            onTap: () => callFn!(),
+            onTap: () async {
+              var res =
+                  await UserHttp.toViewLater(bvid: videoItem.bvid as String);
+              SmartDialog.showToast(res['msg']);
+            },
            value: 'pause',
-            height: 35,
+            height: 40,
            child: const Row(
              children: [
                Icon(Icons.watch_later_outlined, size: 16),
@ -392,6 +398,55 @@ class WatchLater extends StatelessWidget {
              ],
            ),
          ),
+          const PopupMenuDivider(),
+          PopupMenuItem<String>(
+            onTap: () async {
+              SmartDialog.show(
+                useSystem: true,
+                animationType: SmartAnimationType.centerFade_otherSlide,
+                builder: (BuildContext context) {
+                  return AlertDialog(
+                    title: const Text('提示'),
+                    content: Text(
+                        '确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
+                        '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
+                    actions: [
+                      TextButton(
+                        onPressed: () => SmartDialog.dismiss(),
+                        child: Text(
+                          '点错了',
+                          style: TextStyle(
+                              color: Theme.of(context).colorScheme.outline),
+                        ),
+                      ),
+                      TextButton(
+                        onPressed: () async {
+                          var res = await VideoHttp.relationMod(
+                            mid: videoItem.owner.mid,
+                            act: 5,
+                            reSrc: 11,
+                          );
+                          SmartDialog.dismiss();
+                          SmartDialog.showToast(res['msg'] ?? '成功');
+                        },
+                        child: const Text('确认'),
+                      )
+                    ],
+                  );
+                },
+              );
+            },
+            value: 'pause',
+            height: 40,
+            child: Row(
+              children: [
+                const Icon(Icons.block, size: 16),
+                const SizedBox(width: 6),
+                Text('拉黑：${videoItem.owner.name}',
+                    style: const TextStyle(fontSize: 13))
+              ],
+            ),
+          ),
        ],
      ),
    );
--- a/lib/http/api.dart
+++ b/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';

  // 分类搜索
@ -214,6 +214,9 @@ class Api {
  // https://api.bilibili.com/x/relation/tags
  static const String followingsClass = '/x/relation/tags';

+  // 搜索follow
+  static const followSearch = '/x/relation/followings/search';
+
  // 粉丝
  // vmid 用户id pn 页码 ps 每页个数，最大50 order: desc
  // order_type 排序规则 最近访问传空，最常访问传 attention
@ -230,6 +233,10 @@ class Api {
  static const String liveRoomInfo =
      '${HttpString.liveBaseUrl}/xlive/web-room/v2/index/getRoomPlayInfo';

+  // 直播间详情 H5
+  static const String liveRoomInfoH5 =
+      '${HttpString.liveBaseUrl}/xlive/web-room/v1/index/getH5InfoByRoom';
+
  // 用户信息 需要Wbi签名
  // https://api.bilibili.com/x/space/wbi/acc/info?mid=503427686&token=&platform=web&web_location=1550101&w_rid=d709892496ce93e3d94d6d37c95bde91&wts=1689301482
  static const String memberInfo = '/x/space/wbi/acc/info';
@ -467,4 +474,7 @@ class Api {
  /// page_size
  static const getSeasonDetailApi =
      '/x/polymer/web-space/seasons_archives_list';
+
+  /// 获取未读动态数
+  static const getUnreadDynamic = '/x/web-interface/dynamic/entrance';
 }
--- a/lib/http/bangumi.dart
+++ b/lib/http/bangumi.dart
@ -1,5 +1,5 @@
-import 'package:pilipala/http/index.dart';
-import 'package:pilipala/models/bangumi/list.dart';
+import '../models/bangumi/list.dart';
+import 'index.dart';

 class BangumiHttp {
  static Future bangumiList({int? page}) async {
--- a/lib/http/black.dart
+++ b/lib/http/black.dart
@ -1,5 +1,5 @@
-import 'package:pilipala/http/index.dart';
-import 'package:pilipala/models/user/black.dart';
+import '../models/user/black.dart';
+import 'index.dart';

 class BlackHttp {
  static Future blackList({required int pn, int? ps}) async {
--- a/lib/http/common.dart
+++ b/lib/http/common.dart
@ -0,0 +1,17 @@
+import 'index.dart';
+
+class CommonHttp {
+  static Future unReadDynamic() async {
+    var res = await Request().get(Api.getUnreadDynamic,
+        data: {'alltype_offset': 0, 'video_offset': '', 'article_offset': 0});
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': res.data['data']['dyn_basic_infos']};
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+}
--- a/lib/http/danmaku.dart
+++ b/lib/http/danmaku.dart
@ -1,9 +1,6 @@
 import 'package:dio/dio.dart';
-import 'package:flutter/foundation.dart';
-import 'package:pilipala/http/index.dart';
-import 'package:pilipala/models/danmaku/dm.pb.dart';
-
-import 'constants.dart';
+import '../models/danmaku/dm.pb.dart';
+import 'index.dart';

 class DanmakaHttp {
  // 获取视频弹幕
@ -24,21 +21,23 @@ class DanmakaHttp {
    );
    return DmSegMobileReply.fromBuffer(response.data);
  }
+
  static Future shootDanmaku({
-    int type = 1,//弹幕类选择(1：视频弹幕 2：漫画弹幕)
-    required int oid,// 视频cid
-    required String msg,//弹幕文本(长度小于 100 字符)
-    int mode = 1,// 弹幕类型(1：滚动弹幕 4：底端弹幕 5：顶端弹幕 6：逆向弹幕(不能使用） 7：高级弹幕 8：代码弹幕（不能使用） 9：BAS弹幕（pool必须为2）)
+    int type = 1, //弹幕类选择(1：视频弹幕 2：漫画弹幕)
+    required int oid, // 视频cid
+    required String msg, //弹幕文本(长度小于 100 字符)
+    int mode =
+        1, // 弹幕类型(1：滚动弹幕 4：底端弹幕 5：顶端弹幕 6：逆向弹幕(不能使用） 7：高级弹幕 8：代码弹幕（不能使用） 9：BAS弹幕（pool必须为2）)
    // String? aid,// 稿件avid
    // String? bvid,// bvid与aid必须有一个
    required String bvid,
-    int? progress,// 弹幕出现在视频内的时间（单位为毫秒，默认为0）
-    int? color,// 弹幕颜色(默认白色，16777215）
-    int? fontsize,// 弹幕字号（默认25）
-    int? pool,// 弹幕池选择（0：普通池 1：字幕池 2：特殊池（代码/BAS弹幕）默认普通池，0）
+    int? progress, // 弹幕出现在视频内的时间（单位为毫秒，默认为0）
+    int? color, // 弹幕颜色(默认白色，16777215）
+    int? fontsize, // 弹幕字号（默认25）
+    int? pool, // 弹幕池选择（0：普通池 1：字幕池 2：特殊池（代码/BAS弹幕）默认普通池，0）
    //int? rnd,// 当前时间戳*1000000（若无此项，则发送弹幕冷却时间限制为90s；若有此项，则发送弹幕冷却时间限制为5s）
-    int? colorful,//60001：专属渐变彩色（需要会员）
-    int? checkbox_type,//是否带 UP 身份标识（0：普通；4：带有标识）
+    int? colorful, //60001：专属渐变彩色（需要会员）
+    int? checkbox_type, //是否带 UP 身份标识（0：普通；4：带有标识）
    // String? csrf,//CSRF Token（位于 Cookie）	Cookie 方式必要
    // String? access_key,//	APP 登录 Token		APP 方式必要
  }) async {
--- a/lib/http/dynamics.dart
+++ b/lib/http/dynamics.dart
@ -1,6 +1,6 @@
-import 'package:pilipala/http/index.dart';
-import 'package:pilipala/models/dynamics/result.dart';
-import 'package:pilipala/models/dynamics/up.dart';
+import '../models/dynamics/result.dart';
+import '../models/dynamics/up.dart';
+import 'index.dart';

 class DynamicsHttp {
  static Future followDynamic({
--- a/lib/http/fan.dart
+++ b/lib/http/fan.dart
@ -1,5 +1,5 @@
-import 'package:pilipala/http/index.dart';
-import 'package:pilipala/models/fans/result.dart';
+import '../models/fans/result.dart';
+import 'index.dart';

 class FanHttp {
  static Future fans({int? vmid, int? pn, int? ps, String? orderType}) async {
--- a/lib/http/follow.dart
+++ b/lib/http/follow.dart
@ -1,5 +1,5 @@
-import 'package:pilipala/http/index.dart';
-import 'package:pilipala/models/follow/result.dart';
+import '../models/follow/result.dart';
+import 'index.dart';

 class FollowHttp {
  static Future followings(
--- a/lib/http/html.dart
+++ b/lib/http/html.dart
@ -1,6 +1,6 @@
 import 'package:html/dom.dart';
 import 'package:html/parser.dart';
-import 'package:pilipala/http/index.dart';
+import 'index.dart';

 class HtmlHttp {
  // article
@ -15,7 +15,7 @@ class HtmlHttp {
      Match match = regex.firstMatch(response.data)!;
      String matchedString = match.group(0)!;
      response = await Request().get(
-        'https:$matchedString' + '/',
+        'https:$matchedString/',
        extra: {'ua': 'pc'},
      );
    }
--- a/lib/http/init.dart
+++ b/lib/http/init.dart
@ -1,17 +1,18 @@
 // ignore_for_file: avoid_print
+import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
-import 'dart:async';
-import 'package:dio/dio.dart';
 import 'package:cookie_jar/cookie_jar.dart';
+import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
-import 'package:dio_http2_adapter/dio_http2_adapter.dart';
-import 'package:hive/hive.dart';
-import 'package:pilipala/utils/storage.dart';
-import 'package:pilipala/utils/utils.dart';
-import 'package:pilipala/http/constants.dart';
-import 'package:pilipala/http/interceptor.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';
+import 'interceptor.dart';

 class Request {
  static final Request _instance = Request._internal();
@ -20,25 +21,25 @@ class Request {
  factory Request() => _instance;
  Box setting = GStrorage.setting;
  static Box localCache = GStrorage.localCache;
-  late dynamic enableSystemProxy;
+  late bool enableSystemProxy;
  late String systemProxyHost;
  late String systemProxyPort;

  /// 设置cookie
  static setCookie() async {
    Box userInfoCache = GStrorage.userInfo;
-    var cookiePath = await Utils.getCookiePath();
-    var cookieJar = PersistCookieJar(
+    final String cookiePath = await Utils.getCookiePath();
+    final PersistCookieJar cookieJar = PersistCookieJar(
      ignoreExpires: true,
      storage: FileStorage(cookiePath),
    );
    cookieManager = CookieManager(cookieJar);
    dio.interceptors.add(cookieManager);
-    var cookie = await cookieManager.cookieJar
+    final List<Cookie> cookie = await cookieManager.cookieJar
        .loadForRequest(Uri.parse(HttpString.baseUrl));
-    var userInfo = userInfoCache.get('userInfoCache');
+    final userInfo = userInfoCache.get('userInfoCache');
    if (userInfo != null && userInfo.mid != null) {
-      var cookie2 = await cookieManager.cookieJar
+      final List<Cookie> cookie2 = await cookieManager.cookieJar
          .loadForRequest(Uri.parse(HttpString.tUrl));
      if (cookie2.isEmpty) {
        try {
@ -57,14 +58,15 @@ class Request {
        log("setCookie, ${e.toString()}");
      }
    }
-    var cookieString =
-        cookie.map((cookie) => '${cookie.name}=${cookie.value}').join('; ');
+    final String cookieString = cookie
+        .map((Cookie cookie) => '${cookie.name}=${cookie.value}')
+        .join('; ');
    dio.options.headers['cookie'] = cookieString;
  }

  // 从cookie中获取 csrf token
  static Future<String> getCsrf() async {
-    var cookies = await cookieManager.cookieJar
+    List<Cookie> cookies = await cookieManager.cookieJar
        .loadForRequest(Uri.parse(HttpString.apiBaseUrl));
    String token = '';
    if (cookies.where((e) => e.name == 'bili_jct').isNotEmpty) {
@ -73,13 +75,14 @@ class Request {
    return token;
  }

-  static setOptionsHeaders(userInfo, status) {
+  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/';
  }
@ -100,30 +103,31 @@ class Request {
      headers: {},
    );

-    enableSystemProxy =
-        setting.get(SettingBoxKey.enableSystemProxy, defaultValue: false);
+    enableSystemProxy = setting.get(SettingBoxKey.enableSystemProxy,
+        defaultValue: false) as bool;
    systemProxyHost =
        localCache.get(LocalCacheKey.systemProxyHost, defaultValue: '');
    systemProxyPort =
        localCache.get(LocalCacheKey.systemProxyPort, defaultValue: '');

-    dio = Dio(options)
+    dio = Dio(options);

-      /// fix 第三方登录 302重定向 跟iOS代理问题冲突
-      ..httpClientAdapter = Http2Adapter(
-        ConnectionManager(
-          idleTimeout: const Duration(milliseconds: 10000),
-          onClientCreate: (_, config) => config.onBadCertificate = (_) => true,
-        ),
-      );
+    /// fix 第三方登录 302重定向 跟iOS代理问题冲突
+    // ..httpClientAdapter = Http2Adapter(
+    //   ConnectionManager(
+    //     idleTimeout: const Duration(milliseconds: 10000),
+    //     onClientCreate: (_, ClientSetting config) =>
+    //         config.onBadCertificate = (_) => true,
+    //   ),
+    // );

    /// 设置代理
    if (enableSystemProxy) {
      dio.httpClientAdapter = IOHttpClientAdapter(
        createHttpClient: () {
-          final client = HttpClient();
+          final HttpClient client = HttpClient();
          // Config the client.
-          client.findProxy = (uri) {
+          client.findProxy = (Uri uri) {
            // return 'PROXY host:port';
            return 'PROXY $systemProxyHost:$systemProxyPort';
          };
@ -145,7 +149,7 @@ class Request {
    ));

    dio.transformer = BackgroundTransformer();
-    dio.options.validateStatus = (status) {
+    dio.options.validateStatus = (int? status) {
      return status! >= 200 && status < 300 ||
          HttpString.validateStatusCodes.contains(status);
    };
@ -156,7 +160,7 @@ class Request {
   */
  get(url, {data, options, cancelToken, extra}) async {
    Response response;
-    Options options = Options();
+    final Options options = Options();
    ResponseType resType = ResponseType.json;
    if (extra != null) {
      resType = extra!['resType'] ?? ResponseType.json;
@ -175,8 +179,14 @@ class Request {
      );
      return response;
    } on DioException catch (e) {
-      print('get error: $e');
-      return Future.error(await ApiInterceptor.dioError(e));
+      Response errResponse = Response(
+        data: {
+          'message': await ApiInterceptor.dioError(e)
+        }, // 将自定义 Map 数据赋值给 Response 的 data 属性
+        statusCode: 200,
+        requestOptions: RequestOptions(),
+      );
+      return errResponse;
    }
  }

@ -197,8 +207,14 @@ class Request {
      // print('post success: ${response.data}');
      return response;
    } on DioException catch (e) {
-      print('post error: $e');
-      return Future.error(await ApiInterceptor.dioError(e));
+      Response errResponse = Response(
+        data: {
+          'message': await ApiInterceptor.dioError(e)
+        }, // 将自定义 Map 数据赋值给 Response 的 data 属性
+        statusCode: 200,
+        requestOptions: RequestOptions(),
+      );
+      return errResponse;
    }
  }

--- a/lib/http/interceptor.dart
+++ b/lib/http/interceptor.dart
@ -1,11 +1,10 @@
 // ignore_for_file: avoid_print

-import 'package:dio/dio.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:dio/dio.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
-import 'package:pilipala/utils/storage.dart';
-// import 'package:get/get.dart' hide Response;
+import '../utils/storage.dart';

 class ApiInterceptor extends Interceptor {
  @override
@ -21,16 +20,16 @@ class ApiInterceptor extends Interceptor {
  void onResponse(Response response, ResponseInterceptorHandler handler) {
    try {
      if (response.statusCode == 302) {
-        List<String> locations = response.headers['location']!;
+        final List<String> locations = response.headers['location']!;
        if (locations.isNotEmpty) {
          if (locations.first.startsWith('https://www.mcbbs.net')) {
-            final uri = Uri.parse(locations.first);
-            final accessKey = uri.queryParameters['access_key'];
-            final mid = uri.queryParameters['mid'];
+            final Uri uri = Uri.parse(locations.first);
+            final String? accessKey = uri.queryParameters['access_key'];
+            final String? mid = uri.queryParameters['mid'];
            try {
              Box localCache = GStrorage.localCache;
-              localCache.put(
-                  LocalCacheKey.accessKey, {'mid': mid, 'value': accessKey});
+              localCache.put(LocalCacheKey.accessKey,
+                  <String, String?>{'mid': mid, 'value': accessKey});
            } catch (_) {}
          }
        }
@ -53,47 +52,46 @@ class ApiInterceptor extends Interceptor {
    super.onError(err, handler);
  }

-  static Future dioError(DioException error) async {
+  static Future<String> dioError(DioException error) async {
    switch (error.type) {
      case DioExceptionType.badCertificate:
        return '证书有误！';
      case DioExceptionType.badResponse:
        return '服务器异常，请稍后重试！';
      case DioExceptionType.cancel:
-        return "请求已被取消，请重新请求";
+        return '请求已被取消，请重新请求';
      case DioExceptionType.connectionError:
        return '连接错误，请检查网络设置';
      case DioExceptionType.connectionTimeout:
-        return "网络连接超时，请检查网络设置";
+        return '网络连接超时，请检查网络设置';
      case DioExceptionType.receiveTimeout:
-        return "响应超时，请稍后重试！";
+        return '响应超时，请稍后重试！';
      case DioExceptionType.sendTimeout:
-        return "发送请求超时，请检查网络设置";
+        return '发送请求超时，请检查网络设置';
      case DioExceptionType.unknown:
-        var res = await checkConect();
-        return res + " \n 网络异常，请稍后重试！";
-      default:
-        return "Dio异常";
+        final String res = await checkConnect();
+        return '$res，网络异常！';
    }
  }

-  static Future<dynamic> checkConect() async {
-    final connectivityResult = await (Connectivity().checkConnectivity());
-    if (connectivityResult == ConnectivityResult.mobile) {
-      return 'connected with mobile network';
-    } else if (connectivityResult == ConnectivityResult.wifi) {
-      return 'connected with wifi network';
-    } else if (connectivityResult == ConnectivityResult.ethernet) {
-      // I am connected to a ethernet network.
-    } else if (connectivityResult == ConnectivityResult.vpn) {
-      // I am connected to a vpn network.
-      // Note for iOS and macOS:
-      // There is no separate network interface type for [vpn].
-      // It returns [other] on any device (also simulator)
-    } else if (connectivityResult == ConnectivityResult.other) {
-      // I am connected to a network which is not in the above mentioned networks.
-    } else if (connectivityResult == ConnectivityResult.none) {
-      return 'not connected to any network';
+  static Future<String> checkConnect() async {
+    final ConnectivityResult connectivityResult =
+        await Connectivity().checkConnectivity();
+    switch (connectivityResult) {
+      case ConnectivityResult.mobile:
+        return '正在使用移动流量';
+      case ConnectivityResult.wifi:
+        return '正在使用wifi';
+      case ConnectivityResult.ethernet:
+        return '正在使用局域网';
+      case ConnectivityResult.vpn:
+        return '正在使用代理网络';
+      case ConnectivityResult.other:
+        return '正在使用其他网络';
+      case ConnectivityResult.none:
+        return '未连接到任何网络';
+      default:
+        return '';
    }
  }
 }
--- a/lib/http/live.dart
+++ b/lib/http/live.dart
@ -1,7 +1,8 @@
-import 'package:pilipala/http/api.dart';
-import 'package:pilipala/http/init.dart';
-import 'package:pilipala/models/live/item.dart';
-import 'package:pilipala/models/live/room_info.dart';
+import '../models/live/item.dart';
+import '../models/live/room_info.dart';
+import '../models/live/room_info_h5.dart';
+import 'api.dart';
+import 'init.dart';

 class LiveHttp {
  static Future liveList(
@ -46,4 +47,22 @@ class LiveHttp {
      };
    }
  }
+
+  static Future liveRoomInfoH5({roomId, qn}) async {
+    var res = await Request().get(Api.liveRoomInfoH5, data: {
+      'room_id': roomId,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': RoomInfoH5Model.fromJson(res.data['data'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }
--- a/lib/http/login.dart
+++ b/lib/http/login.dart
@ -1,13 +1,12 @@
 import 'dart:convert';
 import 'dart:math';
 import 'package:crypto/crypto.dart';
-
 import 'package:dio/dio.dart';
 import 'package:encrypt/encrypt.dart';
-import 'package:pilipala/http/index.dart';
-import 'package:pilipala/models/login/index.dart';
-import 'package:pilipala/utils/login.dart';
 import 'package:uuid/uuid.dart';
+import '../models/login/index.dart';
+import '../utils/login.dart';
+import 'index.dart';

 class LoginHttp {
  static Future queryCaptcha() async {
--- a/lib/http/member.dart
+++ b/lib/http/member.dart
@ -1,17 +1,17 @@
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/http/index.dart';
-import 'package:pilipala/models/dynamics/result.dart';
-import 'package:pilipala/models/follow/result.dart';
-import 'package:pilipala/models/member/archive.dart';
-import 'package:pilipala/models/member/coin.dart';
-import 'package:pilipala/models/member/info.dart';
-import 'package:pilipala/models/member/seasons.dart';
-import 'package:pilipala/models/member/tags.dart';
-import 'package:pilipala/utils/storage.dart';
-import 'package:pilipala/utils/utils.dart';
-import 'package:pilipala/utils/wbi_sign.dart';
+import '../common/constants.dart';
+import '../models/dynamics/result.dart';
+import '../models/follow/result.dart';
+import '../models/member/archive.dart';
+import '../models/member/coin.dart';
+import '../models/member/info.dart';
+import '../models/member/seasons.dart';
+import '../models/member/tags.dart';
+import '../utils/storage.dart';
+import '../utils/utils.dart';
+import '../utils/wbi_sign.dart';
+import 'index.dart';

 class MemberHttp {
  static Future memberInfo({
@ -101,10 +101,13 @@ class MemberHttp {
        'data': MemberArchiveDataModel.fromJson(res.data['data'])
      };
    } else {
+      Map errMap = {
+        -352: '风控校验失败，请检查登录状态',
+      };
      return {
        'status': false,
        'data': [],
-        'msg': res.data['message'],
+        'msg': errMap[res.data['code']] ?? res.data['message'],
      };
    }
  }
@ -123,10 +126,13 @@ class MemberHttp {
        'data': DynamicsDataModel.fromJson(res.data['data']),
      };
    } else {
+      Map errMap = {
+        -352: '风控校验失败，请检查登录状态',
+      };
      return {
        'status': false,
        'data': [],
-        'msg': res.data['message'],
+        'msg': errMap[res.data['code']] ?? res.data['message'],
      };
    }
  }
@ -461,4 +467,41 @@ class MemberHttp {
      };
    }
  }
+
+  // 搜索follow
+  static Future getfollowSearch({
+    required int mid,
+    required int ps,
+    required int pn,
+    required String name,
+  }) async {
+    Map<String, dynamic> data = {
+      'vmid': mid,
+      'pn': pn,
+      'ps': ps,
+      'order': 'desc',
+      'order_type': 'attention',
+      'gaia_source': 'main_web',
+      'name': name,
+      'web_location': 333.999,
+    };
+    Map params = await WbiSign().makSign(data);
+    var res = await Request().get(Api.followSearch, data: {
+      ...data,
+      'w_rid': params['w_rid'],
+      'wts': params['wts'],
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': FollowDataModel.fromJson(res.data['data'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }
--- a/lib/http/msg.dart
+++ b/lib/http/msg.dart
@ -1,8 +1,8 @@
-import 'package:pilipala/http/api.dart';
-import 'package:pilipala/http/init.dart';
-import 'package:pilipala/models/msg/account.dart';
-import 'package:pilipala/models/msg/session.dart';
-import 'package:pilipala/utils/wbi_sign.dart';
+import '../models/msg/account.dart';
+import '../models/msg/session.dart';
+import '../utils/wbi_sign.dart';
+import 'api.dart';
+import 'init.dart';

 class MsgHttp {
  // 会话列表
--- a/lib/http/reply.dart
+++ b/lib/http/reply.dart
@ -1,6 +1,6 @@
-import 'package:pilipala/http/api.dart';
-import 'package:pilipala/http/init.dart';
-import 'package:pilipala/models/video/reply/data.dart';
+import '../models/video/reply/data.dart';
+import 'api.dart';
+import 'init.dart';

 class ReplyHttp {
  static Future replyList({
--- a/lib/http/search.dart
+++ b/lib/http/search.dart
@ -1,13 +1,12 @@
 import 'dart:convert';
-
 import 'package:hive/hive.dart';
-import 'package:pilipala/http/index.dart';
-import 'package:pilipala/models/bangumi/info.dart';
-import 'package:pilipala/models/common/search_type.dart';
-import 'package:pilipala/models/search/hot.dart';
-import 'package:pilipala/models/search/result.dart';
-import 'package:pilipala/models/search/suggest.dart';
-import 'package:pilipala/utils/storage.dart';
+import '../models/bangumi/info.dart';
+import '../models/common/search_type.dart';
+import '../models/search/hot.dart';
+import '../models/search/result.dart';
+import '../models/search/suggest.dart';
+import '../utils/storage.dart';
+import 'index.dart';

 class SearchHttp {
  static Box setting = GStrorage.setting;
@ -37,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);
@ -129,25 +128,28 @@ class SearchHttp {
    }
  }

-  static Future ab2c({int? aid, String? bvid}) async {
+  static Future<int> ab2c({int? aid, String? bvid}) async {
    Map<String, dynamic> data = {};
    if (aid != null) {
      data['aid'] = aid;
    } else if (bvid != null) {
      data['bvid'] = bvid;
    }
-    var res = await Request().get(Api.ab2c, data: {...data});
+    final dynamic res =
+        await Request().get(Api.ab2c, data: <String, dynamic>{...data});
    return res.data['data'].first['cid'];
  }

-  static Future bangumiInfo({int? seasonId, int? epId}) async {
-    Map<String, dynamic> data = {};
+  static Future<Map<String, dynamic>> bangumiInfo(
+      {int? seasonId, int? epId}) async {
+    final Map<String, dynamic> data = {};
    if (seasonId != null) {
      data['season_id'] = seasonId;
    } else if (epId != null) {
      data['ep_id'] = epId;
    }
-    var res = await Request().get(Api.bangumiInfo, data: {...data});
+    final dynamic res =
+        await Request().get(Api.bangumiInfo, data: <String, dynamic>{...data});
    if (res.data['code'] == 0) {
      return {
        'status': true,
--- a/lib/http/user.dart
+++ b/lib/http/user.dart
@ -1,14 +1,13 @@
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/http/api.dart';
-import 'package:pilipala/http/init.dart';
-import 'package:pilipala/models/model_hot_video_item.dart';
-import 'package:pilipala/models/user/fav_detail.dart';
-import 'package:pilipala/models/user/fav_folder.dart';
-import 'package:pilipala/models/user/history.dart';
-import 'package:pilipala/models/user/info.dart';
-import 'package:pilipala/models/user/stat.dart';
-import 'package:pilipala/utils/wbi_sign.dart';
+import '../common/constants.dart';
+import '../models/model_hot_video_item.dart';
+import '../models/user/fav_detail.dart';
+import '../models/user/fav_folder.dart';
+import '../models/user/history.dart';
+import '../models/user/info.dart';
+import '../models/user/stat.dart';
+import 'api.dart';
+import 'init.dart';

 class UserHttp {
  static Future<dynamic> userStat({required int mid}) async {
--- a/lib/http/video.dart
+++ b/lib/http/video.dart
@ -1,19 +1,19 @@
 import 'dart:developer';
-
 import 'package:hive/hive.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/http/api.dart';
-import 'package:pilipala/http/init.dart';
-import 'package:pilipala/models/common/reply_type.dart';
-import 'package:pilipala/models/home/rcmd/result.dart';
-import 'package:pilipala/models/model_hot_video_item.dart';
-import 'package:pilipala/models/model_rec_video_item.dart';
-import 'package:pilipala/models/user/fav_folder.dart';
-import 'package:pilipala/models/video/ai.dart';
-import 'package:pilipala/models/video/play/url.dart';
-import 'package:pilipala/models/video_detail_res.dart';
-import 'package:pilipala/utils/storage.dart';
-import 'package:pilipala/utils/wbi_sign.dart';
+import '../common/constants.dart';
+import '../models/common/reply_type.dart';
+import '../models/home/rcmd/result.dart';
+import '../models/model_hot_video_item.dart';
+import '../models/model_rec_video_item.dart';
+import '../models/user/fav_folder.dart';
+import '../models/video/ai.dart';
+import '../models/video/play/url.dart';
+import '../models/video_detail_res.dart';
+import '../utils/recommend_filter.dart';
+import '../utils/storage.dart';
+import '../utils/wbi_sign.dart';
+import 'api.dart';
+import 'init.dart';

 /// res.data['code'] == 0 请求正常返回结果
 /// res.data['data'] 为结果
@ -33,27 +33,41 @@ class VideoHttp {
        Api.recommendListWeb,
        data: {
          'version': 1,
-          'feed_version': 'V3',
+          'feed_version': 'V8',
+          'homepage_ver': 1,
          'ps': ps,
          'fresh_idx': freshIdx,
-          'fresh_type': 999999
+          'brush': freshIdx,
+          'fresh_type': 4
        },
      );
      if (res.data['code'] == 0) {
        List<RecVideoItemModel> list = [];
+        List<int> blackMidsList =
+            setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
        for (var i in res.data['data']['item']) {
-          list.add(RecVideoItemModel.fromJson(i));
+          //过滤掉live与ad，以及拉黑用户
+          if (i['goto'] == 'av' &&
+              (i['owner'] != null &&
+                  !blackMidsList.contains(i['owner']['mid']))) {
+            RecVideoItemModel videoItem = RecVideoItemModel.fromJson(i);
+            if (!RecommendFilter.filter(videoItem)) {
+              list.add(videoItem);
+            }
+          }
        }
        return {'status': true, 'data': list};
      } else {
-        return {'status': false, 'data': [], 'msg': ''};
+        return {'status': false, 'data': [], 'msg': res.data['message']};
      }
    } catch (err) {
      return {'status': false, 'data': [], 'msg': err.toString()};
    }
  }

-  static Future rcmdVideoListApp({int? ps, required int freshIdx}) async {
+  // 添加额外的loginState变量模拟未登录状态
+  static Future rcmdVideoListApp(
+      {bool loginStatus = true, required int freshIdx}) async {
    try {
      var res = await Request().get(
        Api.recommendListApp,
@ -66,9 +80,11 @@ class VideoHttp {
          'device_name': 'vivo',
          'pull': freshIdx == 0 ? 'true' : 'false',
          'appkey': Constants.appKey,
-          'access_key': localCache
-                  .get(LocalCacheKey.accessKey, defaultValue: {})['value'] ??
-              ''
+          'access_key': loginStatus
+              ? (localCache.get(LocalCacheKey.accessKey,
+                      defaultValue: {})['value'] ??
+                  '')
+              : ''
        },
      );
      if (res.data['code'] == 0) {
@ -81,12 +97,15 @@ class VideoHttp {
              (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) &&
              (i['args'] != null &&
                  !blackMidsList.contains(i['args']['up_mid']))) {
-            list.add(RecVideoItemAppModel.fromJson(i));
+            RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i);
+            if (!RecommendFilter.filter(videoItem)) {
+              list.add(videoItem);
+            }
          }
        }
        return {'status': true, 'data': list};
      } else {
-        return {'status': false, 'data': [], 'msg': ''};
+        return {'status': false, 'data': [], 'msg': res.data['message']};
      }
    } catch (err) {
      return {'status': false, 'data': [], 'msg': err.toString()};
@ -111,7 +130,7 @@ class VideoHttp {
        }
        return {'status': true, 'data': list};
      } else {
-        return {'status': false, 'data': []};
+        return {'status': false, 'data': [], 'msg': res.data['message']};
      }
    } catch (err) {
      return {'status': false, 'data': [], 'msg': err};
@ -134,6 +153,12 @@ class VideoHttp {
      data['bvid'] = bvid;
    }

+    // 免登录查看1080p
+    if (userInfoCache.get('userInfoCache') == null &&
+        setting.get(SettingBoxKey.p1080, defaultValue: true)) {
+      data['try_look'] = 1;
+    }
+
    Map params = await WbiSign().makSign({
      ...data,
      'fourk': 1,
@ -142,11 +167,6 @@ class VideoHttp {
      'web_location': 1550101,
    });

-    // 免登录查看1080p
-    if (userInfoCache.get('userInfoCache') == null &&
-        setting.get(SettingBoxKey.p1080, defaultValue: true)) {
-      data['try_look'] = 1;
-    }
    try {
      var res = await Request().get(Api.videoUrl, data: params);
      if (res.data['code'] == 0) {
@ -196,7 +216,10 @@ class VideoHttp {
    if (res.data['code'] == 0) {
      List<HotVideoItemModel> list = [];
      for (var i in res.data['data']) {
-        list.add(HotVideoItemModel.fromJson(i));
+        HotVideoItemModel videoItem = HotVideoItemModel.fromJson(i);
+        if (!RecommendFilter.filter(videoItem, relatedVideos: true)) {
+          list.add(videoItem);
+        }
      }
      return {'status': true, 'data': list};
    } else {
@ -217,10 +240,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': []};
    }
  }

@ -298,7 +322,7 @@ class VideoHttp {
    if (res.data['code'] == 0) {
      return {'status': true, 'data': res.data['data']};
    } else {
-      return {'status': false, 'data': []};
+      return {'status': false, 'data': [], 'msg': res.data['message']};
    }
  }

@ -354,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': []};
    }
  }

@ -370,7 +394,7 @@ class VideoHttp {
    if (res.data['code'] == 0) {
      return {'status': true, 'data': res.data['data']};
    } else {
-      return {'status': true, 'data': []};
+      return {'status': false, 'data': []};
    }
  }

@ -426,6 +450,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']};
    }
  }

@ -440,11 +466,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': []};
    }
  }
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@ -21,6 +21,9 @@ 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:pilipala/utils/recommend_filter.dart';
+import 'package:catcher_2/catcher_2.dart';
+import './services/loggeer.dart';

 void main() async {
  WidgetsFlutterBinding.ensureInitialized();
@ -30,7 +33,35 @@ void main() async {
      .then((_) async {
    await GStrorage.init();
    await setupServiceLocator();
-    runApp(const MyApp());
+    Request();
+    await Request.setCookie();
+    RecommendFilter();
+
+    // 异常捕获 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(
@ -38,9 +69,7 @@ void main() async {
      systemNavigationBarDividerColor: Colors.transparent,
      statusBarColor: Colors.transparent,
    ));
-    await Request.setCookie();
    Data.init();
-    GStrorage.lazyInit();
    PiliSchame.init();
  });
 }
@ -112,6 +141,13 @@ class MyApp extends StatelessWidget {
                ? darkColorScheme
                : lightColorScheme,
            useMaterial3: true,
+            snackBarTheme: SnackBarThemeData(
+              actionTextColor: lightColorScheme.primary,
+              backgroundColor: lightColorScheme.secondaryContainer,
+              closeIconColor: lightColorScheme.secondary,
+              contentTextStyle: TextStyle(color: lightColorScheme.secondary),
+              elevation: 20,
+            ),
            pageTransitionsTheme: const PageTransitionsTheme(
              builders: <TargetPlatform, PageTransitionsBuilder>{
                TargetPlatform.android: ZoomPageTransitionsBuilder(
@ -126,6 +162,13 @@ class MyApp extends StatelessWidget {
                ? lightColorScheme
                : darkColorScheme,
            useMaterial3: true,
+            snackBarTheme: SnackBarThemeData(
+              actionTextColor: darkColorScheme.primary,
+              backgroundColor: darkColorScheme.secondaryContainer,
+              closeIconColor: darkColorScheme.secondary,
+              contentTextStyle: TextStyle(color: darkColorScheme.secondary),
+              elevation: 20,
+            ),
          ),
          localizationsDelegates: const [
            GlobalCupertinoLocalizations.delegate,
@ -141,9 +184,8 @@ class MyApp extends StatelessWidget {
            return FlutterSmartDialog(
              toastBuilder: (String msg) => CustomToast(msg: msg),
              child: MediaQuery(
-                data: MediaQuery.of(context).copyWith(
-                    textScaleFactor:
-                        MediaQuery.of(context).textScaleFactor * textScale),
+                data: MediaQuery.of(context)
+                    .copyWith(textScaler: TextScaler.linear(textScale)),
                child: child!,
              ),
            );
--- a/lib/models/common/dynamic_badge_mode.dart
+++ b/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];
+}
--- a/lib/models/common/rcmd_type.dart
+++ b/lib/models/common/rcmd_type.dart
@ -1,7 +1,7 @@
 // 首页推荐类型
-enum RcmdType { web, app }
+enum RcmdType { web, app, notLogin }

 extension RcmdTypeExtension on RcmdType {
-  String get values => ['web', 'app'][index];
-  String get labels => ['web端', 'app端'][index];
+  String get values => ['web', 'app', 'notLogin'][index];
+  String get labels => ['web端', 'app端', '游客模式'][index];
 }
--- a/lib/models/common/reply_sort_type.dart
+++ b/lib/models/common/reply_sort_type.dart
@ -1,6 +1,6 @@
-enum ReplySortType { time, like, reply }
+enum ReplySortType { time, like }

 extension ReplySortTypeExtension on ReplySortType {
-  String get titles => ['最新评论', '最热评论', '回复最多'][index];
-  String get labels => ['最新', '最热', '最多回复'][index];
+  String get titles => ['最新评论', '最热评论'][index];
+  String get labels => ['最新', '最热'][index];
 }
--- a/lib/models/common/tab_type.dart
+++ b/lib/models/common/tab_type.dart
@ -9,6 +9,7 @@ enum TabType { live, rcmd, hot, bangumi }

 extension TabTypeDesc on TabType {
  String get description => ['直播', '推荐', '热门', '番剧'][index];
+  String get id => ['live', 'rcmd', 'hot', 'bangumi'][index];
 }

 List tabsConfig = [
--- a/lib/models/github/latest.dart
+++ b/lib/models/github/latest.dart
@ -17,8 +17,9 @@ class LatestDataModel {
    url = json['url'];
    tagName = json['tag_name'];
    createdAt = json['created_at'];
-    assets =
-        json['assets'].map<AssetItem>((e) => AssetItem.fromJson(e)).toList();
+    assets = json['assets'] != null
+        ? json['assets'].map<AssetItem>((e) => AssetItem.fromJson(e)).toList()
+        : [];
    body = json['body'];
  }
 }
--- a/lib/models/home/rcmd/result.dart
+++ b/lib/models/home/rcmd/result.dart
@ -1,8 +1,5 @@
-import 'package:hive/hive.dart';
+import 'package:pilipala/utils/id_utils.dart';

-part 'result.g.dart';
-
-@HiveType(typeId: 0)
 class RecVideoItemAppModel {
  RecVideoItemAppModel({
    this.id,
@ -27,47 +24,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)
+  int? duration;
  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) {
@ -75,17 +52,32 @@ class RecVideoItemAppModel {
        ? json['player_args']['aid']
        : int.parse(json['param'] ?? '-1');
    aid = json['player_args'] != null ? json['player_args']['aid'] : -1;
-    bvid = null;
+    bvid = json['player_args'] != null
+        ? IdUtils.av2bv(json['player_args']['aid'])
+        : '';
    cid = json['player_args'] != null ? json['player_args']['cid'] : -1;
    pic = json['cover'];
    stat = RcmdStat.fromJson(json);
-    duration = json['cover_right_text'];
+    // 改用player_args中的duration作为原始数据（秒数）
+    duration =
+        json['player_args'] != null ? json['player_args']['duration'] : -1;
+    //duration = json['cover_right_text'];
    title = json['title'];
-    isFollowed = 0;
    owner = RcmdOwner.fromJson(json);
    rcmdReason = json['rcmd_reason_style'] != null
        ? RcmdReason.fromJson(json['rcmd_reason_style'])
        : null;
+    // 由于app端api并不会直接返回与owner的关注状态
+    // 所以借用推荐原因是否为“已关注”、“新关注”等判别关注状态，从而与web端接口等效
+    isFollowed = rcmdReason != null &&
+            rcmdReason!.content != null &&
+            rcmdReason!.content!.contains('关注')
+        ? 1
+        : 0;
+    // 如果是，就无需再显示推荐原因，交由view统一处理即可
+    if (isFollowed == 1) {
+      rcmdReason = null;
+    }
    goto = json['goto'];
    param = int.parse(json['param']);
    uri = json['uri'];
@ -102,18 +94,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 +110,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 +126,11 @@ class RcmdOwner {
  }
 }

-@HiveType(typeId: 8)
 class RcmdReason {
  RcmdReason({
    this.content,
  });

-  @HiveField(0)
  String? content;

  RcmdReason.fromJson(Map<String, dynamic> json) {
--- a/lib/models/home/rcmd/result.g.dart
+++ b/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;
-}
--- a/lib/models/live/room_info_h5.dart
+++ b/lib/models/live/room_info_h5.dart
@ -0,0 +1,130 @@
+class RoomInfoH5Model {
+  RoomInfoH5Model({
+    this.roomInfo,
+    this.anchorInfo,
+    this.isRoomFeed,
+    this.watchedShow,
+    this.likeInfoV3,
+    this.blockInfo,
+  });
+
+  RoomInfo? roomInfo;
+  AnchorInfo? anchorInfo;
+  int? isRoomFeed;
+  Map? watchedShow;
+  LikeInfoV3? likeInfoV3;
+  Map? blockInfo;
+
+  RoomInfoH5Model.fromJson(Map<String, dynamic> json) {
+    roomInfo = RoomInfo.fromJson(json['room_info']);
+    anchorInfo = AnchorInfo.fromJson(json['anchor_info']);
+    isRoomFeed = json['is_room_feed'];
+    watchedShow = json['watched_show'];
+    likeInfoV3 = LikeInfoV3.fromJson(json['like_info_v3']);
+    blockInfo = json['block_info'];
+  }
+}
+
+class RoomInfo {
+  RoomInfo({
+    this.uid,
+    this.roomId,
+    this.title,
+    this.cover,
+    this.description,
+    this.liveStatus,
+    this.liveStartTime,
+    this.areaId,
+    this.areaName,
+    this.parentAreaId,
+    this.parentAreaName,
+    this.online,
+    this.background,
+    this.appBackground,
+    this.liveId,
+  });
+
+  int? uid;
+  int? roomId;
+  String? title;
+  String? cover;
+  String? description;
+  int? liveStatus;
+  int? liveStartTime;
+  int? areaId;
+  String? areaName;
+  int? parentAreaId;
+  String? parentAreaName;
+  int? online;
+  String? background;
+  String? appBackground;
+  String? liveId;
+
+  RoomInfo.fromJson(Map<String, dynamic> json) {
+    uid = json['uid'];
+    roomId = json['room_id'];
+    title = json['title'];
+    cover = json['cover'];
+    description = json['description'];
+    liveStatus = json['liveS_satus'];
+    liveStartTime = json['live_start_time'];
+    areaId = json['area_id'];
+    areaName = json['area_name'];
+    parentAreaId = json['parent_area_id'];
+    parentAreaName = json['parent_area_name'];
+    online = json['online'];
+    background = json['background'];
+    appBackground = json['app_background'];
+    liveId = json['live_id'];
+  }
+}
+
+class AnchorInfo {
+  AnchorInfo({
+    this.baseInfo,
+    this.relationInfo,
+  });
+
+  BaseInfo? baseInfo;
+  RelationInfo? relationInfo;
+
+  AnchorInfo.fromJson(Map<String, dynamic> json) {
+    baseInfo = BaseInfo.fromJson(json['base_info']);
+    relationInfo = RelationInfo.fromJson(json['relation_info']);
+  }
+}
+
+class BaseInfo {
+  BaseInfo({
+    this.uname,
+    this.face,
+  });
+
+  String? uname;
+  String? face;
+
+  BaseInfo.fromJson(Map<String, dynamic> json) {
+    uname = json['uname'];
+    face = json['face'];
+  }
+}
+
+class RelationInfo {
+  RelationInfo({this.attention});
+
+  int? attention;
+
+  RelationInfo.fromJson(Map<String, dynamic> json) {
+    attention = json['attention'];
+  }
+}
+
+class LikeInfoV3 {
+  LikeInfoV3({this.totalLikes});
+
+  int? totalLikes;
+
+  LikeInfoV3.fromJson(Map<String, dynamic> json) {
+    totalLikes = json['total_likes'];
+  }
+}
--- a/lib/models/model_rec_video_item.dart
+++ b/lib/models/model_rec_video_item.dart
@ -1,5 +1,3 @@
-import 'package:pilipala/utils/utils.dart';
-
 import './model_owner.dart';
 import 'package:hive/hive.dart';

@ -38,7 +36,7 @@ class RecVideoItemModel {
  @HiveField(6)
  String? title = '';
  @HiveField(7)
-  String? duration = '';
+  int? duration = -1;
  @HiveField(8)
  int? pubdate = -1;
  @HiveField(9)
@ -58,7 +56,7 @@ class RecVideoItemModel {
    uri = json["uri"];
    pic = json["pic"];
    title = json["title"];
-    duration = Utils.tampToSeektime(json["duration"]);
+    duration = json["duration"];
    pubdate = json["pubdate"];
    owner = Owner.fromJson(json["owner"]);
    stat = Stat.fromJson(json["stat"]);
@ -84,6 +82,7 @@ class Stat {
  int? danmu;

  Stat.fromJson(Map<String, dynamic> json) {
+    // 无需在model中转换以保留原始数据，在view层处理即可
    view = json["view"];
    like = json["like"];
    danmu = json['danmaku'];
--- a/lib/models/model_rec_video_item.g.dart
+++ b/lib/models/model_rec_video_item.g.dart
@ -24,7 +24,7 @@ class RecVideoItemModelAdapter extends TypeAdapter<RecVideoItemModel> {
      uri: fields[4] as String?,
      pic: fields[5] as String?,
      title: fields[6] as String?,
-      duration: fields[7] as String?,
+      duration: fields[7] as int?,
      pubdate: fields[8] as int?,
      owner: fields[9] as Owner?,
      stat: fields[10] as Stat?,
--- a/lib/models/msg/session.dart
+++ b/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']
--- a/lib/pages/about/index.dart
+++ b/lib/pages/about/index.dart
@ -7,6 +7,7 @@ import 'package:pilipala/http/index.dart';
 import 'package:pilipala/models/github/latest.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:url_launcher/url_launcher.dart';
+import '../../utils/cache_manage.dart';

 class AboutPage extends StatefulWidget {
  const AboutPage({super.key});
@ -17,10 +18,23 @@ class AboutPage extends StatefulWidget {

 class _AboutPageState extends State<AboutPage> {
  final AboutController _aboutController = Get.put(AboutController());
+  String cacheSize = '';
+
+  @override
+  void initState() {
+    super.initState();
+    // 读取缓存占用
+    getCacheSize();
+  }
+
+  Future<void> getCacheSize() async {
+    final res = await CacheManage().loadApplicationCache();
+    setState(() => cacheSize = res);
+  }

  @override
  Widget build(BuildContext context) {
-    Color outline = Theme.of(context).colorScheme.outline;
+    final Color outline = Theme.of(context).colorScheme.outline;
    TextStyle subTitleStyle =
        TextStyle(fontSize: 13, color: Theme.of(context).colorScheme.outline);
    return Scaffold(
@ -29,7 +43,6 @@ class _AboutPageState extends State<AboutPage> {
      ),
      body: SingleChildScrollView(
        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
          children: [
            Image.asset(
              'assets/images/logo/logo_android_2.png',
@ -47,7 +60,7 @@ class _AboutPageState extends State<AboutPage> {
            const SizedBox(height: 20),
            Obx(
              () => ListTile(
-                title: const Text("当前版本"),
+                title: const Text('当前版本'),
                trailing: Text(_aboutController.currentVersion.value,
                    style: subTitleStyle),
              ),
@ -87,6 +100,14 @@ class _AboutPageState extends State<AboutPage> {
                style: subTitleStyle,
              ),
            ),
+            ListTile(
+              onTap: () => _aboutController.webSiteUrl(),
+              title: const Text('访问官网'),
+              trailing: Text(
+                'https://pilipalanet.mysxl.cn',
+                style: subTitleStyle,
+              ),
+            ),
            ListTile(
              onTap: () => _aboutController.panDownload(),
              title: const Text('网盘下载'),
@ -126,6 +147,22 @@ 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),
+            ),
+            ListTile(
+              onTap: () async {
+                var cleanStatus = await CacheManage().clearCacheAll();
+                if (cleanStatus) {
+                  getCacheSize();
+                }
+              },
+              title: const Text('清除缓存'),
+              subtitle: Text('图片及网络缓存 $cacheSize', style: subTitleStyle),
+              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
+            ),
          ],
        ),
      ),
@ -245,4 +282,17 @@ class AboutController extends GetxController {
      print(e);
    }
  }
+
+  // 官网
+  webSiteUrl() {
+    launchUrl(
+      Uri.parse('https://pilipalanet.mysxl.cn'),
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
+  // 日志
+  logs() {
+    Get.toNamed('/logs');
+  }
 }
--- a/lib/pages/bangumi/introduction/controller.dart
+++ b/lib/pages/bangumi/introduction/controller.dart
@ -63,8 +63,8 @@ class BangumiIntroController extends GetxController {
  @override
  void onInit() {
    super.onInit();
-    if (Get.arguments.isNotEmpty) {
-      if (Get.arguments.containsKey('bangumiItem')) {
+    if (Get.arguments.isNotEmpty as bool) {
+      if (Get.arguments.containsKey('bangumiItem') as bool) {
        preRender = true;
        bangumiItem = Get.arguments['bangumiItem'];
        // bangumiItem!['pic'] = args.pic;
--- a/lib/pages/bangumi/introduction/view.dart
+++ b/lib/pages/bangumi/introduction/view.dart
@ -51,12 +51,11 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
    cid = widget.cid!;
    bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-    bangumiIntroController.bangumiDetail.listen((value) {
+    bangumiIntroController.bangumiDetail.listen((BangumiInfoModel value) {
      bangumiDetail = value;
    });
    _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
-    videoDetailCtr.cid.listen((p0) {
-      print('🐶🐶$p0');
+    videoDetailCtr.cid.listen((int p0) {
      cid = p0;
      setState(() {});
    });
@ -67,7 +66,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
    super.build(context);
    return FutureBuilder(
      future: _futureBuilderFuture,
-      builder: (context, snapshot) {
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
        if (snapshot.connectionState == ConnectionState.done) {
          if (snapshot.data['status']) {
            // 请求成功
@ -83,7 +82,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
            //   errMsg: snapshot.data['msg'],
            //   fn: () => Get.back(),
            // );
-            return SizedBox();
+            return const SizedBox();
          }
        } else {
          return BangumiInfo(
@ -98,16 +97,16 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
 }

 class BangumiInfo extends StatefulWidget {
-  final bool loadingStatus;
-  final BangumiInfoModel? bangumiDetail;
-  final int? cid;
-
  const BangumiInfo({
-    Key? key,
+    super.key,
    this.loadingStatus = false,
    this.bangumiDetail,
    this.cid,
-  }) : super(key: key);
+  });
+
+  final bool loadingStatus;
+  final BangumiInfoModel? bangumiDetail;
+  final int? cid;

  @override
  State<BangumiInfo> createState() => _BangumiInfoState();
@ -123,12 +122,15 @@ class _BangumiInfoState extends State<BangumiInfo> {
  int? cid;
  bool isProcessing = false;
  void Function()? handleState(Future Function() action) {
-    return isProcessing ? null : () async {
-      setState(() => isProcessing = true);
-      await action();
-      setState(() => isProcessing = false);
-    };
+    return isProcessing
+        ? null
+        : () async {
+            setState(() => isProcessing = true);
+            await action();
+            setState(() => isProcessing = false);
+          };
  }
+
  @override
  void initState() {
    super.initState();
@ -155,7 +157,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
      context: context,
      useRootNavigator: true,
      isScrollControlled: true,
-      builder: (context) {
+      builder: (BuildContext context) {
        return FavPanel(ctr: bangumiIntroController);
      },
    );
@ -175,7 +177,7 @@ class _BangumiInfoState extends State<BangumiInfo> {

  @override
  Widget build(BuildContext context) {
-    ThemeData t = Theme.of(context);
+    final ThemeData t = Theme.of(context);
    return SliverPadding(
      padding: const EdgeInsets.only(
          left: StyleString.safeSpace, right: StyleString.safeSpace, top: 20),
@ -185,7 +187,6 @@ class _BangumiInfoState extends State<BangumiInfo> {
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                  Row(
-                    mainAxisAlignment: MainAxisAlignment.start,
                    crossAxisAlignment: CrossAxisAlignment.start,
                    children: [
                      Stack(
@ -244,7 +245,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                              EdgeInsets.zero),
                                          backgroundColor:
                                              MaterialStateProperty.resolveWith(
-                                                  (states) {
+                                                  (Set<MaterialState> states) {
                                            return t
                                                .colorScheme.primaryContainer
                                                .withOpacity(0.7);
@ -386,7 +387,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
  }

  Widget actionGrid(BuildContext context, bangumiIntroController) {
-    return LayoutBuilder(builder: (context, constraints) {
+    return LayoutBuilder(
+        builder: (BuildContext context, BoxConstraints constraints) {
      return Material(
        child: Padding(
          padding: const EdgeInsets.only(top: 16, bottom: 8),
@ -394,7 +396,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
            height: constraints.maxWidth / 5 * 0.8,
            child: GridView.count(
              primary: false,
-              padding: const EdgeInsets.all(0),
+              padding: EdgeInsets.zero,
              crossAxisCount: 5,
              childAspectRatio: 1.25,
              children: <Widget>[
@ -402,7 +404,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                  () => ActionItem(
                      icon: const Icon(FontAwesomeIcons.thumbsUp),
                      selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                      onTap: handleState(bangumiIntroController.actionLikeVideo),
+                      onTap:
+                          handleState(bangumiIntroController.actionLikeVideo),
                      selectStatus: bangumiIntroController.hasLike.value,
                      loadingStatus: false,
                      text: !widget.loadingStatus
@ -413,7 +416,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                  () => ActionItem(
                      icon: const Icon(FontAwesomeIcons.b),
                      selectIcon: const Icon(FontAwesomeIcons.b),
-                      onTap: handleState(bangumiIntroController.actionCoinVideo),
+                      onTap:
+                          handleState(bangumiIntroController.actionCoinVideo),
                      selectStatus: bangumiIntroController.hasCoin.value,
                      loadingStatus: false,
                      text: !widget.loadingStatus
--- a/lib/pages/bangumi/view.dart
+++ b/lib/pages/bangumi/view.dart
@ -4,11 +4,11 @@ import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
+import 'package:nil/nil.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
-import 'package:pilipala/pages/rcmd/view.dart';

 import 'controller.dart';
 import 'widgets/bangumu_card_v.dart';
@ -74,7 +74,7 @@ class _BangumiPageState extends State<BangumiPage>
    super.build(context);
    return RefreshIndicator(
      onRefresh: () async {
-        await _bangumidController.queryBangumiListFeed(type: 'init');
+        await _bangumidController.queryBangumiListFeed();
        return _bangumidController.queryBangumiFollow();
      },
      child: CustomScrollView(
@ -112,10 +112,11 @@ class _BangumiPageState extends State<BangumiPage>
                      ),
                    ),
                    SizedBox(
-                      height: 258,
+                      height: 268,
                      child: FutureBuilder(
                        future: _futureBuilderFutureFollow,
-                        builder: (context, snapshot) {
+                        builder:
+                            (BuildContext context, AsyncSnapshot snapshot) {
                          if (snapshot.connectionState ==
                              ConnectionState.done) {
                            if (snapshot.data == null) {
@ -156,10 +157,10 @@ class _BangumiPageState extends State<BangumiPage>
                                      ),
                              );
                            } else {
-                              return const SizedBox();
+                              return nil;
                            }
                          } else {
-                            return const SizedBox();
+                            return nil;
                          }
                        },
                      ),
@ -188,7 +189,7 @@ class _BangumiPageState extends State<BangumiPage>
                StyleString.safeSpace, 0, StyleString.safeSpace, 0),
            sliver: FutureBuilder(
              future: _futureBuilderFuture,
-              builder: (context, snapshot) {
+              builder: (BuildContext context, AsyncSnapshot snapshot) {
                if (snapshot.connectionState == ConnectionState.done) {
                  Map data = snapshot.data as Map;
                  if (data['status']) {
@ -197,7 +198,10 @@ class _BangumiPageState extends State<BangumiPage>
                  } else {
                    return HttpError(
                      errMsg: data['msg'],
-                      fn: () => {},
+                      fn: () {
+                        _futureBuilderFuture =
+                            _bangumidController.queryBangumiListFeed();
+                      },
                    );
                  }
                } else {
@ -206,7 +210,6 @@ class _BangumiPageState extends State<BangumiPage>
              },
            ),
          ),
-          LoadingMore()
        ],
      ),
    );
@ -222,13 +225,13 @@ class _BangumiPageState extends State<BangumiPage>
        // 列数
        crossAxisCount: 3,
        mainAxisExtent: Get.size.width / 3 / 0.65 +
-            32 * MediaQuery.of(context).textScaleFactor,
+            MediaQuery.textScalerOf(context).scale(32.0),
      ),
      delegate: SliverChildBuilderDelegate(
        (BuildContext context, int index) {
          return bangumiList!.isNotEmpty
              ? BangumiCardV(bangumiItem: bangumiList[index])
-              : const SizedBox();
+              : nil;
        },
        childCount: bangumiList!.isNotEmpty ? bangumiList!.length : 10,
      ),
--- a/lib/pages/bangumi/widgets/bangumi_panel.dart
+++ b/lib/pages/bangumi/widgets/bangumi_panel.dart
@ -8,11 +8,6 @@ import 'package:pilipala/utils/storage.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';

 class BangumiPanel extends StatefulWidget {
-  final List<EpisodeItem> pages;
-  final int? cid;
-  final double? sheetHeight;
-  final Function? changeFuc;
-
  const BangumiPanel({
    super.key,
    required this.pages,
@ -21,6 +16,11 @@ class BangumiPanel extends StatefulWidget {
    this.changeFuc,
  });

+  final List<EpisodeItem> pages;
+  final int? cid;
+  final double? sheetHeight;
+  final Function? changeFuc;
+
  @override
  State<BangumiPanel> createState() => _BangumiPanelState();
 }
@ -50,10 +50,10 @@ class _BangumiPanelState extends State<BangumiPanel> {
    }
    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);

-    videoDetailCtr.cid.listen((p0) {
+    videoDetailCtr.cid.listen((int p0) {
      cid = p0;
      setState(() {});
-      currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
+      currentIndex = widget.pages.indexWhere((EpisodeItem e) => e.cid == cid);
      scrollToIndex();
    });
  }
@ -106,7 +106,8 @@ class _BangumiPanelState extends State<BangumiPanel> {
                    child: Material(
                      child: ScrollablePositionedList.builder(
                        itemCount: widget.pages.length,
-                        itemBuilder: (context, index) => ListTile(
+                        itemBuilder: (BuildContext context, int index) =>
+                            ListTile(
                          onTap: () {
                            setState(() {
                              changeFucCall(widget.pages[index], index);
@ -150,7 +151,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
  }

  void changeFucCall(item, i) async {
-    if (item.badge != null && vipStatus != 1) {
+    if (item.badge != null && item.badge == '会员' && vipStatus != 1) {
      SmartDialog.showToast('需要大会员');
      return;
    }
@ -212,78 +213,87 @@ class _BangumiPanelState extends State<BangumiPanel> {
        SizedBox(
          height: 60,
          child: ListView.builder(
-              controller: listViewScrollCtr,
-              scrollDirection: Axis.horizontal,
-              itemCount: widget.pages.length,
-              itemExtent: 150,
-              itemBuilder: ((context, i) {
-                return Container(
-                  width: 150,
-                  margin: const EdgeInsets.only(right: 10),
-                  child: Material(
-                    color: Theme.of(context).colorScheme.onInverseSurface,
-                    borderRadius: BorderRadius.circular(6),
-                    clipBehavior: Clip.hardEdge,
-                    child: InkWell(
-                      onTap: () => changeFucCall(widget.pages[i], i),
-                      child: Padding(
-                        padding: const EdgeInsets.symmetric(
-                            vertical: 8, horizontal: 10),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Row(
-                              children: [
-                                if (i == currentIndex) ...[
-                                  Image.asset(
-                                    'assets/images/live.png',
-                                    color:
-                                        Theme.of(context).colorScheme.primary,
-                                    height: 12,
-                                  ),
-                                  const SizedBox(width: 6)
-                                ],
-                                Text(
-                                  '第${i + 1}话',
-                                  style: TextStyle(
-                                      fontSize: 13,
-                                      color: i == currentIndex
-                                          ? Theme.of(context)
-                                              .colorScheme
-                                              .primary
-                                          : Theme.of(context)
-                                              .colorScheme
-                                              .onSurface),
+            controller: listViewScrollCtr,
+            scrollDirection: Axis.horizontal,
+            itemCount: widget.pages.length,
+            itemExtent: 150,
+            itemBuilder: (BuildContext context, int i) {
+              return Container(
+                width: 150,
+                margin: const EdgeInsets.only(right: 10),
+                child: Material(
+                  color: Theme.of(context).colorScheme.onInverseSurface,
+                  borderRadius: BorderRadius.circular(6),
+                  clipBehavior: Clip.hardEdge,
+                  child: InkWell(
+                    onTap: () => changeFucCall(widget.pages[i], i),
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(
+                          vertical: 8, horizontal: 10),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: <Widget>[
+                          Row(
+                            children: [
+                              if (i == currentIndex) ...<Widget>[
+                                Image.asset(
+                                  'assets/images/live.png',
+                                  color: Theme.of(context).colorScheme.primary,
+                                  height: 12,
                                ),
-                                const SizedBox(width: 2),
-                                if (widget.pages[i].badge != null) ...[
+                                const SizedBox(width: 6)
+                              ],
+                              Text(
+                                '第${i + 1}话',
+                                style: TextStyle(
+                                    fontSize: 13,
+                                    color: i == currentIndex
+                                        ? Theme.of(context).colorScheme.primary
+                                        : Theme.of(context)
+                                            .colorScheme
+                                            .onSurface),
+                              ),
+                              const SizedBox(width: 2),
+                              if (widget.pages[i].badge != null) ...[
+                                if (widget.pages[i].badge == '会员') ...[
                                  Image.asset(
                                    'assets/images/big-vip.png',
                                    height: 16,
                                  ),
                                ],
-                              ],
-                            ),
-                            const SizedBox(height: 3),
-                            Text(
-                              widget.pages[i].longTitle!,
-                              maxLines: 1,
-                              style: TextStyle(
-                                  fontSize: 13,
-                                  color: i == currentIndex
-                                      ? Theme.of(context).colorScheme.primary
-                                      : Theme.of(context)
-                                          .colorScheme
-                                          .onSurface),
-                              overflow: TextOverflow.ellipsis,
-                            )
-                          ],
-                        ),
+                                if (widget.pages[i].badge != '会员') ...[
+                                  const Spacer(),
+                                  Text(
+                                    widget.pages[i].badge!,
+                                    style: TextStyle(
+                                      fontSize: 11,
+                                      color:
+                                          Theme.of(context).colorScheme.primary,
+                                    ),
+                                  ),
+                                ],
+                              ]
+                            ],
+                          ),
+                          const SizedBox(height: 3),
+                          Text(
+                            widget.pages[i].longTitle!,
+                            maxLines: 1,
+                            style: TextStyle(
+                                fontSize: 13,
+                                color: i == currentIndex
+                                    ? Theme.of(context).colorScheme.primary
+                                    : Theme.of(context).colorScheme.onSurface),
+                            overflow: TextOverflow.ellipsis,
+                          )
+                        ],
                      ),
                    ),
                  ),
-                );
-              })),
+                ),
+              );
+            },
+          ),
        )
      ],
    );
--- a/lib/pages/bangumi/widgets/bangumu_card_v.dart
+++ b/lib/pages/bangumi/widgets/bangumu_card_v.dart
@ -11,17 +11,16 @@ import 'package:pilipala/common/widgets/network_img_layer.dart';

 // 视频卡片 - 垂直布局
 class BangumiCardV extends StatelessWidget {
-  // ignore: prefer_typing_uninitialized_variables
-  final bangumiItem;
-  final Function()? longPress;
-  final Function()? longPressEnd;
-
  const BangumiCardV({
-    Key? key,
+    super.key,
    required this.bangumiItem,
    this.longPress,
    this.longPressEnd,
-  }) : super(key: key);
+  });
+
+  final bangumiItem;
+  final Function()? longPress;
+  final Function()? longPressEnd;

  @override
  Widget build(BuildContext context) {
@ -43,9 +42,9 @@ class BangumiCardV extends StatelessWidget {
        // },
        child: InkWell(
          onTap: () async {
-            int seasonId = bangumiItem.seasonId;
+            final int seasonId = bangumiItem.seasonId;
            SmartDialog.showLoading(msg: '获取中...');
-            var res = await SearchHttp.bangumiInfo(seasonId: seasonId);
+            final res = await SearchHttp.bangumiInfo(seasonId: seasonId);
            SmartDialog.dismiss().then((value) {
              if (res['status']) {
                if (res['data'].episodes.isEmpty) {
@ -81,8 +80,8 @@ class BangumiCardV extends StatelessWidget {
                child: AspectRatio(
                  aspectRatio: 0.65,
                  child: LayoutBuilder(builder: (context, boxConstraints) {
-                    double maxWidth = boxConstraints.maxWidth;
-                    double maxHeight = boxConstraints.maxHeight;
+                    final double maxWidth = boxConstraints.maxWidth;
+                    final double maxHeight = boxConstraints.maxHeight;
                    return Stack(
                      children: [
                        Hero(
@ -124,9 +123,9 @@ class BangumiCardV extends StatelessWidget {
 }

 class BangumiContent extends StatelessWidget {
+  const BangumiContent({super.key, required this.bangumiItem});
  // ignore: prefer_typing_uninitialized_variables
  final bangumiItem;
-  const BangumiContent({Key? key, required this.bangumiItem}) : super(key: key);
  @override
  Widget build(BuildContext context) {
    return Expanded(
--- a/lib/pages/blacklist/index.dart
+++ b/lib/pages/blacklist/index.dart
@ -70,7 +70,7 @@ class _BlackListPageState extends State<BlackListPage> {
        onRefresh: () async => await _blackListController.queryBlacklist(),
        child: FutureBuilder(
          future: _futureBuilderFuture,
-          builder: (context, snapshot) {
+          builder: (BuildContext context, AsyncSnapshot snapshot) {
            if (snapshot.connectionState == ConnectionState.done) {
              var data = snapshot.data;
              if (data['status']) {
--- a/lib/pages/danmaku/controller.dart
+++ b/lib/pages/danmaku/controller.dart
@ -1,26 +1,23 @@
 import 'package:pilipala/http/danmaku.dart';
 import 'package:pilipala/models/danmaku/dm.pb.dart';
-import 'package:pilipala/plugin/pl_player/index.dart';

 class PlDanmakuController {
  PlDanmakuController(this.cid);
  final int cid;
-  Map<int,List<DanmakuElem>> dmSegMap = {};
+  Map<int, List<DanmakuElem>> dmSegMap = {};
  // 已请求的段落标记
  List<bool> requestedSeg = [];

  bool get initiated => requestedSeg.isNotEmpty;

-  static int SEGMENT_LENGTH = 60 * 6 * 1000;
+  static int segmentLength = 60 * 6 * 1000;

  void initiate(int videoDuration, int progress) {
    if (requestedSeg.isEmpty) {
-      int segCount = (videoDuration / SEGMENT_LENGTH).ceil();
+      int segCount = (videoDuration / segmentLength).ceil();
      requestedSeg = List<bool>.generate(segCount, (index) => false);
    }
-    queryDanmaku(
-        calcSegment(progress)
-    );
+    queryDanmaku(calcSegment(progress));
  }

  void dispose() {
@ -29,17 +26,17 @@ class PlDanmakuController {
  }

  int calcSegment(int progress) {
-    return progress ~/ SEGMENT_LENGTH;
+    return progress ~/ segmentLength;
  }

  void queryDanmaku(int segmentIndex) async {
    assert(requestedSeg[segmentIndex] == false);
    requestedSeg[segmentIndex] = true;
-    DmSegMobileReply result =
-        await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: segmentIndex + 1);
+    final DmSegMobileReply result = await DanmakaHttp.queryDanmaku(
+        cid: cid, segmentIndex: segmentIndex + 1);
    if (result.elems.isNotEmpty) {
      for (var element in result.elems) {
-        int pos = element.progress ~/ 100;//每0.1秒存储一次
+        int pos = element.progress ~/ 100; //每0.1秒存储一次
        if (dmSegMap[pos] == null) {
          dmSegMap[pos] = [];
        }
--- a/lib/pages/danmaku/view.dart
+++ b/lib/pages/danmaku/view.dart
@ -1,4 +1,3 @@
-import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@ -36,6 +35,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
  late double opacityVal;
  late double fontSizeVal;
  late double danmakuDurationVal;
+  late double strokeWidth;
  int latestAddedPosition = -1;

  @override
@ -43,15 +43,13 @@ class _PlDanmakuState extends State<PlDanmaku> {
    super.initState();
    enableShowDanmaku =
        setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: false);
-    _plDanmakuController =
-        PlDanmakuController(widget.cid);
+    _plDanmakuController = PlDanmakuController(widget.cid);
    if (mounted) {
      playerController = widget.playerController;
      if (enableShowDanmaku || playerController.isOpenDanmu.value) {
        _plDanmakuController.initiate(
            playerController.duration.value.inMilliseconds,
-            playerController.position.value.inMilliseconds
-        );
+            playerController.position.value.inMilliseconds);
      }
      playerController
        ..addStatusLister(playerListener)
@ -61,14 +59,14 @@ class _PlDanmakuState extends State<PlDanmaku> {
      if (p0 && !_plDanmakuController.initiated) {
        _plDanmakuController.initiate(
            playerController.duration.value.inMilliseconds,
-            playerController.position.value.inMilliseconds
-        );
+            playerController.position.value.inMilliseconds);
      }
    });
    blockTypes = playerController.blockTypes;
    showArea = playerController.showArea;
    opacityVal = playerController.opacityVal;
    fontSizeVal = playerController.fontSizeVal;
+    strokeWidth = playerController.strokeWidth;
    danmakuDurationVal = playerController.danmakuDurationVal;
  }

@ -87,7 +85,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
      return;
    }
    int currentPosition = position.inMilliseconds;
-    currentPosition -= currentPosition % 100;//取整百的毫秒数
+    currentPosition -= currentPosition % 100; //取整百的毫秒数

    if (currentPosition == latestAddedPosition) {
      return;
@ -98,17 +96,18 @@ class _PlDanmakuState extends State<PlDanmaku> {
        _plDanmakuController.getCurrentDanmaku(currentPosition);

    if (currentDanmakuList != null) {
-      Color? defaultColor = playerController.blockTypes.contains(6) ?
-        DmUtils.decimalToColor(16777215) : null;
+      Color? defaultColor = playerController.blockTypes.contains(6)
+          ? DmUtils.decimalToColor(16777215)
+          : null;

-      _controller!.addItems(
-        currentDanmakuList.map((e) => DanmakuItem(
-          e.content,
-          color: defaultColor ?? DmUtils.decimalToColor(e.color),
-          time: e.progress,
-          type: DmUtils.getPosition(e.mode),
-        )).toList()
-      );
+      _controller!.addItems(currentDanmakuList
+          .map((e) => DanmakuItem(
+                e.content,
+                color: defaultColor ?? DmUtils.decimalToColor(e.color),
+                time: e.progress,
+                type: DmUtils.getPosition(e.mode),
+              ))
+          .toList());
    }
  }

@ -128,7 +127,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
          duration: const Duration(milliseconds: 100),
          child: DanmakuView(
            createdController: (DanmakuController e) async {
-              widget.playerController.danmakuController = _controller = e;
+              playerController.danmakuController = _controller = e;
            },
            option: DanmakuOption(
              fontSize: 15 * fontSizeVal,
@ -137,7 +136,9 @@ class _PlDanmakuState extends State<PlDanmaku> {
              hideTop: blockTypes.contains(5),
              hideScroll: blockTypes.contains(2),
              hideBottom: blockTypes.contains(4),
-              duration: danmakuDurationVal / widget.playerController.playbackSpeed,
+              duration:
+                  danmakuDurationVal / playerController.playbackSpeed,
+              strokeWidth: strokeWidth,
              // initDuration /
              //     (danmakuSpeedVal * widget.playerController.playbackSpeed),
            ),
--- a/lib/pages/dynamics/detail/controller.dart
+++ b/lib/pages/dynamics/detail/controller.dart
@ -37,6 +37,10 @@ class DynamicDetailController extends GetxController {
    }
    int deaultReplySortIndex =
        setting.get(SettingBoxKey.replySortType, defaultValue: 0);
+    if (deaultReplySortIndex == 2) {
+      setting.put(SettingBoxKey.replySortType, 0);
+      deaultReplySortIndex = 0;
+    }
    _sortType = ReplySortType.values[deaultReplySortIndex];
    sortTypeTitle.value = _sortType.titles;
    sortTypeLabel.value = _sortType.labels;
@ -92,9 +96,6 @@ class DynamicDetailController extends GetxController {
        _sortType = ReplySortType.like;
        break;
      case ReplySortType.like:
-        _sortType = ReplySortType.reply;
-        break;
-      case ReplySortType.reply:
        _sortType = ReplySortType.time;
        break;
      default:
--- a/lib/pages/dynamics/detail/index.dart
+++ b/lib/pages/dynamics/detail/index.dart
--- a/lib/pages/dynamics/detail/view.dart
+++ b/lib/pages/dynamics/detail/view.dart
@ -8,11 +8,11 @@ import 'package:pilipala/common/skeleton/video_reply.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/models/dynamics/result.dart';
-import 'package:pilipala/pages/dynamics/deatil/index.dart';
+import 'package:pilipala/pages/dynamics/detail/index.dart';
 import 'package:pilipala/pages/dynamics/widgets/author_panel.dart';
 import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
-import 'package:pilipala/pages/video/detail/replyNew/index.dart';
-import 'package:pilipala/pages/video/detail/replyReply/index.dart';
+import 'package:pilipala/pages/video/detail/reply_new/index.dart';
+import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';

--- a/lib/pages/dynamics/view.dart
+++ b/lib/pages/dynamics/view.dart
@ -192,22 +192,6 @@ class _DynamicsPageState extends State<DynamicsPage>
                  )
                ],
              ),
-              // Obx(
-              //   () => Visibility(
-              //     visible: _dynamicsController.userLogin.value,
-              //     child: Positioned(
-              //       right: 4,
-              //       top: 0,
-              //       bottom: 0,
-              //       child: IconButton(
-              //         padding: EdgeInsets.zero,
-              //         onPressed: () =>
-              //             {feedBack(), _dynamicsController.resetSearch()},
-              //         icon: const Icon(Icons.history, size: 21),
-              //       ),
-              //     ),
-              //   ),
-              // ),
            ],
          ),
        ),
@ -229,7 +213,8 @@ class _DynamicsPageState extends State<DynamicsPage>
                    return Obx(() => UpPanel(_dynamicsController.upData.value));
                  } else {
                    return const SliverToBoxAdapter(
-                        child: SizedBox(height: 80));
+                      child: SizedBox(height: 80),
+                    );
                  }
                } else {
                  return const SliverToBoxAdapter(
@ -240,15 +225,6 @@ class _DynamicsPageState extends State<DynamicsPage>
                }
              },
            ),
-            SliverToBoxAdapter(
-              child: Container(
-                height: 6,
-                color: Theme.of(context)
-                    .colorScheme
-                    .onInverseSurface
-                    .withOpacity(0.5),
-              ),
-            ),
            FutureBuilder(
              future: _futureBuilderFuture,
              builder: (context, snapshot) {
--- a/lib/pages/dynamics/widgets/author_panel.dart
+++ b/lib/pages/dynamics/widgets/author_panel.dart
@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.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/http/user.dart';
 import 'package:pilipala/utils/feed_back.dart';
--- a/lib/pages/dynamics/widgets/content_panel.dart
+++ b/lib/pages/dynamics/widgets/content_panel.dart
@ -1,5 +1,7 @@
 // 内容
 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';
 import 'package:pilipala/pages/preview/index.dart';
@ -48,6 +50,13 @@ class _ContentState extends State<Content> {
        WidgetSpan(
          child: LayoutBuilder(
            builder: (context, BoxConstraints box) {
+              double maxWidth = box.maxWidth.truncateToDouble();
+              double maxHeight = box.maxWidth * 0.6; // 设置最大高度
+              double height = maxWidth *
+                  0.5 *
+                  (pictureItem.height != null && pictureItem.width != null
+                      ? pictureItem.height! / pictureItem.width!
+                      : 1);
              return GestureDetector(
                onTap: () {
                  showDialog(
@ -58,18 +67,29 @@ class _ContentState extends State<Content> {
                    },
                  );
                },
-                child: Padding(
-                  padding: const EdgeInsets.only(top: 4),
-                  child: NetworkImgLayer(
-                    src: pictureItem.url,
+                child: Container(
+                    padding: const EdgeInsets.only(top: 4),
+                    constraints: BoxConstraints(maxHeight: maxHeight),
                    width: box.maxWidth / 2,
-                    height: box.maxWidth *
-                        0.5 *
-                        (pictureItem.height != null && pictureItem.width != null
-                            ? pictureItem.height! / pictureItem.width!
-                            : 1),
-                  ),
-                ),
+                    height: height,
+                    child: Stack(
+                      children: [
+                        Positioned.fill(
+                          child: NetworkImgLayer(
+                            src: pictureItem.url,
+                            width: maxWidth / 2,
+                            height: height,
+                          ),
+                        ),
+                        height > Get.size.height * 0.9
+                            ? const PBadge(
+                                text: '长图',
+                                right: 8,
+                                bottom: 8,
+                              )
+                            : const SizedBox(),
+                      ],
+                    )),
              );
            },
          ),
@ -83,6 +103,7 @@ class _ContentState extends State<Content> {
        list.add(
          LayoutBuilder(
            builder: (context, BoxConstraints box) {
+              double maxWidth = box.maxWidth.truncateToDouble();
              return GestureDetector(
                onTap: () {
                  showDialog(
@ -95,8 +116,10 @@ class _ContentState extends State<Content> {
                },
                child: NetworkImgLayer(
                  src: pics[i].url,
-                  width: box.maxWidth,
-                  height: box.maxWidth,
+                  width: maxWidth,
+                  height: maxWidth,
+                  origAspectRatio:
+                      pics[i].width!.toInt() / pics[i].height!.toInt(),
                ),
              );
            },
@ -107,7 +130,7 @@ class _ContentState extends State<Content> {
        WidgetSpan(
          child: LayoutBuilder(
            builder: (context, BoxConstraints box) {
-              double maxWidth = box.maxWidth;
+              double maxWidth = box.maxWidth.truncateToDouble();
              double crossCount = len < 3 ? 2 : 3;
              double height = maxWidth /
                      crossCount *
--- a/lib/pages/dynamics/widgets/pic_panel.dart
+++ b/lib/pages/dynamics/widgets/pic_panel.dart
@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
@ -87,7 +88,7 @@ Widget picWidget(item, context) {
              childAspectRatio: aspectRatio,
              children: list,
            ),
-            if (len == 1 && origAspectRatio < 0.4)
+            if (len == 1 && height > Get.size.height * 0.9)
              const PBadge(
                text: '长图',
                top: null,
--- a/lib/pages/dynamics/widgets/rich_node_panel.dart
+++ b/lib/pages/dynamics/widgets/rich_node_panel.dart
@ -1,6 +1,8 @@
 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/http/search.dart';

 // 富文本
 InlineSpan richNode(item, context) {
@ -191,6 +193,39 @@ InlineSpan richNode(item, context) {
            ),
          );
        }
+        // 投稿
+        if (i.type == 'RICH_TEXT_NODE_TYPE_BV') {
+          spanChilds.add(
+            WidgetSpan(
+              alignment: PlaceholderAlignment.middle,
+              child: Icon(
+                Icons.play_circle_outline_outlined,
+                size: 16,
+                color: Theme.of(context).colorScheme.primary,
+              ),
+            ),
+          );
+          spanChilds.add(
+            WidgetSpan(
+              alignment: PlaceholderAlignment.middle,
+              child: GestureDetector(
+                onTap: () async {
+                  try {
+                    int cid = await SearchHttp.ab2c(bvid: i.rid);
+                    Get.toNamed('/video?bvid=${i.rid}&cid=$cid',
+                        arguments: {'pic': null, 'heroTag': i.rid});
+                  } catch (err) {
+                    SmartDialog.showToast(err.toString());
+                  }
+                },
+                child: Text(
+                  '${i.text} ',
+                  style: authorStyle,
+                ),
+              ),
+            ),
+          );
+        }
      }
      // if (contentType == 'major' &&
      //     item.modules.moduleDynamic.major.opus.pics.isNotEmpty) {
--- a/lib/pages/dynamics/widgets/up_panel.dart
+++ b/lib/pages/dynamics/widgets/up_panel.dart
@ -36,8 +36,7 @@ class _UpPanelState extends State<UpPanel> {
    }
    upList.insert(
      0,
-      UpItem(
-          face: 'https://files.catbox.moe/8uc48f.png', uname: '全部动态', mid: -1),
+      UpItem(face: '', uname: '全部动态', mid: -1),
    );
    userInfo = userInfoCache.get('userInfoCache');
    upList.insert(
@ -56,7 +55,7 @@ class _UpPanelState extends State<UpPanel> {
      floating: true,
      pinned: false,
      delegate: _SliverHeaderDelegate(
-          height: 124,
+          height: 126,
          child: Column(
            mainAxisAlignment: MainAxisAlignment.start,
            crossAxisAlignment: CrossAxisAlignment.start,
@ -121,6 +120,13 @@ class _UpPanelState extends State<UpPanel> {
                  ],
                ),
              ),
+              Container(
+                height: 6,
+                color: Theme.of(context)
+                    .colorScheme
+                    .onInverseSurface
+                    .withOpacity(0.5),
+              ),
            ],
          )),
    );
@ -139,7 +145,7 @@ class _UpPanelState extends State<UpPanel> {
          int liveLen = liveList.length;
          int upLen = upList.length;
          double itemWidth = contentWidth + itemPadding.horizontal;
-          double screenWidth = MediaQuery.of(context).size.width;
+          double screenWidth = MediaQuery.sizeOf(context).width;
          double moveDistance = 0.0;
          if (itemWidth * (upList.length + liveList.length) <= screenWidth) {
          } else if ((upLen - i - 0.5) * itemWidth > screenWidth / 2) {
@ -171,6 +177,9 @@ class _UpPanelState extends State<UpPanel> {
      },
      onLongPress: () {
        feedBack();
+        if (data.mid == -1) {
+          return;
+        }
        String heroTag = Utils.makeHeroTag(data.mid);
        Get.toNamed('/member?mid=${data.mid}',
            arguments: {'face': data.face, 'heroTag': heroTag});
@ -198,12 +207,19 @@ class _UpPanelState extends State<UpPanel> {
                backgroundColor: data.type == 'live'
                    ? Theme.of(context).colorScheme.secondaryContainer
                    : Theme.of(context).colorScheme.primary,
-                child: NetworkImgLayer(
-                  width: 49,
-                  height: 49,
-                  src: data.face,
-                  type: 'avatar',
-                ),
+                child: data.face != ''
+                    ? NetworkImgLayer(
+                        width: 50,
+                        height: 50,
+                        src: data.face,
+                        type: 'avatar',
+                      )
+                    : const CircleAvatar(
+                        radius: 25,
+                        backgroundImage: AssetImage(
+                          'assets/images/noface.jpeg',
+                        ),
+                      ),
              ),
              Padding(
                padding: const EdgeInsets.only(top: 4),
@ -271,13 +287,11 @@ class UpPanelSkeleton extends StatelessWidget {
            mainAxisAlignment: MainAxisAlignment.center,
            children: [
              Container(
-                width: 49,
-                height: 49,
+                width: 50,
+                height: 50,
                decoration: BoxDecoration(
                  color: Theme.of(context).colorScheme.onInverseSurface,
-                  borderRadius: const BorderRadius.all(
-                    Radius.circular(24),
-                  ),
+                  borderRadius: BorderRadius.circular(50),
                ),
              ),
              Container(
--- a/lib/pages/favDetail/widget/fav_video_card.dart
+++ b/lib/pages/favDetail/widget/fav_video_card.dart
@ -1,216 +0,0 @@
-import 'package:get/get.dart';
-import 'package:flutter/material.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/common/widgets/stat/danmu.dart';
-import 'package:pilipala/common/widgets/stat/view.dart';
-import 'package:pilipala/http/search.dart';
-import 'package:pilipala/http/video.dart';
-import 'package:pilipala/models/common/search_type.dart';
-import 'package:pilipala/utils/id_utils.dart';
-import 'package:pilipala/utils/utils.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
-
-// 收藏视频卡片 - 水平布局
-class FavVideoCardH extends StatelessWidget {
-  final dynamic videoItem;
-  final Function? callFn;
-
-  const FavVideoCardH({Key? key, required this.videoItem, this.callFn})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    int id = videoItem.id;
-    String bvid = videoItem.bvid ?? IdUtils.av2bv(id);
-    String heroTag = Utils.makeHeroTag(id);
-    return InkWell(
-      onTap: () async {
-        // int? seasonId;
-        String? epId;
-        if (videoItem.ogv != null && videoItem.ogv['type_name'] == '番剧') {
-          videoItem.cid = await SearchHttp.ab2c(bvid: bvid);
-          // seasonId = videoItem.ogv['season_id'];
-          epId = videoItem.epId;
-        } else if (videoItem.page == 0 || videoItem.page > 1) {
-          var result = await VideoHttp.videoIntro(bvid: bvid);
-          if (result['status']) {
-            epId = result['data'].epId;
-          }
-        }
-
-        Map<String, String> parameters = {
-          'bvid': bvid,
-          'cid': videoItem.cid.toString(),
-          'epId': epId ?? '',
-        };
-        // if (seasonId != null) {
-        //   parameters['seasonId'] = seasonId.toString();
-        // }
-        Get.toNamed('/video', parameters: parameters, arguments: {
-          'videoItem': videoItem,
-          'heroTag': heroTag,
-          'videoType':
-              epId != null ? SearchType.media_bangumi : SearchType.video,
-        });
-      },
-      child: Column(
-        children: [
-          Padding(
-            padding: const EdgeInsets.fromLTRB(
-                StyleString.safeSpace, 5, StyleString.safeSpace, 5),
-            child: LayoutBuilder(
-              builder: (context, boxConstraints) {
-                double width =
-                    (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2;
-                return SizedBox(
-                  height: width / StyleString.aspectRatio,
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      AspectRatio(
-                        aspectRatio: StyleString.aspectRatio,
-                        child: LayoutBuilder(
-                          builder: (context, boxConstraints) {
-                            double maxWidth = boxConstraints.maxWidth;
-                            double maxHeight = boxConstraints.maxHeight;
-                            return Stack(
-                              children: [
-                                Hero(
-                                  tag: heroTag,
-                                  child: NetworkImgLayer(
-                                    src: videoItem.pic,
-                                    width: maxWidth,
-                                    height: maxHeight,
-                                  ),
-                                ),
-                                Positioned(
-                                  right: 4,
-                                  bottom: 4,
-                                  child: Container(
-                                    padding: const EdgeInsets.symmetric(
-                                        vertical: 1, horizontal: 6),
-                                    decoration: BoxDecoration(
-                                        borderRadius: BorderRadius.circular(4),
-                                        color: Colors.black54.withOpacity(0.4)),
-                                    child: Text(
-                                      Utils.timeFormat(videoItem.duration!),
-                                      style: const TextStyle(
-                                          fontSize: 11, color: Colors.white),
-                                    ),
-                                  ),
-                                )
-                              ],
-                            );
-                          },
-                        ),
-                      ),
-                      VideoContent(videoItem: videoItem, callFn: callFn)
-                    ],
-                  ),
-                );
-              },
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class VideoContent extends StatelessWidget {
-  final dynamic videoItem;
-  final Function? callFn;
-  const VideoContent({super.key, required this.videoItem, this.callFn});
-
-  @override
-  Widget build(BuildContext context) {
-    return Expanded(
-      child: Padding(
-        padding: const EdgeInsets.fromLTRB(10, 2, 6, 0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              videoItem.title,
-              textAlign: TextAlign.start,
-              style: const TextStyle(
-                fontWeight: FontWeight.w500,
-                letterSpacing: 0.3,
-              ),
-              maxLines: 2,
-              overflow: TextOverflow.ellipsis,
-            ),
-            const Spacer(),
-            Text(
-              Utils.dateFormat(videoItem.ctime!),
-              style: TextStyle(
-                  fontSize: 11, color: Theme.of(context).colorScheme.outline),
-            ),
-            Text(
-              videoItem.owner.name,
-              style: TextStyle(
-                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
-                color: Theme.of(context).colorScheme.outline,
-              ),
-            ),
-            Row(
-              children: [
-                StatView(
-                  theme: 'gray',
-                  view: videoItem.cntInfo['play'],
-                ),
-                const SizedBox(width: 8),
-                StatDanMu(theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
-                const Spacer(),
-                SizedBox(
-                  width: 26,
-                  height: 26,
-                  child: IconButton(
-                    style: ButtonStyle(
-                      padding: MaterialStateProperty.all(EdgeInsets.zero),
-                    ),
-                    onPressed: () {
-                      showDialog(
-                        context: Get.context!,
-                        builder: (context) {
-                          return AlertDialog(
-                            title: const Text('提示'),
-                            content: const Text('要取消收藏吗?'),
-                            actions: [
-                              TextButton(
-                                  onPressed: () => Get.back(),
-                                  child: Text(
-                                    '取消',
-                                    style: TextStyle(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .outline),
-                                  )),
-                              TextButton(
-                                onPressed: () async {
-                                  await callFn!();
-                                  Get.back();
-                                },
-                                child: const Text('确定取消'),
-                              )
-                            ],
-                          );
-                        },
-                      );
-                    },
-                    icon: Icon(
-                      Icons.clear_outlined,
-                      color: Theme.of(context).colorScheme.outline,
-                      size: 18,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
--- a/lib/pages/fav_detail/controller.dart
+++ b/lib/pages/fav_detail/controller.dart
--- a/lib/pages/fav_detail/index.dart
+++ b/lib/pages/fav_detail/index.dart
--- a/lib/pages/fav_detail/view.dart
+++ b/lib/pages/fav_detail/view.dart
@ -7,7 +7,7 @@ import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
-import 'package:pilipala/pages/favDetail/index.dart';
+import 'package:pilipala/pages/fav_detail/index.dart';

 import 'widget/fav_video_card.dart';

@ -24,11 +24,13 @@ class _FavDetailPageState extends State<FavDetailPage> {
      Get.put(FavDetailController());
  late StreamController<bool> titleStreamC; // a
  Future? _futureBuilderFuture;
+  late String mediaId;

  @override
  void initState() {
    super.initState();
    _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail();
+    mediaId = Get.parameters['mediaId']!;
    titleStreamC = StreamController<bool>();
    _controller.addListener(
      () {
@ -94,8 +96,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
            ),
            actions: [
              IconButton(
-                onPressed: () => Get.toNamed(
-                    '/favSearch?searchType=0&mediaId=${Get.parameters['mediaId']!}'),
+                onPressed: () =>
+                    Get.toNamed('/favSearch?searchType=0&mediaId=$mediaId'),
                icon: const Icon(Icons.search_outlined),
              ),
              //   IconButton(
--- a/lib/pages/fav_detail/widget/fav_video_card.dart
+++ b/lib/pages/fav_detail/widget/fav_video_card.dart
@ -0,0 +1,257 @@
+import 'package:get/get.dart';
+import 'package:flutter/material.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/stat/danmu.dart';
+import 'package:pilipala/common/widgets/stat/view.dart';
+import 'package:pilipala/http/search.dart';
+import 'package:pilipala/http/video.dart';
+import 'package:pilipala/models/common/search_type.dart';
+import 'package:pilipala/utils/id_utils.dart';
+import 'package:pilipala/utils/utils.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import '../../../common/widgets/badge.dart';
+
+// 收藏视频卡片 - 水平布局
+class FavVideoCardH extends StatelessWidget {
+  final dynamic videoItem;
+  final Function? callFn;
+  final int? searchType;
+
+  const FavVideoCardH({
+    Key? key,
+    required this.videoItem,
+    this.callFn,
+    this.searchType,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    int id = videoItem.id;
+    String bvid = videoItem.bvid ?? IdUtils.av2bv(id);
+    String heroTag = Utils.makeHeroTag(id);
+    return InkWell(
+      onTap: () async {
+        // int? seasonId;
+        String? epId;
+        if (videoItem.ogv != null &&
+            (videoItem.ogv['type_name'] == '番剧' ||
+                videoItem.ogv['type_name'] == '国创')) {
+          videoItem.cid = await SearchHttp.ab2c(bvid: bvid);
+          // seasonId = videoItem.ogv['season_id'];
+          epId = videoItem.epId;
+        } else if (videoItem.page == 0 || videoItem.page > 1) {
+          var result = await VideoHttp.videoIntro(bvid: bvid);
+          if (result['status']) {
+            epId = result['data'].epId;
+          }
+        }
+
+        Map<String, String> parameters = {
+          'bvid': bvid,
+          'cid': videoItem.cid.toString(),
+          'epId': epId ?? '',
+        };
+        // if (seasonId != null) {
+        //   parameters['seasonId'] = seasonId.toString();
+        // }
+        Get.toNamed('/video', parameters: parameters, arguments: {
+          'videoItem': videoItem,
+          'heroTag': heroTag,
+          'videoType':
+              epId != null ? SearchType.media_bangumi : SearchType.video,
+        });
+      },
+      child: Column(
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(
+                StyleString.safeSpace, 5, StyleString.safeSpace, 5),
+            child: LayoutBuilder(
+              builder: (context, boxConstraints) {
+                double width =
+                    (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2;
+                return SizedBox(
+                  height: width / StyleString.aspectRatio,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      AspectRatio(
+                        aspectRatio: StyleString.aspectRatio,
+                        child: LayoutBuilder(
+                          builder: (context, boxConstraints) {
+                            double maxWidth = boxConstraints.maxWidth;
+                            double maxHeight = boxConstraints.maxHeight;
+                            return Stack(
+                              children: [
+                                Hero(
+                                  tag: heroTag,
+                                  child: NetworkImgLayer(
+                                    src: videoItem.pic,
+                                    width: maxWidth,
+                                    height: maxHeight,
+                                  ),
+                                ),
+                                PBadge(
+                                  text: Utils.timeFormat(videoItem.duration!),
+                                  right: 6.0,
+                                  bottom: 6.0,
+                                  type: 'gray',
+                                ),
+                                if (videoItem.ogv != null) ...[
+                                  PBadge(
+                                    text: videoItem.ogv['type_name'],
+                                    top: 6.0,
+                                    right: 6.0,
+                                    bottom: null,
+                                    left: null,
+                                  ),
+                                ],
+                              ],
+                            );
+                          },
+                        ),
+                      ),
+                      VideoContent(
+                        videoItem: videoItem,
+                        callFn: callFn,
+                        searchType: searchType,
+                      )
+                    ],
+                  ),
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class VideoContent extends StatelessWidget {
+  final dynamic videoItem;
+  final Function? callFn;
+  final int? searchType;
+  const VideoContent({
+    super.key,
+    required this.videoItem,
+    this.callFn,
+    this.searchType,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(10, 2, 6, 0),
+        child: Stack(
+          children: [
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  videoItem.title,
+                  textAlign: TextAlign.start,
+                  style: const TextStyle(
+                    fontWeight: FontWeight.w500,
+                    letterSpacing: 0.3,
+                  ),
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                ),
+                if (videoItem.ogv != null) ...[
+                  Text(
+                    videoItem.intro,
+                    style: TextStyle(
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
+                  ),
+                ],
+                const Spacer(),
+                Text(
+                  Utils.dateFormat(videoItem.favTime),
+                  style: TextStyle(
+                      fontSize: 11,
+                      color: Theme.of(context).colorScheme.outline),
+                ),
+                if (videoItem.owner.name != '') ...[
+                  Text(
+                    videoItem.owner.name,
+                    style: TextStyle(
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
+                  ),
+                ],
+                Padding(
+                  padding: const EdgeInsets.only(top: 2),
+                  child: Row(
+                    children: [
+                      StatView(
+                        theme: 'gray',
+                        view: videoItem.cntInfo['play'],
+                      ),
+                      const SizedBox(width: 8),
+                      StatDanMu(
+                          theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
+                      const Spacer(),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+            searchType != 1
+                ? Positioned(
+                    right: 0,
+                    bottom: -4,
+                    child: IconButton(
+                      style: ButtonStyle(
+                        padding: MaterialStateProperty.all(EdgeInsets.zero),
+                      ),
+                      onPressed: () {
+                        showDialog(
+                          context: Get.context!,
+                          builder: (context) {
+                            return AlertDialog(
+                              title: const Text('提示'),
+                              content: const Text('要取消收藏吗?'),
+                              actions: [
+                                TextButton(
+                                    onPressed: () => Get.back(),
+                                    child: Text(
+                                      '取消',
+                                      style: TextStyle(
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .outline),
+                                    )),
+                                TextButton(
+                                  onPressed: () async {
+                                    await callFn!();
+                                    Get.back();
+                                  },
+                                  child: const Text('确定取消'),
+                                )
+                              ],
+                            );
+                          },
+                        );
+                      },
+                      icon: Icon(
+                        Icons.clear_outlined,
+                        color: Theme.of(context).colorScheme.outline,
+                        size: 18,
+                      ),
+                    ),
+                  )
+                : const SizedBox(),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/pages/fav_search/controller.dart
+++ b/lib/pages/fav_search/controller.dart
@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/user/fav_detail.dart';

+import '../../http/video.dart';
+
 class FavSearchController extends GetxController {
  final ScrollController scrollController = ScrollController();
  Rx<TextEditingController> controller = TextEditingController().obs;
@ -72,4 +75,21 @@ class FavSearchController extends GetxController {
    if (!hasMore) return;
    searchFav(type: 'onLoad');
  }
+
+  onCancelFav(int id) async {
+    var result = await VideoHttp.favVideo(
+        aid: id, addIds: '', delIds: mediaId.toString());
+    if (result['status']) {
+      if (result['data']['prompt']) {
+        List dataList = favList;
+        for (var i in dataList) {
+          if (i.id == id) {
+            dataList.remove(i);
+            break;
+          }
+        }
+        SmartDialog.showToast('取消收藏');
+      }
+    }
+  }
 }
--- a/lib/pages/fav_search/view.dart
+++ b/lib/pages/fav_search/view.dart
@ -3,14 +3,12 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
-import 'package:pilipala/pages/favDetail/widget/fav_video_card.dart';
+import 'package:pilipala/pages/fav_detail/widget/fav_video_card.dart';

 import 'controller.dart';

 class FavSearchPage extends StatefulWidget {
-  final int? sourceType;
-  final int? mediaId;
-  const FavSearchPage({super.key, this.sourceType, this.mediaId});
+  const FavSearchPage({super.key});

  @override
  State<FavSearchPage> createState() => _FavSearchPageState();
@ -19,11 +17,12 @@ class FavSearchPage extends StatefulWidget {
 class _FavSearchPageState extends State<FavSearchPage> {
  final FavSearchController _favSearchCtr = Get.put(FavSearchController());
  late ScrollController scrollController;
+  late int searchType;

  @override
  void initState() {
    super.initState();
-
+    searchType = int.parse(Get.parameters['searchType']!);
    scrollController = _favSearchCtr.scrollController;
    scrollController.addListener(
      () {
@ -100,7 +99,11 @@ class _FavSearchPageState extends State<FavSearchPage> {
                      } else {
                        return FavVideoCardH(
                          videoItem: _favSearchCtr.favList[index],
-                          callFn: () => null,
+                          searchType: searchType,
+                          callFn: () => searchType != 1
+                              ? _favSearchCtr
+                                  .onCancelFav(_favSearchCtr.favList[index].id!)
+                              : {},
                        );
                      }
                    },
--- a/lib/pages/follow/view.dart
+++ b/lib/pages/follow/view.dart
@ -37,6 +37,29 @@ class _FollowPageState extends State<FollowPage> {
              : '${_followController.name}的关注',
          style: Theme.of(context).textTheme.titleMedium,
        ),
+        actions: [
+          IconButton(
+            onPressed: () => Get.toNamed('/followSearch?mid=$mid'),
+            icon: const Icon(Icons.search_outlined),
+          ),
+          PopupMenuButton(
+            icon: const Icon(Icons.more_vert),
+            itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+              PopupMenuItem(
+                onTap: () => Get.toNamed('/blackListPage'),
+                child: const Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Icon(Icons.block, size: 19),
+                    SizedBox(width: 10),
+                    Text('黑名单管理'),
+                  ],
+                ),
+              )
+            ],
+          ),
+          const SizedBox(width: 6),
+        ],
      ),
      body: Obx(
        () => !_followController.isOwner.value
@ -87,3 +110,22 @@ class _FollowPageState extends State<FollowPage> {
    );
  }
 }
+
+class _FakeAPI {
+  static const List<String> _kOptions = <String>[
+    'aardvark',
+    'bobcat',
+    'chameleon',
+  ];
+  // Searches the options, but injects a fake "network" delay.
+  static Future<Iterable<String>> search(String query) async {
+    await Future<void>.delayed(
+        const Duration(seconds: 1)); // Fake 1 second delay.
+    if (query == '') {
+      return const Iterable<String>.empty();
+    }
+    return _kOptions.where((String option) {
+      return option.contains(query.toLowerCase());
+    });
+  }
+}
--- a/lib/pages/follow/widgets/follow_item.dart
+++ b/lib/pages/follow/widgets/follow_item.dart
@ -42,7 +42,7 @@ class FollowItem extends StatelessWidget {
        overflow: TextOverflow.ellipsis,
      ),
      dense: true,
-      trailing: ctr!.isOwner.value
+      trailing: ctr != null && ctr!.isOwner.value
          ? SizedBox(
              height: 34,
              child: TextButton(
--- a/lib/pages/follow_search/controller.dart
+++ b/lib/pages/follow_search/controller.dart
@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/member.dart';
+
+import '../../models/follow/result.dart';
+
+class FollowSearchController extends GetxController {
+  Rx<TextEditingController> controller = TextEditingController().obs;
+  final FocusNode searchFocusNode = FocusNode();
+  RxString searchKeyWord = ''.obs;
+  String hintText = '搜索';
+  RxString loadingStatus = 'init'.obs;
+  late int mid = 1;
+  RxString uname = ''.obs;
+  int ps = 20;
+  int pn = 1;
+  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
+  RxInt total = 0.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    mid = int.parse(Get.parameters['mid']!);
+  }
+
+  // 清空搜索
+  void onClear() {
+    if (searchKeyWord.value.isNotEmpty && controller.value.text != '') {
+      controller.value.clear();
+      searchKeyWord.value = '';
+    } else {
+      Get.back();
+    }
+  }
+
+  void onChange(value) {
+    searchKeyWord.value = value;
+  }
+
+  //  提交搜索内容
+  void submit() {
+    loadingStatus.value = 'loading';
+    searchFollow();
+  }
+
+  Future searchFollow({type = 'init'}) async {
+    if (controller.value.text == '') {
+      return {'status': true, 'data': <FollowItemModel>[].obs};
+    }
+    if (type == 'init') {
+      ps = 1;
+    }
+    var res = await MemberHttp.getfollowSearch(
+      mid: mid,
+      ps: ps,
+      pn: pn,
+      name: controller.value.text,
+    );
+    if (res['status']) {
+      if (type == 'init') {
+        followList.value = res['data'].list;
+      } else {
+        followList.addAll(res['data'].list);
+      }
+      total.value = res['data'].total;
+    }
+    return res;
+  }
+
+  void onLoad() {
+    searchFollow(type: 'onLoad');
+  }
+}
--- a/lib/pages/follow_search/index.dart
+++ b/lib/pages/follow_search/index.dart
@ -0,0 +1,4 @@
+library follow_search;
+
+export './controller.dart';
+export './view.dart';
--- a/lib/pages/follow_search/view.dart
+++ b/lib/pages/follow_search/view.dart
@ -0,0 +1,121 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/pages/follow_search/index.dart';
+
+import '../follow/widgets/follow_item.dart';
+
+class FollowSearchPage extends StatefulWidget {
+  const FollowSearchPage({super.key});
+
+  @override
+  State<FollowSearchPage> createState() => _FollowSearchPageState();
+}
+
+class _FollowSearchPageState extends State<FollowSearchPage> {
+  final FollowSearchController _followSearchController =
+      Get.put(FollowSearchController());
+  late Future? _futureBuilder;
+  final ScrollController scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    _futureBuilder = _followSearchController.searchFollow();
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle(
+              'my-throttler', const Duration(milliseconds: 500), () {
+            _followSearchController.onLoad();
+          });
+        }
+      },
+    );
+  }
+
+  void reRequest() {
+    setState(() {
+      _futureBuilder = _followSearchController.searchFollow();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        titleSpacing: 0,
+        actions: [
+          IconButton(
+            onPressed: reRequest,
+            icon: const Icon(CupertinoIcons.search, size: 22),
+          ),
+          const SizedBox(width: 6),
+        ],
+        title: TextField(
+          autofocus: true,
+          focusNode: _followSearchController.searchFocusNode,
+          controller: _followSearchController.controller.value,
+          textInputAction: TextInputAction.search,
+          onChanged: (value) => _followSearchController.onChange(value),
+          decoration: InputDecoration(
+            hintText: _followSearchController.hintText,
+            border: InputBorder.none,
+            suffixIcon: IconButton(
+              icon: Icon(
+                Icons.clear,
+                size: 22,
+                color: Theme.of(context).colorScheme.outline,
+              ),
+              onPressed: () => _followSearchController.onClear(),
+            ),
+          ),
+          onSubmitted: (String value) => reRequest(),
+        ),
+      ),
+      body: FutureBuilder(
+          future: _futureBuilder,
+          builder: (BuildContext context, AsyncSnapshot snapshot) {
+            if (snapshot.connectionState == ConnectionState.done) {
+              var data = snapshot.data;
+              if (data == null) {
+                return CustomScrollView(
+                  slivers: [
+                    HttpError(errMsg: snapshot.data['msg'], fn: reRequest)
+                  ],
+                );
+              }
+              if (data['status']) {
+                RxList followList = _followSearchController.followList;
+                return Obx(
+                  () => followList.isNotEmpty
+                      ? ListView.builder(
+                          controller: scrollController,
+                          itemCount: followList.length,
+                          itemBuilder: ((context, index) {
+                            return FollowItem(
+                              item: followList[index],
+                            );
+                          }),
+                        )
+                      : CustomScrollView(
+                          slivers: [HttpError(errMsg: '未搜索到结果', fn: reRequest)],
+                        ),
+                );
+              } else {
+                return CustomScrollView(
+                  slivers: [
+                    HttpError(errMsg: snapshot.data['msg'], fn: reRequest)
+                  ],
+                );
+              }
+            } else {
+              return const SizedBox();
+            }
+          }),
+    );
+  }
+}
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@ -5,15 +5,17 @@ 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;
-  late List tabs;
-  int initialIndex = 1;
+  late RxList tabs = [].obs;
+  RxInt initialIndex = 1.obs;
  late TabController tabController;
  late List tabsCtrList;
  late List<Widget> tabsPageList;
  Box userInfoCache = GStrorage.userInfo;
+  Box settingStorage = GStrorage.setting;
  RxBool userLogin = false.obs;
  RxString userFace = ''.obs;
  var userInfo;
@ -21,6 +23,9 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
  late final StreamController<bool> searchBarStream =
      StreamController<bool>.broadcast();
  late bool hideSearchBar;
+  late List defaultTabs;
+  late List<String> tabbarSort;
+  RxString defaultSearch = ''.obs;

  @override
  void onInit() {
@ -28,19 +33,13 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
    userInfo = userInfoCache.get('userInfoCache');
    userLogin.value = userInfo != null;
    userFace.value = userInfo != null ? userInfo.face : '';
-
    // 进行tabs配置
-    tabs = tabsConfig;
-    tabsCtrList = tabsConfig.map((e) => e['ctr']).toList();
-    tabsPageList = tabsConfig.map<Widget>((e) => e['page']).toList();
-
-    tabController = TabController(
-      initialIndex: initialIndex,
-      length: tabs.length,
-      vsync: this,
-    );
+    setTabConfig();
    hideSearchBar =
        setting.get(SettingBoxKey.hideSearchBar, defaultValue: true);
+    if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
+      searchDefault();
+    }
  }

  void onRefresh() {
@ -62,4 +61,52 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
    if (val) return;
    userFace.value = userInfo != null ? userInfo.face : '';
  }
+
+  void setTabConfig() async {
+    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;
+
+    if (tabbarSort.contains(TabType.rcmd.id)) {
+      initialIndex.value = tabbarSort.indexOf(TabType.rcmd.id);
+    } else {
+      initialIndex.value = 0;
+    }
+    tabsCtrList = tabs.map((e) => e['ctr']).toList();
+    tabsPageList = tabs.map<Widget>((e) => e['page']).toList();
+
+    tabController = TabController(
+      initialIndex: initialIndex.value,
+      length: tabs.length,
+      vsync: this,
+    );
+    // 监听 tabController 切换
+    tabController.animation!.addListener(() {
+      if (tabController.indexIsChanging) {
+        if (initialIndex.value != tabController.index) {
+          initialIndex.value = tabController.index;
+        }
+      } else {
+        final int temp = tabController.animation!.value.round();
+        if (initialIndex.value != temp) {
+          initialIndex.value = temp;
+          tabController.index = initialIndex.value;
+        }
+      }
+    });
+  }
+
+  void searchDefault() async {
+    var res = await Request().get(Api.searchDefault);
+    if (res.data['code'] == 0) {
+      defaultSearch.value = res.data['data']['name'];
+    }
+  }
 }
--- a/lib/pages/home/view.dart
+++ b/lib/pages/home/view.dart
@ -1,10 +1,10 @@
 import 'dart:async';

 import 'package:flutter/material.dart';
+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';

@ -30,7 +30,7 @@ class _HomePageState extends State<HomePage>
    stream = _homeController.searchBarStream.stream;
  }

-  showUserBottonSheet() {
+  showUserBottomSheet() {
    feedBack();
    showModalBottomSheet(
      context: context,
@ -46,50 +46,61 @@ class _HomePageState extends State<HomePage>
  @override
  Widget build(BuildContext context) {
    super.build(context);
+    Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
+    // 设置状态栏图标的亮度
+    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+      statusBarIconBrightness: currentBrightness == Brightness.light
+          ? Brightness.dark
+          : Brightness.light,
+    ));
    return Scaffold(
      extendBody: true,
      extendBodyBehindAppBar: true,
-      appBar: AppBar(toolbarHeight: 0, elevation: 0),
-      body: Column(
+      body: Stack(
        children: [
-          CustomAppBar(
-            stream: _homeController.hideSearchBar
-                ? stream
-                : StreamController<bool>.broadcast().stream,
-            ctr: _homeController,
-            callback: showUserBottonSheet,
-          ),
-          const SizedBox(height: 8),
-          SizedBox(
-            width: double.infinity,
-            height: 42,
-            child: Align(
-              alignment: Alignment.center,
-              child: TabBar(
-                controller: _homeController.tabController,
-                tabs: [
-                  for (var i in _homeController.tabs) Tab(text: i['label'])
-                ],
-                isScrollable: true,
-                dividerColor: Colors.transparent,
-                enableFeedback: true,
-                splashBorderRadius: BorderRadius.circular(10),
-                tabAlignment: TabAlignment.center,
-                onTap: (value) {
-                  feedBack();
-                  if (_homeController.initialIndex == value) {
-                    _homeController.tabsCtrList[value]().animateToTop();
-                  }
-                  _homeController.initialIndex = value;
-                },
+          // gradient background
+          Align(
+            alignment: Alignment.topLeft,
+            child: Opacity(
+              opacity: 0.6,
+              child: Container(
+                width: MediaQuery.of(context).size.width,
+                height: MediaQuery.of(context).size.height,
+                decoration: BoxDecoration(
+                  gradient: LinearGradient(
+                      colors: [
+                        Theme.of(context).colorScheme.primary.withOpacity(0.9),
+                        Theme.of(context).colorScheme.primary.withOpacity(0.5),
+                        Theme.of(context).colorScheme.surface
+                      ],
+                      begin: Alignment.topLeft,
+                      end: Alignment.bottomRight,
+                      stops: const [0, 0.0034, 0.34]),
+                ),
              ),
            ),
          ),
-          Expanded(
-            child: TabBarView(
-              controller: _homeController.tabController,
-              children: _homeController.tabsPageList,
-            ),
+          Column(
+            children: [
+              CustomAppBar(
+                stream: _homeController.hideSearchBar
+                    ? stream
+                    : StreamController<bool>.broadcast().stream,
+                ctr: _homeController,
+                callback: showUserBottomSheet,
+              ),
+              if (_homeController.tabs.length > 1) ...[
+                const CustomTabs(),
+              ] else ...[
+                const SizedBox(height: 6),
+              ],
+              Expanded(
+                child: TabBarView(
+                  controller: _homeController.tabController,
+                  children: _homeController.tabsPageList,
+                ),
+              ),
+            ],
          ),
        ],
      ),
@ -119,87 +130,23 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
    return StreamBuilder(
      stream: stream,
      initialData: true,
-      builder: (context, AsyncSnapshot snapshot) {
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        final RxBool isUserLoggedIn = ctr!.userLogin;
+        final double top = MediaQuery.of(context).padding.top;
        return AnimatedOpacity(
          opacity: snapshot.data ? 1 : 0,
          duration: const Duration(milliseconds: 300),
          child: AnimatedContainer(
            curve: Curves.easeInOutCubicEmphasized,
            duration: const Duration(milliseconds: 500),
-            height: snapshot.data
-                ? MediaQuery.of(context).padding.top + 52
-                : MediaQuery.of(context).padding.top - 10,
-            child: Container(
-              padding: EdgeInsets.only(
-                left: 20,
-                right: 20,
-                bottom: 0,
-                top: MediaQuery.of(context).padding.top + 4,
-              ),
-              child: Row(
-                children: [
-                  const Expanded(child: SearchPage()),
-                  if (ctr!.userLogin.value) ...[
-                    const SizedBox(width: 6),
-                    IconButton(
-                        onPressed: () => Get.toNamed('/whisper'),
-                        icon: const Icon(Icons.notifications_none))
-                  ],
-                  const SizedBox(width: 6),
-                  Obx(
-                    () => ctr!.userLogin.value
-                        ? Stack(
-                            children: [
-                              Obx(
-                                () => NetworkImgLayer(
-                                  type: 'avatar',
-                                  width: 34,
-                                  height: 34,
-                                  src: ctr!.userFace.value,
-                                ),
-                              ),
-                              Positioned.fill(
-                                child: Material(
-                                  color: Colors.transparent,
-                                  child: InkWell(
-                                    onTap: () => callback!(),
-                                    splashColor: Theme.of(context)
-                                        .colorScheme
-                                        .primaryContainer
-                                        .withOpacity(0.3),
-                                    borderRadius: const BorderRadius.all(
-                                      Radius.circular(50),
-                                    ),
-                                  ),
-                                ),
-                              )
-                            ],
-                          )
-                        : SizedBox(
-                            width: 38,
-                            height: 38,
-                            child: IconButton(
-                              style: ButtonStyle(
-                                padding:
-                                    MaterialStateProperty.all(EdgeInsets.zero),
-                                backgroundColor:
-                                    MaterialStateProperty.resolveWith((states) {
-                                  return Theme.of(context)
-                                      .colorScheme
-                                      .onInverseSurface;
-                                }),
-                              ),
-                              onPressed: () => callback!(),
-                              icon: Icon(
-                                Icons.person_rounded,
-                                size: 22,
-                                color: Theme.of(context).colorScheme.primary,
-                              ),
-                            ),
-                          ),
-                  ),
-                ],
-              ),
+            height: snapshot.data ? top + 52 : top,
+            padding: EdgeInsets.fromLTRB(14, top + 6, 14, 0),
+            child: UserInfoWidget(
+              top: top,
+              ctr: ctr,
+              userLogin: isUserLoggedIn,
+              userFace: ctr?.userFace.value,
+              callback: () => callback!(),
            ),
          ),
        );
@ -207,3 +154,236 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
    );
  }
 }
+
+class UserInfoWidget extends StatelessWidget {
+  const UserInfoWidget({
+    Key? key,
+    required this.top,
+    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: [
+        SearchBar(ctr: ctr),
+        if (userLogin.value) ...[
+          const SizedBox(width: 4),
+          ClipRect(
+            child: IconButton(
+              onPressed: () => Get.toNamed('/whisper'),
+              icon: const Icon(Icons.notifications_none),
+            ),
+          )
+        ],
+        const SizedBox(width: 8),
+        Obx(
+          () => userLogin.value
+              ? Stack(
+                  children: [
+                    NetworkImgLayer(
+                      type: 'avatar',
+                      width: 34,
+                      height: 34,
+                      src: userFace,
+                    ),
+                    Positioned.fill(
+                      child: Material(
+                        color: Colors.transparent,
+                        child: InkWell(
+                          onTap: () => callback?.call(),
+                          splashColor: Theme.of(context)
+                              .colorScheme
+                              .primaryContainer
+                              .withOpacity(0.3),
+                          borderRadius: const BorderRadius.all(
+                            Radius.circular(50),
+                          ),
+                        ),
+                      ),
+                    )
+                  ],
+                )
+              : DefaultUser(callback: () => callback!()),
+        ),
+      ],
+    );
+  }
+}
+
+class DefaultUser extends StatelessWidget {
+  const DefaultUser({super.key, this.callback});
+  final Function? callback;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 38,
+      height: 38,
+      child: IconButton(
+        style: ButtonStyle(
+          padding: MaterialStateProperty.all(EdgeInsets.zero),
+          backgroundColor: MaterialStateProperty.resolveWith((states) {
+            return Theme.of(context).colorScheme.onInverseSurface;
+          }),
+        ),
+        onPressed: () => callback?.call(),
+        icon: Icon(
+          Icons.person_rounded,
+          size: 22,
+          color: Theme.of(context).colorScheme.primary,
+        ),
+      ),
+    );
+  }
+}
+
+class CustomTabs extends StatefulWidget {
+  const CustomTabs({super.key});
+
+  @override
+  State<CustomTabs> createState() => _CustomTabsState();
+}
+
+class _CustomTabsState extends State<CustomTabs> {
+  final HomeController _homeController = Get.put(HomeController());
+
+  void onTap(int index) {
+    feedBack();
+    if (_homeController.initialIndex.value == index) {
+      _homeController.tabsCtrList[index]().animateToTop();
+    }
+    _homeController.initialIndex.value = index;
+    _homeController.tabController.index = index;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 44,
+      margin: const EdgeInsets.only(top: 4),
+      child: Obx(
+        () => ListView.separated(
+          padding: const EdgeInsets.symmetric(horizontal: 14.0),
+          scrollDirection: Axis.horizontal,
+          itemCount: _homeController.tabs.length,
+          separatorBuilder: (BuildContext context, int index) {
+            return const SizedBox(width: 10);
+          },
+          itemBuilder: (BuildContext context, int index) {
+            String label = _homeController.tabs[index]['label'];
+            return Obx(
+              () => CustomChip(
+                onTap: () => onTap(index),
+                label: label,
+                selected: index == _homeController.initialIndex.value,
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
+
+class CustomChip extends StatelessWidget {
+  final Function onTap;
+  final String label;
+  final bool selected;
+  const CustomChip({
+    super.key,
+    required this.onTap,
+    required this.label,
+    required this.selected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final ColorScheme colorTheme = Theme.of(context).colorScheme;
+    final Color secondaryContainer = colorTheme.secondaryContainer;
+    final TextStyle chipTextStyle = selected
+        ? const TextStyle(fontWeight: FontWeight.bold, fontSize: 13)
+        : const TextStyle(fontSize: 13);
+    final ColorScheme colorScheme = Theme.of(context).colorScheme;
+    const VisualDensity visualDensity =
+        VisualDensity(horizontal: -4.0, vertical: -2.0);
+    return InputChip(
+      side: BorderSide(
+        color: selected
+            ? colorScheme.onSecondaryContainer.withOpacity(0.2)
+            : Colors.transparent,
+      ),
+      backgroundColor: secondaryContainer,
+      selectedColor: secondaryContainer,
+      color: MaterialStateProperty.resolveWith<Color>(
+          (Set<MaterialState> states) => secondaryContainer.withAlpha(200)),
+      padding: const EdgeInsets.fromLTRB(7, 1, 7, 1),
+      label: Text(label, style: chipTextStyle),
+      onPressed: () => onTap(),
+      selected: selected,
+      showCheckmark: false,
+      visualDensity: visualDensity,
+    );
+  }
+}
+
+class SearchBar extends StatelessWidget {
+  const SearchBar({
+    Key? key,
+    required this.ctr,
+  }) : super(key: key);
+
+  final HomeController? ctr;
+
+  @override
+  Widget build(BuildContext context) {
+    final ColorScheme colorScheme = Theme.of(context).colorScheme;
+    return Expanded(
+      child: Container(
+        width: 250,
+        height: 44,
+        clipBehavior: Clip.hardEdge,
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(25),
+        ),
+        child: Material(
+          color: colorScheme.onSecondaryContainer.withOpacity(0.05),
+          child: InkWell(
+            splashColor: colorScheme.primaryContainer.withOpacity(0.3),
+            onTap: () => Get.toNamed(
+              '/search',
+              parameters: {'hintText': ctr!.defaultSearch.value},
+            ),
+            child: Row(
+              children: [
+                const SizedBox(width: 14),
+                Icon(
+                  Icons.search_outlined,
+                  color: colorScheme.onSecondaryContainer,
+                ),
+                const SizedBox(width: 10),
+                Obx(
+                  () => Text(
+                    ctr!.defaultSearch.value,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(color: colorScheme.outline),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/lib/pages/hot/view.dart
+++ b/lib/pages/hot/view.dart
@ -70,68 +70,70 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
  @override
  Widget build(BuildContext context) {
    super.build(context);
-    return Scaffold(
-      body: RefreshIndicator(
-        onRefresh: () async {
-          return await _hotController.onRefresh();
-        },
-        child: CustomScrollView(
-          controller: _hotController.scrollController,
-          slivers: [
-            SliverPadding(
-              // 单列布局 EdgeInsets.zero
-              padding:
-                  const EdgeInsets.fromLTRB(0, StyleString.safeSpace - 5, 0, 0),
-              sliver: FutureBuilder(
-                future: _futureBuilderFuture,
-                builder: (context, snapshot) {
-                  if (snapshot.connectionState == ConnectionState.done) {
-                    Map data = snapshot.data as Map;
-                    if (data['status']) {
-                      return Obx(
-                        () => SliverList(
-                          delegate:
-                              SliverChildBuilderDelegate((context, index) {
-                            return VideoCardH(
-                              videoItem: _hotController.videoList[index],
-                              showPubdate: true,
-                              longPress: () {
-                                _hotController.popupDialog = _createPopupDialog(
-                                    _hotController.videoList[index]);
-                                Overlay.of(context)
-                                    .insert(_hotController.popupDialog!);
-                              },
-                              longPressEnd: () {
-                                _hotController.popupDialog?.remove();
-                              },
-                            );
-                          }, childCount: _hotController.videoList.length),
-                        ),
-                      );
-                    } else {
-                      return HttpError(
-                        errMsg: data['msg'],
-                        fn: () => setState(() {}),
-                      );
-                    }
+    return RefreshIndicator(
+      onRefresh: () async {
+        return await _hotController.onRefresh();
+      },
+      child: CustomScrollView(
+        controller: _hotController.scrollController,
+        slivers: [
+          SliverPadding(
+            // 单列布局 EdgeInsets.zero
+            padding:
+                const EdgeInsets.fromLTRB(0, StyleString.safeSpace - 5, 0, 0),
+            sliver: FutureBuilder(
+              future: _futureBuilderFuture,
+              builder: (context, snapshot) {
+                if (snapshot.connectionState == ConnectionState.done) {
+                  Map data = snapshot.data as Map;
+                  if (data['status']) {
+                    return Obx(
+                      () => SliverList(
+                        delegate: SliverChildBuilderDelegate((context, index) {
+                          return VideoCardH(
+                            videoItem: _hotController.videoList[index],
+                            showPubdate: true,
+                            longPress: () {
+                              _hotController.popupDialog = _createPopupDialog(
+                                  _hotController.videoList[index]);
+                              Overlay.of(context)
+                                  .insert(_hotController.popupDialog!);
+                            },
+                            longPressEnd: () {
+                              _hotController.popupDialog?.remove();
+                            },
+                          );
+                        }, childCount: _hotController.videoList.length),
+                      ),
+                    );
                  } else {
-                    // 骨架屏
-                    return SliverList(
-                      delegate: SliverChildBuilderDelegate((context, index) {
-                        return const VideoCardHSkeleton();
-                      }, childCount: 10),
+                    return HttpError(
+                      errMsg: data['msg'],
+                      fn: () {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _hotController.queryHotFeed('init');
+                        });
+                      },
                    );
                  }
-                },
-              ),
+                } else {
+                  // 骨架屏
+                  return SliverList(
+                    delegate: SliverChildBuilderDelegate((context, index) {
+                      return const VideoCardHSkeleton();
+                    }, childCount: 10),
+                  );
+                }
+              },
            ),
-            SliverToBoxAdapter(
-              child: SizedBox(
-                height: MediaQuery.of(context).padding.bottom + 10,
-              ),
-            )
-          ],
-        ),
+          ),
+          SliverToBoxAdapter(
+            child: SizedBox(
+              height: MediaQuery.of(context).padding.bottom + 10,
+            ),
+          )
+        ],
      ),
    );
  }
--- a/lib/pages/html/controller.dart
+++ b/lib/pages/html/controller.dart
@ -96,9 +96,6 @@ class HtmlRenderController extends GetxController {
        _sortType = ReplySortType.like;
        break;
      case ReplySortType.like:
-        _sortType = ReplySortType.reply;
-        break;
-      case ReplySortType.reply:
        _sortType = ReplySortType.time;
        break;
      default:
--- a/lib/pages/html/view.dart
+++ b/lib/pages/html/view.dart
@ -10,8 +10,8 @@ import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
-import 'package:pilipala/pages/video/detail/replyNew/index.dart';
-import 'package:pilipala/pages/video/detail/replyReply/index.dart';
+import 'package:pilipala/pages/video/detail/reply_new/index.dart';
+import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
 import 'package:pilipala/utils/feed_back.dart';

 import 'controller.dart';
--- a/lib/pages/live/controller.dart
+++ b/lib/pages/live/controller.dart
@ -10,8 +10,7 @@ class LiveController extends GetxController {
  int count = 12;
  int _currentPage = 1;
  RxInt crossAxisCount = 2.obs;
-  RxList<LiveItemModel> liveList = [LiveItemModel()].obs;
-  bool isLoadingMore = false;
+  RxList<LiveItemModel> liveList = <LiveItemModel>[].obs;
  bool flag = false;
  OverlayEntry? popupDialog;
  Box setting = GStrorage.setting;
@ -39,7 +38,6 @@ class LiveController extends GetxController {
      }
      _currentPage += 1;
    }
-    isLoadingMore = false;
    return res;
  }

--- a/lib/pages/live/view.dart
+++ b/lib/pages/live/view.dart
@ -11,7 +11,6 @@ import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
-import 'package:pilipala/pages/rcmd/index.dart';

 import 'controller.dart';
 import 'widgets/live_item.dart';
@ -45,8 +44,8 @@ class _LivePageState extends State<LivePage>
      () {
        if (scrollController.position.pixels >=
            scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('liveList', const Duration(seconds: 1), () {
-            _liveController.isLoadingMore = true;
+          EasyThrottle.throttle('liveList', const Duration(milliseconds: 200),
+              () {
            _liveController.onLoad();
          });
        }
@ -108,24 +107,20 @@ class _LivePageState extends State<LivePage>
                    } else {
                      return HttpError(
                        errMsg: data['msg'],
-                        fn: () => {},
+                        fn: () {
+                          setState(() {
+                            _futureBuilderFuture =
+                                _liveController.queryLiveList('init');
+                          });
+                        },
                      );
                    }
                  } else {
-                    // 缓存数据
-                    if (_liveController.liveList.length > 1) {
-                      return contentGrid(
-                          _liveController, _liveController.liveList);
-                    }
-                    // 骨架屏
-                    else {
-                      return contentGrid(_liveController, []);
-                    }
+                    return contentGrid(_liveController, []);
                  }
                },
              ),
            ),
-            LoadingMore(ctr: _liveController)
          ],
        ),
      ),
@ -162,8 +157,9 @@ class _LivePageState extends State<LivePage>
        crossAxisCount: crossAxisCount,
        mainAxisExtent:
            Get.size.width / crossAxisCount / StyleString.aspectRatio +
-                (crossAxisCount == 1 ? 48 : 68) *
-                    MediaQuery.of(context).textScaleFactor,
+                MediaQuery.textScalerOf(context).scale(
+                  (crossAxisCount == 1 ? 48 : 68),
+                ),
      ),
      delegate: SliverChildBuilderDelegate(
        (BuildContext context, int index) {
--- a/lib/pages/live/widgets/live_item.dart
+++ b/lib/pages/live/widgets/live_item.dart
@ -184,18 +184,32 @@ class VideoStat extends StatelessWidget {
          tileMode: TileMode.mirror,
        ),
      ),
-      child: RichText(
-        maxLines: 1,
-        textAlign: TextAlign.justify,
-        softWrap: false,
-        text: TextSpan(
-          style: const TextStyle(fontSize: 11, color: Colors.white),
-          children: [
-            TextSpan(text: liveItem!.areaName!),
-            TextSpan(text: liveItem!.watchedShow!['text_small']),
-          ],
-        ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(
+            liveItem!.areaName!,
+            style: const TextStyle(fontSize: 11, color: Colors.white),
+          ),
+          Text(
+            liveItem!.watchedShow!['text_small'],
+            style: const TextStyle(fontSize: 11, color: Colors.white),
+          ),
+        ],
      ),
+
+      // child: RichText(
+      //   maxLines: 1,
+      //   textAlign: TextAlign.justify,
+      //   softWrap: false,
+      //   text: TextSpan(
+      //     style: const TextStyle(fontSize: 11, color: Colors.white),
+      //     children: [
+      //       TextSpan(text: liveItem!.areaName!),
+      //       TextSpan(text: liveItem!.watchedShow!['text_small']),
+      //     ],
+      //   ),
+      // ),
    );
  }
 }
--- a/lib/pages/liveRoom/view.dart
+++ b/lib/pages/liveRoom/view.dart
@ -1,177 +0,0 @@
-import 'dart:io';
-
-import 'package:floating/floating.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/plugin/pl_player/index.dart';
-
-import 'controller.dart';
-import 'widgets/bottom_control.dart';
-
-class LiveRoomPage extends StatefulWidget {
-  const LiveRoomPage({super.key});
-
-  @override
-  State<LiveRoomPage> createState() => _LiveRoomPageState();
-}
-
-class _LiveRoomPageState extends State<LiveRoomPage> {
-  final LiveRoomController _liveRoomController = Get.put(LiveRoomController());
-  PlPlayerController? plPlayerController;
-
-  bool isShowCover = true;
-  bool isPlay = true;
-  Floating? floating;
-
-  @override
-  void initState() {
-    super.initState();
-    plPlayerController = _liveRoomController.plPlayerController;
-    plPlayerController!.onPlayerStatusChanged.listen(
-      (PlayerStatus status) {
-        if (status == PlayerStatus.playing) {
-          isShowCover = false;
-          setState(() {});
-        }
-      },
-    );
-    if (Platform.isAndroid) {
-      floating = Floating();
-    }
-  }
-
-  @override
-  void dispose() {
-    plPlayerController!.dispose();
-    if (floating != null) {
-      floating!.dispose();
-    }
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    Widget childWhenDisabled = Scaffold(
-      primary: true,
-      appBar: PreferredSize(
-        preferredSize: Size.fromHeight(
-          MediaQuery.of(context).orientation == Orientation.portrait ? 56 : 0,
-        ),
-        child: AppBar(
-          centerTitle: false,
-          titleSpacing: 0,
-          title: _liveRoomController.liveItem != null
-              ? Row(
-                  children: [
-                    NetworkImgLayer(
-                      width: 34,
-                      height: 34,
-                      type: 'avatar',
-                      src: _liveRoomController.liveItem.face,
-                    ),
-                    const SizedBox(width: 10),
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          _liveRoomController.liveItem.uname,
-                          style: const TextStyle(fontSize: 14),
-                        ),
-                        const SizedBox(height: 1),
-                        if (_liveRoomController.liveItem.watchedShow != null)
-                          Text(
-                              _liveRoomController
-                                      .liveItem.watchedShow['text_large'] ??
-                                  '',
-                              style: const TextStyle(fontSize: 12)),
-                      ],
-                    ),
-                  ],
-                )
-              : const SizedBox(),
-          // actions: [
-          //   SizedBox(
-          //     height: 34,
-          //     child: ElevatedButton(onPressed: () {}, child: const Text('关注')),
-          //   ),
-          //   const SizedBox(width: 12),
-          // ],
-        ),
-      ),
-      body: Column(
-        children: [
-          Stack(
-            children: [
-              PopScope(
-                canPop: plPlayerController?.isFullScreen.value != true,
-                onPopInvoked: (bool didPop) {
-                  if (plPlayerController?.isFullScreen.value == true) {
-                    plPlayerController!.triggerFullScreen(status: false);
-                  }
-                  if (MediaQuery.of(context).orientation ==
-                      Orientation.landscape) {
-                    verticalScreen();
-                  }
-                },
-                child: SizedBox(
-                  width: Get.size.width,
-                  height: MediaQuery.of(context).orientation ==
-                          Orientation.landscape
-                      ? Get.size.height
-                      : Get.size.width * 9 / 16,
-                  child: plPlayerController!.videoPlayerController != null
-                      ? PLVideoPlayer(
-                          controller: plPlayerController!,
-                          bottomControl: BottomControl(
-                            controller: plPlayerController,
-                            liveRoomCtr: _liveRoomController,
-                            floating: floating,
-                          ),
-                        )
-                      : const SizedBox(),
-                ),
-              ),
-              // if (_liveRoomController.liveItem != null &&
-              //     _liveRoomController.liveItem.cover != null)
-              //   Visibility(
-              //     visible: isShowCover,
-              //     child: Positioned(
-              //       top: 0,
-              //       left: 0,
-              //       right: 0,
-              //       child: NetworkImgLayer(
-              //         type: 'emote',
-              //         src: _liveRoomController.liveItem.cover,
-              //         width: Get.size.width,
-              //         height: videoHeight,
-              //       ),
-              //     ),
-              //   ),
-            ],
-          ),
-        ],
-      ),
-    );
-    Widget childWhenEnabled = AspectRatio(
-      aspectRatio: 16 / 9,
-      child: plPlayerController!.videoPlayerController != null
-          ? PLVideoPlayer(
-              controller: plPlayerController!,
-              bottomControl: BottomControl(
-                controller: plPlayerController,
-                liveRoomCtr: _liveRoomController,
-              ),
-            )
-          : const SizedBox(),
-    );
-    if (Platform.isAndroid) {
-      return PiPSwitcher(
-        childWhenDisabled: childWhenDisabled,
-        childWhenEnabled: childWhenEnabled,
-      );
-    } else {
-      return childWhenDisabled;
-    }
-  }
-}
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
@ -3,6 +3,7 @@ import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/live.dart';
 import 'package:pilipala/models/live/room_info.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
+import '../../models/live/room_info_h5.dart';

 class LiveRoomController extends GetxController {
  String cover = '';
@ -14,13 +15,7 @@ class LiveRoomController extends GetxController {
  RxBool volumeOff = false.obs;
  PlPlayerController plPlayerController =
      PlPlayerController.getInstance(videoType: 'live');
-
-  // MeeduPlayerController meeduPlayerController = MeeduPlayerController(
-  //   colorTheme: Theme.of(Get.context!).colorScheme.primary,
-  //   pipEnabled: true,
-  //   controlsStyle: ControlsStyle.live,
-  //   enabledButtons: const EnabledButtons(pip: true),
-  // );
+  Rx<RoomInfoH5Model> roomInfoH5 = RoomInfoH5Model().obs;

  @override
  void onInit() {
@ -36,11 +31,10 @@ class LiveRoomController extends GetxController {
        cover = liveItem.cover;
      }
    }
-    queryLiveInfo();
  }

-  playerInit(source) {
-    plPlayerController.setDataSource(
+  playerInit(source) async {
+    await plPlayerController.setDataSource(
      DataSource(
        videoSource: source,
        audioSource: null,
@ -66,7 +60,8 @@ class LiveRoomController extends GetxController {
      String videoUrl = (item.urlInfo?.first.host)! +
          item.baseUrl! +
          item.urlInfo!.first.extra!;
-      playerInit(videoUrl);
+      await playerInit(videoUrl);
+      return res;
    }
  }

@ -80,4 +75,12 @@ class LiveRoomController extends GetxController {
      volumeOff.value = true;
    }
  }
+
+  Future queryLiveInfoH5() async {
+    var res = await LiveHttp.liveRoomInfoH5(roomId: roomId);
+    if (res['status']) {
+      roomInfoH5.value = res['data'];
+    }
+    return res;
+  }
 }
--- a/lib/pages/live_room/index.dart
+++ b/lib/pages/live_room/index.dart
--- a/lib/pages/live_room/view.dart
+++ b/lib/pages/live_room/view.dart
@ -0,0 +1,207 @@
+import 'dart:io';
+
+import 'package:floating/floating.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/plugin/pl_player/index.dart';
+
+import 'controller.dart';
+import 'widgets/bottom_control.dart';
+
+class LiveRoomPage extends StatefulWidget {
+  const LiveRoomPage({super.key});
+
+  @override
+  State<LiveRoomPage> createState() => _LiveRoomPageState();
+}
+
+class _LiveRoomPageState extends State<LiveRoomPage> {
+  final LiveRoomController _liveRoomController = Get.put(LiveRoomController());
+  PlPlayerController? plPlayerController;
+  late Future? _futureBuilder;
+  late Future? _futureBuilderFuture;
+
+  bool isShowCover = true;
+  bool isPlay = true;
+  Floating? floating;
+
+  @override
+  void initState() {
+    super.initState();
+    if (Platform.isAndroid) {
+      floating = Floating();
+    }
+    videoSourceInit();
+    _futureBuilderFuture = _liveRoomController.queryLiveInfo();
+  }
+
+  Future<void> videoSourceInit() async {
+    _futureBuilder = _liveRoomController.queryLiveInfoH5();
+    plPlayerController = _liveRoomController.plPlayerController;
+  }
+
+  @override
+  void dispose() {
+    plPlayerController!.dispose();
+    if (floating != null) {
+      floating!.dispose();
+    }
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Widget videoPlayerPanel = FutureBuilder(
+      future: _futureBuilderFuture,
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        if (snapshot.hasData && snapshot.data['status']) {
+          return PLVideoPlayer(
+            controller: plPlayerController!,
+            bottomControl: BottomControl(
+              controller: plPlayerController,
+              liveRoomCtr: _liveRoomController,
+              floating: floating,
+            ),
+          );
+        } else {
+          return const SizedBox();
+        }
+      },
+    );
+
+    Widget childWhenDisabled = Scaffold(
+      primary: true,
+      backgroundColor: Colors.black,
+      body: Stack(
+        children: [
+          // Obx(
+          //   () => Positioned.fill(
+          //     child: Opacity(
+          //       opacity: 0.8,
+          //       child: _liveRoomController
+          //                       .roomInfoH5.value.roomInfo?.appBackground !=
+          //                   '' &&
+          //               _liveRoomController
+          //                       .roomInfoH5.value.roomInfo?.appBackground !=
+          //                   null
+          //           ? NetworkImgLayer(
+          //               width: Get.width,
+          //               height: Get.height,
+          //               src: _liveRoomController
+          //                       .roomInfoH5.value.roomInfo?.appBackground ??
+          //                   '',
+          //             )
+          //           : Image.asset(
+          //               'assets/images/live/default_bg.webp',
+          //               width: Get.width,
+          //               height: Get.height,
+          //             ),
+          //     ),
+          //   ),
+          // ),
+          Positioned.fill(
+            child: Opacity(
+              opacity: 0.8,
+              child: Image.asset(
+                'assets/images/live/default_bg.webp',
+                width: Get.width,
+                height: Get.height,
+              ),
+            ),
+          ),
+          Column(
+            children: [
+              AppBar(
+                centerTitle: false,
+                titleSpacing: 0,
+                backgroundColor: Colors.transparent,
+                foregroundColor: Colors.white,
+                toolbarHeight:
+                    MediaQuery.of(context).orientation == Orientation.portrait
+                        ? 56
+                        : 0,
+                title: FutureBuilder(
+                  future: _futureBuilder,
+                  builder: (context, snapshot) {
+                    if (snapshot.data == null) {
+                      return const SizedBox();
+                    }
+                    Map data = snapshot.data as Map;
+                    if (data['status']) {
+                      return Obx(
+                        () => Row(
+                          children: [
+                            NetworkImgLayer(
+                              width: 34,
+                              height: 34,
+                              type: 'avatar',
+                              src: _liveRoomController
+                                  .roomInfoH5.value.anchorInfo!.baseInfo!.face,
+                            ),
+                            const SizedBox(width: 10),
+                            Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(
+                                  _liveRoomController.roomInfoH5.value
+                                      .anchorInfo!.baseInfo!.uname!,
+                                  style: const TextStyle(fontSize: 14),
+                                ),
+                                const SizedBox(height: 1),
+                                if (_liveRoomController
+                                        .roomInfoH5.value.watchedShow !=
+                                    null)
+                                  Text(
+                                    _liveRoomController.roomInfoH5.value
+                                            .watchedShow!['text_large'] ??
+                                        '',
+                                    style: const TextStyle(fontSize: 12),
+                                  ),
+                              ],
+                            ),
+                          ],
+                        ),
+                      );
+                    } else {
+                      return const SizedBox();
+                    }
+                  },
+                ),
+              ),
+              PopScope(
+                canPop: plPlayerController?.isFullScreen.value != true,
+                onPopInvoked: (bool didPop) {
+                  if (plPlayerController?.isFullScreen.value == true) {
+                    plPlayerController!.triggerFullScreen(status: false);
+                  }
+                  if (MediaQuery.of(context).orientation ==
+                      Orientation.landscape) {
+                    verticalScreen();
+                  }
+                },
+                child: SizedBox(
+                  width: Get.size.width,
+                  height: MediaQuery.of(context).orientation ==
+                          Orientation.landscape
+                      ? Get.size.height
+                      : Get.size.width * 9 / 16,
+                  child: videoPlayerPanel,
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+    if (Platform.isAndroid) {
+      return PiPSwitcher(
+        childWhenDisabled: childWhenDisabled,
+        childWhenEnabled: videoPlayerPanel,
+        floating: floating,
+      );
+    } else {
+      return childWhenDisabled;
+    }
+  }
+}
--- a/lib/pages/live_room/widgets/bottom_control.dart
+++ b/lib/pages/live_room/widgets/bottom_control.dart
@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/video/play/url.dart';
-import 'package:pilipala/pages/liveRoom/index.dart';
+import 'package:pilipala/pages/live_room/index.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/utils/storage.dart';

--- a/lib/pages/main/controller.dart
+++ b/lib/pages/main/controller.dart
@ -1,14 +1,17 @@
 import 'dart:async';

+import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/http/common.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 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>[
@ -19,14 +22,15 @@ class MainController extends GetxController {
  RxList navigationBars = [
    {
      'icon': const Icon(
-        Icons.favorite_outline,
+        Icons.home_outlined,
        size: 21,
      ),
      'selectIcon': const Icon(
-        Icons.favorite,
+        Icons.home,
        size: 21,
      ),
      'label': "首页",
+      'count': 0,
    },
    {
      'icon': const Icon(
@ -38,17 +42,19 @@ class MainController extends GetxController {
        size: 21,
      ),
      'label': "动态",
+      'count': 0,
    },
    {
      'icon': const Icon(
-        Icons.folder_outlined,
+        Icons.video_collection_outlined,
        size: 20,
      ),
      'selectIcon': const Icon(
-        Icons.folder,
+        Icons.video_collection,
        size: 21,
      ),
      'label': "媒体库",
+      'count': 0,
    }
  ].obs;
  final StreamController<bool> bottomBarStream =
@ -56,6 +62,11 @@ class MainController extends GetxController {
  Box setting = GStrorage.setting;
  DateTime? _lastPressedAt;
  late bool hideTabBar;
+  late PageController pageController;
+  int selectedIndex = 0;
+  Box userInfoCache = GStrorage.userInfo;
+  RxBool userLogin = false.obs;
+  late Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;

  @override
  void onInit() {
@ -64,17 +75,52 @@ class MainController extends GetxController {
      Utils.checkUpdata();
    }
    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();
+    }
  }

-  Future<bool> onBackPressed(BuildContext context) {
+  void onBackPressed(BuildContext context) {
    if (_lastPressedAt == null ||
        DateTime.now().difference(_lastPressedAt!) >
            const Duration(seconds: 2)) {
      // 两次点击时间间隔超过2秒，重新记录时间戳
      _lastPressedAt = DateTime.now();
+      if (selectedIndex != 0) {
+        pageController.jumpTo(0);
+      }
      SmartDialog.showToast("再按一次退出Pili");
-      return Future.value(false); // 不退出应用
+      return; // 不退出应用
    }
-    return Future.value(true); // 退出应用
+    SystemNavigator.pop(); // 退出应用
+  }
+
+  void getUnreadDynamic() async {
+    if (!userLogin.value) {
+      return;
+    }
+    int dynamicItemIndex =
+        navigationBars.indexWhere((item) => item['label'] == "动态");
+    var res = await CommonHttp.unReadDynamic();
+    var data = res['data'];
+    if (dynamicItemIndex != -1) {
+      navigationBars[dynamicItemIndex]['count'] =
+          data == null ? 0 : data.length; // 修改 count 属性为新的值
+    }
+    navigationBars.refresh();
+  }
+
+  void clearUnread() async {
+    int dynamicItemIndex =
+        navigationBars.indexWhere((item) => item['label'] == "动态");
+    if (dynamicItemIndex != -1) {
+      navigationBars[dynamicItemIndex]['count'] = 0; // 修改 count 属性为新的值
+    }
+    navigationBars.refresh();
  }
 }
--- a/lib/pages/main/view.dart
+++ b/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';
@ -24,8 +25,6 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
  final DynamicsController _dynamicController = Get.put(DynamicsController());
  final MediaController _mediaController = Get.put(MediaController());

-  PageController? _pageController;
-  int selectedIndex = 0;
  int? _lastSelectTime; //上次点击时间
  Box setting = GStrorage.setting;
  late bool enableMYBar;
@ -34,13 +33,14 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
  void initState() {
    super.initState();
    _lastSelectTime = DateTime.now().millisecondsSinceEpoch;
-    _pageController = PageController(initialPage: selectedIndex);
+    _mainController.pageController =
+        PageController(initialPage: _mainController.selectedIndex);
    enableMYBar = setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
  }

  void setIndex(int value) async {
    feedBack();
-    _pageController!.jumpToPage(value);
+    _mainController.pageController.jumpToPage(value);
    var currentPage = _mainController.pages[value];
    if (currentPage is HomePage) {
      if (_homeController.flag) {
@ -68,6 +68,7 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
        _lastSelectTime = DateTime.now().millisecondsSinceEpoch;
      }
      _dynamicController.flag = true;
+      _mainController.clearUnread();
    } else {
      _dynamicController.flag = false;
    }
@ -88,20 +89,23 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
  Widget build(BuildContext context) {
    Box localCache = GStrorage.localCache;
    double statusBarHeight = MediaQuery.of(context).padding.top;
-    double sheetHeight = MediaQuery.of(context).size.height -
+    double sheetHeight = MediaQuery.sizeOf(context).height -
        MediaQuery.of(context).padding.top -
-        MediaQuery.of(context).size.width * 9 / 16;
+        MediaQuery.sizeOf(context).width * 9 / 16;
    localCache.put('sheetHeight', sheetHeight);
    localCache.put('statusBarHeight', statusBarHeight);
    return PopScope(
-      onPopInvoked: (bool status) => _mainController.onBackPressed(context),
+      canPop: false,
+      onPopInvoked: (bool didPop) async {
+        _mainController.onBackPressed(context);
+      },
      child: Scaffold(
        extendBody: true,
        body: PageView(
          physics: const NeverScrollableScrollPhysics(),
-          controller: _pageController,
+          controller: _mainController.pageController,
          onPageChanged: (index) {
-            selectedIndex = index;
+            _mainController.selectedIndex = index;
            setState(() {});
          },
          children: _mainController.pages,
@ -116,36 +120,68 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
              curve: Curves.easeInOutCubicEmphasized,
              duration: const Duration(milliseconds: 500),
              offset: Offset(0, snapshot.data ? 0 : 1),
-              child: enableMYBar
-                  ? NavigationBar(
-                      onDestinationSelected: (value) => setIndex(value),
-                      selectedIndex: selectedIndex,
-                      destinations: <Widget>[
-                        ..._mainController.navigationBars.map((e) {
-                          return NavigationDestination(
-                            icon: e['icon'],
-                            selectedIcon: e['selectIcon'],
-                            label: e['label'],
-                          );
-                        }).toList(),
-                      ],
-                    )
-                  : BottomNavigationBar(
-                      currentIndex: selectedIndex,
-                      onTap: (value) => setIndex(value),
-                      iconSize: 16,
-                      selectedFontSize: 12,
-                      unselectedFontSize: 12,
-                      items: [
-                        ..._mainController.navigationBars.map((e) {
-                          return BottomNavigationBarItem(
-                            icon: e['icon'],
-                            activeIcon: e['selectIcon'],
-                            label: e['label'],
-                          );
-                        }).toList(),
-                      ],
-                    ),
+              child: Obx(
+                () => enableMYBar
+                    ? NavigationBar(
+                        onDestinationSelected: (value) => setIndex(value),
+                        selectedIndex: _mainController.selectedIndex,
+                        destinations: <Widget>[
+                          ..._mainController.navigationBars.map((e) {
+                            return NavigationDestination(
+                              icon: Obx(
+                                () => Badge(
+                                  label:
+                                      _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'],
+                            );
+                          }).toList(),
+                        ],
+                      )
+                    : BottomNavigationBar(
+                        currentIndex: _mainController.selectedIndex,
+                        onTap: (value) => setIndex(value),
+                        iconSize: 16,
+                        selectedFontSize: 12,
+                        unselectedFontSize: 12,
+                        items: [
+                          ..._mainController.navigationBars.map((e) {
+                            return BottomNavigationBarItem(
+                              icon: Obx(
+                                () => Badge(
+                                  label:
+                                      _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'],
+                            );
+                          }).toList(),
+                        ],
+                      ),
+              ),
            );
          },
        ),
--- a/lib/pages/media/view.dart
+++ b/lib/pages/media/view.dart
@ -163,7 +163,7 @@ class _MediaPageState extends State<MediaPage>
        // const SizedBox(height: 10),
        SizedBox(
          width: double.infinity,
-          height: 200 * MediaQuery.of(context).textScaleFactor,
+          height: MediaQuery.textScalerOf(context).scale(200),
          child: FutureBuilder(
              future: _futureBuilderFuture,
              builder: (context, snapshot) {
--- a/lib/pages/member/view.dart
+++ b/lib/pages/member/view.dart
@ -41,7 +41,7 @@ class _MemberPageState extends State<MemberPage>
    _memberCoinsFuture = _memberController.getRecentCoinVideo();
    _extendNestCtr.addListener(
      () {
-        double offset = _extendNestCtr.position.pixels;
+        final double offset = _extendNestCtr.position.pixels;
        if (offset > 100) {
          appbarStream.add(true);
        } else {
@ -67,7 +67,7 @@ class _MemberPageState extends State<MemberPage>
            title: StreamBuilder(
              stream: appbarStream.stream,
              initialData: false,
-              builder: (context, AsyncSnapshot snapshot) {
+              builder: (BuildContext context, AsyncSnapshot snapshot) {
                return AnimatedOpacity(
                  opacity: snapshot.data ? 1 : 0,
                  curve: Curves.easeOut,
@ -105,7 +105,7 @@ class _MemberPageState extends State<MemberPage>
            actions: [
              IconButton(
                onPressed: () => Get.toNamed(
-                    '/memberSearch?mid=${Get.parameters['mid']}&uname=${_memberController.memberInfo.value.name!}'),
+                    '/memberSearch?mid=$mid&uname=${_memberController.memberInfo.value.name!}'),
                icon: const Icon(Icons.search_outlined),
              ),
              PopupMenuButton(
--- a/lib/pages/member_archive/controller.dart
+++ b/lib/pages/member_archive/controller.dart
@ -25,7 +25,7 @@ class MemberArchiveController extends GetxController {

  // 获取用户投稿
  Future getMemberArchive(type) async {
-    if (type == 'onRefresh') {
+    if (type == 'init') {
      pn = 1;
    }
    var res = await MemberHttp.memberArchive(
@ -34,7 +34,12 @@ class MemberArchiveController extends GetxController {
      order: currentOrder['type']!,
    );
    if (res['status']) {
-      archivesList.addAll(res['data'].list.vlist);
+      if (type == 'init') {
+        archivesList.value = res['data'].list.vlist;
+      }
+      if (type == 'onLoad') {
+        archivesList.addAll(res['data'].list.vlist);
+      }
      count = res['data'].page['count'];
      pn += 1;
    }
@ -42,13 +47,14 @@ class MemberArchiveController extends GetxController {
  }

  toggleSort() async {
-    pn = 1;
-    int index = orderList.indexOf(currentOrder);
+    List<String> typeList = orderList.map((e) => e['type']!).toList();
+    int index = typeList.indexOf(currentOrder['type']!);
    if (index == orderList.length - 1) {
      currentOrder.value = orderList.first;
    } else {
      currentOrder.value = orderList[index + 1];
    }
+    getMemberArchive('init');
  }

  // 上拉加载
--- a/Show More
+++ b/Show More